From 700123c55b2319cdc9628b5e62be096647499d36 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 3 Jan 2012 02:30:37 +0100 Subject: [PATCH 001/185] FifoPlayer: Add an "Analyzer" tab which allows browsing through all rendered objects per frame and through all register setting commands per object --- .../Src/FifoPlayer/FifoPlaybackAnalyzer.cpp | 10 +- .../Core/Core/Src/FifoPlayer/FifoPlayer.cpp | 5 +- Source/Core/Core/Src/FifoPlayer/FifoPlayer.h | 2 + Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp | 218 +++++++++++++++++- Source/Core/DolphinWX/Src/FifoPlayerDlg.h | 11 + 5 files changed, 229 insertions(+), 17 deletions(-) diff --git a/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp b/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp index 4aea2acc98..a8ba627019 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp +++ b/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp @@ -71,10 +71,10 @@ void FifoPlaybackAnalyzer::AnalyzeFrames(FifoDataFile *file, std::vector prevCmds; - + while (cmdStart < frame.fifoDataSize) { // Add memory updates that have occured before this point in the frame @@ -83,9 +83,9 @@ void FifoPlaybackAnalyzer::AnalyzeFrames(FifoDataFile *file, std::vectorGetFrame(m_CurrentFrame), m_FrameInfo[m_CurrentFrame]); - ++m_CurrentFrame; + WriteFrame(m_File->GetFrame(m_CurrentFrame), m_FrameInfo[m_CurrentFrame]); + + ++m_CurrentFrame; } } } diff --git a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h b/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h index 486c3c69e4..9db6c0d980 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h +++ b/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h @@ -44,6 +44,8 @@ public: u32 GetFrameObjectCount(); u32 GetCurrentFrameNum() { return m_CurrentFrame; } + const AnalyzedFrameInfo& GetAnalyzedFrameInfo(u32 frame) { return m_FrameInfo[frame]; } + // Frame range u32 GetFrameRangeStart() { return m_FrameRangeStart; } void SetFrameRangeStart(u32 start); diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp index cd863095a1..5a321298a1 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp @@ -21,6 +21,7 @@ #include "Thread.h" #include "FifoPlayer/FifoPlayer.h" #include "FifoPlayer/FifoRecorder.h" +#include "OpcodeDecoding.h" #include DECLARE_EVENT_TYPE(RECORDING_FINISHED_EVENT, -1) @@ -65,6 +66,10 @@ FifoPlayerDlg::~FifoPlayerDlg() m_FramesToRecordCtrl->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnNumFramesToRecord), NULL, this); m_Close->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnCloseClick), NULL, this); + m_framesList->Disconnect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnFrameListSelectionChanged), NULL, this); + m_objectsList->Disconnect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnObjectListSelectionChanged), NULL, this); + m_objectCmdList->Disconnect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnObjectCmdListSelectionChanged), NULL, this); + FifoPlayer::GetInstance().SetFrameWrittenCallback(NULL); sMutex.lock(); @@ -80,6 +85,8 @@ void FifoPlayerDlg::CreateGUIControls() sMain = new wxBoxSizer(wxVERTICAL); m_Notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0); + + { m_PlayPage = new wxPanel(m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); wxBoxSizer* sPlayPage; sPlayPage = new wxBoxSizer(wxVERTICAL); @@ -151,6 +158,9 @@ void FifoPlayerDlg::CreateGUIControls() m_PlayPage->Layout(); sPlayPage->Fit(m_PlayPage); m_Notebook->AddPage(m_PlayPage, _("Play"), true); + } + + { m_RecordPage = new wxPanel(m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); wxBoxSizer* sRecordPage; sRecordPage = new wxBoxSizer(wxVERTICAL); @@ -199,28 +209,58 @@ void FifoPlayerDlg::CreateGUIControls() m_RecordPage->Layout(); sRecordPage->Fit(m_RecordPage); m_Notebook->AddPage(m_RecordPage, _("Record"), false); + } + + // Analyze page + { + m_AnalyzePage = new wxPanel(m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + wxBoxSizer* sAnalyzePage; + sAnalyzePage = new wxBoxSizer(wxVERTICAL); + + wxStaticBoxSizer* sTestSizer; + sTestSizer = new wxStaticBoxSizer(new wxStaticBox(m_AnalyzePage, wxID_ANY, _("Frame info")), wxHORIZONTAL); + + m_framesList = new wxListBox(m_AnalyzePage, wxID_ANY); + m_framesList->SetMinSize(wxSize(100, 250)); + sTestSizer->Add(m_framesList, 0, wxALL, 5); + + m_objectsList = new wxListBox(m_AnalyzePage, wxID_ANY); + m_objectsList->SetMinSize(wxSize(110, 250)); + sTestSizer->Add(m_objectsList, 0, wxALL, 5); + + m_objectCmdList = new wxListBox(m_AnalyzePage, wxID_ANY); + m_objectCmdList->SetMinSize(wxSize(175, 250)); + sTestSizer->Add(m_objectCmdList, 0, wxALL, 5); + + sAnalyzePage->Add(sTestSizer, 0, wxEXPAND, 5); + m_AnalyzePage->SetSizer(sAnalyzePage); + m_AnalyzePage->Layout(); + sAnalyzePage->Fit(m_AnalyzePage); + m_Notebook->AddPage(m_AnalyzePage, _("Analyze"), false); + } + sMain->Add(m_Notebook, 1, wxEXPAND | wxALL, 5); - + wxBoxSizer* sButtons; sButtons = new wxBoxSizer(wxHORIZONTAL); - + wxBoxSizer* sCloseButtonExpander; sCloseButtonExpander = new wxBoxSizer(wxHORIZONTAL); - + sButtons->Add(sCloseButtonExpander, 1, wxEXPAND, 5); - + m_Close = new wxButton(this, wxID_ANY, _("Close"), wxDefaultPosition, wxDefaultSize, 0); sButtons->Add(m_Close, 0, wxALL, 5); - + sMain->Add(sButtons, 0, wxEXPAND, 5); - + SetSizer(sMain); Layout(); sMain->Fit(this); - + Center(wxBOTH); - + // Connect Events Connect(wxEVT_PAINT, wxPaintEventHandler(FifoPlayerDlg::OnPaint)); m_FrameFromCtrl->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnFrameFrom), NULL, this); @@ -231,7 +271,11 @@ void FifoPlayerDlg::CreateGUIControls() m_RecordStop->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnRecordStop), NULL, this); m_Save->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnSaveFile), NULL, this); m_FramesToRecordCtrl->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnNumFramesToRecord), NULL, this); - m_Close->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnCloseClick), NULL, this); + Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnCloseClick), NULL, this); + + m_framesList->Connect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnFrameListSelectionChanged), NULL, this); + m_objectsList->Connect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnObjectListSelectionChanged), NULL, this); + m_objectCmdList->Connect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnObjectCmdListSelectionChanged), NULL, this); Connect(RECORDING_FINISHED_EVENT, wxCommandEventHandler(FifoPlayerDlg::OnRecordingFinished), NULL, this); Connect(FRAME_WRITTEN_EVENT, wxCommandEventHandler(FifoPlayerDlg::OnFrameWritten), NULL, this); @@ -243,6 +287,7 @@ void FifoPlayerDlg::OnPaint(wxPaintEvent& event) { UpdatePlayGui(); UpdateRecorderGui(); + UpdateAnalyzerGui(); event.Skip(); } @@ -250,10 +295,11 @@ void FifoPlayerDlg::OnPaint(wxPaintEvent& event) void FifoPlayerDlg::OnFrameFrom(wxSpinEvent& event) { FifoPlayer &player = FifoPlayer::GetInstance(); + player.SetFrameRangeStart(event.GetPosition()); m_FrameFromCtrl->SetValue(player.GetFrameRangeStart()); - m_FrameToCtrl->SetValue(player.GetFrameRangeEnd()); + m_FrameToCtrl->SetValue(player.GetFrameRangeEnd()); } void FifoPlayerDlg::OnFrameTo(wxSpinEvent& event) @@ -326,6 +372,141 @@ void FifoPlayerDlg::OnNumFramesToRecord(wxSpinEvent& event) m_FramesToRecord = -1; } +void FifoPlayerDlg::OnFrameListSelectionChanged(wxCommandEvent& event) +{ + FifoPlayer& player = FifoPlayer::GetInstance(); + + m_objectsList->Clear(); + if (event.GetInt() != -1) + { + int num_objects = player.GetAnalyzedFrameInfo(event.GetInt()).objectStarts.size(); + for (int i = 0; i < num_objects; ++i) + m_objectsList->Append(wxString::Format(wxT("Object %i"), i)); + } + + // Call OnObjectListSelectionChanged + m_objectsList->SetSelection(-1); +} + +void FifoPlayerDlg::OnObjectListSelectionChanged (wxCommandEvent& event) +{ + FifoPlayer& player = FifoPlayer::GetInstance(); + + int frame_idx = m_framesList->GetSelection(); + int object_idx = event.GetInt(); + + m_objectCmdList->Clear(); + if (frame_idx != -1 && object_idx != -1) + { + const AnalyzedFrameInfo& frame = player.GetAnalyzedFrameInfo(frame_idx); + const FifoFrameInfo& fifo_frame = player.GetFile()->GetFrame(frame_idx); + const u8* objectdata_start = &fifo_frame.fifoData[frame.objectStarts[object_idx]]; + const u8* objectdata_end = &fifo_frame.fifoData[frame.objectEnds[object_idx]]; + u8* objectdata = (u8*)objectdata_start; + const int obj_offset = objectdata_start - &fifo_frame.fifoData[frame.objectStarts[0]]; + + int cmd = *objectdata++; + int stream_size = Common::swap16(objectdata); + objectdata += 2; + int vertex_size = (objectdata_end - objectdata) / stream_size; + wxString newLabel = wxString::Format(wxT("%08X: %02X %04X "), obj_offset, cmd, stream_size); + if ((objectdata_end - objectdata) % stream_size) newLabel += _("NOTE: Stream size doesn't match actual data length\n"); + while (objectdata < objectdata_end) + { + // Group bytes by vertex + newLabel += wxString::Format(wxT("%02X"), *objectdata++); + if (((objectdata - (objectdata_start+3)) % vertex_size) == 0) newLabel += wxT(" "); + } + m_objectCmdList->Append(newLabel); + + + // Between objectdata_end and next_objdata_start, there are register setting commands + if (object_idx + 1 < frame.objectStarts.size()) + { + const u8* next_objdata_start = &fifo_frame.fifoData[frame.objectStarts[object_idx+1]]; + while (objectdata < next_objdata_start) + { + int cmd = *objectdata++; + switch (cmd) + { + case GX_NOP: + newLabel = _("NOP"); + break; + + case 0x44: + newLabel = _("0x44"); + break; + + case GX_CMD_INVL_VC: + newLabel = _("GX_CMD_INVL_VC"); + break; + + case GX_LOAD_CP_REG: + { + u32 cmd2 = *objectdata++; + u32 value = Common::swap32(objectdata); + objectdata += 4; + + newLabel = wxString::Format(wxT("CP %02X %08X"), cmd2, value); + } + break; + + case GX_LOAD_XF_REG: + { + u32 cmd2 = Common::swap32(objectdata); + objectdata += 4; + u8 streamSize = ((cmd2 >> 16) & 15) + 1; + + newLabel = wxString::Format(wxT("XF %08X(%02X) ..."), cmd2, streamSize); + + objectdata += streamSize * 4; + } + break; + + case GX_LOAD_INDX_A: + case GX_LOAD_INDX_B: + case GX_LOAD_INDX_C: + case GX_LOAD_INDX_D: + objectdata += 4; + newLabel = wxString::Format(wxT("LOAD INDX %s"), (cmd == GX_LOAD_INDX_A) ? "A" : + (cmd == GX_LOAD_INDX_B) ? "B" : + (cmd == GX_LOAD_INDX_C) ? "C" : "D"); + break; + + case GX_CMD_CALL_DL: + // The recorder should have expanded display lists into the fifo stream and skipped the call to start them + // That is done to make it easier to track where memory is updated + _assert_(false); + objectdata += 8; + newLabel = wxString::Format(wxT("CALL DL")); + break; + + case GX_LOAD_BP_REG: + { + u32 cmd2 = Common::swap32(objectdata); + objectdata += 4; + newLabel = wxString::Format(wxT("BP %02X %06X"), cmd2 >> 24, cmd2 & 0xFFFFFF); + } + break; + + default: + newLabel = _("Unexpected 0x80 call? Aborting..."); + objectdata = (u8*)next_objdata_start; + break; + } + m_objectCmdList->Append(newLabel); + } + } + } + // Call OnObjectCmdListSelectionChanged + m_objectCmdList->SetSelection(-1); +} + +void FifoPlayerDlg::OnObjectCmdListSelectionChanged (wxCommandEvent& event) +{ + +} + void FifoPlayerDlg::OnCloseClick(wxCommandEvent& WXUNUSED(event)) { Hide(); @@ -375,6 +556,23 @@ void FifoPlayerDlg::UpdateRecorderGui() m_Save->Enable(GetSaveButtonEnabled()); } +void FifoPlayerDlg::UpdateAnalyzerGui() +{ + FifoPlayer &player = FifoPlayer::GetInstance(); + FifoDataFile* file = player.GetFile(); + + int num_frames = (file) ? player.GetFile()->GetFrameCount() : 0; + if (m_framesList->GetCount() != num_frames) + { + m_framesList->Clear(); + for (int i = 0; i < num_frames; ++i) + { + m_framesList->Append(wxString::Format(wxT("Frame %i"), i)); + } + m_framesList->SetSelection(-1); + } +} + wxString FifoPlayerDlg::CreateFileFrameCountLabel() const { FifoDataFile *file = FifoPlayer::GetInstance().GetFile(); diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.h b/Source/Core/DolphinWX/Src/FifoPlayerDlg.h index 7ecbef8de3..8bcb5ee29b 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.h +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.h @@ -47,8 +47,13 @@ private: void OnRecordingFinished(wxCommandEvent& event); void OnFrameWritten(wxCommandEvent& event); + void OnFrameListSelectionChanged(wxCommandEvent& event); + void OnObjectListSelectionChanged(wxCommandEvent& event); + void OnObjectCmdListSelectionChanged(wxCommandEvent& event); + void UpdatePlayGui(); void UpdateRecorderGui(); + void UpdateAnalyzerGui(); wxString CreateFileFrameCountLabel() const; wxString CreateCurrentFrameLabel() const; @@ -89,6 +94,12 @@ private: wxButton* m_Save; wxStaticText* m_FramesToRecordLabel; wxSpinCtrl* m_FramesToRecordCtrl; + + wxPanel* m_AnalyzePage; + wxListBox* m_framesList; + wxListBox* m_objectsList; + wxListBox* m_objectCmdList; + wxButton* m_Close; s32 m_FramesToRecord; From 8c62a56c7167cf93b0ba755fcfda4e7f97924ac8 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 3 Jan 2012 22:26:54 +0100 Subject: [PATCH 002/185] FifoPlayer: Show full data of XF register loads (Did I do this correctly?) --- Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp index 5a321298a1..89a5144127 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp @@ -455,11 +455,18 @@ void FifoPlayerDlg::OnObjectListSelectionChanged (wxCommandEvent& event) { u32 cmd2 = Common::swap32(objectdata); objectdata += 4; + u8 streamSize = ((cmd2 >> 16) & 15) + 1; - newLabel = wxString::Format(wxT("XF %08X(%02X) ..."), cmd2, streamSize); + const u8* stream_start = objectdata; + const u8* stream_end = stream_start + streamSize * 4; - objectdata += streamSize * 4; + newLabel = wxString::Format(wxT("XF %08X "), cmd2); + while (objectdata < stream_end) + { + newLabel += wxString::Format(wxT("%02X"), *objectdata++); + if (((objectdata - stream_start) % 4) == 0) newLabel += wxT(" "); + } } break; From 5eb24a51cfa57ad4bbdc6b9ccc77af4a4f2b289e Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 5 Jan 2012 17:49:46 +0100 Subject: [PATCH 003/185] FifoPlayer: Add a description label for the currently selected object command. Requires adding such descriptions for all BP/CP/XF registers. For now, I added descriptions for EFB copy related BP registers. --- Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp | 61 +++++++++-- Source/Core/DolphinWX/Src/FifoPlayerDlg.h | 3 + Source/Core/VideoCommon/Src/BPMemory.cpp | 110 ++++++++++++++++++++ Source/Core/VideoCommon/Src/BPMemory.h | 2 + 4 files changed, 169 insertions(+), 7 deletions(-) diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp index 89a5144127..4a6476c58c 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp @@ -218,19 +218,26 @@ void FifoPlayerDlg::CreateGUIControls() sAnalyzePage = new wxBoxSizer(wxVERTICAL); wxStaticBoxSizer* sTestSizer; - sTestSizer = new wxStaticBoxSizer(new wxStaticBox(m_AnalyzePage, wxID_ANY, _("Frame info")), wxHORIZONTAL); + sTestSizer = new wxStaticBoxSizer(new wxStaticBox(m_AnalyzePage, wxID_ANY, _("Frame info")), wxVERTICAL); + + wxBoxSizer* sListsSizer = new wxBoxSizer(wxHORIZONTAL); m_framesList = new wxListBox(m_AnalyzePage, wxID_ANY); m_framesList->SetMinSize(wxSize(100, 250)); - sTestSizer->Add(m_framesList, 0, wxALL, 5); + sListsSizer->Add(m_framesList, 0, wxALL, 5); m_objectsList = new wxListBox(m_AnalyzePage, wxID_ANY); m_objectsList->SetMinSize(wxSize(110, 250)); - sTestSizer->Add(m_objectsList, 0, wxALL, 5); + sListsSizer->Add(m_objectsList, 0, wxALL, 5); m_objectCmdList = new wxListBox(m_AnalyzePage, wxID_ANY); m_objectCmdList->SetMinSize(wxSize(175, 250)); - sTestSizer->Add(m_objectCmdList, 0, wxALL, 5); + sListsSizer->Add(m_objectCmdList, 0, wxALL, 5); + + sTestSizer->Add(sListsSizer, 0, wxALL, 5); + + m_objectCmdInfo = new wxStaticText(m_AnalyzePage, wxID_ANY, wxString()); + sTestSizer->Add(m_objectCmdInfo, 0, wxALL, 5); sAnalyzePage->Add(sTestSizer, 0, wxEXPAND, 5); @@ -388,7 +395,7 @@ void FifoPlayerDlg::OnFrameListSelectionChanged(wxCommandEvent& event) m_objectsList->SetSelection(-1); } -void FifoPlayerDlg::OnObjectListSelectionChanged (wxCommandEvent& event) +void FifoPlayerDlg::OnObjectListSelectionChanged(wxCommandEvent& event) { FifoPlayer& player = FifoPlayer::GetInstance(); @@ -396,6 +403,7 @@ void FifoPlayerDlg::OnObjectListSelectionChanged (wxCommandEvent& event) int object_idx = event.GetInt(); m_objectCmdList->Clear(); + m_objectCmdOffsets.clear(); if (frame_idx != -1 && object_idx != -1) { const AnalyzedFrameInfo& frame = player.GetAnalyzedFrameInfo(frame_idx); @@ -413,11 +421,12 @@ void FifoPlayerDlg::OnObjectListSelectionChanged (wxCommandEvent& event) if ((objectdata_end - objectdata) % stream_size) newLabel += _("NOTE: Stream size doesn't match actual data length\n"); while (objectdata < objectdata_end) { - // Group bytes by vertex + // Group bytes by vertex - TODO: Won't work.. newLabel += wxString::Format(wxT("%02X"), *objectdata++); if (((objectdata - (objectdata_start+3)) % vertex_size) == 0) newLabel += wxT(" "); } m_objectCmdList->Append(newLabel); + m_objectCmdOffsets.push_back(0); // Between objectdata_end and next_objdata_start, there are register setting commands @@ -426,6 +435,7 @@ void FifoPlayerDlg::OnObjectListSelectionChanged (wxCommandEvent& event) const u8* next_objdata_start = &fifo_frame.fifoData[frame.objectStarts[object_idx+1]]; while (objectdata < next_objdata_start) { + m_objectCmdOffsets.push_back(objectdata - objectdata_start); int cmd = *objectdata++; switch (cmd) { @@ -509,9 +519,46 @@ void FifoPlayerDlg::OnObjectListSelectionChanged (wxCommandEvent& event) m_objectCmdList->SetSelection(-1); } -void FifoPlayerDlg::OnObjectCmdListSelectionChanged (wxCommandEvent& event) +void FifoPlayerDlg::OnObjectCmdListSelectionChanged(wxCommandEvent& event) { + const int frame_idx = m_framesList->GetSelection(); + const int object_idx = m_objectsList->GetSelection(); + if (event.GetInt() == -1 || frame_idx == -1 || object_idx == -1) + { + m_objectCmdInfo->SetLabel(wxString()); + return; + } + + FifoPlayer& player = FifoPlayer::GetInstance(); + const AnalyzedFrameInfo& frame = player.GetAnalyzedFrameInfo(frame_idx); + const FifoFrameInfo& fifo_frame = player.GetFile()->GetFrame(frame_idx); + const u8* cmddata = &fifo_frame.fifoData[frame.objectStarts[object_idx]] + m_objectCmdOffsets[event.GetInt()]; + + // TODO: Not sure whether we should bother translating the descriptions + wxString newLabel; + if (*cmddata == GX_LOAD_BP_REG) + { + char name[64]="\0", desc[512]="\0"; + GetBPRegInfo(cmddata+1, name, sizeof(name), desc, sizeof(desc)); + newLabel = _("BP register "); + newLabel += (name[0] != '\0') ? wxString::From8BitData(name) : wxString::Format(_("UNKNOWN_%02X"), *(cmddata+1)); + newLabel += wxT(":\n"); + if (desc[0] != '\0') + newLabel += wxString::From8BitData(desc); + else + newLabel += _("No description available"); + } + else if (*cmddata == GX_LOAD_CP_REG) + newLabel = _("CP reg"); + else if (*cmddata == GX_LOAD_XF_REG) + newLabel = _("XF reg"); + else + newLabel = _("No description available"); + + m_objectCmdInfo->SetLabel(newLabel); + Layout(); + Fit(); } void FifoPlayerDlg::OnCloseClick(wxCommandEvent& WXUNUSED(event)) diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.h b/Source/Core/DolphinWX/Src/FifoPlayerDlg.h index 8bcb5ee29b..cc9cbdd5e3 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.h +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.h @@ -18,6 +18,7 @@ #ifndef __FIFO_PLAYER_DLG_h__ #define __FIFO_PLAYER_DLG_h__ +#include #include #include @@ -99,6 +100,8 @@ private: wxListBox* m_framesList; wxListBox* m_objectsList; wxListBox* m_objectCmdList; + std::vector m_objectCmdOffsets; + wxStaticText* m_objectCmdInfo; wxButton* m_Close; diff --git a/Source/Core/VideoCommon/Src/BPMemory.cpp b/Source/Core/VideoCommon/Src/BPMemory.cpp index da09893f35..95e801a433 100644 --- a/Source/Core/VideoCommon/Src/BPMemory.cpp +++ b/Source/Core/VideoCommon/Src/BPMemory.cpp @@ -66,3 +66,113 @@ void BPReload() } } } + + +void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size_t desc_size) +{ + const char* yes_no[2] = { "Yes", "No" }; + + u32 cmddata = Common::swap32(*(u32*)data) & 0xFFFFFF; + switch (data[0]) + { + // Macro to set the register name and make sure it was written correctly via compile time assertion + #define SetRegName(reg) \ + snprintf(name, name_size, #reg); \ + (void)(reg); + + case BPMEM_DISPLAYCOPYFILER: // 0x01 + // TODO: This is actually the sample pattern used for copies from an antialiased EFB + SetRegName(BPMEM_DISPLAYCOPYFILER); + // TODO: Description + break; + + case 0x02: // 0x02 + case 0x03: // 0x03 + case 0x04: // 0x04 + // TODO: same as BPMEM_DISPLAYCOPYFILER + break; + + case BPMEM_EFB_TL: // 0x49 + { + SetRegName(BPMEM_EFB_TL); + X10Y10 left_top; left_top.hex = cmddata; + snprintf(desc, desc_size, "Left: %d\nTop: %d", left_top.x, left_top.y); + } + break; + + case BPMEM_EFB_BR: // 0x4A + { + // TODO: Misleading name, should be BPMEM_EFB_WH instead + SetRegName(BPMEM_EFB_BR); + X10Y10 width_height; width_height.hex = cmddata; + snprintf(desc, desc_size, "Width: %d\nHeight: %d", width_height.x+1, width_height.y+1); + } + break; + + case BPMEM_EFB_ADDR: // 0x4B + SetRegName(BPMEM_EFB_ADDR); + snprintf(desc, desc_size, "Target address (32 byte aligned): %06x", cmddata << 5); + break; + + case BPMEM_COPYYSCALE: // 0x4E + SetRegName(BPMEM_COPYYSCALE); + snprintf(desc, desc_size, "Scaling factor (XFB copy only): 0x%X (%f or inverted %f)", cmddata, (float)cmddata/256.f, 256.f/(float)cmddata); + break; + + case BPMEM_CLEAR_AR: // 0x4F + SetRegName(BPMEM_CLEAR_AR); + snprintf(desc, desc_size, "Alpha: %02X\nRed: %02x", (cmddata&0xFF00)>>8, cmddata&0xFF); + break; + + case BPMEM_CLEAR_GB: // 0x50 + SetRegName(BPMEM_CLEAR_GB); + snprintf(desc, desc_size, "Green: %02X\nBlue: %02x", (cmddata&0xFF00)>>8, cmddata&0xFF); + break; + + case BPMEM_CLEAR_Z: // 0x51 + SetRegName(BPMEM_CLEAR_Z); + snprintf(desc, desc_size, "Z value: %06X", cmddata); + break; + + case BPMEM_TRIGGER_EFB_COPY: // 0x52 + { + SetRegName(BPMEM_TRIGGER_EFB_COPY); + UPE_Copy copy; copy.Hex = cmddata; + snprintf(desc, desc_size, "Clamping: %s\n" + "Converting from RGB to YUV: %s\n" + "Target pixel format: 0x%X\n" + "Gamma correction: %s\n" + "Mipmap filter: %s\n" + "Vertical scaling: %s\n" + "Clear: %s\n" + "Frame to field: 0x%01X\n" + "Copy to XFB: %s\n" + "Intensity format: %s\n" + "Automatic color conversion: %s\n", + (copy.clamp0 && copy.clamp1) ? "Top and Bottom" : (copy.clamp0) ? "Top only" : (copy.clamp1) ? "Bottom only" : "None", + yes_no[copy.yuv], + copy.tp_realFormat(), + (copy.gamma==0)?"1.0":(copy.gamma==1)?"1.7":(copy.gamma==2)?"2.2":"Invalid value 0x3?", + yes_no[copy.half_scale], + yes_no[copy.scale_invert], + yes_no[copy.clear], + copy.frame_to_field, + yes_no[copy.copy_to_xfb], + yes_no[copy.intensity_fmt], + yes_no[copy.auto_conv]); + } + break; + + case BPMEM_COPYFILTER0: // 0x53 + SetRegName(BPMEM_COPYFILTER0); + // TODO: Description + break; + + case BPMEM_COPYFILTER1: // 0x54 + SetRegName(BPMEM_COPYFILTER1); + // TODO: Description + break; + +#undef SET_REG_NAME + } +} diff --git a/Source/Core/VideoCommon/Src/BPMemory.h b/Source/Core/VideoCommon/Src/BPMemory.h index 1f6f453a77..51f2c0a5b5 100644 --- a/Source/Core/VideoCommon/Src/BPMemory.h +++ b/Source/Core/VideoCommon/Src/BPMemory.h @@ -978,4 +978,6 @@ extern BPMemory bpmem; void LoadBPReg(u32 value0); +void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size_t desc_size); + #endif // _BPMEMORY_H From ecb616f7fff1a3e01452367af9204f0a547d24cd Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 7 Jan 2012 17:38:00 +0100 Subject: [PATCH 004/185] FifoPlayer: Make sure that we actually display "Yes" if some variable is true... FifoPlayer: More consistency of output (display "0x" in front of hex numbers, write hex numbers in capital letters) --- Source/Core/VideoCommon/Src/BPMemory.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Source/Core/VideoCommon/Src/BPMemory.cpp b/Source/Core/VideoCommon/Src/BPMemory.cpp index 95e801a433..3f21e1acb0 100644 --- a/Source/Core/VideoCommon/Src/BPMemory.cpp +++ b/Source/Core/VideoCommon/Src/BPMemory.cpp @@ -70,7 +70,7 @@ void BPReload() void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size_t desc_size) { - const char* yes_no[2] = { "Yes", "No" }; + const char* no_yes[2] = { "No", "Yes" }; u32 cmddata = Common::swap32(*(u32*)data) & 0xFFFFFF; switch (data[0]) @@ -111,7 +111,7 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size case BPMEM_EFB_ADDR: // 0x4B SetRegName(BPMEM_EFB_ADDR); - snprintf(desc, desc_size, "Target address (32 byte aligned): %06x", cmddata << 5); + snprintf(desc, desc_size, "Target address (32 byte aligned): 0x%06X", cmddata << 5); break; case BPMEM_COPYYSCALE: // 0x4E @@ -121,17 +121,17 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size case BPMEM_CLEAR_AR: // 0x4F SetRegName(BPMEM_CLEAR_AR); - snprintf(desc, desc_size, "Alpha: %02X\nRed: %02x", (cmddata&0xFF00)>>8, cmddata&0xFF); + snprintf(desc, desc_size, "Alpha: 0x%02X\nRed: 0x%02X", (cmddata&0xFF00)>>8, cmddata&0xFF); break; case BPMEM_CLEAR_GB: // 0x50 SetRegName(BPMEM_CLEAR_GB); - snprintf(desc, desc_size, "Green: %02X\nBlue: %02x", (cmddata&0xFF00)>>8, cmddata&0xFF); + snprintf(desc, desc_size, "Green: 0x%02X\nBlue: 0x%02X", (cmddata&0xFF00)>>8, cmddata&0xFF); break; case BPMEM_CLEAR_Z: // 0x51 SetRegName(BPMEM_CLEAR_Z); - snprintf(desc, desc_size, "Z value: %06X", cmddata); + snprintf(desc, desc_size, "Z value: 0x%06X", cmddata); break; case BPMEM_TRIGGER_EFB_COPY: // 0x52 @@ -150,16 +150,16 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size "Intensity format: %s\n" "Automatic color conversion: %s\n", (copy.clamp0 && copy.clamp1) ? "Top and Bottom" : (copy.clamp0) ? "Top only" : (copy.clamp1) ? "Bottom only" : "None", - yes_no[copy.yuv], + no_yes[copy.yuv], copy.tp_realFormat(), (copy.gamma==0)?"1.0":(copy.gamma==1)?"1.7":(copy.gamma==2)?"2.2":"Invalid value 0x3?", - yes_no[copy.half_scale], - yes_no[copy.scale_invert], - yes_no[copy.clear], + no_yes[copy.half_scale], + no_yes[copy.scale_invert], + no_yes[copy.clear], copy.frame_to_field, - yes_no[copy.copy_to_xfb], - yes_no[copy.intensity_fmt], - yes_no[copy.auto_conv]); + no_yes[copy.copy_to_xfb], + no_yes[copy.intensity_fmt], + no_yes[copy.auto_conv]); } break; From ad1a4d7ce318232acf2086bc59c44d66d83e6180 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 21 Jan 2012 13:40:14 +0100 Subject: [PATCH 005/185] FifoPlayer: Add a search function for the analyzer tab. Also some tiny fixes. --- Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp | 252 ++++++++++++++++++-- Source/Core/DolphinWX/Src/FifoPlayerDlg.h | 20 ++ Source/Core/VideoCommon/Src/BPMemory.cpp | 2 +- 3 files changed, 249 insertions(+), 25 deletions(-) diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp index 4a6476c58c..dcb0050a49 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp @@ -37,7 +37,7 @@ wxEvtHandler *volatile FifoPlayerDlg::m_EvtHandler = NULL; FifoPlayerDlg::FifoPlayerDlg(wxWindow * const parent) : wxDialog(parent, wxID_ANY, _("FIFO Player"), wxDefaultPosition, wxDefaultSize), - m_FramesToRecord(1) + m_search_result_idx(0), m_FramesToRecord(1) { CreateGUIControls(); @@ -79,8 +79,6 @@ FifoPlayerDlg::~FifoPlayerDlg() void FifoPlayerDlg::CreateGUIControls() { - SetSizeHints(wxDefaultSize, wxDefaultSize); - wxBoxSizer* sMain; sMain = new wxBoxSizer(wxVERTICAL); @@ -153,7 +151,8 @@ void FifoPlayerDlg::CreateGUIControls() sPlayOptions->Add(m_EarlyMemoryUpdates, 0, wxALL, 5); sPlayPage->Add(sPlayOptions, 0, wxEXPAND, 5); - + sPlayPage->AddStretchSpacer(); + m_PlayPage->SetSizer(sPlayPage); m_PlayPage->Layout(); sPlayPage->Fit(m_PlayPage); @@ -204,7 +203,8 @@ void FifoPlayerDlg::CreateGUIControls() sRecordingOptions->Add(m_FramesToRecordCtrl, 0, wxALL, 5); sRecordPage->Add(sRecordingOptions, 0, wxEXPAND, 5); - + sRecordPage->AddStretchSpacer(); + m_RecordPage->SetSizer(sRecordPage); m_RecordPage->Layout(); sRecordPage->Fit(m_RecordPage); @@ -217,8 +217,8 @@ void FifoPlayerDlg::CreateGUIControls() wxBoxSizer* sAnalyzePage; sAnalyzePage = new wxBoxSizer(wxVERTICAL); - wxStaticBoxSizer* sTestSizer; - sTestSizer = new wxStaticBoxSizer(new wxStaticBox(m_AnalyzePage, wxID_ANY, _("Frame info")), wxVERTICAL); + wxStaticBoxSizer* sFrameInfoSizer; + sFrameInfoSizer = new wxStaticBoxSizer(new wxStaticBox(m_AnalyzePage, wxID_ANY, _("Frame Info")), wxVERTICAL); wxBoxSizer* sListsSizer = new wxBoxSizer(wxHORIZONTAL); @@ -234,13 +234,45 @@ void FifoPlayerDlg::CreateGUIControls() m_objectCmdList->SetMinSize(wxSize(175, 250)); sListsSizer->Add(m_objectCmdList, 0, wxALL, 5); - sTestSizer->Add(sListsSizer, 0, wxALL, 5); + sFrameInfoSizer->Add(sListsSizer, 0, wxALL, 5); m_objectCmdInfo = new wxStaticText(m_AnalyzePage, wxID_ANY, wxString()); - sTestSizer->Add(m_objectCmdInfo, 0, wxALL, 5); + sFrameInfoSizer->Add(m_objectCmdInfo, 0, wxALL, 5); + + sAnalyzePage->Add(sFrameInfoSizer, 0, wxEXPAND, 5); + + wxStaticBoxSizer* sSearchSizer = new wxStaticBoxSizer(new wxStaticBox(m_AnalyzePage, wxID_ANY, _("Search current Object")), wxVERTICAL); + + wxBoxSizer* sSearchField = new wxBoxSizer(wxHORIZONTAL); + + sSearchField->Add(new wxStaticText(m_AnalyzePage, wxID_ANY, _("Search for hex Value:")), 0, wxALIGN_CENTER_VERTICAL, 5); + // TODO: ugh, wxValidator sucks - but we should use it anyway. + m_searchField = new wxTextCtrl(m_AnalyzePage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); + m_numResultsText = new wxStaticText(m_AnalyzePage, wxID_ANY, wxEmptyString); + + sSearchField->Add(m_searchField, 0, wxALL, 5); + sSearchField->Add(m_numResultsText, 0, wxALIGN_CENTER_VERTICAL, 5); + + wxBoxSizer* sSearchButtons = new wxBoxSizer(wxHORIZONTAL); + + m_beginSearch = new wxButton(m_AnalyzePage, wxID_ANY, _("Search")); + m_findNext = new wxButton(m_AnalyzePage, wxID_ANY, _("Find next")); + m_findPrevious = new wxButton(m_AnalyzePage, wxID_ANY, _("Find previous")); + + m_beginSearch->Disable(); + m_findNext->Disable(); + m_findPrevious->Disable(); + + sSearchButtons->Add(m_beginSearch, 0, wxALL, 5); + sSearchButtons->Add(m_findNext, 0, wxALL, 5); + sSearchButtons->Add(m_findPrevious, 0, wxALL, 5); + + sSearchSizer->Add(sSearchField, 0, wxEXPAND, 5); + sSearchSizer->Add(sSearchButtons, 0, wxEXPAND, 5); + + sAnalyzePage->Add(sSearchSizer, 0, wxEXPAND, 5); + sAnalyzePage->AddStretchSpacer(); - sAnalyzePage->Add(sTestSizer, 0, wxEXPAND, 5); - m_AnalyzePage->SetSizer(sAnalyzePage); m_AnalyzePage->Layout(); sAnalyzePage->Fit(m_AnalyzePage); @@ -284,6 +316,13 @@ void FifoPlayerDlg::CreateGUIControls() m_objectsList->Connect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnObjectListSelectionChanged), NULL, this); m_objectCmdList->Connect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnObjectCmdListSelectionChanged), NULL, this); + m_beginSearch->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnBeginSearch), NULL, this); + m_findNext->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnFindNextClick), NULL, this); + m_findPrevious->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnFindPreviousClick), NULL, this); + + m_searchField->Connect(wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(FifoPlayerDlg::OnBeginSearch), NULL, this); + m_searchField->Connect(wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(FifoPlayerDlg::OnSearchFieldTextChanged), NULL, this); + Connect(RECORDING_FINISHED_EVENT, wxCommandEventHandler(FifoPlayerDlg::OnRecordingFinished), NULL, this); Connect(FRAME_WRITTEN_EVENT, wxCommandEventHandler(FifoPlayerDlg::OnFrameWritten), NULL, this); @@ -379,6 +418,165 @@ void FifoPlayerDlg::OnNumFramesToRecord(wxSpinEvent& event) m_FramesToRecord = -1; } +void FifoPlayerDlg::OnBeginSearch(wxCommandEvent& event) +{ + wxString str_search_val = m_searchField->GetValue(); + + if (m_framesList->GetSelection() == -1) + return; + + // TODO: Limited to even str lengths... + if (str_search_val.Length() && str_search_val.Length() % 2) + { + m_numResultsText->SetLabel(_("Invalid search string (only even string lengths supported)")); + return; + } + + unsigned int val_length = str_search_val.Length() / 2; + u8* search_val = new u8[val_length]; + for (unsigned int i = 0; i < val_length; ++i) + { + wxString char_str = str_search_val.Mid(2*i, 2); + unsigned long val; + if (!char_str.ToULong(&val, 16)) + { + m_numResultsText->SetLabel(_("Invalid search string (couldn't convert to number)")); + delete[] search_val; + return; + } + search_val[i] = (u8)val; + } + search_results.clear(); + + u8* start_ptr; + u8* end_ptr; + + int frame_idx = m_framesList->GetSelection(); + FifoPlayer& player = FifoPlayer::GetInstance(); + const AnalyzedFrameInfo& frame = player.GetAnalyzedFrameInfo(frame_idx); + const FifoFrameInfo& fifo_frame = player.GetFile()->GetFrame(frame_idx); + + // TODO: Support searching through the last object... How do we know were the cmd data ends? + // TODO: Support searching for bit patterns + int obj_idx = m_objectsList->GetSelection(); + if (obj_idx == -1) + { + m_numResultsText->SetLabel(_("Invalid search parameters (no object selected)")); + return; + } + start_ptr = &fifo_frame.fifoData[frame.objectStarts[obj_idx]]; + end_ptr = &fifo_frame.fifoData[frame.objectStarts[obj_idx+1]]; + + for (u8* ptr = start_ptr; ptr < end_ptr-val_length+1; ++ptr) + { + if (memcmp(ptr, search_val, val_length) == 0) + { + SearchResult result; + result.frame_idx = frame_idx; + + int obj_idx = m_objectsList->GetSelection(); + result.obj_idx = obj_idx; + result.cmd_idx = 0; + for (unsigned int cmd_idx = 1; cmd_idx < m_objectCmdOffsets.size(); ++cmd_idx) + { + if (ptr < start_ptr + m_objectCmdOffsets[cmd_idx]) + { + result.cmd_idx = cmd_idx-1; + break; + } + } + search_results.push_back(result); + } + } + delete[] search_val; + + ChangeSearchResult(0); + m_beginSearch->Disable(); + m_findNext->Enable(); + m_findPrevious->Enable(); + m_numResultsText->SetLabel(wxString::Format(_("Found %d results for \'"), search_results.size()) + m_searchField->GetValue() + _("\'")); +} + +void FifoPlayerDlg::OnSearchFieldTextChanged(wxCommandEvent& event) +{ + m_beginSearch->Enable(m_searchField->GetLineLength(0) > 0); + m_findNext->Disable(); + m_findPrevious->Disable(); +} + +void FifoPlayerDlg::OnFindNextClick(wxCommandEvent& event) +{ + int cur_cmd_index = m_objectCmdList->GetSelection(); + if (cur_cmd_index == -1) + { + ChangeSearchResult(0); + return; + } + + for (std::vector::iterator it = search_results.begin(); it != search_results.end(); ++it) + { + if (it->cmd_idx > cur_cmd_index) + { + ChangeSearchResult(it - search_results.begin()); + return; + } + } +} + +void FifoPlayerDlg::OnFindPreviousClick(wxCommandEvent& event) +{ + int cur_cmd_index = m_objectCmdList->GetSelection(); + if (cur_cmd_index == -1) + { + ChangeSearchResult(search_results.size() - 1); + return; + } + + for (std::vector::reverse_iterator it = search_results.rbegin(); it != search_results.rend(); ++it) + { + if (it->cmd_idx < cur_cmd_index) + { + ChangeSearchResult(search_results.size()-1 - (it - search_results.rbegin())); + return; + } + } +} + +void FifoPlayerDlg::ChangeSearchResult(unsigned int result_idx) +{ + if (search_results.size() > result_idx) + { + m_search_result_idx = result_idx; + int prev_frame = m_framesList->GetSelection(); + int prev_obj = m_objectsList->GetSelection(); + int prev_cmd = m_objectCmdList->GetSelection(); + m_framesList->SetSelection(search_results[result_idx].frame_idx); + m_objectsList->SetSelection(search_results[result_idx].obj_idx); + m_objectCmdList->SetSelection(search_results[result_idx].cmd_idx); + + wxCommandEvent ev(wxEVT_COMMAND_LISTBOX_SELECTED); + if (prev_frame != m_framesList->GetSelection()) + { + ev.SetInt(m_framesList->GetSelection()); + OnFrameListSelectionChanged(ev); + } + if (prev_obj != m_objectsList->GetSelection()) + { + ev.SetInt(m_objectsList->GetSelection()); + OnObjectListSelectionChanged(ev); + } + if (prev_cmd != m_objectCmdList->GetSelection()) + { + ev.SetInt(m_objectCmdList->GetSelection()); + OnObjectCmdListSelectionChanged(ev); + } + } + else if (search_results.size()) + { + ChangeSearchResult(search_results.size() - 1); + } +} + void FifoPlayerDlg::OnFrameListSelectionChanged(wxCommandEvent& event) { FifoPlayer& player = FifoPlayer::GetInstance(); @@ -391,8 +589,10 @@ void FifoPlayerDlg::OnFrameListSelectionChanged(wxCommandEvent& event) m_objectsList->Append(wxString::Format(wxT("Object %i"), i)); } - // Call OnObjectListSelectionChanged - m_objectsList->SetSelection(-1); + // Update object list + wxCommandEvent ev = wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED); + ev.SetInt(-1); + OnObjectListSelectionChanged(ev); } void FifoPlayerDlg::OnObjectListSelectionChanged(wxCommandEvent& event) @@ -421,21 +621,20 @@ void FifoPlayerDlg::OnObjectListSelectionChanged(wxCommandEvent& event) if ((objectdata_end - objectdata) % stream_size) newLabel += _("NOTE: Stream size doesn't match actual data length\n"); while (objectdata < objectdata_end) { - // Group bytes by vertex - TODO: Won't work.. newLabel += wxString::Format(wxT("%02X"), *objectdata++); - if (((objectdata - (objectdata_start+3)) % vertex_size) == 0) newLabel += wxT(" "); } m_objectCmdList->Append(newLabel); m_objectCmdOffsets.push_back(0); // Between objectdata_end and next_objdata_start, there are register setting commands - if (object_idx + 1 < frame.objectStarts.size()) + if (object_idx + 1 < (int)frame.objectStarts.size()) { const u8* next_objdata_start = &fifo_frame.fifoData[frame.objectStarts[object_idx+1]]; while (objectdata < next_objdata_start) { m_objectCmdOffsets.push_back(objectdata - objectdata_start); + int new_offset = objectdata - &fifo_frame.fifoData[frame.objectStarts[0]]; int cmd = *objectdata++; switch (cmd) { @@ -485,9 +684,9 @@ void FifoPlayerDlg::OnObjectListSelectionChanged(wxCommandEvent& event) case GX_LOAD_INDX_C: case GX_LOAD_INDX_D: objectdata += 4; - newLabel = wxString::Format(wxT("LOAD INDX %s"), (cmd == GX_LOAD_INDX_A) ? "A" : - (cmd == GX_LOAD_INDX_B) ? "B" : - (cmd == GX_LOAD_INDX_C) ? "C" : "D"); + newLabel = wxString::Format(wxT("LOAD INDX %s"), (cmd == GX_LOAD_INDX_A) ? _("A") : + (cmd == GX_LOAD_INDX_B) ? _("B") : + (cmd == GX_LOAD_INDX_C) ? _("C") : _("D")); break; case GX_CMD_CALL_DL: @@ -511,12 +710,15 @@ void FifoPlayerDlg::OnObjectListSelectionChanged(wxCommandEvent& event) objectdata = (u8*)next_objdata_start; break; } + newLabel = wxString::Format(_("%08X: "), new_offset) + newLabel; m_objectCmdList->Append(newLabel); } } } - // Call OnObjectCmdListSelectionChanged - m_objectCmdList->SetSelection(-1); + // Update command list + wxCommandEvent ev = wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED); + ev.SetInt(-1); + OnObjectCmdListSelectionChanged(ev); } void FifoPlayerDlg::OnObjectCmdListSelectionChanged(wxCommandEvent& event) @@ -526,7 +728,7 @@ void FifoPlayerDlg::OnObjectCmdListSelectionChanged(wxCommandEvent& event) if (event.GetInt() == -1 || frame_idx == -1 || object_idx == -1) { - m_objectCmdInfo->SetLabel(wxString()); + m_objectCmdInfo->SetLabel(wxEmptyString); return; } @@ -616,14 +818,16 @@ void FifoPlayerDlg::UpdateAnalyzerGui() FifoDataFile* file = player.GetFile(); int num_frames = (file) ? player.GetFile()->GetFrameCount() : 0; - if (m_framesList->GetCount() != num_frames) + if ((int)m_framesList->GetCount() != num_frames) { m_framesList->Clear(); for (int i = 0; i < num_frames; ++i) { m_framesList->Append(wxString::Format(wxT("Frame %i"), i)); } - m_framesList->SetSelection(-1); + wxCommandEvent ev = wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED); + ev.SetInt(-1); + OnFrameListSelectionChanged(ev); } } diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.h b/Source/Core/DolphinWX/Src/FifoPlayerDlg.h index cc9cbdd5e3..4e2c24fdd6 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.h +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.h @@ -45,6 +45,12 @@ private: void OnNumFramesToRecord( wxSpinEvent& event ); void OnCloseClick( wxCommandEvent& event ); + void OnBeginSearch(wxCommandEvent& event); + void OnFindNextClick(wxCommandEvent& event); + void OnFindPreviousClick(wxCommandEvent& event); + void OnSearchFieldTextChanged(wxCommandEvent& event); + void ChangeSearchResult(unsigned int result_idx); + void OnRecordingFinished(wxCommandEvent& event); void OnFrameWritten(wxCommandEvent& event); @@ -103,6 +109,20 @@ private: std::vector m_objectCmdOffsets; wxStaticText* m_objectCmdInfo; + wxTextCtrl* m_searchField; + wxButton* m_beginSearch; + wxButton* m_findNext; + wxButton* m_findPrevious; + wxStaticText* m_numResultsText; + + struct SearchResult { + int frame_idx; + int obj_idx; + int cmd_idx; + }; + std::vector search_results; + unsigned int m_search_result_idx; + wxButton* m_Close; s32 m_FramesToRecord; diff --git a/Source/Core/VideoCommon/Src/BPMemory.cpp b/Source/Core/VideoCommon/Src/BPMemory.cpp index 3f21e1acb0..43a4facacf 100644 --- a/Source/Core/VideoCommon/Src/BPMemory.cpp +++ b/Source/Core/VideoCommon/Src/BPMemory.cpp @@ -148,7 +148,7 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size "Frame to field: 0x%01X\n" "Copy to XFB: %s\n" "Intensity format: %s\n" - "Automatic color conversion: %s\n", + "Automatic color conversion: %s", (copy.clamp0 && copy.clamp1) ? "Top and Bottom" : (copy.clamp0) ? "Top only" : (copy.clamp1) ? "Bottom only" : "None", no_yes[copy.yuv], copy.tp_realFormat(), From 98993bfbd31f863832522d50f15795a811c0db5d Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Fri, 9 Dec 2011 14:58:58 -0800 Subject: [PATCH 006/185] fix the twocardsloaded settings, correctly disables the copy functions when only one card is loaded Signed-off-by: LPFaint99 --- Source/Core/DolphinWX/Src/MemcardManager.cpp | 21 +++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index 98390122e2..89fc096b13 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -101,6 +101,7 @@ CMemcardManager::CMemcardManager(wxWindow* parent, wxWindowID id, const wxString memoryCard[SLOT_A]=NULL; memoryCard[SLOT_B]=NULL; + mcmSettings.twoCardsLoaded = false; if (!LoadSettings()) { itemsPerPage = 16; @@ -283,7 +284,7 @@ void CMemcardManager::ChangePath(int slot) m_PrevPage[slot]->Disable(); m_MemcardList[slot]->prevPage = false; } - if (!strcasecmp(m_MemcardPath[slot2]->GetPath().mb_str(), m_MemcardPath[slot]->GetPath().mb_str())) + if (!m_MemcardPath[SLOT_A]->GetPath().CmpNoCase(m_MemcardPath[SLOT_B]->GetPath())) { if(m_MemcardPath[slot]->GetPath().length()) PanicAlertT("Memcard already opened"); @@ -292,7 +293,10 @@ void CMemcardManager::ChangePath(int slot) { if (m_MemcardPath[slot]->GetPath().length() && ReloadMemcard(m_MemcardPath[slot]->GetPath().mb_str(), slot)) { - mcmSettings.twoCardsLoaded = true; + if (memoryCard[slot2]) + { + mcmSettings.twoCardsLoaded = true; + } m_SaveImport[slot]->Enable(); m_SaveExport[slot]->Enable(); m_Delete[slot]->Enable(); @@ -318,16 +322,9 @@ void CMemcardManager::ChangePath(int slot) } } } - if (m_Delete[SLOT_A]->IsEnabled() && m_Delete[SLOT_B]->IsEnabled()) - { - m_CopyFrom[SLOT_A]->Enable(); - m_CopyFrom[SLOT_B]->Enable(); - } - else - { - m_CopyFrom[SLOT_A]->Disable(); - m_CopyFrom[SLOT_B]->Disable(); - } + + m_CopyFrom[SLOT_A]->Enable(mcmSettings.twoCardsLoaded); + m_CopyFrom[SLOT_B]->Enable(mcmSettings.twoCardsLoaded); } void CMemcardManager::OnPageChange(wxCommandEvent& event) From d5c393fe96efc3a3dff46d59405789bc5aea46d8 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Fri, 9 Dec 2011 15:02:05 -0800 Subject: [PATCH 007/185] initial work on displaying, exporting, and deleting from memory cards that have gaps in the fst Conflicts: .gitignore Source/Core/DolphinWX/Src/MemcardManager.cpp Signed-off-by: LPFaint99 --- Source/Core/Core/Src/HW/GCMemcard.cpp | 21 +++++++++++++++++ Source/Core/Core/Src/HW/GCMemcard.h | 1 + Source/Core/DolphinWX/Src/MemcardManager.cpp | 24 ++++++++++++-------- 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp index cab7d950a2..646c210b29 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.cpp +++ b/Source/Core/Core/Src/HW/GCMemcard.cpp @@ -320,6 +320,27 @@ u8 GCMemcard::GetNumFiles() return j; } +u8 GCMemcard::GetFileIndex(u8 fileNumber) +{ + if (m_valid) + { + + u8 j = 0; + for (int i = 0; i < DIRLEN; i++) + { + if (BE32(dir.Dir[i].Gamecode)!= 0xFFFFFFFF) + { + if (j == fileNumber) + { + return i; + } + j++; + } + } + } + return -1; +} + u16 GCMemcard::GetFreeBlocks() { if (!m_valid) diff --git a/Source/Core/Core/Src/HW/GCMemcard.h b/Source/Core/Core/Src/HW/GCMemcard.h index 8c7baa4774..59cecded32 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.h +++ b/Source/Core/Core/Src/HW/GCMemcard.h @@ -185,6 +185,7 @@ public: // get number of file entries in the directory u8 GetNumFiles(); + u8 GetFileIndex(u8 fileNumber); // get the free blocks from bat u16 GetFreeBlocks(); diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index 89fc096b13..a7b999f7a6 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -493,6 +493,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) slot2 = SLOT_B; case ID_COPYFROM_A: index = slot2 ? index_B : index_A; + index = memoryCard[slot2]->GetFileIndex(index); if ((index != wxNOT_FOUND)) { CopyDeleteSwitch(memoryCard[slot]->CopyFrom(*memoryCard[slot2], index), slot); @@ -542,6 +543,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) slot=SLOT_A; index = index_A; case ID_SAVEEXPORT_B: + index = memoryCard[slot]->GetFileIndex(index); if (index != wxNOT_FOUND) { char tempC[10 + DENTRY_STRLEN], @@ -588,6 +590,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) slot = SLOT_A; index = index_A; case ID_DELETE_B: + index = memoryCard[slot]->GetFileIndex(index); if (index != wxNOT_FOUND) { CopyDeleteSwitch(memoryCard[slot]->RemoveFile(index), slot); @@ -628,18 +631,19 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card) wxImageList *list = m_MemcardList[card]->GetImageList(wxIMAGE_LIST_SMALL); list->RemoveAll(); - int nFiles = memoryCard[card]->GetNumFiles(); + u8 nFiles = memoryCard[card]->GetNumFiles(); int *images = new int[nFiles*2]; - for (int i = 0;i < nFiles;i++) + for (u8 i = 0;i < nFiles;i++) { static u32 pxdata[96*32]; static u8 animDelay[8]; static u32 animData[32*32*8]; - int numFrames = memoryCard[card]->ReadAnimRGBA8(i,animData,animDelay); + u8 fileIndex = memoryCard[card]->GetFileIndex(i); + int numFrames = memoryCard[card]->ReadAnimRGBA8(fileIndex, animData, animDelay); - if (!memoryCard[card]->ReadBannerRGBA8(i,pxdata)) + if (!memoryCard[card]->ReadBannerRGBA8(fileIndex, pxdata)) { memset(pxdata,0,96*32*4); @@ -689,13 +693,15 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card) char comment[DENTRY_STRLEN]; u16 blocks; u16 firstblock; + u8 fileIndex = memoryCard[card]->GetFileIndex(j); + int index = m_MemcardList[card]->InsertItem(j, wxEmptyString); m_MemcardList[card]->SetItem(index, COLUMN_BANNER, wxEmptyString); - if (!memoryCard[card]->DEntry_Comment1(j, title)) title[0]=0; - if (!memoryCard[card]->DEntry_Comment2(j, comment)) comment[0]=0; + if (!memoryCard[card]->DEntry_Comment1(fileIndex, title)) title[0]=0; + if (!memoryCard[card]->DEntry_Comment2(fileIndex, comment)) comment[0]=0; bool ascii = memoryCard[card]->IsAsciiEncoding(); @@ -721,14 +727,14 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card) m_MemcardList[card]->SetItem(index, COLUMN_TITLE, wxTitle); m_MemcardList[card]->SetItem(index, COLUMN_COMMENT, wxComment); - blocks = memoryCard[card]->DEntry_BlockCount(j); + blocks = memoryCard[card]->DEntry_BlockCount(fileIndex); if (blocks == 0xFFFF) blocks = 0; wxBlock.Printf(wxT("%10d"), blocks); m_MemcardList[card]->SetItem(index,COLUMN_BLOCKS, wxBlock); - firstblock = memoryCard[card]->DEntry_FirstBlock(j); + firstblock = memoryCard[card]->DEntry_FirstBlock(fileIndex); if (firstblock == 0xFFFF) firstblock = 3; // to make firstblock -1 wxFirstBlock.Printf(wxT("%15d"), firstblock-4); - m_MemcardList[card]->SetItem(index,COLUMN_FIRSTBLOCK, wxFirstBlock); + m_MemcardList[card]->SetItem(index, COLUMN_FIRSTBLOCK, wxFirstBlock); m_MemcardList[card]->SetItem(index, COLUMN_ICON, wxEmptyString); if (images[j] >= 0) From dfe890e8f11352f1ca91cca557a2788e2b102f4e Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Sat, 10 Dec 2011 15:44:08 -0800 Subject: [PATCH 008/185] pass by reference instead of pointer in several places, return std::strings instead of filling a buffer, move gci filename generation to a function inside gcmemcard instead of the gui code change all functions that do not modify the object to const Conflicts: Source/Core/Core/Src/HW/GCMemcard.cpp Source/Core/DolphinWX/Src/MemcardManager.cpp Signed-off-by: LPFaint99 --- Source/Core/Core/Src/HW/GCMemcard.cpp | 253 +++++++++---------- Source/Core/Core/Src/HW/GCMemcard.h | 78 +++--- Source/Core/DolphinWX/Src/MemcardManager.cpp | 30 +-- 3 files changed, 173 insertions(+), 188 deletions(-) diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp index 646c210b29..cd72a6826d 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.cpp +++ b/Source/Core/Core/Src/HW/GCMemcard.cpp @@ -16,7 +16,6 @@ // http://code.google.com/p/dolphin-emu/ #include "GCMemcard.h" #include "ColorUtil.h" - static void ByteSwap(u8 *valueA, u8 *valueB) { u8 tmp = *valueA; @@ -225,7 +224,7 @@ GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis) mcdFile.Close(); } -bool GCMemcard::IsAsciiEncoding() +bool GCMemcard::IsAsciiEncoding() const { return hdr.Encoding == 0; } @@ -267,7 +266,7 @@ void GCMemcard::calc_checksumsBE(u16 *buf, u32 length, u16 *csum, u16 *inv_csum) } } -u32 GCMemcard::TestChecksums() +u32 GCMemcard::TestChecksums() const { u16 csum=0, csum_inv=0; @@ -306,7 +305,7 @@ bool GCMemcard::FixChecksums() return true; } -u8 GCMemcard::GetNumFiles() +u8 GCMemcard::GetNumFiles() const { if (!m_valid) return 0; @@ -320,13 +319,13 @@ u8 GCMemcard::GetNumFiles() return j; } -u8 GCMemcard::GetFileIndex(u8 fileNumber) +u8 GCMemcard::GetFileIndex(u8 fileNumber) const { if (m_valid) { u8 j = 0; - for (int i = 0; i < DIRLEN; i++) + for (u8 i = 0; i < DIRLEN; i++) { if (BE32(dir.Dir[i].Gamecode)!= 0xFFFFFFFF) { @@ -338,10 +337,10 @@ u8 GCMemcard::GetFileIndex(u8 fileNumber) } } } - return -1; + return 0xFF; } -u16 GCMemcard::GetFreeBlocks() +u16 GCMemcard::GetFreeBlocks() const { if (!m_valid) return 0; @@ -349,7 +348,7 @@ u16 GCMemcard::GetFreeBlocks() return BE16(bat.FreeBlocks); } -u8 GCMemcard::TitlePresent(DEntry d) +u8 GCMemcard::TitlePresent(DEntry d) const { if (!m_valid) return DIRLEN; @@ -367,102 +366,113 @@ u8 GCMemcard::TitlePresent(DEntry d) return i; } +bool GCMemcard::GCI_FileName(u8 index, std::string &filename) const +{ + if (!m_valid || index > DIRLEN || (BE32(dir.Dir[index].Gamecode) == 0xFFFFFFFF)) + return false; + filename = std::string((char*)dir.Dir[index].Gamecode, 4) + '_' + (char*)dir.Dir[index].Filename + ".gci"; + return true; +} // DEntry functions, all take u8 index < DIRLEN (127) // Functions that have ascii output take a char *buffer -bool GCMemcard::DEntry_GameCode(u8 index, char *buffer) +std::string GCMemcard::DEntry_GameCode(u8 index) const { - if (!m_valid) - return false; - - memcpy(buffer, dir.Dir[index].Gamecode, 4); - buffer[4] = 0; - return true; + if (!m_valid || index > DIRLEN) + return ""; + return std::string((const char*)dir.Dir[index].Gamecode, 4); } -bool GCMemcard::DEntry_Markercode(u8 index, char *buffer) +std::string GCMemcard::DEntry_Makercode(u8 index) const { - if (!m_valid) - return false; - - memcpy(buffer, dir.Dir[index].Markercode, 2); - buffer[2] = 0; - return true; + if (!m_valid || index > DIRLEN) + return ""; + return std::string((const char*)dir.Dir[index].Makercode, 2); } -bool GCMemcard::DEntry_BIFlags(u8 index, char *buffer) -{ - if (!m_valid) - return false; +std::string GCMemcard::DEntry_BIFlags(u8 index) const +{ + if (!m_valid || index > DIRLEN) + return ""; + + std::string flags; int x = dir.Dir[index].BIFlags; for (int i = 0; i < 8; i++) { - buffer[i] = (x & 0x80) ? '1' : '0'; + flags.push_back((x & 0x80) ? '1' : '0'); x = x << 1; } - buffer[8] = 0; - return true; + flags.push_back(0); + return flags; } -bool GCMemcard::DEntry_FileName(u8 index, char *buffer) +std::string GCMemcard::DEntry_FileName(u8 index) const { - if (!m_valid) - return false; - - memcpy (buffer, (const char*)dir.Dir[index].Filename, DENTRY_STRLEN); - buffer[31] = 0; - return true; + if (!m_valid || index > DIRLEN) + return ""; + return std::string((const char*)dir.Dir[index].Filename, DENTRY_STRLEN); } -u32 GCMemcard::DEntry_ModTime(u8 index) +u32 GCMemcard::DEntry_ModTime(u8 index) const { + if (!m_valid || index > DIRLEN) + return 0xFFFFFFFF; return BE32(dir.Dir[index].ModTime); } -u32 GCMemcard::DEntry_ImageOffset(u8 index) +u32 GCMemcard::DEntry_ImageOffset(u8 index) const { + if (!m_valid || index > DIRLEN) + return 0xFFFFFFFF; return BE32(dir.Dir[index].ImageOffset); } -bool GCMemcard::DEntry_IconFmt(u8 index, char *buffer) +std::string GCMemcard::DEntry_IconFmt(u8 index) const { - if (!m_valid) return false; - + if (!m_valid || index > DIRLEN) + return ""; int x = dir.Dir[index].IconFmt[0]; + std::string format; for(int i = 0; i < 16; i++) { if (i == 8) x = dir.Dir[index].IconFmt[1]; - buffer[i] = (x & 0x80) ? '1' : '0'; + format.push_back((x & 0x80) ? '1' : '0'); x = x << 1; } - buffer[16] = 0; - return true; - + format.push_back(0); + return format; } -u16 GCMemcard::DEntry_AnimSpeed(u8 index) +u16 GCMemcard::DEntry_AnimSpeed(u8 index) const { + if (!m_valid || index > DIRLEN) + return 0; return BE16(dir.Dir[index].AnimSpeed); } -bool GCMemcard::DEntry_Permissions(u8 index, char *fn) +std::string GCMemcard::DEntry_Permissions(u8 index) const { - if (!m_valid) return false; - fn[0] = (dir.Dir[index].Permissions & 16) ? 'x' : 'M'; - fn[1] = (dir.Dir[index].Permissions & 8) ? 'x' : 'C'; - fn[2] = (dir.Dir[index].Permissions & 4) ? 'P' : 'x'; - fn[3] = 0; - return true; + if (!m_valid || index > DIRLEN) + return ""; + u8 Permissions = dir.Dir[index].Permissions; + std::string permissionsString; + permissionsString.push_back((Permissions & 16) ? 'x' : 'M'); + permissionsString.push_back((Permissions & 8) ? 'x' : 'C'); + permissionsString.push_back((Permissions & 4) ? 'P' : 'x'); + permissionsString.push_back(0); + return permissionsString; } -u8 GCMemcard::DEntry_CopyCounter(u8 index) +u8 GCMemcard::DEntry_CopyCounter(u8 index) const { + if (!m_valid || index > DIRLEN) + return 0xFF; return dir.Dir[index].CopyCounter; } -u16 GCMemcard::DEntry_FirstBlock(u8 index) +u16 GCMemcard::DEntry_FirstBlock(u8 index) const { - if (!m_valid) + if (!m_valid || index > DIRLEN) return 0xFFFF; u16 block = BE16(dir.Dir[index].FirstBlock); @@ -470,9 +480,9 @@ u16 GCMemcard::DEntry_FirstBlock(u8 index) return block; } -u16 GCMemcard::DEntry_BlockCount(u8 index) +u16 GCMemcard::DEntry_BlockCount(u8 index) const { - if (!m_valid) + if (!m_valid || index > DIRLEN) return 0xFFFF; u16 blocks = BE16(dir.Dir[index].BlockCount); @@ -480,56 +490,51 @@ u16 GCMemcard::DEntry_BlockCount(u8 index) return blocks; } -u32 GCMemcard::DEntry_CommentsAddress(u8 index) +u32 GCMemcard::DEntry_CommentsAddress(u8 index) const { + if (!m_valid || index > DIRLEN) + return 0xFFFF; return BE32(dir.Dir[index].CommentsAddr); } -bool GCMemcard::DEntry_Comment1(u8 index, char* buffer) +std::string GCMemcard::GetSaveComment1(u8 index) const { - if (!m_valid) - return false; + if (!m_valid || index > DIRLEN) + return ""; u32 Comment1 = BE32(dir.Dir[index].CommentsAddr); u32 DataBlock = BE16(dir.Dir[index].FirstBlock) - MC_FST_BLOCKS; if ((DataBlock > maxBlock) || (Comment1 == 0xFFFFFFFF)) { - buffer[0] = 0; - return false; + return ""; } - memcpy(buffer, mc_data + (DataBlock * BLOCK_SIZE) + Comment1, DENTRY_STRLEN); - buffer[31] = 0; - return true; + return std::string((const char *)mc_data + (DataBlock * BLOCK_SIZE) + Comment1, DENTRY_STRLEN); } -bool GCMemcard::DEntry_Comment2(u8 index, char* buffer) +std::string GCMemcard::GetSaveComment2(u8 index) const { - if (!m_valid) - return false; + if (!m_valid || index > DIRLEN) + return ""; u32 Comment1 = BE32(dir.Dir[index].CommentsAddr); u32 Comment2 = Comment1 + DENTRY_STRLEN; u32 DataBlock = BE16(dir.Dir[index].FirstBlock) - MC_FST_BLOCKS; if ((DataBlock > maxBlock) || (Comment1 == 0xFFFFFFFF)) { - buffer[0] = 0; - return false; + return ""; } - memcpy(buffer, mc_data + (DataBlock * BLOCK_SIZE) + Comment2, DENTRY_STRLEN); - buffer[31] = 0; - return true; + return std::string((const char *)mc_data + (DataBlock * BLOCK_SIZE) + Comment2, DENTRY_STRLEN); } -bool GCMemcard::DEntry_Copy(u8 index, GCMemcard::DEntry& info) +bool GCMemcard::GetDEntry(u8 index, DEntry &dest) const { - if (!m_valid) + if (!m_valid || index > DIRLEN) return false; - - info = dir.Dir[index]; + dest = dir.Dir[index]; return true; } -u32 GCMemcard::DEntry_GetSaveData(u8 index, u8* dest, bool old) +u32 GCMemcard::DEntry_GetSaveData(u8 index, u8* dest, bool old) const { if (!m_valid) return NOMEMCARD; @@ -687,13 +692,13 @@ u32 GCMemcard::RemoveFile(u8 index) //index in the directory array while (nextIndex < DIRLEN) { - DEntry * tempDEntry = new DEntry; - DEntry_Copy(nextIndex, *tempDEntry); + DEntry tempDEntry; + GetDEntry(nextIndex, tempDEntry); u8 * tempSaveData = NULL; //Only get file data if it is a valid dir entry - if (BE16(tempDEntry->FirstBlock) != 0xFFFF) + if (BE16(tempDEntry.FirstBlock) != 0xFFFF) { - *(u16*)&bat.FreeBlocks = BE16(BE16(bat.FreeBlocks) - BE16(tempDEntry->BlockCount)); + *(u16*)&bat.FreeBlocks = BE16(BE16(bat.FreeBlocks) - BE16(tempDEntry.BlockCount)); u16 size = DEntry_BlockCount(nextIndex); if (size != 0xFFFF) @@ -707,7 +712,6 @@ u32 GCMemcard::RemoveFile(u8 index) //index in the directory array break; case FAIL: delete[] tempSaveData; - delete tempDEntry; return FAIL; } } @@ -716,10 +720,9 @@ u32 GCMemcard::RemoveFile(u8 index) //index in the directory array //Only call import file if DEntry_GetSaveData returns SUCCESS if (tempSaveData != NULL) { - ImportFile(*tempDEntry, tempSaveData, blocks_left); + ImportFile(tempDEntry, tempSaveData, blocks_left); delete[] tempSaveData; } - delete tempDEntry; nextIndex++; } @@ -737,13 +740,14 @@ u32 GCMemcard::RemoveFile(u8 index) //index in the directory array return SUCCESS; } -u32 GCMemcard::CopyFrom(GCMemcard& source, u8 index) +u32 GCMemcard::CopyFrom(const GCMemcard& source, u8 index) { - if (!m_valid) + if (!m_valid || !source.m_valid) return NOMEMCARD; DEntry tempDEntry; - if (!source.DEntry_Copy(index, tempDEntry)) return NOMEMCARD; + if (!source.GetDEntry(index, tempDEntry)) + return NOMEMCARD; u32 size = source.DEntry_BlockCount(index); if (size == 0xFFFF) return INVALIDFILESIZE; @@ -764,7 +768,7 @@ u32 GCMemcard::CopyFrom(GCMemcard& source, u8 index) } } -u32 GCMemcard::ImportGci(const char *inputFile, std::string outputFile) +u32 GCMemcard::ImportGci(const char *inputFile, const std::string &outputFile) { if (outputFile.empty() && !m_valid) return OPENFAIL; @@ -778,7 +782,7 @@ u32 GCMemcard::ImportGci(const char *inputFile, std::string outputFile) return result; } -u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, std::string outputFile) +u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, const std::string &outputFile) { File::IOFile gci(gcih); unsigned int offset; @@ -810,8 +814,8 @@ u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, std::string } gci.Seek(offset, SEEK_SET); - DEntry *tempDEntry = new DEntry; - gci.ReadBytes(tempDEntry, DENTRY_SIZE); + DEntry tempDEntry; + gci.ReadBytes(&tempDEntry, DENTRY_SIZE); const int fStart = (int)gci.Tell(); gci.Seek(0, SEEK_END); const int length = (int)gci.Tell() - fStart; @@ -819,12 +823,12 @@ u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, std::string Gcs_SavConvert(tempDEntry, offset, length); - if (length != BE16(tempDEntry->BlockCount) * BLOCK_SIZE) + if (length != BE16(tempDEntry.BlockCount) * BLOCK_SIZE) return LENGTHFAIL; if (gci.Tell() != offset + DENTRY_SIZE) // Verify correct file position return OPENFAIL; - u32 size = BE16((tempDEntry->BlockCount)) * BLOCK_SIZE; + u32 size = BE16((tempDEntry.BlockCount)) * BLOCK_SIZE; u8 *tempSaveData = new u8[size]; gci.ReadBytes(tempSaveData, size); u32 ret; @@ -835,14 +839,13 @@ u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, std::string if (!gci2) { delete[] tempSaveData; - delete tempDEntry; return OPENFAIL; } gci2.Seek(0, SEEK_SET); - if (!gci2.WriteBytes(tempDEntry, DENTRY_SIZE)) + if (!gci2.WriteBytes(&tempDEntry, DENTRY_SIZE)) completeWrite = false; - int fileBlocks = BE16(tempDEntry->BlockCount); + int fileBlocks = BE16(tempDEntry.BlockCount); gci2.Seek(DENTRY_SIZE, SEEK_SET); if (!gci2.WriteBytes(tempSaveData, BLOCK_SIZE * fileBlocks)) @@ -853,14 +856,13 @@ u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, std::string ret = WRITEFAIL; } else - ret = ImportFile(*tempDEntry, tempSaveData, 0); + ret = ImportFile(tempDEntry, tempSaveData, 0); delete[] tempSaveData; - delete tempDEntry; return ret; } -u32 GCMemcard::ExportGci(u8 index, const char *fileName, std::string *fileName2) +u32 GCMemcard::ExportGci(u8 index, const char* fileName, const std::string &directory) const { File::IOFile gci; int offset = GCI; @@ -868,15 +870,8 @@ u32 GCMemcard::ExportGci(u8 index, const char *fileName, std::string *fileName2) { if (BE32(dir.Dir[index].Gamecode) == 0xFFFFFFFF) return SUCCESS; - size_t length = fileName2->length() + 42; - char *filename = new char[length]; - char GameCode[5]; - - DEntry_GameCode(index, GameCode); - - sprintf(filename, "%s/%s_%s.gci", fileName2->c_str(), GameCode, dir.Dir[index].Filename); - gci.Open(filename, "wb"); - delete[] filename; + std::string outpuName = directory + DIR_SEP + DEntry_GameCode(index) + '_' + (char*)dir.Dir[index].Filename + ".gci"; + gci.Open(outpuName, "wb"); } else { @@ -917,12 +912,12 @@ u32 GCMemcard::ExportGci(u8 index, const char *fileName, std::string *fileName2) } DEntry tempDEntry; - if (!DEntry_Copy(index, tempDEntry)) + if (!GetDEntry(index, tempDEntry)) { return NOMEMCARD; } - Gcs_SavConvert(&tempDEntry, offset); + Gcs_SavConvert(tempDEntry, offset); gci.WriteBytes(&tempDEntry, DENTRY_SIZE); u32 size = DEntry_BlockCount(index); @@ -955,7 +950,7 @@ u32 GCMemcard::ExportGci(u8 index, const char *fileName, std::string *fileName2) return WRITEFAIL; } -void GCMemcard::Gcs_SavConvert(DEntry* tempDEntry, int saveType, int length) +void GCMemcard::Gcs_SavConvert(DEntry &tempDEntry, int saveType, int length) { switch(saveType) { @@ -965,7 +960,7 @@ void GCMemcard::Gcs_SavConvert(DEntry* tempDEntry, int saveType, int length) // It is stored only within the corresponding GSV file. // If the GCS file is added without using the GameSaves software, // the value stored is always "1" - *(u16*)&tempDEntry->BlockCount = BE16(length / BLOCK_SIZE); + *(u16*)&tempDEntry.BlockCount = BE16(length / BLOCK_SIZE); } break; case SAV: @@ -974,24 +969,24 @@ void GCMemcard::Gcs_SavConvert(DEntry* tempDEntry, int saveType, int length) // 0x34 and 0x35, 0x36 and 0x37, 0x38 and 0x39, 0x3A and 0x3B, // 0x3C and 0x3D,0x3E and 0x3F. // It seems that sav files also swap the BIFlags... - ByteSwap(&tempDEntry->Unused1, &tempDEntry->BIFlags); - ArrayByteSwap((tempDEntry->ImageOffset)); - ArrayByteSwap(&(tempDEntry->ImageOffset[2])); - ArrayByteSwap((tempDEntry->IconFmt)); - ArrayByteSwap((tempDEntry->AnimSpeed)); - ByteSwap(&tempDEntry->Permissions, &tempDEntry->CopyCounter); - ArrayByteSwap((tempDEntry->FirstBlock)); - ArrayByteSwap((tempDEntry->BlockCount)); - ArrayByteSwap((tempDEntry->Unused2)); - ArrayByteSwap((tempDEntry->CommentsAddr)); - ArrayByteSwap(&(tempDEntry->CommentsAddr[2])); + ByteSwap(&tempDEntry.Unused1, &tempDEntry.BIFlags); + ArrayByteSwap((tempDEntry.ImageOffset)); + ArrayByteSwap(&(tempDEntry.ImageOffset[2])); + ArrayByteSwap((tempDEntry.IconFmt)); + ArrayByteSwap((tempDEntry.AnimSpeed)); + ByteSwap(&tempDEntry.Permissions, &tempDEntry.CopyCounter); + ArrayByteSwap((tempDEntry.FirstBlock)); + ArrayByteSwap((tempDEntry.BlockCount)); + ArrayByteSwap((tempDEntry.Unused2)); + ArrayByteSwap((tempDEntry.CommentsAddr)); + ArrayByteSwap(&(tempDEntry.CommentsAddr[2])); break; default: break; } } -bool GCMemcard::ReadBannerRGBA8(u8 index, u32* buffer) +bool GCMemcard::ReadBannerRGBA8(u8 index, u32* buffer) const { if (!m_valid) return false; @@ -1032,7 +1027,7 @@ bool GCMemcard::ReadBannerRGBA8(u8 index, u32* buffer) return true; } -u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) +u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const { if (!m_valid) return 0; diff --git a/Source/Core/Core/Src/HW/GCMemcard.h b/Source/Core/Core/Src/HW/GCMemcard.h index 59cecded32..57a42b9d3a 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.h +++ b/Source/Core/Core/Src/HW/GCMemcard.h @@ -19,6 +19,7 @@ #define __GCMEMCARD_h__ #include "Common.h" +#include "CommonPaths.h" #include "Sram.h" #include "StringUtil.h" #include "EXI_DeviceIPL.h" @@ -101,7 +102,7 @@ private: struct DEntry { u8 Gamecode[4]; //0x00 0x04 Gamecode - u8 Markercode[2]; //0x04 0x02 Makercode + u8 Makercode[2]; //0x04 0x02 Makercode u8 Unused1; //0x06 0x01 reserved/unused (always 0xff, has no effect) u8 BIFlags; //0x07 0x01 banner gfx format and icon animation (Image Key) // bit(s) description @@ -168,67 +169,58 @@ private: }; #pragma pack(pop) - u32 ImportGciInternal(FILE* gcih, const char *inputFile, std::string outputFile); + u32 ImportGciInternal(FILE* gcih, const char *inputFile, const std::string &outputFile); static void FormatInternal(GCMC_Header &GCP); public: GCMemcard(const char* fileName, bool forceCreation=false, bool sjis=false); - bool IsValid() { return m_valid; } - bool IsAsciiEncoding(); + bool IsValid() const { return m_valid; } + bool IsAsciiEncoding() const; bool Save(); bool Format(bool sjis = false, u16 SizeMb = MemCard2043Mb); static bool Format(u8 * card_data, bool sjis = false, u16 SizeMb = MemCard2043Mb); static void calc_checksumsBE(u16 *buf, u32 length, u16 *csum, u16 *inv_csum); - u32 TestChecksums(); + u32 TestChecksums() const; bool FixChecksums(); // get number of file entries in the directory - u8 GetNumFiles(); - u8 GetFileIndex(u8 fileNumber); + u8 GetNumFiles() const; + u8 GetFileIndex(u8 fileNumber) const; // get the free blocks from bat - u16 GetFreeBlocks(); + u16 GetFreeBlocks() const; // If title already on memcard returns index, otherwise returns -1 - u8 TitlePresent(DEntry d); - - // DEntry functions, all take u8 index < DIRLEN (127) - // Functions that have ascii output take a char *buffer + u8 TitlePresent(DEntry d) const; - // buffer needs to be a char[5] or bigger - bool DEntry_GameCode(u8 index, char *buffer); - // buffer needs to be a char[2] or bigger - bool DEntry_Markercode(u8 index, char *buffer); - // buffer needs to be a char[9] or bigger - bool DEntry_BIFlags(u8 index, char *buffer); - // buffer needs to be a char[32] or bigger - bool DEntry_FileName(u8 index, char *buffer); - u32 DEntry_ModTime(u8 index); - u32 DEntry_ImageOffset(u8 index); - // buffer needs to be a char[17] or bigger - bool DEntry_IconFmt(u8 index, char *buffer); - u16 DEntry_AnimSpeed(u8 index); - // buffer needs to be a char[4] or bigger - bool DEntry_Permissions(u8 index, char *buffer); - u8 DEntry_CopyCounter(u8 index); + bool GCI_FileName(u8 index, std::string &filename) const; + // DEntry functions, all take u8 index < DIRLEN (127) + std::string DEntry_GameCode(u8 index) const; + std::string DEntry_Makercode(u8 index) const; + std::string DEntry_BIFlags(u8 index) const; + std::string DEntry_FileName(u8 index) const; + u32 DEntry_ModTime(u8 index) const; + u32 DEntry_ImageOffset(u8 index) const; + std::string DEntry_IconFmt(u8 index) const; + u16 DEntry_AnimSpeed(u8 index) const; + std::string DEntry_Permissions(u8 index) const; + u8 DEntry_CopyCounter(u8 index) const; // get first block for file - u16 DEntry_FirstBlock(u8 index); + u16 DEntry_FirstBlock(u8 index) const; // get file length in blocks - u16 DEntry_BlockCount(u8 index); - u32 DEntry_CommentsAddress(u8 index); - // buffer needs to be a char[32] or bigger - bool DEntry_Comment1(u8 index, char *buffer); - // buffer needs to be a char[32] or bigger - bool DEntry_Comment2(u8 index, char *buffer); + u16 DEntry_BlockCount(u8 index) const; + u32 DEntry_CommentsAddress(u8 index) const; + std::string GetSaveComment1(u8 index) const; + std::string GetSaveComment2(u8 index) const; // Copies a DEntry from u8 index to DEntry& data - bool DEntry_Copy(u8 index, DEntry& data); + bool GetDEntry(u8 index, DEntry &dest) const; // assumes there's enough space in buffer // old determines if function uses old or new method of copying data // some functions only work with old way, some only work with new way // TODO: find a function that works for all calls or split into 2 functions - u32 DEntry_GetSaveData(u8 index, u8* buffer, bool old); + u32 DEntry_GetSaveData(u8 index, u8* buffer, bool old) const; // adds the file to the directory and copies its contents // if remove > 0 it will pad bat.map with 0's sizeof remove @@ -238,23 +230,23 @@ public: u32 RemoveFile(u8 index); // reads a save from another memcard, and imports the data into this memcard - u32 CopyFrom(GCMemcard& source, u8 index); + u32 CopyFrom(const GCMemcard& source, u8 index); // reads a .gci/.gcs/.sav file and calls ImportFile or saves out a gci file - u32 ImportGci(const char* inputFile, std::string outputFile); + u32 ImportGci(const char* inputFile,const std::string &outputFile); // writes a .gci file to disk containing index - u32 ExportGci(u8 index, const char* fileName, std::string* fileName2); + u32 ExportGci(u8 index, const char* fileName, const std::string &directory) const; // GCI files are untouched, SAV files are byteswapped // GCS files have the block count set, default is 1 (For export as GCS) - void Gcs_SavConvert(DEntry* tempDEntry, int saveType, int length = BLOCK_SIZE); + static void Gcs_SavConvert(DEntry &tempDEntry, int saveType, int length = BLOCK_SIZE); // reads the banner image - bool ReadBannerRGBA8(u8 index, u32* buffer); + bool ReadBannerRGBA8(u8 index, u32* buffer) const; // reads the animation frames - u32 ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays); + u32 ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const; }; #endif diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index a7b999f7a6..84e6eb8b1d 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -546,15 +546,16 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) index = memoryCard[slot]->GetFileIndex(index); if (index != wxNOT_FOUND) { - char tempC[10 + DENTRY_STRLEN], - tempC2[DENTRY_STRLEN]; - memoryCard[slot]->DEntry_GameCode(index,tempC); - memoryCard[slot]->DEntry_FileName(index,tempC2); - sprintf(tempC, "%s_%s.gci", tempC, tempC2); + std::string gciFilename; + if (!memoryCard[slot]->GCI_FileName(index, gciFilename)) + { + PanicAlert("invalid index"); + return; + } wxString fileName = wxFileSelector( _("Export save as..."), wxString::From8BitData(DefaultIOPath.c_str()), - wxString::From8BitData(tempC), wxT(".gci"), + wxString::From8BitData(gciFilename.c_str()), wxT(".gci"), _("Native GCI files(*.gci)") + wxString(wxT("|*.gci|")) + _("MadCatz Gameshark files(*.gcs)") + wxString(wxT("|*.gcs|")) + _("Datel MaxDrive/Pro files(*.sav)") + wxString(wxT("|*.sav")), @@ -562,7 +563,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) if (fileName.length() > 0) { - if (!CopyDeleteSwitch(memoryCard[slot]->ExportGci(index, fileName.mb_str(), NULL), -1)) + if (!CopyDeleteSwitch(memoryCard[slot]->ExportGci(index, fileName.mb_str(), ""), -1)) { File::Delete(std::string(fileName.mb_str())); } @@ -582,7 +583,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) "%s\nand have the same name as a file on your memcard\nContinue?", path1.c_str())) for (int i = 0; i < DIRLEN; i++) { - CopyDeleteSwitch(memoryCard[slot]->ExportGci(i, ".", &path1), -1); + CopyDeleteSwitch(memoryCard[slot]->ExportGci(i, NULL, path1), -1); } break; } @@ -614,8 +615,7 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card) wxComment, wxBlock, wxFirstBlock, - wxLabel, - tString; + wxLabel; m_MemcardList[card]->Hide(); @@ -689,8 +689,6 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card) for (j = page[card] * itemsPerPage; (j < nFiles) && (j < pagesMax); j++) { - char title[DENTRY_STRLEN]; - char comment[DENTRY_STRLEN]; u16 blocks; u16 firstblock; u8 fileIndex = memoryCard[card]->GetFileIndex(j); @@ -700,8 +698,8 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card) m_MemcardList[card]->SetItem(index, COLUMN_BANNER, wxEmptyString); - if (!memoryCard[card]->DEntry_Comment1(fileIndex, title)) title[0]=0; - if (!memoryCard[card]->DEntry_Comment2(fileIndex, comment)) comment[0]=0; + std::string title = memoryCard[card]->GetSaveComment1(fileIndex); + std::string comment = memoryCard[card]->GetSaveComment2(fileIndex); bool ascii = memoryCard[card]->IsAsciiEncoding(); @@ -721,8 +719,8 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card) // it returns CP-932, in order to use iconv we need to use CP932 wxCSConv SJISConv(wxT("CP932")); #endif - wxTitle = wxString(title, ascii ? *wxConvCurrent : SJISConv); - wxComment = wxString(comment, ascii ? *wxConvCurrent : SJISConv); + wxTitle = wxString(title.c_str(), ascii ? *wxConvCurrent : SJISConv); + wxComment = wxString(comment.c_str(), ascii ? *wxConvCurrent : SJISConv); m_MemcardList[card]->SetItem(index, COLUMN_TITLE, wxTitle); m_MemcardList[card]->SetItem(index, COLUMN_COMMENT, wxComment); From 8355363dcd4783eea852768e2007d8c29c069fef Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Sat, 10 Dec 2011 15:44:40 -0800 Subject: [PATCH 009/185] change the data section from a plain array to a vector of blocks (arrays of 0x2000) Signed-off-by: LPFaint99 --- Source/Core/Core/Src/HW/GCMemcard.cpp | 171 ++++++++++++-------------- Source/Core/Core/Src/HW/GCMemcard.h | 15 ++- 2 files changed, 91 insertions(+), 95 deletions(-) diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp index cd72a6826d..7a574b7106 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.cpp +++ b/Source/Core/Core/Src/HW/GCMemcard.cpp @@ -63,7 +63,6 @@ void decodeCI8image(u32* dst, u8* src, u16* pal, int width, int height) GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis) : m_valid(false) , m_fileName(filename) - , mc_data(NULL) { File::IOFile mcdFile(m_fileName, "r+b"); if (!mcdFile.IsOpen()) @@ -209,16 +208,22 @@ GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis) mcdFile.Seek(0xa000, SEEK_SET); maxBlock = (u32)m_sizeMb * MBIT_TO_BLOCKS; - mc_data_size = (maxBlock - MC_FST_BLOCKS) * BLOCK_SIZE; - mc_data = new u8[mc_data_size]; - - if (mcdFile.ReadBytes(mc_data, mc_data_size)) + mc_data_blocks.reserve(maxBlock - MC_FST_BLOCKS); + + m_valid = true; + for (u32 i = MC_FST_BLOCKS; i < maxBlock; ++i) { - m_valid = true; - } - else - { - PanicAlertT("Failed to read save data\n(0xA000-)\nMemcard may be truncated"); + GCMBlock b; + if (mcdFile.ReadBytes(b.block, BLOCK_SIZE)) + { + mc_data_blocks.push_back(b); + } + else + { + PanicAlertT("Failed to read block %d of the save data\nMemcard may be truncated\nFilePosition:%llx", i, mcdFile.Tell()); + m_valid = false; + break; + } } mcdFile.Close(); @@ -239,7 +244,10 @@ bool GCMemcard::Save() mcdFile.WriteBytes(&dir_backup, BLOCK_SIZE); mcdFile.WriteBytes(&bat, BLOCK_SIZE); mcdFile.WriteBytes(&bat_backup, BLOCK_SIZE); - mcdFile.WriteBytes(mc_data, mc_data_size); + for (int i = 0; i < maxBlock - MC_FST_BLOCKS; ++i) + { + mcdFile.WriteBytes(mc_data_blocks[i].block, BLOCK_SIZE); + } return mcdFile.Close(); } @@ -373,6 +381,7 @@ bool GCMemcard::GCI_FileName(u8 index, std::string &filename) const filename = std::string((char*)dir.Dir[index].Gamecode, 4) + '_' + (char*)dir.Dir[index].Filename + ".gci"; return true; } + // DEntry functions, all take u8 index < DIRLEN (127) // Functions that have ascii output take a char *buffer @@ -446,7 +455,7 @@ std::string GCMemcard::DEntry_IconFmt(u8 index) const u16 GCMemcard::DEntry_AnimSpeed(u8 index) const { if (!m_valid || index > DIRLEN) - return 0; + return 0xFF; return BE16(dir.Dir[index].AnimSpeed); } @@ -508,7 +517,7 @@ std::string GCMemcard::GetSaveComment1(u8 index) const { return ""; } - return std::string((const char *)mc_data + (DataBlock * BLOCK_SIZE) + Comment1, DENTRY_STRLEN); + return std::string((const char *)mc_data_blocks[DataBlock].block + Comment1, DENTRY_STRLEN); } std::string GCMemcard::GetSaveComment2(u8 index) const @@ -523,7 +532,7 @@ std::string GCMemcard::GetSaveComment2(u8 index) const { return ""; } - return std::string((const char *)mc_data + (DataBlock * BLOCK_SIZE) + Comment2, DENTRY_STRLEN); + return std::string((const char *)mc_data_blocks[DataBlock].block + Comment2, DENTRY_STRLEN); } bool GCMemcard::GetDEntry(u8 index, DEntry &dest) const @@ -534,7 +543,7 @@ bool GCMemcard::GetDEntry(u8 index, DEntry &dest) const return true; } -u32 GCMemcard::DEntry_GetSaveData(u8 index, u8* dest, bool old) const +u32 GCMemcard::GetSaveData(u8 index, std::vector & Blocks) const { if (!m_valid) return NOMEMCARD; @@ -549,31 +558,15 @@ u32 GCMemcard::DEntry_GetSaveData(u8 index, u8* dest, bool old) const return FAIL; } - if (!old) + for (int i = 0; i < saveLength; ++i) { - memcpy(dest, mc_data + BLOCK_SIZE * (block - MC_FST_BLOCKS), saveLength * BLOCK_SIZE); - } - else - { - if (block == 0) return FAIL; - while (block != 0xffff) - { - memcpy(dest, mc_data + BLOCK_SIZE * (block - MC_FST_BLOCKS), BLOCK_SIZE); - dest += BLOCK_SIZE; - - u16 nextblock = Common::swap16(bat.Map[block - MC_FST_BLOCKS]); - if (block + saveLength != memcardSize && nextblock > 0) - {//Fixes for older memcards that were not initialized with FF - block = nextblock; - } - else break; - } + Blocks.push_back(mc_data_blocks[i + block-MC_FST_BLOCKS]); } return SUCCESS; } // End DEntry functions -u32 GCMemcard::ImportFile(DEntry& direntry, u8* contents, int remove) +u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks, int remove) { if (!m_valid) return NOMEMCARD; @@ -627,11 +620,15 @@ u32 GCMemcard::ImportFile(DEntry& direntry, u8* contents, int remove) } } - // keep assuming no freespace fragmentation, and copy over all the data - u8 *destination = mc_data + (firstFree1 - MC_FST_BLOCKS) * BLOCK_SIZE; int fileBlocks = BE16(direntry.BlockCount); - memcpy(destination, contents, BLOCK_SIZE * fileBlocks); + firstFree1 -= MC_FST_BLOCKS; + // keep assuming no freespace fragmentation, and copy over all the data + for (int i = 0; i < fileBlocks; ++i) + { + mc_data_blocks[i + firstFree1] = saveBlocks[i]; + } + bat_backup = bat; u16 last = BE16(bat_backup.LastAllocated); u16 i = (last - 4); @@ -694,34 +691,31 @@ u32 GCMemcard::RemoveFile(u8 index) //index in the directory array { DEntry tempDEntry; GetDEntry(nextIndex, tempDEntry); - u8 * tempSaveData = NULL; + std::vector saveData; + u16 size = 0; //Only get file data if it is a valid dir entry if (BE16(tempDEntry.FirstBlock) != 0xFFFF) { *(u16*)&bat.FreeBlocks = BE16(BE16(bat.FreeBlocks) - BE16(tempDEntry.BlockCount)); - u16 size = DEntry_BlockCount(nextIndex); + size = DEntry_BlockCount(nextIndex); if (size != 0xFFFF) { - tempSaveData = new u8[size * BLOCK_SIZE]; - switch (DEntry_GetSaveData(nextIndex, tempSaveData, true)) + saveData.reserve(size); + switch (GetSaveData(nextIndex, saveData)) { case NOMEMCARD: - delete[] tempSaveData; - tempSaveData = NULL; break; case FAIL: - delete[] tempSaveData; return FAIL; } } } memset(&(dir.Dir[nextIndex]), 0xFF, DENTRY_SIZE); - //Only call import file if DEntry_GetSaveData returns SUCCESS - if (tempSaveData != NULL) + //Only call import file if GetSaveData returns SUCCESS + if (saveData.size() == size) { - ImportFile(tempDEntry, tempSaveData, blocks_left); - delete[] tempSaveData; + ImportFile(tempDEntry, saveData, blocks_left); } nextIndex++; @@ -751,20 +745,17 @@ u32 GCMemcard::CopyFrom(const GCMemcard& source, u8 index) u32 size = source.DEntry_BlockCount(index); if (size == 0xFFFF) return INVALIDFILESIZE; - u8 *tempSaveData = new u8[size * BLOCK_SIZE]; - switch (source.DEntry_GetSaveData(index, tempSaveData, true)) + std::vector saveData; + saveData.reserve(size); + switch (source.GetSaveData(index, saveData)) { case FAIL: - delete[] tempSaveData; return FAIL; case NOMEMCARD: - delete[] tempSaveData; return NOMEMCARD; default: - u32 ret = ImportFile(tempDEntry, tempSaveData, 0); - delete[] tempSaveData; - return ret; + return ImportFile(tempDEntry, saveData, 0); } } @@ -828,9 +819,16 @@ u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, const std::s if (gci.Tell() != offset + DENTRY_SIZE) // Verify correct file position return OPENFAIL; - u32 size = BE16((tempDEntry.BlockCount)) * BLOCK_SIZE; - u8 *tempSaveData = new u8[size]; - gci.ReadBytes(tempSaveData, size); + u32 size = BE16((tempDEntry.BlockCount)); + std::vector saveData; + saveData.reserve(size); + + for (int i = 0; i < size; ++i) + { + GCMBlock b; + gci.ReadBytes(b.block, BLOCK_SIZE); + saveData.push_back(b); + } u32 ret; if (!outputFile.empty()) { @@ -838,7 +836,6 @@ u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, const std::s bool completeWrite = true; if (!gci2) { - delete[] tempSaveData; return OPENFAIL; } gci2.Seek(0, SEEK_SET); @@ -848,30 +845,32 @@ u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, const std::s int fileBlocks = BE16(tempDEntry.BlockCount); gci2.Seek(DENTRY_SIZE, SEEK_SET); - if (!gci2.WriteBytes(tempSaveData, BLOCK_SIZE * fileBlocks)) + for (int i = 0; i < fileBlocks; ++i) + { + if (!gci2.WriteBytes(saveData[i].block, BLOCK_SIZE)) completeWrite = false; + } + if (completeWrite) ret = GCS; else ret = WRITEFAIL; } else - ret = ImportFile(tempDEntry, tempSaveData, 0); + ret = ImportFile(tempDEntry, saveData, 0); - delete[] tempSaveData; return ret; } -u32 GCMemcard::ExportGci(u8 index, const char* fileName, const std::string &directory) const +u32 GCMemcard::ExportGci(u8 index, const char *fileName, const std::string &directory) const { File::IOFile gci; int offset = GCI; - if (!strcasecmp(fileName, ".")) + if (!fileName) { - if (BE32(dir.Dir[index].Gamecode) == 0xFFFFFFFF) return SUCCESS; - - std::string outpuName = directory + DIR_SEP + DEntry_GameCode(index) + '_' + (char*)dir.Dir[index].Filename + ".gci"; - gci.Open(outpuName, "wb"); + std::string gciFilename; + if (!GCI_FileName(index, gciFilename)) return SUCCESS; + gci.Open(directory + DIR_SEP + gciFilename, "wb"); } else { @@ -926,23 +925,21 @@ u32 GCMemcard::ExportGci(u8 index, const char* fileName, const std::string &dire return FAIL; } - size *= BLOCK_SIZE; - u8 *tempSaveData = new u8[size]; + std::vector saveData; + saveData.reserve(size); - switch(DEntry_GetSaveData(index, tempSaveData, true)) + switch(GetSaveData(index, saveData)) { case FAIL: - delete[] tempSaveData; return FAIL; - case NOMEMCARD: - delete[] tempSaveData; return NOMEMCARD; } gci.Seek(DENTRY_SIZE + offset, SEEK_SET); - gci.WriteBytes(tempSaveData, size); - - delete[] tempSaveData; + for (int i = 0; i < size; ++i) + { + gci.WriteBytes(saveData[i].block, BLOCK_SIZE); + } if (gci.IsGood()) return SUCCESS; @@ -1013,14 +1010,14 @@ bool GCMemcard::ReadBannerRGBA8(u8 index, u32* buffer) const if (bnrFormat&1) { - u8 *pxdata = (u8* )(mc_data + (DataBlock * BLOCK_SIZE) + DataOffset); - u16 *paldata = (u16*)(mc_data + (DataBlock * BLOCK_SIZE) + DataOffset + pixels); + u8 *pxdata = (u8* )(mc_data_blocks[DataBlock].block + DataOffset); + u16 *paldata = (u16*)(mc_data_blocks[DataBlock].block + DataOffset + pixels); decodeCI8image(buffer, pxdata, paldata, 96, 32); } else { - u16 *pxdata = (u16*)(mc_data + (DataBlock * BLOCK_SIZE) + DataOffset); + u16 *pxdata = (u16*)(mc_data_blocks[DataBlock].block + DataOffset); decode5A3image(buffer, pxdata, 96, 32); } @@ -1053,7 +1050,7 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const return 0; } - u8* animData = (u8*)(mc_data + (DataBlock * BLOCK_SIZE) + DataOffset); + u8* animData = (u8*)(mc_data_blocks[DataBlock].block + DataOffset); switch (bnrFormat) { @@ -1169,17 +1166,13 @@ bool GCMemcard::Format(bool sjis, u16 SizeMb) m_sizeMb = SizeMb; maxBlock = (u32)m_sizeMb * MBIT_TO_BLOCKS; - if (mc_data) + mc_data_blocks.reserve(maxBlock - MC_FST_BLOCKS); + for (u32 i = 0; i < (maxBlock - MC_FST_BLOCKS); ++i) { - delete mc_data; - mc_data = NULL; + GCMBlock b; + mc_data_blocks.push_back(b); } - mc_data_size = BLOCK_SIZE * (m_sizeMb * MBIT_TO_BLOCKS - MC_FST_BLOCKS); - mc_data = new u8[mc_data_size]; - if (!mc_data) - return false; - memset(mc_data, 0xFF, mc_data_size); m_valid = true; return Save(); diff --git a/Source/Core/Core/Src/HW/GCMemcard.h b/Source/Core/Core/Src/HW/GCMemcard.h index 57a42b9d3a..e1ab970053 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.h +++ b/Source/Core/Core/Src/HW/GCMemcard.h @@ -76,11 +76,14 @@ private: std::string m_fileName; u32 maxBlock; - u32 mc_data_size; - u8* mc_data; - u16 m_sizeMb; - + struct GCMBlock + { + GCMBlock(){erase();} + void erase() {memset(block, 0xFF, BLOCK_SIZE);} + u8 block[BLOCK_SIZE]; + }; + std::vector mc_data_blocks; #pragma pack(push,1) struct Header { //Offset Size Description // Serial in libogc @@ -220,11 +223,11 @@ public: // old determines if function uses old or new method of copying data // some functions only work with old way, some only work with new way // TODO: find a function that works for all calls or split into 2 functions - u32 DEntry_GetSaveData(u8 index, u8* buffer, bool old) const; + u32 GetSaveData(u8 index, std::vector &saveBlocks) const; // adds the file to the directory and copies its contents // if remove > 0 it will pad bat.map with 0's sizeof remove - u32 ImportFile(DEntry& direntry, u8* contents, int remove); + u32 ImportFile(DEntry& direntry, std::vector &saveBlocks, int remove); // delete a file from the directory u32 RemoveFile(u8 index); From 1fe67e19ab8ee1dfb87df3d348270bd76eb5a9b5 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Mon, 6 Feb 2012 01:52:13 -0800 Subject: [PATCH 010/185] use BAT for block locations instead of assuming nonfragmented blocks *untested* Signed-off-by: LPFaint99 --- Source/Core/Core/Src/HW/GCMemcard.cpp | 105 +++++++++++++++++++++----- Source/Core/Core/Src/HW/GCMemcard.h | 6 +- 2 files changed, 90 insertions(+), 21 deletions(-) diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp index 7a574b7106..2926017b2a 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.cpp +++ b/Source/Core/Core/Src/HW/GCMemcard.cpp @@ -543,24 +543,61 @@ bool GCMemcard::GetDEntry(u8 index, DEntry &dest) const return true; } +u16 GCMemcard::GetNextBlock(u16 Block) const +{ + if ((Block < MC_FST_BLOCKS) || (Block > maxBlock)) + return 0; + return Common::swap16(bat.Map[Block-MC_FST_BLOCKS]); +} + +u16 GCMemcard::NextFreeBlock(u16 StartingBlock) const +{ + for (u16 i = StartingBlock; i < BAT_SIZE; ++i) + if (bat.Map[i-MC_FST_BLOCKS] == 0) + return i; +} + +bool GCMemcard::ClearBlocks(u16 FirstBlock, u16 BlockCount) +{ + std::vector blocks; + while (FirstBlock != 0xFF && FirstBlock != 0) + { + blocks.push_back(FirstBlock); + FirstBlock = GetNextBlock(FirstBlock); + } + + if (FirstBlock > 0) + { + size_t length = blocks.size(); + if (length != BlockCount) + return false; + for (int i = 0; i < length; ++i) + bat.Map[blocks.at(i)-MC_FST_BLOCKS] = 0; + *(u16*)&bat.FreeBlocks = BE16(BE16(bat.FreeBlocks) - BlockCount); + } + return true; +} u32 GCMemcard::GetSaveData(u8 index, std::vector & Blocks) const { if (!m_valid) return NOMEMCARD; u16 block = DEntry_FirstBlock(index); - u16 saveLength = DEntry_BlockCount(index); + u16 BlockCount = DEntry_BlockCount(index); u16 memcardSize = BE16(hdr.SizeMb) * MBIT_TO_BLOCKS; - if ((block == 0xFFFF) || (saveLength == 0xFFFF) - || (block + saveLength > memcardSize)) + if ((block == 0xFFFF) || (BlockCount == 0xFFFF)) { return FAIL; } - for (int i = 0; i < saveLength; ++i) + u16 nextBlock = block; + for (int i = 0; i < BlockCount; ++i) { - Blocks.push_back(mc_data_blocks[i + block-MC_FST_BLOCKS]); + if ((!nextBlock) || (nextBlock == 0xFFFF)) + return FAIL; + Blocks.push_back(mc_data_blocks[nextBlock-MC_FST_BLOCKS]); + nextBlock = GetNextBlock(nextBlock); } return SUCCESS; } @@ -585,10 +622,12 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks, i } // find first free data block -- assume no freespace fragmentation - int totalspace = (((u32)BE16(hdr.SizeMb) * MBIT_TO_BLOCKS) - MC_FST_BLOCKS); - int firstFree1 = BE16(bat.LastAllocated) + 1; - int firstFree2 = 0; - for (int i = 0; i < DIRLEN; i++) + //int totalspace = (((u32)BE16(hdr.SizeMb) * MBIT_TO_BLOCKS) - MC_FST_BLOCKS); + //int firstFree1 = BE16(bat.LastAllocated) + 1; + + + +/* for (int i = 0; i < DIRLEN; i++) { if (BE32(dir.Dir[i].Gamecode) == 0xFFFFFFFF) { @@ -601,7 +640,8 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks, i } } firstFree1 = max(firstFree1, firstFree2); - + */ + u16 firstBlock = NextFreeBlock(); // find first free dir entry int index = -1; for (int i=0; i < DIRLEN; i++) @@ -610,7 +650,7 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks, i { index = i; dir.Dir[i] = direntry; - *(u16*)&dir.Dir[i].FirstBlock = BE16(firstFree1); + *(u16*)&dir.Dir[i].FirstBlock = BE16(firstBlock); if (!remove) { dir.Dir[i].CopyCounter = dir.Dir[i].CopyCounter+1; @@ -622,15 +662,22 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks, i int fileBlocks = BE16(direntry.BlockCount); - firstFree1 -= MC_FST_BLOCKS; + + u16 nextBlock; // keep assuming no freespace fragmentation, and copy over all the data for (int i = 0; i < fileBlocks; ++i) - { - mc_data_blocks[i + firstFree1] = saveBlocks[i]; + { + mc_data_blocks[firstBlock - MC_FST_BLOCKS] = saveBlocks[i]; + if (i == fileBlocks-1) + nextBlock = 0xFFFF; + else + nextBlock = NextFreeBlock(firstBlock+1); + bat.Map[firstBlock - MC_FST_BLOCKS] = BE16(nextBlock); + firstBlock = nextBlock; } bat_backup = bat; - u16 last = BE16(bat_backup.LastAllocated); +/* u16 last = BE16(bat_backup.LastAllocated); u16 i = (last - 4); int j = 2; while(j < BE16(direntry.BlockCount) + 1) @@ -645,11 +692,12 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks, i { bat_backup.Map[i++] = 0x0000; } - + */ //update last allocated block - *(u16*)&bat_backup.LastAllocated = BE16(BE16(bat_backup.LastAllocated) + j - 1); +/* *(u16*)&bat_backup.LastAllocated = BE16(BE16(bat_backup.LastAllocated) + j - 1); +*/ //update freespace counter - *(u16*)&bat_backup.FreeBlocks = BE16(totalspace - firstFree1 - fileBlocks + MC_FST_BLOCKS); + *(u16*)&bat_backup.FreeBlocks = BE16(BE16(bat_backup.FreeBlocks) - fileBlocks); if (!remove) @@ -666,7 +714,25 @@ u32 GCMemcard::RemoveFile(u8 index) //index in the directory array { if (!m_valid) return NOMEMCARD; + if (index >= DIRLEN) + return DELETE_FAIL; + + dir_backup = dir; + bat_backup = bat; + u16 startingblock = BE16(dir.Dir[index].FirstBlock); + u16 numberofblocks = BE16(dir.Dir[index].BlockCount); + if (!ClearBlocks(startingblock, numberofblocks)) + return DELETE_FAIL; + + + memset(&(dir.Dir[index]), 0xFF, DENTRY_SIZE); + + *(u16*)&dir.UpdateCounter = BE16(BE16(dir.UpdateCounter) + 1); + *(u16*)&bat.UpdateCounter = BE16(BE16(bat.UpdateCounter) + 1); + + return SUCCESS; + /* //error checking u16 startingblock = 0; for (int i = 0; i < DIRLEN; i++) @@ -730,8 +796,7 @@ u32 GCMemcard::RemoveFile(u8 index) //index in the directory array } // increment update counter *(u16*)&dir.UpdateCounter = BE16(BE16(dir.UpdateCounter) + 1); - - return SUCCESS; + */ } u32 GCMemcard::CopyFrom(const GCMemcard& source, u8 index) diff --git a/Source/Core/Core/Src/HW/GCMemcard.h b/Source/Core/Core/Src/HW/GCMemcard.h index e1ab970053..e66f77887e 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.h +++ b/Source/Core/Core/Src/HW/GCMemcard.h @@ -55,6 +55,7 @@ enum DENTRY_STRLEN = 0x20, DENTRY_SIZE = 0x40, BLOCK_SIZE = 0x2000, + BAT_SIZE = 0xFFB, MemCard59Mb = 0x04, MemCard123Mb = 0x08, @@ -162,7 +163,7 @@ private: u8 UpdateCounter[2];//0x0004 2 update Counter u8 FreeBlocks[2]; //0x0006 2 free Blocks u8 LastAllocated[2];//0x0008 2 last allocated Block - u16 Map[0xFFB]; //0x000a 0x1ff8 Map of allocated Blocks + u16 Map[BAT_SIZE]; //0x000a 0x1ff8 Map of allocated Blocks } bat,bat_backup; struct GCMC_Header { @@ -218,6 +219,9 @@ public: std::string GetSaveComment2(u8 index) const; // Copies a DEntry from u8 index to DEntry& data bool GetDEntry(u8 index, DEntry &dest) const; + u16 GetNextBlock(u16 Block) const; + u16 NextFreeBlock(u16 StartingBlock=MC_FST_BLOCKS) const; + bool ClearBlocks(u16 StartingBlock, u16 Length); // assumes there's enough space in buffer // old determines if function uses old or new method of copying data From 3d20c5745896f0787ed0d974e73d20f11d240de9 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Mon, 6 Feb 2012 17:27:49 -0800 Subject: [PATCH 011/185] Update directorys and BlockAllocs correctly, use the most uptodate directory/bat instead of always the first Signed-off-by: LPFaint99 --- Source/Core/Core/Src/HW/GCMemcard.cpp | 335 +++++++++---------- Source/Core/Core/Src/HW/GCMemcard.h | 12 +- Source/Core/DolphinWX/Src/MemcardManager.cpp | 4 +- 3 files changed, 164 insertions(+), 187 deletions(-) diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp index 2926017b2a..9b9d39fc02 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.cpp +++ b/Source/Core/Core/Src/HW/GCMemcard.cpp @@ -227,6 +227,28 @@ GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis) } mcdFile.Close(); + + if (BE16(dir.UpdateCounter) > (BE16(dir_backup.UpdateCounter))) + { + CurrentDir = &dir; + PreviousDir = &dir_backup; + } + else + { + CurrentDir = &dir_backup; + PreviousDir = &dir; + } + if (BE16(bat.UpdateCounter) > BE16(bat_backup.UpdateCounter)) + { + PanicAlert("jere, %x, %x",BE16(bat.UpdateCounter) , BE16(bat_backup.UpdateCounter)); + CurrentBat = &bat; + PreviousBat = &bat_backup; + } + else + { + CurrentBat = &bat_backup; + PreviousBat = &bat; + } } bool GCMemcard::IsAsciiEncoding() const @@ -321,7 +343,7 @@ u8 GCMemcard::GetNumFiles() const u8 j = 0; for (int i = 0; i < DIRLEN; i++) { - if (BE32(dir.Dir[i].Gamecode)!= 0xFFFFFFFF) + if (BE32(CurrentDir->Dir[i].Gamecode)!= 0xFFFFFFFF) j++; } return j; @@ -335,7 +357,7 @@ u8 GCMemcard::GetFileIndex(u8 fileNumber) const u8 j = 0; for (u8 i = 0; i < DIRLEN; i++) { - if (BE32(dir.Dir[i].Gamecode)!= 0xFFFFFFFF) + if (BE32(CurrentDir->Dir[i].Gamecode)!= 0xFFFFFFFF) { if (j == fileNumber) { @@ -353,7 +375,7 @@ u16 GCMemcard::GetFreeBlocks() const if (!m_valid) return 0; - return BE16(bat.FreeBlocks); + return BE16(CurrentBat->FreeBlocks); } u8 GCMemcard::TitlePresent(DEntry d) const @@ -364,8 +386,8 @@ u8 GCMemcard::TitlePresent(DEntry d) const u8 i = 0; while(i < DIRLEN) { - if ((BE32(dir.Dir[i].Gamecode) == BE32(d.Gamecode)) && - (!memcmp(dir.Dir[i].Filename, d.Filename, 32))) + if ((BE32(CurrentDir->Dir[i].Gamecode) == BE32(d.Gamecode)) && + (!memcmp(CurrentDir->Dir[i].Filename, d.Filename, 32))) { break; } @@ -376,9 +398,9 @@ u8 GCMemcard::TitlePresent(DEntry d) const bool GCMemcard::GCI_FileName(u8 index, std::string &filename) const { - if (!m_valid || index > DIRLEN || (BE32(dir.Dir[index].Gamecode) == 0xFFFFFFFF)) + if (!m_valid || index > DIRLEN || (BE32(CurrentDir->Dir[index].Gamecode) == 0xFFFFFFFF)) return false; - filename = std::string((char*)dir.Dir[index].Gamecode, 4) + '_' + (char*)dir.Dir[index].Filename + ".gci"; + filename = std::string((char*)CurrentDir->Dir[index].Gamecode, 4) + '_' + (char*)CurrentDir->Dir[index].Filename + ".gci"; return true; } @@ -389,14 +411,14 @@ std::string GCMemcard::DEntry_GameCode(u8 index) const { if (!m_valid || index > DIRLEN) return ""; - return std::string((const char*)dir.Dir[index].Gamecode, 4); + return std::string((const char*)CurrentDir->Dir[index].Gamecode, 4); } std::string GCMemcard::DEntry_Makercode(u8 index) const { if (!m_valid || index > DIRLEN) return ""; - return std::string((const char*)dir.Dir[index].Makercode, 2); + return std::string((const char*)CurrentDir->Dir[index].Makercode, 2); } std::string GCMemcard::DEntry_BIFlags(u8 index) const @@ -405,7 +427,7 @@ std::string GCMemcard::DEntry_BIFlags(u8 index) const return ""; std::string flags; - int x = dir.Dir[index].BIFlags; + int x = CurrentDir->Dir[index].BIFlags; for (int i = 0; i < 8; i++) { flags.push_back((x & 0x80) ? '1' : '0'); @@ -419,32 +441,32 @@ std::string GCMemcard::DEntry_FileName(u8 index) const { if (!m_valid || index > DIRLEN) return ""; - return std::string((const char*)dir.Dir[index].Filename, DENTRY_STRLEN); + return std::string((const char*)CurrentDir->Dir[index].Filename, DENTRY_STRLEN); } u32 GCMemcard::DEntry_ModTime(u8 index) const { if (!m_valid || index > DIRLEN) return 0xFFFFFFFF; - return BE32(dir.Dir[index].ModTime); + return BE32(CurrentDir->Dir[index].ModTime); } u32 GCMemcard::DEntry_ImageOffset(u8 index) const { if (!m_valid || index > DIRLEN) return 0xFFFFFFFF; - return BE32(dir.Dir[index].ImageOffset); + return BE32(CurrentDir->Dir[index].ImageOffset); } std::string GCMemcard::DEntry_IconFmt(u8 index) const { if (!m_valid || index > DIRLEN) return ""; - int x = dir.Dir[index].IconFmt[0]; + int x = CurrentDir->Dir[index].IconFmt[0]; std::string format; for(int i = 0; i < 16; i++) { - if (i == 8) x = dir.Dir[index].IconFmt[1]; + if (i == 8) x = CurrentDir->Dir[index].IconFmt[1]; format.push_back((x & 0x80) ? '1' : '0'); x = x << 1; } @@ -456,14 +478,14 @@ u16 GCMemcard::DEntry_AnimSpeed(u8 index) const { if (!m_valid || index > DIRLEN) return 0xFF; - return BE16(dir.Dir[index].AnimSpeed); + return BE16(CurrentDir->Dir[index].AnimSpeed); } std::string GCMemcard::DEntry_Permissions(u8 index) const { if (!m_valid || index > DIRLEN) return ""; - u8 Permissions = dir.Dir[index].Permissions; + u8 Permissions = CurrentDir->Dir[index].Permissions; std::string permissionsString; permissionsString.push_back((Permissions & 16) ? 'x' : 'M'); permissionsString.push_back((Permissions & 8) ? 'x' : 'C'); @@ -476,7 +498,7 @@ u8 GCMemcard::DEntry_CopyCounter(u8 index) const { if (!m_valid || index > DIRLEN) return 0xFF; - return dir.Dir[index].CopyCounter; + return CurrentDir->Dir[index].CopyCounter; } u16 GCMemcard::DEntry_FirstBlock(u8 index) const @@ -484,7 +506,7 @@ u16 GCMemcard::DEntry_FirstBlock(u8 index) const if (!m_valid || index > DIRLEN) return 0xFFFF; - u16 block = BE16(dir.Dir[index].FirstBlock); + u16 block = BE16(CurrentDir->Dir[index].FirstBlock); if (block > (u16) maxBlock) return 0xFFFF; return block; } @@ -494,7 +516,7 @@ u16 GCMemcard::DEntry_BlockCount(u8 index) const if (!m_valid || index > DIRLEN) return 0xFFFF; - u16 blocks = BE16(dir.Dir[index].BlockCount); + u16 blocks = BE16(CurrentDir->Dir[index].BlockCount); if (blocks > (u16) maxBlock) return 0xFFFF; return blocks; } @@ -503,7 +525,7 @@ u32 GCMemcard::DEntry_CommentsAddress(u8 index) const { if (!m_valid || index > DIRLEN) return 0xFFFF; - return BE32(dir.Dir[index].CommentsAddr); + return BE32(CurrentDir->Dir[index].CommentsAddr); } std::string GCMemcard::GetSaveComment1(u8 index) const @@ -511,8 +533,8 @@ std::string GCMemcard::GetSaveComment1(u8 index) const if (!m_valid || index > DIRLEN) return ""; - u32 Comment1 = BE32(dir.Dir[index].CommentsAddr); - u32 DataBlock = BE16(dir.Dir[index].FirstBlock) - MC_FST_BLOCKS; + u32 Comment1 = BE32(CurrentDir->Dir[index].CommentsAddr); + u32 DataBlock = BE16(CurrentDir->Dir[index].FirstBlock) - MC_FST_BLOCKS; if ((DataBlock > maxBlock) || (Comment1 == 0xFFFFFFFF)) { return ""; @@ -525,9 +547,9 @@ std::string GCMemcard::GetSaveComment2(u8 index) const if (!m_valid || index > DIRLEN) return ""; - u32 Comment1 = BE32(dir.Dir[index].CommentsAddr); + u32 Comment1 = BE32(CurrentDir->Dir[index].CommentsAddr); u32 Comment2 = Comment1 + DENTRY_STRLEN; - u32 DataBlock = BE16(dir.Dir[index].FirstBlock) - MC_FST_BLOCKS; + u32 DataBlock = BE16(CurrentDir->Dir[index].FirstBlock) - MC_FST_BLOCKS; if ((DataBlock > maxBlock) || (Comment1 == 0xFFFFFFFF)) { return ""; @@ -539,44 +561,47 @@ bool GCMemcard::GetDEntry(u8 index, DEntry &dest) const { if (!m_valid || index > DIRLEN) return false; - dest = dir.Dir[index]; + dest = CurrentDir->Dir[index]; return true; } - -u16 GCMemcard::GetNextBlock(u16 Block) const +u16 GCMemcard::BlockAlloc::GetNextBlock(u16 Block) const { - if ((Block < MC_FST_BLOCKS) || (Block > maxBlock)) + if ((Block < MC_FST_BLOCKS) || (Block > 4091)) return 0; - return Common::swap16(bat.Map[Block-MC_FST_BLOCKS]); + return Common::swap16(Map[Block-MC_FST_BLOCKS]); } -u16 GCMemcard::NextFreeBlock(u16 StartingBlock) const +u16 GCMemcard::BlockAlloc::NextFreeBlock(u16 StartingBlock) const { for (u16 i = StartingBlock; i < BAT_SIZE; ++i) - if (bat.Map[i-MC_FST_BLOCKS] == 0) + if (Map[i-MC_FST_BLOCKS] == 0) return i; } -bool GCMemcard::ClearBlocks(u16 FirstBlock, u16 BlockCount) +bool GCMemcard::BlockAlloc::ClearBlocks(u16 FirstBlock, u16 BlockCount) { std::vector blocks; - while (FirstBlock != 0xFF && FirstBlock != 0) + while (FirstBlock != 0xFFFF && FirstBlock != 0) { blocks.push_back(FirstBlock); FirstBlock = GetNextBlock(FirstBlock); } - if (FirstBlock > 0) { size_t length = blocks.size(); if (length != BlockCount) + { return false; + } for (int i = 0; i < length; ++i) - bat.Map[blocks.at(i)-MC_FST_BLOCKS] = 0; - *(u16*)&bat.FreeBlocks = BE16(BE16(bat.FreeBlocks) - BlockCount); + Map[blocks.at(i)-MC_FST_BLOCKS] = 0; + *(u16*)&FreeBlocks = BE16(BE16(FreeBlocks) + BlockCount); + + return true; } - return true; + return false; } + u32 GCMemcard::GetSaveData(u8 index, std::vector & Blocks) const { if (!m_valid) @@ -597,13 +622,13 @@ u32 GCMemcard::GetSaveData(u8 index, std::vector & Blocks) const if ((!nextBlock) || (nextBlock == 0xFFFF)) return FAIL; Blocks.push_back(mc_data_blocks[nextBlock-MC_FST_BLOCKS]); - nextBlock = GetNextBlock(nextBlock); + nextBlock = CurrentBat->GetNextBlock(nextBlock); } return SUCCESS; } // End DEntry functions -u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks, int remove) +u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks) { if (!m_valid) return NOMEMCARD; @@ -612,11 +637,11 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks, i { return OUTOFDIRENTRIES; } - if (BE16(bat.FreeBlocks) < BE16(direntry.BlockCount)) + if (BE16(CurrentBat->FreeBlocks) < BE16(direntry.BlockCount)) { return OUTOFBLOCKS; } - if (!remove && (TitlePresent(direntry) != DIRLEN)) + if (TitlePresent(direntry) != DIRLEN) { return TITLEPRESENT; } @@ -625,44 +650,40 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks, i //int totalspace = (((u32)BE16(hdr.SizeMb) * MBIT_TO_BLOCKS) - MC_FST_BLOCKS); //int firstFree1 = BE16(bat.LastAllocated) + 1; + u16 firstBlock = CurrentBat->NextFreeBlock(); + Directory UpdatedDir = *CurrentDir; -/* for (int i = 0; i < DIRLEN; i++) - { - if (BE32(dir.Dir[i].Gamecode) == 0xFFFFFFFF) - { - break; - } - else - { - firstFree2 = max(firstFree2, - (int)(BE16(dir.Dir[i].FirstBlock) + BE16(dir.Dir[i].BlockCount))); - } - } - firstFree1 = max(firstFree1, firstFree2); - */ - u16 firstBlock = NextFreeBlock(); // find first free dir entry int index = -1; for (int i=0; i < DIRLEN; i++) { - if (BE32(dir.Dir[i].Gamecode) == 0xFFFFFFFF) + if (BE32(UpdatedDir.Dir[i].Gamecode) == 0xFFFFFFFF) { index = i; - dir.Dir[i] = direntry; - *(u16*)&dir.Dir[i].FirstBlock = BE16(firstBlock); - if (!remove) - { - dir.Dir[i].CopyCounter = dir.Dir[i].CopyCounter+1; - } - dir_backup = dir; + UpdatedDir.Dir[i] = direntry; + *(u16*)&UpdatedDir.Dir[i].FirstBlock = BE16(firstBlock); + UpdatedDir.Dir[i].CopyCounter = UpdatedDir.Dir[i].CopyCounter+1; break; } } - + *(u16*)&UpdatedDir.UpdateCounter = BE16(BE16(UpdatedDir.UpdateCounter) + 1); + *PreviousDir = UpdatedDir; + if (PreviousDir == &dir ) + { + CurrentDir = &dir; + PreviousDir = &dir_backup; + } + else + { + CurrentDir = &dir_backup; + PreviousDir = &dir; + } int fileBlocks = BE16(direntry.BlockCount); + + BlockAlloc UpdatedBat = *CurrentBat; u16 nextBlock; // keep assuming no freespace fragmentation, and copy over all the data for (int i = 0; i < fileBlocks; ++i) @@ -671,42 +692,24 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks, i if (i == fileBlocks-1) nextBlock = 0xFFFF; else - nextBlock = NextFreeBlock(firstBlock+1); - bat.Map[firstBlock - MC_FST_BLOCKS] = BE16(nextBlock); + nextBlock = UpdatedBat.NextFreeBlock(firstBlock+1); + UpdatedBat.Map[firstBlock - MC_FST_BLOCKS] = BE16(nextBlock); firstBlock = nextBlock; } - - bat_backup = bat; -/* u16 last = BE16(bat_backup.LastAllocated); - u16 i = (last - 4); - int j = 2; - while(j < BE16(direntry.BlockCount) + 1) + *(u16*)&UpdatedBat.FreeBlocks = BE16(BE16(UpdatedBat.FreeBlocks) - fileBlocks); + *(u16*)&UpdatedBat.UpdateCounter = BE16(BE16(UpdatedBat.UpdateCounter) + 1); + *PreviousBat = UpdatedBat; + if (PreviousBat == &bat ) { - bat_backup.Map[i] = BE16(last + (u16)j); - i++; - j++; + CurrentBat = &bat; + PreviousBat = &bat_backup; } - bat_backup.Map[i++] = 0xFFFF; - //Set bat.map to 0 for each block that was removed - for (int k = 0; k < remove; k++) + else { - bat_backup.Map[i++] = 0x0000; + CurrentBat = &bat_backup; + PreviousBat = &bat; } - */ - //update last allocated block -/* *(u16*)&bat_backup.LastAllocated = BE16(BE16(bat_backup.LastAllocated) + j - 1); -*/ - //update freespace counter - *(u16*)&bat_backup.FreeBlocks = BE16(BE16(bat_backup.FreeBlocks) - fileBlocks); - - if (!remove) - { // ... and dir update counter - *(u16*)&dir_backup.UpdateCounter = BE16(BE16(dir_backup.UpdateCounter) + 1); - // ... and bat update counter - *(u16*)&bat_backup.UpdateCounter = BE16(BE16(bat_backup.UpdateCounter) + 1); - } - bat = bat_backup; return SUCCESS; } @@ -716,87 +719,59 @@ u32 GCMemcard::RemoveFile(u8 index) //index in the directory array return NOMEMCARD; if (index >= DIRLEN) return DELETE_FAIL; - - dir_backup = dir; - bat_backup = bat; u16 startingblock = BE16(dir.Dir[index].FirstBlock); u16 numberofblocks = BE16(dir.Dir[index].BlockCount); - if (!ClearBlocks(startingblock, numberofblocks)) + + BlockAlloc UpdatedBat = *CurrentBat; + if (!UpdatedBat.ClearBlocks(startingblock, numberofblocks)) return DELETE_FAIL; + *(u16*)&UpdatedBat.UpdateCounter = BE16(BE16(UpdatedBat.UpdateCounter) + 1); + *PreviousBat = UpdatedBat; + if (PreviousBat == &bat ) + { + CurrentBat = &bat; + PreviousBat = &bat_backup; + } + else + { + CurrentBat = &bat_backup; + PreviousBat = &bat; + } + + Directory UpdatedDir = *CurrentDir; + *(u32*)&UpdatedDir.Dir[index].Gamecode = 0; + *(u16*)&UpdatedDir.Dir[index].Makercode = 0; + memset(UpdatedDir.Dir[index].Filename, 0, 0x20); + strcpy((char*)UpdatedDir.Dir[index].Filename, "Broken File000"); + *(u16*)&UpdatedDir.UpdateCounter = BE16(BE16(UpdatedDir.UpdateCounter) + 1); + + *PreviousDir = UpdatedDir; + if (PreviousDir == &dir ) + { + CurrentDir = &dir; + PreviousDir = &dir_backup; + } + else + { + CurrentDir = &dir_backup; + PreviousDir = &dir; + } + memset(&(UpdatedDir.Dir[index]), 0xFF, DENTRY_SIZE); + *(u16*)&UpdatedDir.UpdateCounter = BE16(BE16(UpdatedDir.UpdateCounter) + 1); + *PreviousDir = UpdatedDir; + if (PreviousDir == &dir ) + { + CurrentDir = &dir; + PreviousDir = &dir_backup; + } + else + { + CurrentDir = &dir_backup; + PreviousDir = &dir; + } - - memset(&(dir.Dir[index]), 0xFF, DENTRY_SIZE); - - *(u16*)&dir.UpdateCounter = BE16(BE16(dir.UpdateCounter) + 1); - *(u16*)&bat.UpdateCounter = BE16(BE16(bat.UpdateCounter) + 1); - return SUCCESS; - /* - //error checking - u16 startingblock = 0; - for (int i = 0; i < DIRLEN; i++) - { - if (startingblock > BE16(dir.Dir[i].FirstBlock)) - return DELETE_FAIL; - startingblock = BE16(dir.Dir[i].FirstBlock); - } - - //backup the directory and bat (not really needed here but meh :P - dir_backup = dir; - bat_backup = bat; - - //free the blocks - int blocks_left = BE16(dir.Dir[index].BlockCount); - *(u16*)&bat.LastAllocated = BE16(BE16(dir.Dir[index].FirstBlock) - 1); - - u8 nextIndex = index + 1; - memset(&(dir.Dir[index]), 0xFF, DENTRY_SIZE); - - while (nextIndex < DIRLEN) - { - DEntry tempDEntry; - GetDEntry(nextIndex, tempDEntry); - std::vector saveData; - u16 size = 0; - //Only get file data if it is a valid dir entry - if (BE16(tempDEntry.FirstBlock) != 0xFFFF) - { - *(u16*)&bat.FreeBlocks = BE16(BE16(bat.FreeBlocks) - BE16(tempDEntry.BlockCount)); - - size = DEntry_BlockCount(nextIndex); - if (size != 0xFFFF) - { - saveData.reserve(size); - switch (GetSaveData(nextIndex, saveData)) - { - case NOMEMCARD: - break; - case FAIL: - return FAIL; - } - } - } - memset(&(dir.Dir[nextIndex]), 0xFF, DENTRY_SIZE); - //Only call import file if GetSaveData returns SUCCESS - if (saveData.size() == size) - { - ImportFile(tempDEntry, saveData, blocks_left); - } - nextIndex++; - - } - //Added to clean up if removing last file - if (BE16(bat.LastAllocated) == (u16)4) - { - for (int j = 0; j < blocks_left; j++) - { - bat.Map[j] = 0x0000; - } - } - // increment update counter - *(u16*)&dir.UpdateCounter = BE16(BE16(dir.UpdateCounter) + 1); - */ } u32 GCMemcard::CopyFrom(const GCMemcard& source, u8 index) @@ -820,7 +795,7 @@ u32 GCMemcard::CopyFrom(const GCMemcard& source, u8 index) case NOMEMCARD: return NOMEMCARD; default: - return ImportFile(tempDEntry, saveData, 0); + return ImportFile(tempDEntry, saveData); } } @@ -922,7 +897,7 @@ u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, const std::s ret = WRITEFAIL; } else - ret = ImportFile(tempDEntry, saveData, 0); + ret = ImportFile(tempDEntry, saveData); return ret; } @@ -1053,7 +1028,7 @@ bool GCMemcard::ReadBannerRGBA8(u8 index, u32* buffer) const if (!m_valid) return false; - int flags = dir.Dir[index].BIFlags; + int flags = CurrentDir->Dir[index].BIFlags; // Timesplitters 2 is the only game that I see this in // May be a hack if (flags == 0xFB) flags = ~flags; @@ -1063,8 +1038,8 @@ bool GCMemcard::ReadBannerRGBA8(u8 index, u32* buffer) const if (bnrFormat == 0) return false; - u32 DataOffset = BE32(dir.Dir[index].ImageOffset); - u32 DataBlock = BE16(dir.Dir[index].FirstBlock) - MC_FST_BLOCKS; + u32 DataOffset = BE32(CurrentDir->Dir[index].ImageOffset); + u32 DataBlock = BE16(CurrentDir->Dir[index].FirstBlock) - MC_FST_BLOCKS; if ((DataBlock > maxBlock) || (DataOffset == 0xFFFFFFFF)) { @@ -1098,17 +1073,17 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const // Sonic Heroes it the only game I have seen that tries to use a CI8 and RGB5A3 icon int fmtCheck = 0; - int formats = BE16(dir.Dir[index].IconFmt); - int fdelays = BE16(dir.Dir[index].AnimSpeed); + int formats = BE16(CurrentDir->Dir[index].IconFmt); + int fdelays = BE16(CurrentDir->Dir[index].AnimSpeed); - int flags = dir.Dir[index].BIFlags; + int flags = CurrentDir->Dir[index].BIFlags; // Timesplitters 2 is the only game that I see this in // May be a hack if (flags == 0xFB) flags = ~flags; int bnrFormat = (flags&3); - u32 DataOffset = BE32(dir.Dir[index].ImageOffset); - u32 DataBlock = BE16(dir.Dir[index].FirstBlock) - MC_FST_BLOCKS; + u32 DataOffset = BE32(CurrentDir->Dir[index].ImageOffset); + u32 DataBlock = BE16(CurrentDir->Dir[index].FirstBlock) - MC_FST_BLOCKS; if ((DataBlock > maxBlock) || (DataOffset == 0xFFFFFFFF)) { diff --git a/Source/Core/Core/Src/HW/GCMemcard.h b/Source/Core/Core/Src/HW/GCMemcard.h index e66f77887e..dfa6bd6f65 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.h +++ b/Source/Core/Core/Src/HW/GCMemcard.h @@ -157,6 +157,7 @@ private: u16 Checksum_Inv; //0x1ffe 2 Inverse Checksum } dir, dir_backup; + Directory *CurrentDir, *PreviousDir; struct BlockAlloc { u16 Checksum; //0x0000 2 Additive Checksum u16 Checksum_Inv; //0x0002 2 Inverse Checksum @@ -164,7 +165,12 @@ private: u8 FreeBlocks[2]; //0x0006 2 free Blocks u8 LastAllocated[2];//0x0008 2 last allocated Block u16 Map[BAT_SIZE]; //0x000a 0x1ff8 Map of allocated Blocks + u16 GetNextBlock(u16 Block) const; + u16 NextFreeBlock(u16 StartingBlock=MC_FST_BLOCKS) const; + bool ClearBlocks(u16 StartingBlock, u16 Length); } bat,bat_backup; + + BlockAlloc *CurrentBat, *PreviousBat; struct GCMC_Header { Header *hdr; @@ -219,9 +225,6 @@ public: std::string GetSaveComment2(u8 index) const; // Copies a DEntry from u8 index to DEntry& data bool GetDEntry(u8 index, DEntry &dest) const; - u16 GetNextBlock(u16 Block) const; - u16 NextFreeBlock(u16 StartingBlock=MC_FST_BLOCKS) const; - bool ClearBlocks(u16 StartingBlock, u16 Length); // assumes there's enough space in buffer // old determines if function uses old or new method of copying data @@ -230,8 +233,7 @@ public: u32 GetSaveData(u8 index, std::vector &saveBlocks) const; // adds the file to the directory and copies its contents - // if remove > 0 it will pad bat.map with 0's sizeof remove - u32 ImportFile(DEntry& direntry, std::vector &saveBlocks, int remove); + u32 ImportFile(DEntry& direntry, std::vector &saveBlocks); // delete a file from the directory u32 RemoveFile(u8 index); diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index 84e6eb8b1d..a6ed1513c6 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -730,8 +730,8 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card) wxBlock.Printf(wxT("%10d"), blocks); m_MemcardList[card]->SetItem(index,COLUMN_BLOCKS, wxBlock); firstblock = memoryCard[card]->DEntry_FirstBlock(fileIndex); - if (firstblock == 0xFFFF) firstblock = 3; // to make firstblock -1 - wxFirstBlock.Printf(wxT("%15d"), firstblock-4); + //if (firstblock == 0xFFFF) firstblock = 3; // to make firstblock -1 + wxFirstBlock.Printf(wxT("%15d"), firstblock); m_MemcardList[card]->SetItem(index, COLUMN_FIRSTBLOCK, wxFirstBlock); m_MemcardList[card]->SetItem(index, COLUMN_ICON, wxEmptyString); From 0aeb94d3bef7cef475cfb7bf7655b7bc9446448a Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Mon, 6 Feb 2012 17:40:06 -0800 Subject: [PATCH 012/185] disable changing a dentry to "broken file" before removing it, the ipl does not always do this Signed-off-by: LPFaint99 --- Source/Core/Core/Src/HW/GCMemcard.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp index 9b9d39fc02..38f7a20528 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.cpp +++ b/Source/Core/Core/Src/HW/GCMemcard.cpp @@ -740,6 +740,9 @@ u32 GCMemcard::RemoveFile(u8 index) //index in the directory array } Directory UpdatedDir = *CurrentDir; + /* + // TODO: determine when this is used, even on the same memory card I have seen + // both update to broken file, and not updated *(u32*)&UpdatedDir.Dir[index].Gamecode = 0; *(u16*)&UpdatedDir.Dir[index].Makercode = 0; memset(UpdatedDir.Dir[index].Filename, 0, 0x20); @@ -757,6 +760,7 @@ u32 GCMemcard::RemoveFile(u8 index) //index in the directory array CurrentDir = &dir_backup; PreviousDir = &dir; } + */ memset(&(UpdatedDir.Dir[index]), 0xFF, DENTRY_SIZE); *(u16*)&UpdatedDir.UpdateCounter = BE16(BE16(UpdatedDir.UpdateCounter) + 1); *PreviousDir = UpdatedDir; From ebdab914cbd90c28c33cd1f81051f7b100e3f390 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Mon, 6 Feb 2012 17:49:17 -0800 Subject: [PATCH 013/185] Change UpdateCounter to u16 Signed-off-by: LPFaint99 --- Source/Core/Core/Src/HW/GCMemcard.cpp | 14 +++++++------- Source/Core/Core/Src/HW/GCMemcard.h | 7 +++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp index 38f7a20528..728f9c5b36 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.cpp +++ b/Source/Core/Core/Src/HW/GCMemcard.cpp @@ -240,7 +240,6 @@ GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis) } if (BE16(bat.UpdateCounter) > BE16(bat_backup.UpdateCounter)) { - PanicAlert("jere, %x, %x",BE16(bat.UpdateCounter) , BE16(bat_backup.UpdateCounter)); CurrentBat = &bat; PreviousBat = &bat_backup; } @@ -564,6 +563,7 @@ bool GCMemcard::GetDEntry(u8 index, DEntry &dest) const dest = CurrentDir->Dir[index]; return true; } + u16 GCMemcard::BlockAlloc::GetNextBlock(u16 Block) const { if ((Block < MC_FST_BLOCKS) || (Block > 4091)) @@ -667,7 +667,7 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks) break; } } - *(u16*)&UpdatedDir.UpdateCounter = BE16(BE16(UpdatedDir.UpdateCounter) + 1); + UpdatedDir.UpdateCounter = BE16(BE16(UpdatedDir.UpdateCounter) + 1); *PreviousDir = UpdatedDir; if (PreviousDir == &dir ) { @@ -697,7 +697,7 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks) firstBlock = nextBlock; } *(u16*)&UpdatedBat.FreeBlocks = BE16(BE16(UpdatedBat.FreeBlocks) - fileBlocks); - *(u16*)&UpdatedBat.UpdateCounter = BE16(BE16(UpdatedBat.UpdateCounter) + 1); + UpdatedBat.UpdateCounter = BE16(BE16(UpdatedBat.UpdateCounter) + 1); *PreviousBat = UpdatedBat; if (PreviousBat == &bat ) { @@ -726,7 +726,7 @@ u32 GCMemcard::RemoveFile(u8 index) //index in the directory array BlockAlloc UpdatedBat = *CurrentBat; if (!UpdatedBat.ClearBlocks(startingblock, numberofblocks)) return DELETE_FAIL; - *(u16*)&UpdatedBat.UpdateCounter = BE16(BE16(UpdatedBat.UpdateCounter) + 1); + UpdatedBat.UpdateCounter = BE16(BE16(UpdatedBat.UpdateCounter) + 1); *PreviousBat = UpdatedBat; if (PreviousBat == &bat ) { @@ -762,7 +762,7 @@ u32 GCMemcard::RemoveFile(u8 index) //index in the directory array } */ memset(&(UpdatedDir.Dir[index]), 0xFF, DENTRY_SIZE); - *(u16*)&UpdatedDir.UpdateCounter = BE16(BE16(UpdatedDir.UpdateCounter) + 1); + UpdatedDir.UpdateCounter = BE16(BE16(UpdatedDir.UpdateCounter) + 1); *PreviousDir = UpdatedDir; if (PreviousDir == &dir ) { @@ -1245,13 +1245,13 @@ void GCMemcard::FormatInternal(GCMC_Header &GCP) Directory *p_dir = GCP.dir, *p_dir_backup = GCP.dir_backup; *(u16*)&p_dir->UpdateCounter = 0; - *(u16*)&p_dir_backup->UpdateCounter = BE16(1); + p_dir_backup->UpdateCounter = BE16(1); calc_checksumsBE((u16*)p_dir, 0xFFE, &p_dir->Checksum, &p_dir->Checksum_Inv); calc_checksumsBE((u16*)p_dir_backup, 0xFFE, &p_dir_backup->Checksum, &p_dir_backup->Checksum_Inv); BlockAlloc *p_bat = GCP.bat, *p_bat_backup = GCP.bat_backup; - *(u16*)&p_bat_backup->UpdateCounter = BE16(1); + p_bat_backup->UpdateCounter = BE16(1); *(u16*)&p_bat->FreeBlocks = *(u16*)&p_bat_backup->FreeBlocks = BE16(( BE16(p_hdr->SizeMb) * MBIT_TO_BLOCKS) - MC_FST_BLOCKS); *(u16*)&p_bat->LastAllocated = *(u16*)&p_bat_backup->LastAllocated = BE16(4); calc_checksumsBE((u16*)p_bat+2, 0xFFE, &p_bat->Checksum, &p_bat->Checksum_Inv); diff --git a/Source/Core/Core/Src/HW/GCMemcard.h b/Source/Core/Core/Src/HW/GCMemcard.h index dfa6bd6f65..b9344bceb3 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.h +++ b/Source/Core/Core/Src/HW/GCMemcard.h @@ -27,7 +27,6 @@ #define BE32(x) (Common::swap32(x)) #define BE16(x) (Common::swap16(x)) #define ArrayByteSwap(a) (ByteSwap(a, a+sizeof(u8))); - enum { SLOT_A = 0, @@ -98,7 +97,7 @@ private: u8 SizeMb[2]; //0x0022 2 size of memcard in Mbits u16 Encoding; //0x0024 2 encoding (ASCII or japanese) u8 Unused1[468]; //0x0026 468 unused (0xff) - u8 UpdateCounter[2];//0x01fa 2 update Counter (?, probably unused) + u16 UpdateCounter;//0x01fa 2 update Counter (?, probably unused) u16 Checksum; //0x01fc 2 Additive Checksum u16 Checksum_Inv; //0x01fe 2 Inverse Checksum u8 Unused2[7680]; //0x0200 0x1e00 unused (0xff) @@ -152,7 +151,7 @@ private: struct Directory { DEntry Dir[DIRLEN]; //0x0000 Directory Entries (max 127) u8 Padding[0x3a]; - u8 UpdateCounter[2];//0x1ffa 2 update Counter + u16 UpdateCounter; //0x1ffa 2 update Counter u16 Checksum; //0x1ffc 2 Additive Checksum u16 Checksum_Inv; //0x1ffe 2 Inverse Checksum } dir, dir_backup; @@ -161,7 +160,7 @@ private: struct BlockAlloc { u16 Checksum; //0x0000 2 Additive Checksum u16 Checksum_Inv; //0x0002 2 Inverse Checksum - u8 UpdateCounter[2];//0x0004 2 update Counter + u16 UpdateCounter; //0x0004 2 update Counter u8 FreeBlocks[2]; //0x0006 2 free Blocks u8 LastAllocated[2];//0x0008 2 last allocated Block u16 Map[BAT_SIZE]; //0x000a 0x1ff8 Map of allocated Blocks From e68b892cc63d9324fc932c3337463ead1e651b45 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Mon, 6 Feb 2012 17:55:10 -0800 Subject: [PATCH 014/185] more changes from u8[] to u16/u32 Signed-off-by: LPFaint99 --- Source/Core/Core/Src/HW/GCMemcard.cpp | 17 +++++++---------- Source/Core/Core/Src/HW/GCMemcard.h | 16 ++++++++-------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp index 728f9c5b36..7423f9ca24 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.cpp +++ b/Source/Core/Core/Src/HW/GCMemcard.cpp @@ -595,7 +595,7 @@ bool GCMemcard::BlockAlloc::ClearBlocks(u16 FirstBlock, u16 BlockCount) } for (int i = 0; i < length; ++i) Map[blocks.at(i)-MC_FST_BLOCKS] = 0; - *(u16*)&FreeBlocks = BE16(BE16(FreeBlocks) + BlockCount); + FreeBlocks = BE16(BE16(FreeBlocks) + BlockCount); return true; } @@ -646,10 +646,7 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks) return TITLEPRESENT; } - // find first free data block -- assume no freespace fragmentation - //int totalspace = (((u32)BE16(hdr.SizeMb) * MBIT_TO_BLOCKS) - MC_FST_BLOCKS); - //int firstFree1 = BE16(bat.LastAllocated) + 1; - + // find first free data block u16 firstBlock = CurrentBat->NextFreeBlock(); Directory UpdatedDir = *CurrentDir; @@ -696,7 +693,7 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks) UpdatedBat.Map[firstBlock - MC_FST_BLOCKS] = BE16(nextBlock); firstBlock = nextBlock; } - *(u16*)&UpdatedBat.FreeBlocks = BE16(BE16(UpdatedBat.FreeBlocks) - fileBlocks); + UpdatedBat.FreeBlocks = BE16(BE16(UpdatedBat.FreeBlocks) - fileBlocks); UpdatedBat.UpdateCounter = BE16(BE16(UpdatedBat.UpdateCounter) + 1); *PreviousBat = UpdatedBat; if (PreviousBat == &bat ) @@ -1235,8 +1232,8 @@ void GCMemcard::FormatInternal(GCMC_Header &GCP) rand = (((rand * (u64)0x0000000041c64e6dULL) + (u64)0x0000000000003039ULL) >> 16); rand &= (u64)0x0000000000007fffULL; } - *(u32*)&p_hdr->SramBias = g_SRAM.counter_bias; - *(u32*)&p_hdr->SramLang = g_SRAM.lang; + p_hdr->SramBias = g_SRAM.counter_bias; + p_hdr->SramLang = g_SRAM.lang; // TODO: determine the purpose of Unk2 1 works for slot A, 0 works for both slot A and slot B *(u32*)&p_hdr->Unk2 = 0; // = _viReg[55]; static vu16* const _viReg = (u16*)0xCC002000; *(u16*)&p_hdr->deviceID = 0; @@ -1252,8 +1249,8 @@ void GCMemcard::FormatInternal(GCMC_Header &GCP) BlockAlloc *p_bat = GCP.bat, *p_bat_backup = GCP.bat_backup; p_bat_backup->UpdateCounter = BE16(1); - *(u16*)&p_bat->FreeBlocks = *(u16*)&p_bat_backup->FreeBlocks = BE16(( BE16(p_hdr->SizeMb) * MBIT_TO_BLOCKS) - MC_FST_BLOCKS); - *(u16*)&p_bat->LastAllocated = *(u16*)&p_bat_backup->LastAllocated = BE16(4); + p_bat->FreeBlocks = *(u16*)&p_bat_backup->FreeBlocks = BE16(( BE16(p_hdr->SizeMb) * MBIT_TO_BLOCKS) - MC_FST_BLOCKS); + p_bat->LastAllocated = p_bat_backup->LastAllocated = BE16(4); calc_checksumsBE((u16*)p_bat+2, 0xFFE, &p_bat->Checksum, &p_bat->Checksum_Inv); calc_checksumsBE((u16*)p_bat_backup+2, 0xFFE, &p_bat_backup->Checksum, &p_bat_backup->Checksum_Inv); } diff --git a/Source/Core/Core/Src/HW/GCMemcard.h b/Source/Core/Core/Src/HW/GCMemcard.h index b9344bceb3..c04217d895 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.h +++ b/Source/Core/Core/Src/HW/GCMemcard.h @@ -89,15 +89,15 @@ private: // Serial in libogc u8 serial[12]; //0x0000 12 ? u64 formatTime; //0x000c 8 time of format (OSTime value) - u8 SramBias[4]; //0x0014 4 sram bias at time of format - u8 SramLang[4]; //0x0018 4 sram language + u32 SramBias; //0x0014 4 sram bias at time of format + u32 SramLang; //0x0018 4 sram language u8 Unk2[4]; //0x001c 4 ? almost always 0 // end Serial in libogc u8 deviceID[2]; //0x0020 2 0 if formated in slot A 1 if formated in slot B u8 SizeMb[2]; //0x0022 2 size of memcard in Mbits u16 Encoding; //0x0024 2 encoding (ASCII or japanese) u8 Unused1[468]; //0x0026 468 unused (0xff) - u16 UpdateCounter;//0x01fa 2 update Counter (?, probably unused) + u16 UpdateCounter; //0x01fa 2 update Counter (?, probably unused) u16 Checksum; //0x01fc 2 Additive Checksum u16 Checksum_Inv; //0x01fe 2 Inverse Checksum u8 Unused2[7680]; //0x0200 0x1e00 unused (0xff) @@ -158,11 +158,11 @@ private: Directory *CurrentDir, *PreviousDir; struct BlockAlloc { - u16 Checksum; //0x0000 2 Additive Checksum - u16 Checksum_Inv; //0x0002 2 Inverse Checksum - u16 UpdateCounter; //0x0004 2 update Counter - u8 FreeBlocks[2]; //0x0006 2 free Blocks - u8 LastAllocated[2];//0x0008 2 last allocated Block + u16 Checksum; //0x0000 2 Additive Checksum + u16 Checksum_Inv; //0x0002 2 Inverse Checksum + u16 UpdateCounter; //0x0004 2 update Counter + u16 FreeBlocks; //0x0006 2 free Blocks + u16 LastAllocated; //0x0008 2 last allocated Block u16 Map[BAT_SIZE]; //0x000a 0x1ff8 Map of allocated Blocks u16 GetNextBlock(u16 Block) const; u16 NextFreeBlock(u16 StartingBlock=MC_FST_BLOCKS) const; From 643770bff9a69b9fbfc4da08c6e00482bfd1a816 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Mon, 6 Feb 2012 23:48:13 -0800 Subject: [PATCH 015/185] more work towards correct file importing Signed-off-by: LPFaint99 --- Source/Core/Core/Src/HW/GCMemcard.cpp | 22 +++++++++++++++++----- Source/Core/Core/Src/HW/GCMemcard.h | 1 + 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp index 7423f9ca24..5ba0c2aaa6 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.cpp +++ b/Source/Core/Core/Src/HW/GCMemcard.cpp @@ -573,9 +573,16 @@ u16 GCMemcard::BlockAlloc::GetNextBlock(u16 Block) const u16 GCMemcard::BlockAlloc::NextFreeBlock(u16 StartingBlock) const { - for (u16 i = StartingBlock; i < BAT_SIZE; ++i) - if (Map[i-MC_FST_BLOCKS] == 0) - return i; + if (FreeBlocks) + { + for (u16 i = StartingBlock; i < BAT_SIZE; ++i) + if (Map[i-MC_FST_BLOCKS] == 0) + return i; + for (u16 i = 0; i < StartingBlock; ++i) + if (Map[i-MC_FST_BLOCKS] == 0) + return i; + } + return 0xFFFF; } bool GCMemcard::BlockAlloc::ClearBlocks(u16 FirstBlock, u16 BlockCount) @@ -647,8 +654,9 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks) } // find first free data block - u16 firstBlock = CurrentBat->NextFreeBlock(); - + u16 firstBlock = CurrentBat->NextFreeBlock(BE16(CurrentBat->LastAllocated)); + if (firstBlock == 0xFFFF) + return OUTOFBLOCKS; Directory UpdatedDir = *CurrentDir; // find first free dir entry @@ -685,14 +693,18 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks) // keep assuming no freespace fragmentation, and copy over all the data for (int i = 0; i < fileBlocks; ++i) { + if (firstBlock == 0xFFFF) + PanicAlert("Fatal Error"); mc_data_blocks[firstBlock - MC_FST_BLOCKS] = saveBlocks[i]; if (i == fileBlocks-1) nextBlock = 0xFFFF; else nextBlock = UpdatedBat.NextFreeBlock(firstBlock+1); UpdatedBat.Map[firstBlock - MC_FST_BLOCKS] = BE16(nextBlock); + UpdatedBat.LastAllocated = BE16(firstBlock); firstBlock = nextBlock; } + UpdatedBat.FreeBlocks = BE16(BE16(UpdatedBat.FreeBlocks) - fileBlocks); UpdatedBat.UpdateCounter = BE16(BE16(UpdatedBat.UpdateCounter) + 1); *PreviousBat = UpdatedBat; diff --git a/Source/Core/Core/Src/HW/GCMemcard.h b/Source/Core/Core/Src/HW/GCMemcard.h index c04217d895..be78bb527c 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.h +++ b/Source/Core/Core/Src/HW/GCMemcard.h @@ -24,6 +24,7 @@ #include "StringUtil.h" #include "EXI_DeviceIPL.h" +#define BE64(x) (Common::swap64(x)) #define BE32(x) (Common::swap32(x)) #define BE16(x) (Common::swap16(x)) #define ArrayByteSwap(a) (ByteSwap(a, a+sizeof(u8))); From 9e398fd418027e4932a1539f7d382b70e8acc408 Mon Sep 17 00:00:00 2001 From: skidau Date: Fri, 2 Mar 2012 18:53:41 +1100 Subject: [PATCH 016/185] Added an external exception check when the CPU writes to the FIFO. This allows the CPU time to service FIFO overflows. Fixes random hangs caused by FIFO overflows and desyncs like in "The Last Story" and "Battalion Wars 2". Thanks to marcosvitali for the research. Fixes issue 5209. Fixes issue 5150. Fixes issue 5055. Fixes issue 4889. Fixes issue 4061. Fixes issue 4010. Fixes issue 3902. --- Source/Core/Core/Src/HW/GPFifo.cpp | 14 ++++++++++-- .../Interpreter/Interpreter_LoadStore.cpp | 4 ++-- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 19 ++++++++++++++++ Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp | 6 ++--- Source/Core/Core/Src/PowerPC/Jit64IL/IR.h | 7 ++++-- .../Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp | 17 ++++++++++++++ .../Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp | 5 +++++ .../Core/Core/Src/PowerPC/JitCommon/JitBase.h | 4 ++++ .../Core/Src/PowerPC/JitCommon/JitCache.cpp | 11 +++++----- .../Core/Src/PowerPC/JitCommon/JitCache.h | 2 +- Source/Core/Core/Src/PowerPC/PPCCache.cpp | 2 +- .../Core/VideoCommon/Src/CommandProcessor.cpp | 22 ------------------- .../Core/VideoCommon/Src/CommandProcessor.h | 1 - Source/Core/VideoCommon/Src/Fifo.cpp | 3 +-- 14 files changed, 75 insertions(+), 42 deletions(-) diff --git a/Source/Core/Core/Src/HW/GPFifo.cpp b/Source/Core/Core/Src/HW/GPFifo.cpp index 4d72317e0d..35d678a411 100644 --- a/Source/Core/Core/Src/HW/GPFifo.cpp +++ b/Source/Core/Core/Src/HW/GPFifo.cpp @@ -19,9 +19,9 @@ #include "ChunkFile.h" #include "ProcessorInterface.h" #include "Memmap.h" -#include "../PowerPC/PowerPC.h" - #include "VideoBackendBase.h" +#include "../PowerPC/JitCommon/JitBase.h" +#include "../PowerPC/PowerPC.h" #include "GPFifo.h" @@ -96,6 +96,16 @@ void STACKALIGN CheckGatherPipe() // move back the spill bytes memmove(m_gatherPipe, m_gatherPipe + cnt, m_gatherPipeCount); + + // Profile where the FIFO writes are occurring. + const u32 addr = PC - 4; + if (jit && (jit->js.fifoWriteAddresses.find(addr)) == (jit->js.fifoWriteAddresses.end())) + { + jit->js.fifoWriteAddresses.insert(addr); + + // Invalidate the JIT block so that it gets recompiled with the external exception check included. + jit->GetBlockCache()->InvalidateICache(addr, 8); + } } } diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp index a7955c0982..cad4761e55 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp @@ -367,7 +367,7 @@ void Interpreter::dcbf(UGeckoInstruction _inst) if (jit) { u32 address = Helper_Get_EA_X(_inst); - jit->GetBlockCache()->InvalidateICache(address & ~0x1f); + jit->GetBlockCache()->InvalidateICache(address & ~0x1f, 32); } } @@ -378,7 +378,7 @@ void Interpreter::dcbi(UGeckoInstruction _inst) if (jit) { u32 address = Helper_Get_EA_X(_inst); - jit->GetBlockCache()->InvalidateICache(address & ~0x1f); + jit->GetBlockCache()->InvalidateICache(address & ~0x1f, 32); } } diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 0d31893b53..a98df95fc3 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -41,6 +41,7 @@ #include "JitAsm.h" #include "JitRegCache.h" #include "Jit64_Tables.h" +#include "HW/ProcessorInterface.h" using namespace Gen; using namespace PowerPC; @@ -569,6 +570,24 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc SetJumpTarget(b1); } + // Add an external exception check if the instruction writes to the FIFO. + if (jit->js.fifoWriteAddresses.find(js.compilerPC) != jit->js.fifoWriteAddresses.end()) + { + gpr.Flush(FLUSH_ALL); + fpr.Flush(FLUSH_ALL); + + TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_EXTERNAL_INT)); + FixupBranch noExtException = J_CC(CC_Z); + TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); + FixupBranch noCPInt = J_CC(CC_Z); + + MOV(32, M(&PC), Imm32(js.compilerPC)); + WriteExceptionExit(); + + SetJumpTarget(noCPInt); + SetJumpTarget(noExtException); + } + Jit64Tables::CompileInstruction(ops[i]); if (js.memcheck && (opinfo->flags & FL_LOADSTORE)) diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp index 3a60a0ae11..afab21b30e 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp @@ -1260,8 +1260,8 @@ static const std::string opcodeNames[] = { "FResult_End", "StorePaired", "StoreSingle", "StoreDouble", "StoreFReg", "FDCmpCR", "CInt16", "CInt32", "SystemCall", "RFIExit", "InterpreterBranch", "IdleBranch", "ShortIdleLoop", - "FPExceptionCheckStart", "FPExceptionCheckEnd", "ISIException", "Tramp", - "BlockStart", "BlockEnd", "Int3", + "FPExceptionCheckStart", "FPExceptionCheckEnd", "ISIException", "ExtExceptionCheck", + "Tramp", "BlockStart", "BlockEnd", "Int3", }; static const unsigned alwaysUsedList[] = { InterpreterFallback, StoreGReg, StoreCR, StoreLink, StoreCTR, StoreMSR, @@ -1269,7 +1269,7 @@ static const unsigned alwaysUsedList[] = { Store16, Store32, StoreSingle, StoreDouble, StorePaired, StoreFReg, FDCmpCR, BlockStart, BlockEnd, IdleBranch, BranchCond, BranchUncond, ShortIdleLoop, SystemCall, InterpreterBranch, RFIExit, FPExceptionCheckStart, - FPExceptionCheckEnd, ISIException, Int3, Tramp, Nop + FPExceptionCheckEnd, ISIException, ExtExceptionCheck, Int3, Tramp, Nop }; static const unsigned extra8RegList[] = { LoadGReg, LoadCR, LoadGQR, LoadFReg, LoadFRegDENToZero, diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h index aca3dd0e37..284cbe6538 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h @@ -165,10 +165,10 @@ enum Opcode { ShortIdleLoop, // Idle loop seen in homebrew like wii mahjong, // just a branch - // used for MMU, at least until someone + // used for exception checking, at least until someone // has a better idea of integrating it FPExceptionCheckStart, FPExceptionCheckEnd, - ISIException, + ISIException,ExtExceptionCheck, // "Opcode" representing a register too far away to // reference directly; this is a size optimization Tramp, @@ -411,6 +411,9 @@ public: InstLoc EmitISIException(InstLoc dest) { return EmitUOp(ISIException, dest); } + InstLoc EmitExtExceptionCheck(InstLoc pc) { + return EmitUOp(ExtExceptionCheck, pc); + } InstLoc EmitRFIExit() { return FoldZeroOp(RFIExit, 0); } diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp index e1807cfbb4..6648189809 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp @@ -50,6 +50,7 @@ The register allocation is linear scan allocation. #include "../../../../Common/Src/CPUDetect.h" #include "MathUtil.h" #include "../../Core.h" +#include "HW/ProcessorInterface.h" static ThunkManager thunks; @@ -761,6 +762,7 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak case FPExceptionCheckStart: case FPExceptionCheckEnd: case ISIException: + case ExtExceptionCheck: case Int3: case Tramp: // No liveness effects @@ -1920,6 +1922,21 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak Jit->WriteExceptionExit(); break; } + case ExtExceptionCheck: { + unsigned InstLoc = ibuild->GetImmValue(getOp1(I)); + + Jit->TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_EXTERNAL_INT)); + FixupBranch noExtException = Jit->J_CC(CC_Z); + Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); + FixupBranch noCPInt = Jit->J_CC(CC_Z); + + Jit->MOV(32, M(&PC), Imm32(InstLoc)); + Jit->WriteExceptionExit(); + + Jit->SetJumpTarget(noCPInt); + Jit->SetJumpTarget(noExtException); + break; + } case Int3: { Jit->INT3(); break; diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp index 75755de5cb..96afff1613 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp @@ -648,6 +648,11 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc { ibuild.EmitFPExceptionCheckStart(ibuild.EmitIntConst(ops[i].address)); } + + if (jit->js.fifoWriteAddresses.find(js.compilerPC) != jit->js.fifoWriteAddresses.end()) + { + ibuild.EmitExtExceptionCheck(ibuild.EmitIntConst(ops[i].address)); + } JitILTables::CompileInstruction(ops[i]); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h index b832e96e1f..be80754bdc 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h @@ -31,6 +31,8 @@ #include "PowerPCDisasm.h" #include "disasm.h" +#include + #define JIT_OPCODE 0 class JitBase : public CPUCoreBase, public EmuCodeBlock @@ -75,6 +77,8 @@ protected: u8* rewriteStart; JitBlock *curBlock; + + std::set fifoWriteAddresses; }; public: diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index 422369d307..8f5ff5d820 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -390,13 +390,12 @@ bool JitBlock::ContainsAddress(u32 em_address) } - void JitBlockCache::InvalidateICache(u32 address) + void JitBlockCache::InvalidateICache(u32 address, const u32 length) { - address &= ~0x1f; // destroy JIT blocks // !! this works correctly under assumption that any two overlapping blocks end at the same address std::map, u32>::iterator it1 = block_map.lower_bound(std::make_pair(address, 0)), it2 = it1, it; - while (it2 != block_map.end() && it2->first.second < address + 0x20) + while (it2 != block_map.end() && it2->first.second < address + length) { DestroyBlock(it2->second, true); it2++; @@ -418,17 +417,17 @@ bool JitBlock::ContainsAddress(u32 em_address) if (address & JIT_ICACHE_VMEM_BIT) { u32 cacheaddr = address & JIT_ICACHE_MASK; - memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, 32); + memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, length); } else if (address & JIT_ICACHE_EXRAM_BIT) { u32 cacheaddr = address & JIT_ICACHEEX_MASK; - memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, 32); + memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, length); } else { u32 cacheaddr = address & JIT_ICACHE_MASK; - memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, 32); + memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, length); } #endif } diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h index 91d47a3d0e..7c19310e02 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h @@ -129,7 +129,7 @@ public: CompiledCode GetCompiledCodeFromBlock(int block_num); // DOES NOT WORK CORRECTLY WITH INLINING - void InvalidateICache(u32 em_address); + void InvalidateICache(u32 address, const u32 length); void DestroyBlock(int block_num, bool invalidate); // Not currently used diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.cpp b/Source/Core/Core/Src/PowerPC/PPCCache.cpp index 704caa4a2c..6956e9db1c 100644 --- a/Source/Core/Core/Src/PowerPC/PPCCache.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCCache.cpp @@ -110,7 +110,7 @@ namespace PowerPC #endif valid[set] = 0; if (jit) - jit->GetBlockCache()->InvalidateICache(addr); + jit->GetBlockCache()->InvalidateICache(addr & ~0x1f, 32); } u32 InstructionCache::ReadInstruction(u32 addr) diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index fc85b8e39d..dbe09aaa0e 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -60,7 +60,6 @@ volatile bool interruptSet= false; volatile bool interruptWaiting= false; volatile bool interruptTokenWaiting = false; volatile bool interruptFinishWaiting = false; -volatile bool OnOverflow = false; bool IsOnThread() { @@ -92,7 +91,6 @@ void DoState(PointerWrap &p) p.Do(interruptWaiting); p.Do(interruptTokenWaiting); p.Do(interruptFinishWaiting); - p.Do(OnOverflow); } inline void WriteLow (volatile u32& _reg, u16 lowbits) {Common::AtomicStore(_reg,(_reg & 0xFFFF0000) | lowbits);} @@ -135,7 +133,6 @@ void Init() bProcessFifoToLoWatermark = false; bProcessFifoAllDistance = false; isPossibleWaitingSetDrawDone = false; - OnOverflow = false; et_UpdateInterrupts = CoreTiming::RegisterEvent("UpdateInterrupts", UpdateInterrupts_Wrapper); } @@ -449,26 +446,7 @@ void STACKALIGN GatherPipeBursted() Common::AtomicAdd(fifo.CPReadWriteDistance, GATHER_PIPE_SIZE); if (!IsOnThread()) - { RunGpu(); - } - else - { - if(fifo.CPReadWriteDistance == fifo.CPEnd - fifo.CPBase - 32) - { - if(!OnOverflow) - NOTICE_LOG(COMMANDPROCESSOR,"FIFO is almost in overflown, BreakPoint: %i", fifo.bFF_Breakpoint); - OnOverflow = true; - while (!CommandProcessor::interruptWaiting && fifo.bFF_GPReadEnable && - fifo.CPReadWriteDistance > fifo.CPEnd - fifo.CPBase - 64) - Common::YieldCPU(); - } - else - { - OnOverflow = false; - } - } - _assert_msg_(COMMANDPROCESSOR, fifo.CPReadWriteDistance <= fifo.CPEnd - fifo.CPBase, "FIFO is overflown by GatherPipe !\nCPU thread is too fast!"); diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.h b/Source/Core/VideoCommon/Src/CommandProcessor.h index db6772d66d..bb969fcb95 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.h +++ b/Source/Core/VideoCommon/Src/CommandProcessor.h @@ -35,7 +35,6 @@ extern volatile bool interruptSet; extern volatile bool interruptWaiting; extern volatile bool interruptTokenWaiting; extern volatile bool interruptFinishWaiting; -extern volatile bool OnOverflow; // internal hardware addresses enum diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp index 842ff49e78..5cb3252816 100644 --- a/Source/Core/VideoCommon/Src/Fifo.cpp +++ b/Source/Core/VideoCommon/Src/Fifo.cpp @@ -137,8 +137,7 @@ void RunGpuLoop() CommandProcessor::SetCpStatus(); // check if we are able to run this buffer - while (!CommandProcessor::interruptWaiting && fifo.bFF_GPReadEnable && - fifo.CPReadWriteDistance && (!AtBreakpoint() || CommandProcessor::OnOverflow)) + while (!CommandProcessor::interruptWaiting && fifo.bFF_GPReadEnable && fifo.CPReadWriteDistance && !AtBreakpoint()) { if (!GpuRunningState) break; From 9276b76fbc0ac77bad5f15ba3d8038c53943249e Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 2 Mar 2012 18:43:44 +0100 Subject: [PATCH 017/185] VideoSoftware: Implement zfreeze (GXSetCoPlanar). Fixes Mario Golf: Toadstool Tour's menus. Reference: The OpenGL extension SGIX_reference_plane seems to provide the same functionality: http://www.opengl.org/registry/specs/SGIX/reference_plane.txt --- Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp index f688a33b78..c212c93601 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp @@ -64,7 +64,12 @@ RasterBlock rasterBlock; void Init() { - tev.Init(); + tev.Init(); + + // Set initial z reference plane in the unlikely case that zfreeze is enabled when drawing the first primitive. + // TODO: This is just a guess! + ZSlope.dfdx = ZSlope.dfdy = 0.f; + ZSlope.f0 = 1.f; } inline int iround(float x) @@ -364,7 +369,8 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer float w[3] = { 1.0f / v0->projectedPosition.w, 1.0f / v1->projectedPosition.w, 1.0f / v2->projectedPosition.w }; InitSlope(&WSlope, w[0], w[1], w[2], fltdx31, fltdx12, fltdy12, fltdy31); - InitSlope(&ZSlope, v0->screenPosition[2], v1->screenPosition[2], v2->screenPosition[2], fltdx31, fltdx12, fltdy12, fltdy31); + if (!bpmem.genMode.zfreeze) + InitSlope(&ZSlope, v0->screenPosition[2], v1->screenPosition[2], v2->screenPosition[2], fltdx31, fltdx12, fltdy12, fltdy31); for(unsigned int i = 0; i < bpmem.genMode.numcolchans; i++) { From 9e649ce79850f6c39fa16ea5a207659bb2e5b052 Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 3 Mar 2012 14:26:39 +1100 Subject: [PATCH 018/185] Added additional checks to ensure that only a FIFO breakpoint exception is handled. This fixes the hangs in games like de Blob, Xenoblade and Super Mario Galaxy introduced by r9e398fd41802. --- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index a98df95fc3..07eb36d263 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -571,7 +571,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc } // Add an external exception check if the instruction writes to the FIFO. - if (jit->js.fifoWriteAddresses.find(js.compilerPC) != jit->js.fifoWriteAddresses.end()) + if (jit->js.fifoWriteAddresses.find(ops[i].address) != jit->js.fifoWriteAddresses.end()) { gpr.Flush(FLUSH_ALL); fpr.Flush(FLUSH_ALL); @@ -580,10 +580,16 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc FixupBranch noExtException = J_CC(CC_Z); TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); FixupBranch noCPInt = J_CC(CC_Z); + TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), + Imm32(ProcessorInterface::INT_CAUSE_PE_TOKEN | + ProcessorInterface::INT_CAUSE_PE_FINISH | + ProcessorInterface::INT_CAUSE_DSP)); + FixupBranch ClearInt = J_CC(CC_NZ); - MOV(32, M(&PC), Imm32(js.compilerPC)); + MOV(32, M(&PC), Imm32(ops[i].address)); WriteExceptionExit(); + SetJumpTarget(ClearInt); SetJumpTarget(noCPInt); SetJumpTarget(noExtException); } From 874e17e504c6c6b19f5a1eb9ef16c82bde179032 Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 3 Mar 2012 15:41:55 +1100 Subject: [PATCH 019/185] Added the corresponding change from r9e649ce79850 to JITIL. --- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 9 +++------ Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp | 3 +++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 07eb36d263..44ce9325b6 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -580,16 +580,13 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc FixupBranch noExtException = J_CC(CC_Z); TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); FixupBranch noCPInt = J_CC(CC_Z); - TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), - Imm32(ProcessorInterface::INT_CAUSE_PE_TOKEN | - ProcessorInterface::INT_CAUSE_PE_FINISH | - ProcessorInterface::INT_CAUSE_DSP)); - FixupBranch ClearInt = J_CC(CC_NZ); + TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_DSP)); + FixupBranch clearInt = J_CC(CC_NZ); MOV(32, M(&PC), Imm32(ops[i].address)); WriteExceptionExit(); - SetJumpTarget(ClearInt); + SetJumpTarget(clearInt); SetJumpTarget(noCPInt); SetJumpTarget(noExtException); } diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp index 6648189809..0152d0d96e 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp @@ -1929,10 +1929,13 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak FixupBranch noExtException = Jit->J_CC(CC_Z); Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); FixupBranch noCPInt = Jit->J_CC(CC_Z); + Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_DSP)); + FixupBranch clearInt = Jit->J_CC(CC_NZ); Jit->MOV(32, M(&PC), Imm32(InstLoc)); Jit->WriteExceptionExit(); + Jit->SetJumpTarget(clearInt); Jit->SetJumpTarget(noCPInt); Jit->SetJumpTarget(noExtException); break; From f5d4fe0bfe13937fa3736aa6b78974ceb6e190ad Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sat, 3 Mar 2012 20:07:20 +0100 Subject: [PATCH 020/185] Fix some minor bugs pointed out by PVS Studio (thanks!) --- Source/Core/Common/Src/SysConf.cpp | 2 +- Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp | 2 +- Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp | 2 +- Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp | 2 +- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 2 +- Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp | 2 +- Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/Core/Common/Src/SysConf.cpp b/Source/Core/Common/Src/SysConf.cpp index ed8a4953e5..97170e5ff1 100644 --- a/Source/Core/Common/Src/SysConf.cpp +++ b/Source/Core/Common/Src/SysConf.cpp @@ -387,7 +387,7 @@ bool SysConf::SaveToFile(const char *filename) } else if (i->type == Type_SmallArray) { - const u8 len = i->dataLength; + const u8 len = (u8)(i->dataLength); f.WriteArray(&len, 1); } diff --git a/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp b/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp index 144270e798..4aefb6dbdb 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp @@ -109,7 +109,7 @@ CEXIIPL::CEXIIPL() : if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHLE_BS2) { // Copy header - memcpy(m_pIPL, m_bNTSC ? iplverNTSC : iplverPAL, sizeof(m_bNTSC ? iplverNTSC : iplverPAL)); + memcpy(m_pIPL, m_bNTSC ? iplverNTSC : iplverPAL, m_bNTSC ? sizeof(iplverNTSC) : sizeof(iplverPAL)); // Load fonts LoadFileToIPL((File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + FONT_SJIS), 0x1aff00); diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp index 3a60a0ae11..8ca83e7208 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp @@ -1212,7 +1212,7 @@ void IRBuilder::simplifyCommutative(unsigned Opcode, InstLoc& Op1, InstLoc& Op2) } bool IRBuilder::maskedValueIsZero(InstLoc Op1, InstLoc Op2) const { - return (~ComputeKnownZeroBits(Op1) & ~ComputeKnownZeroBits(Op1)) == 0; + return (~ComputeKnownZeroBits(Op1) & ~ComputeKnownZeroBits(Op2)) == 0; } // Returns I' if I == (0 - I') diff --git a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp index f354ea4291..c3aa56acd0 100644 --- a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp @@ -299,7 +299,7 @@ u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa, merged_addresses[0] = address; size_of_merged_addresses = 1; - memset(st, 0, sizeof(st)); + memset(st, 0, sizeof(*st)); // Disabled the following optimization in preference of FAST_ICACHE //UGeckoInstruction previnst = Memory::Read_Opcode_JIT_LC(address - 4); diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index fe5827de05..3ef923dc3e 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -158,7 +158,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo } u32* ptr = &uid->values[2]; - for (int i = 0; i < bpmem.genMode.numtevstages+1; ++i) + for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1; ++i) { StageHash(i, ptr); ptr += 4; // max: ptr = &uid->values[66] diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp b/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp index 81a4cf96a6..8ee8081b2c 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp @@ -595,7 +595,7 @@ void drawShadedTexSubQuad(ID3D11ShaderResourceView* texture, // only upload the data to VRAM if it changed if (stsq_observer || - memcmp(rDest, &tex_sub_quad_data.rdest, sizeof(rDest)) != 0 || + memcmp(rDest, &tex_sub_quad_data.rdest, sizeof(*rDest)) != 0 || tex_sub_quad_data.u1 != u1 || tex_sub_quad_data.v1 != v1 || tex_sub_quad_data.u2 != u2 || tex_sub_quad_data.v2 != v2 || tex_sub_quad_data.G != G) { diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp index 3a4b5d0699..9510ad444c 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp @@ -383,7 +383,7 @@ void drawShadedTexQuad(IDirect3DTexture9 *texture, float v2=((float)rSource->bottom) * sh; float g = 1.0f/Gamma; - struct Q2DVertex { float x,y,z,rhw,u,v,w,h,G; } coords[4] = { + const struct Q2DVertex { float x,y,z,rhw,u,v,w,h,G; } coords[4] = { {-1.0f - dw,-1.0f + dh, 0.0f,1.0f, u1, v2, sw, sh, g}, {-1.0f - dw, 1.0f + dh, 0.0f,1.0f, u1, v1, sw, sh, g}, { 1.0f - dw,-1.0f + dh, 0.0f,1.0f, u2, v2, sw, sh, g}, From 5de8366db2ec084e95420b0853abb4d11a431ac0 Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 4 Mar 2012 08:10:46 +1100 Subject: [PATCH 021/185] Made the invalidation of the FIFO write JIT blocks more selective (efficient). Fixes the slowdown in the House of the Dead: Overkill cutscenes. --- Source/Core/Core/Src/HW/GPFifo.cpp | 7 +++---- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 2 +- Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/HW/GPFifo.cpp b/Source/Core/Core/Src/HW/GPFifo.cpp index 35d678a411..725db3011c 100644 --- a/Source/Core/Core/Src/HW/GPFifo.cpp +++ b/Source/Core/Core/Src/HW/GPFifo.cpp @@ -98,13 +98,12 @@ void STACKALIGN CheckGatherPipe() memmove(m_gatherPipe, m_gatherPipe + cnt, m_gatherPipeCount); // Profile where the FIFO writes are occurring. - const u32 addr = PC - 4; - if (jit && (jit->js.fifoWriteAddresses.find(addr)) == (jit->js.fifoWriteAddresses.end())) + if (jit && (jit->js.fifoWriteAddresses.find(PC)) == (jit->js.fifoWriteAddresses.end())) { - jit->js.fifoWriteAddresses.insert(addr); + jit->js.fifoWriteAddresses.insert(PC); // Invalidate the JIT block so that it gets recompiled with the external exception check included. - jit->GetBlockCache()->InvalidateICache(addr, 8); + jit->GetBlockCache()->InvalidateICache(PC, 4); } } } diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 44ce9325b6..71718c6085 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -580,7 +580,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc FixupBranch noExtException = J_CC(CC_Z); TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); FixupBranch noCPInt = J_CC(CC_Z); - TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_DSP)); + TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_VI | ProcessorInterface::INT_CAUSE_PE_TOKEN | ProcessorInterface::INT_CAUSE_PE_FINISH)); FixupBranch clearInt = J_CC(CC_NZ); MOV(32, M(&PC), Imm32(ops[i].address)); diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp index 0152d0d96e..cffc3b5feb 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp @@ -1929,7 +1929,7 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak FixupBranch noExtException = Jit->J_CC(CC_Z); Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); FixupBranch noCPInt = Jit->J_CC(CC_Z); - Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_DSP)); + Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_VI | ProcessorInterface::INT_CAUSE_PE_TOKEN | ProcessorInterface::INT_CAUSE_PE_FINISH)); FixupBranch clearInt = Jit->J_CC(CC_NZ); Jit->MOV(32, M(&PC), Imm32(InstLoc)); From a53916ff5d7d2840ef8612bc16511554d259e848 Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 4 Mar 2012 23:42:33 +1100 Subject: [PATCH 022/185] Changed the detection of FIFO write addresses to writes at the gather pipe boundary. This speeds up games which frequently write to the gather pipe like the pre-rendered movies in The Last Story. Added some code to unlink invalidated blocks so that the recompiled block can be linked (speed-up). --- Source/Core/Core/Src/HW/GPFifo.cpp | 2 +- .../Core/Src/PowerPC/JitCommon/JitCache.cpp | 22 ++++++++++++++++++- .../Core/Src/PowerPC/JitCommon/JitCache.h | 1 + 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/GPFifo.cpp b/Source/Core/Core/Src/HW/GPFifo.cpp index 725db3011c..fd81f099e9 100644 --- a/Source/Core/Core/Src/HW/GPFifo.cpp +++ b/Source/Core/Core/Src/HW/GPFifo.cpp @@ -98,7 +98,7 @@ void STACKALIGN CheckGatherPipe() memmove(m_gatherPipe, m_gatherPipe + cnt, m_gatherPipeCount); // Profile where the FIFO writes are occurring. - if (jit && (jit->js.fifoWriteAddresses.find(PC)) == (jit->js.fifoWriteAddresses.end())) + if (m_gatherPipeCount == 0 && jit && (jit->js.fifoWriteAddresses.find(PC)) == (jit->js.fifoWriteAddresses.end())) { jit->js.fifoWriteAddresses.insert(PC); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index 8f5ff5d820..bccb218fd9 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -353,6 +353,24 @@ bool JitBlock::ContainsAddress(u32 em_address) } } + void JitBlockCache::UnlinkBlock(int i) + { + JitBlock &b = blocks[i]; + std::map::iterator iter; + pair::iterator, multimap::iterator> ppp; + ppp = links_to.equal_range(b.originalAddress); + if (ppp.first == ppp.second) + return; + for (multimap::iterator iter2 = ppp.first; iter2 != ppp.second; ++iter2) { + JitBlock &sourceBlock = blocks[iter2->second]; + for (int e = 0; e < 2; e++) + { + if (sourceBlock.exitAddress[e] == b.originalAddress) + sourceBlock.linkStatus[e] = false; + } + } + } + void JitBlockCache::DestroyBlock(int block_num, bool invalidate) { if (block_num < 0 || block_num >= num_blocks) @@ -375,7 +393,9 @@ bool JitBlock::ContainsAddress(u32 em_address) Memory::WriteUnchecked_U32(b.originalFirstOpcode, b.originalAddress); #endif - // We don't unlink blocks, we just send anyone who tries to run them back to the dispatcher. + UnlinkBlock(block_num); + + // Send anyone who tries to run this block back to the dispatcher. // Not entirely ideal, but .. pretty good. // Spurious entrances from previously linked blocks can only come through checkedEntry XEmitter emit((u8 *)b.checkedEntry); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h index 7c19310e02..16f16d6d14 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h @@ -87,6 +87,7 @@ class JitBlockCache bool RangeIntersect(int s1, int e1, int s2, int e2) const; void LinkBlockExits(int i); void LinkBlock(int i); + void UnlinkBlock(int i); public: JitBlockCache() : From b0f75f17ae19484735675fea348f7e95740f597f Mon Sep 17 00:00:00 2001 From: marcosvitali Date: Mon, 5 Mar 2012 02:40:10 -0300 Subject: [PATCH 023/185] This release still fixed the hangs produced by fifo overflow without sacrifice performance. For example you can test Tutorial moves at the beginning of The last history now is fluid 30/60. Shuffle2: I've delete the hacky line, I think is not necessary anymore. Additional some clean in CommandProcessor. Please test The Last Story and others games affected in the previous commits and give me a feedback. --- Source/Core/Common/Src/VideoBackendBase.h | 2 + Source/Core/Core/Src/HW/GPFifo.cpp | 5 ++- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 3 -- .../Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp | 4 +- .../Core/VideoCommon/Src/CommandProcessor.cpp | 39 +++++++++++-------- .../Core/VideoCommon/Src/CommandProcessor.h | 1 + Source/Core/VideoCommon/Src/MainBase.cpp | 5 +++ Source/Core/VideoCommon/Src/PixelEngine.cpp | 2 - .../Plugin_VideoSoftware/Src/SWmain.cpp | 6 +++ .../Plugin_VideoSoftware/Src/VideoBackend.h | 2 +- 10 files changed, 41 insertions(+), 28 deletions(-) diff --git a/Source/Core/Common/Src/VideoBackendBase.h b/Source/Core/Common/Src/VideoBackendBase.h index 28c8f23246..96f639832b 100644 --- a/Source/Core/Common/Src/VideoBackendBase.h +++ b/Source/Core/Common/Src/VideoBackendBase.h @@ -119,6 +119,7 @@ public: virtual void Video_GatherPipeBursted() = 0; virtual bool Video_IsPossibleWaitingSetDrawDone() = 0; + virtual bool Video_IsHiWatermarkActive() = 0; virtual void Video_AbortFrame() = 0; virtual readFn16 Video_CPRead16() = 0; @@ -159,6 +160,7 @@ class VideoBackendHardware : public VideoBackend void Video_GatherPipeBursted(); bool Video_IsPossibleWaitingSetDrawDone(); + bool Video_IsHiWatermarkActive(); void Video_AbortFrame(); readFn16 Video_CPRead16(); diff --git a/Source/Core/Core/Src/HW/GPFifo.cpp b/Source/Core/Core/Src/HW/GPFifo.cpp index fd81f099e9..9bae7bb621 100644 --- a/Source/Core/Core/Src/HW/GPFifo.cpp +++ b/Source/Core/Core/Src/HW/GPFifo.cpp @@ -96,9 +96,10 @@ void STACKALIGN CheckGatherPipe() // move back the spill bytes memmove(m_gatherPipe, m_gatherPipe + cnt, m_gatherPipeCount); - + // Profile where the FIFO writes are occurring. - if (m_gatherPipeCount == 0 && jit && (jit->js.fifoWriteAddresses.find(PC)) == (jit->js.fifoWriteAddresses.end())) + + if (g_video_backend->Video_IsHiWatermarkActive() && jit && (jit->js.fifoWriteAddresses.find(PC)) == (jit->js.fifoWriteAddresses.end())) { jit->js.fifoWriteAddresses.insert(PC); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 71718c6085..417d1159da 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -580,13 +580,10 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc FixupBranch noExtException = J_CC(CC_Z); TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); FixupBranch noCPInt = J_CC(CC_Z); - TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_VI | ProcessorInterface::INT_CAUSE_PE_TOKEN | ProcessorInterface::INT_CAUSE_PE_FINISH)); - FixupBranch clearInt = J_CC(CC_NZ); MOV(32, M(&PC), Imm32(ops[i].address)); WriteExceptionExit(); - SetJumpTarget(clearInt); SetJumpTarget(noCPInt); SetJumpTarget(noExtException); } diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp index cffc3b5feb..811440d098 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp @@ -1929,13 +1929,11 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak FixupBranch noExtException = Jit->J_CC(CC_Z); Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); FixupBranch noCPInt = Jit->J_CC(CC_Z); - Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_VI | ProcessorInterface::INT_CAUSE_PE_TOKEN | ProcessorInterface::INT_CAUSE_PE_FINISH)); - FixupBranch clearInt = Jit->J_CC(CC_NZ); Jit->MOV(32, M(&PC), Imm32(InstLoc)); Jit->WriteExceptionExit(); - Jit->SetJumpTarget(clearInt); + Jit->SetJumpTarget(noCPInt); Jit->SetJumpTarget(noExtException); break; diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index dbe09aaa0e..38b342b76c 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -56,6 +56,7 @@ static bool bProcessFifoToLoWatermark = false; static bool bProcessFifoAllDistance = false; volatile bool isPossibleWaitingSetDrawDone = false; +volatile bool isHiWatermarkActive = false; volatile bool interruptSet= false; volatile bool interruptWaiting= false; volatile bool interruptTokenWaiting = false; @@ -85,7 +86,7 @@ void DoState(PointerWrap &p) p.Do(bProcessFifoToLoWatermark); p.Do(bProcessFifoAllDistance); - + p.Do(isHiWatermarkActive); p.Do(isPossibleWaitingSetDrawDone); p.Do(interruptSet); p.Do(interruptWaiting); @@ -133,6 +134,7 @@ void Init() bProcessFifoToLoWatermark = false; bProcessFifoAllDistance = false; isPossibleWaitingSetDrawDone = false; + isHiWatermarkActive = false; et_UpdateInterrupts = CoreTiming::RegisterEvent("UpdateInterrupts", UpdateInterrupts_Wrapper); } @@ -141,7 +143,6 @@ void Read16(u16& _rReturnValue, const u32 _Address) { INFO_LOG(COMMANDPROCESSOR, "(r): 0x%08x", _Address); - ProcessFifoEvents(); switch (_Address & 0xFFF) { case STATUS_REGISTER: @@ -409,7 +410,6 @@ void Write16(const u16 _Value, const u32 _Address) if (!IsOnThread()) RunGpu(); - ProcessFifoEvents(); } void Read32(u32& _rReturnValue, const u32 _Address) @@ -425,7 +425,6 @@ void Write32(const u32 _Data, const u32 _Address) void STACKALIGN GatherPipeBursted() { - ProcessFifoEvents(); // if we aren't linked, we don't care about gather pipe data if (!m_CPCtrlReg.GPLinkEnable) { @@ -487,17 +486,18 @@ void AbortFrame() void SetOverflowStatusFromGatherPipe() { - if (!fifo.bFF_HiWatermarkInt) return; + fifo.bFF_HiWatermark = (fifo.CPReadWriteDistance > fifo.CPHiWatermark); - fifo.bFF_LoWatermark = (fifo.CPReadWriteDistance < fifo.CPLoWatermark); + isHiWatermarkActive = fifo.bFF_HiWatermark && fifo.bFF_HiWatermarkInt && m_CPCtrlReg.GPReadEnable; - bool interrupt = fifo.bFF_HiWatermark && fifo.bFF_HiWatermarkInt && - m_CPCtrlReg.GPLinkEnable && m_CPCtrlReg.GPReadEnable; - - if (interrupt != interruptSet && interrupt) - CommandProcessor::UpdateInterrupts(true); - + if (isHiWatermarkActive) + { + interruptSet = true; + INFO_LOG(COMMANDPROCESSOR,"Interrupt set"); + ProcessorInterface::SetInterrupt(INT_CAUSE_CP, true); + } + } void SetCpStatus() @@ -505,7 +505,7 @@ void SetCpStatus() // overflow & underflow check fifo.bFF_HiWatermark = (fifo.CPReadWriteDistance > fifo.CPHiWatermark); fifo.bFF_LoWatermark = (fifo.CPReadWriteDistance < fifo.CPLoWatermark); - + // breakpoint if (fifo.bFF_BPEnable) @@ -540,13 +540,18 @@ void SetCpStatus() bool interrupt = (bpInt || ovfInt || undfInt) && m_CPCtrlReg.GPReadEnable; + isHiWatermarkActive = ovfInt && m_CPCtrlReg.GPReadEnable; + if (interrupt != interruptSet && !interruptWaiting) { u64 userdata = interrupt?1:0; if (IsOnThread()) { - interruptWaiting = true; - CommandProcessor::UpdateInterruptsFromVideoBackend(userdata); + if(!interrupt || bpInt || undfInt) + { + interruptWaiting = true; + CommandProcessor::UpdateInterruptsFromVideoBackend(userdata); + } } else CommandProcessor::UpdateInterrupts(userdata); @@ -631,8 +636,8 @@ void SetCpControlRegister() ProcessorInterface::Fifo_CPUEnd = fifo.CPEnd; } // If overflown happens process the fifo to LoWatemark - if (bProcessFifoToLoWatermark) - ProcessFifoToLoWatermark(); + //if (bProcessFifoToLoWatermark) + // ProcessFifoToLoWatermark(); if(fifo.bFF_GPReadEnable && !m_CPCtrlReg.GPReadEnable) { diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.h b/Source/Core/VideoCommon/Src/CommandProcessor.h index bb969fcb95..2bf965a3ba 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.h +++ b/Source/Core/VideoCommon/Src/CommandProcessor.h @@ -31,6 +31,7 @@ namespace CommandProcessor extern SCPFifoStruct fifo; //This one is shared between gfx thread and emulator thread. extern volatile bool isPossibleWaitingSetDrawDone; //This one is used for sync gfx thread and emulator thread. +extern volatile bool isHiWatermarkActive; extern volatile bool interruptSet; extern volatile bool interruptWaiting; extern volatile bool interruptTokenWaiting; diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp index af21ebbb94..0b1258a662 100644 --- a/Source/Core/VideoCommon/Src/MainBase.cpp +++ b/Source/Core/VideoCommon/Src/MainBase.cpp @@ -250,6 +250,11 @@ bool VideoBackendHardware::Video_IsPossibleWaitingSetDrawDone() return CommandProcessor::isPossibleWaitingSetDrawDone; } +bool VideoBackendHardware::Video_IsHiWatermarkActive() +{ + return CommandProcessor::isHiWatermarkActive; +} + void VideoBackendHardware::Video_AbortFrame() { CommandProcessor::AbortFrame(); diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp index 456e0fb535..ec0683742f 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.cpp +++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp @@ -180,7 +180,6 @@ void Init() void Read16(u16& _uReturnValue, const u32 _iAddress) { DEBUG_LOG(PIXELENGINE, "(r16) 0x%08x", _iAddress); - CommandProcessor::ProcessFifoEvents(); switch (_iAddress & 0xFFF) { // CPU Direct Access EFB Raster State Config @@ -334,7 +333,6 @@ void Write16(const u16 _iValue, const u32 _iAddress) break; } - CommandProcessor::ProcessFifoEvents(); } void Write32(const u32 _iValue, const u32 _iAddress) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index abfd9155f5..c591bd0957 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -215,6 +215,12 @@ bool VideoSoftware::Video_IsPossibleWaitingSetDrawDone(void) return false; } +bool VideoSoftware::Video_IsHiWatermarkActive(void) +{ + return false; +} + + void VideoSoftware::Video_AbortFrame(void) { } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h index 08b4c155ad..7c52e34291 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h @@ -36,7 +36,7 @@ class VideoSoftware : public VideoBackend void Video_SetRendering(bool bEnabled); void Video_GatherPipeBursted(); - + bool Video_IsHiWatermarkActive(); bool Video_IsPossibleWaitingSetDrawDone(); void Video_AbortFrame(); From 614c43029f1ec06cee2014e0cfaa76c0d6ce6889 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Tue, 31 Jan 2012 19:12:21 +1300 Subject: [PATCH 024/185] fixed files so they can have more than one handle opened at a time. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 2 +- .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 4 ++-- .../Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp | 11 +++++------ Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h | 8 +++++--- 4 files changed, 13 insertions(+), 12 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 921d704a69..fb16c38661 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -285,7 +285,7 @@ void ExecuteCommand(u32 _Address) DeviceID = GetDeviceIDByName(DeviceName); // check if a device with this name has been created already - if (DeviceID == -1) + if (DeviceName.find("/dev/") == std::string::npos || DeviceID == -1) { if (DeviceName.find("/dev/") != std::string::npos) { 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 d17e50e0cd..c0aece3407 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 @@ -168,7 +168,7 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) else if (ReturnValue == 0) { ERROR_LOG(WII_IPC_FILEIO, " FileIO failed open: %s (%s) - I/O Error", m_Filename.c_str(), Modes[_Mode]); - ReturnValue = FS_INVALID_ARGUMENT; + ReturnValue = FS_RESULT_FATAL; } if (_CommandAddress) @@ -179,7 +179,7 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) { - u32 ReturnValue = FS_INVALID_ARGUMENT; + u32 ReturnValue = FS_RESULT_FATAL; const s32 SeekPosition = Memory::Read_U32(_CommandAddress + 0xC); const s32 Mode = Memory::Read_U32(_CommandAddress + 0x10); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp index c2ed0fac36..1b32410ef0 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp @@ -109,17 +109,16 @@ bool CWII_IPC_HLE_Device_fs::IOCtlV(u32 _CommandAddress) if (!File::Exists(DirName)) { WARN_LOG(WII_IPC_FILEIO, "FS: Search not found: %s", DirName.c_str()); - ReturnValue = FS_DIRFILE_NOT_FOUND; + ReturnValue = FS_FILE_NOT_EXIST; break; } - - // AyuanX: what if we return "found one successfully" if it is a file? else if (!File::IsDirectory(DirName)) { // It's not a directory, so error. - // Games don't usually seem to care WHICH error they get, as long as it's <0 - WARN_LOG(WII_IPC_FILEIO, "\tNot a directory - return FS_INVALID_ARGUMENT"); - ReturnValue = FS_INVALID_ARGUMENT; + // Games don't usually seem to care WHICH error they get, as long as it's < + // Well the system menu CARES! + WARN_LOG(WII_IPC_FILEIO, "\tNot a directory - return FS_RESULT_FATAL"); + ReturnValue = FS_RESULT_FATAL; break; } diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h index be78de7e39..1afb01cf8d 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h @@ -31,12 +31,14 @@ struct NANDStat }; enum { - FS_RESULT_OK = 0, + FS_RESULT_OK = 0, + FS_INVALID = -4, FS_DIRFILE_NOT_FOUND = -6, - FS_INVALID_ARGUMENT = -101, + FS_RESULT_FATAL = -101, + FS_NO_ACCESS = -102, FS_FILE_EXIST = -105, FS_FILE_NOT_EXIST = -106, - FS_RESULT_FATAL = -128, + FS_NO_HANDLE = -106, }; class CWII_IPC_HLE_Device_fs : public IWII_IPC_HLE_Device From e8e2c241d75728ea404a207e1d323233a353fcab Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Tue, 31 Jan 2012 19:28:17 +1300 Subject: [PATCH 025/185] delroth pointed out that it should be "starts with" not "contains". Unlikely this has ever affected anyone.... --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fb16c38661..38baf7f43e 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -287,7 +287,7 @@ void ExecuteCommand(u32 _Address) // check if a device with this name has been created already if (DeviceName.find("/dev/") == std::string::npos || DeviceID == -1) { - if (DeviceName.find("/dev/") != std::string::npos) + if (DeviceName.find("/dev/") == 0) { WARN_LOG(WII_IPC_HLE, "Unimplemented device: %s", DeviceName.c_str()); From 53d2d9718fe3c436b1f2f39133181ef44036aa23 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Tue, 6 Mar 2012 23:10:04 +1300 Subject: [PATCH 026/185] Fixes issue 2917 and possibly others like 5232 --- .../Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 199 +++++++++++------- .../Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h | 5 + 2 files changed, 125 insertions(+), 79 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 c0aece3407..7b38639ade 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 @@ -87,6 +87,7 @@ CWII_IPC_HLE_Device_FileIO::CWII_IPC_HLE_Device_FileIO(u32 _DeviceID, const std: , m_pFileHandle(NULL) , m_FileLength(0) , m_Mode(0) + , m_SeekPos(0) { Common::ReadReplacements(replacements); } @@ -99,7 +100,7 @@ bool CWII_IPC_HLE_Device_FileIO::Close(u32 _CommandAddress, bool _bForce) { INFO_LOG(WII_IPC_FILEIO, "FileIO: Close %s (DeviceID=%08x)", m_Name.c_str(), m_DeviceID); - m_pFileHandle.Close(); + //m_pFileHandle.Close(); m_FileLength = 0; m_Mode = 0; @@ -117,7 +118,7 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) u32 ReturnValue = 0; // close the file handle if we get a reopen - m_pFileHandle.Close(); + //m_pFileHandle.Close(); static const char* const Modes[] = { @@ -128,31 +129,14 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) }; m_Filename = std::string(HLE_IPC_BuildFilename(m_Name.c_str(), 64)); - + + // The file must exist before we can open it // It should be created by ISFS_CreateFile, not here if(File::Exists(m_Filename)) { - INFO_LOG(WII_IPC_FILEIO, "FileIO: Open %s (%s)", m_Name.c_str(), Modes[_Mode]); - switch(_Mode) - { - case ISFS_OPEN_READ: - m_pFileHandle.Open(m_Filename, "rb"); - break; - - // "r+b" is technically wrong, but OPEN_WRITE should not truncate the file as "wb" does. - case ISFS_OPEN_WRITE: - m_pFileHandle.Open(m_Filename, "r+b"); - break; - - case ISFS_OPEN_RW: - m_pFileHandle.Open(m_Filename, "r+b"); - break; - - default: - PanicAlertT("FileIO: Unknown open mode : 0x%02x", _Mode); - break; - } + INFO_LOG(WII_IPC_FILEIO, "FileIO: Open %s (%s == %08X)", m_Name.c_str(), Modes[_Mode], _Mode); + ReturnValue = m_DeviceID; } else { @@ -160,70 +144,99 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) ReturnValue = FS_FILE_NOT_EXIST; } - if (m_pFileHandle != NULL) - { - m_FileLength = (u32)m_pFileHandle.GetSize(); - ReturnValue = m_DeviceID; - } - else if (ReturnValue == 0) - { - ERROR_LOG(WII_IPC_FILEIO, " FileIO failed open: %s (%s) - I/O Error", m_Filename.c_str(), Modes[_Mode]); - ReturnValue = FS_RESULT_FATAL; - } - if (_CommandAddress) Memory::Write_U32(ReturnValue, _CommandAddress+4); m_Active = true; return true; } + + +bool CWII_IPC_HLE_Device_FileIO::OpenFile() +{ + switch(m_Mode) + { + case ISFS_OPEN_READ: + m_pFileHandle.Open(m_Filename, "rb"); + break; + + // "r+b" is technically wrong, but OPEN_WRITE should not truncate the file as "wb" does. + case ISFS_OPEN_WRITE: + m_pFileHandle.Open(m_Filename, "r+b"); + break; + + case ISFS_OPEN_RW: + m_pFileHandle.Open(m_Filename, "r+b"); + break; + + default: + PanicAlertT("FileIO: Unknown open mode : 0x%02x", m_Mode); + break; + } + return m_pFileHandle.IsOpen(); +} + +void CWII_IPC_HLE_Device_FileIO::CloseFile() +{ + m_pFileHandle.Close(); +} + bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) { u32 ReturnValue = FS_RESULT_FATAL; const s32 SeekPosition = Memory::Read_U32(_CommandAddress + 0xC); const s32 Mode = Memory::Read_U32(_CommandAddress + 0x10); - if (m_pFileHandle == NULL) - { - ERROR_LOG(WII_IPC_FILEIO, "FILEIO: Seek failed because of null file handle - %s", m_Name.c_str()); - ReturnValue = FS_FILE_NOT_EXIST; - } - else if (Mode >= 0 && Mode <= 2) + + if(OpenFile()) { + ReturnValue = FS_RESULT_FATAL; + const u64 fileSize = m_pFileHandle.GetSize(); - INFO_LOG(WII_IPC_FILEIO, "FileIO: Seek Pos: 0x%08x, Mode: %i (%s, Length=0x%08llx)", SeekPosition, Mode, m_Name.c_str(), fileSize); - - // Set seek mode - int seek_mode[3] = {SEEK_SET, SEEK_CUR, SEEK_END}; - - // POSIX allows seek past EOF, the Wii does not. - // TODO: Can we check this without tell'ing/seek'ing twice? - const u64 curPos = m_pFileHandle.Tell(); - if (m_pFileHandle.Seek(SeekPosition, seek_mode[Mode])) - { - const u64 newPos = m_pFileHandle.Tell(); - if (newPos > fileSize) + switch(Mode){ + case 0: { - ERROR_LOG(WII_IPC_FILEIO, "FILEIO: Seek past EOF - %s", m_Name.c_str()); - m_pFileHandle.Seek(curPos, SEEK_SET); + if(SeekPosition >=0 && SeekPosition <= fileSize) + { + m_SeekPos = SeekPosition; + ReturnValue = m_SeekPos; + } + break; + } + case 1: + { + s32 wantedPos = SeekPosition+m_SeekPos; + if(wantedPos >=0 && wantedPos <= fileSize) + { + m_SeekPos = wantedPos; + ReturnValue = m_SeekPos; + } + break; + } + case 2: + { + s32 wantedPos = fileSize+m_SeekPos; + if(wantedPos >=0 && wantedPos <= fileSize) + { + m_SeekPos = wantedPos; + ReturnValue = m_SeekPos; + } + break; + } + default: + { + PanicAlert("CWII_IPC_HLE_Device_FileIO Unsupported seek mode %i", Mode); + ReturnValue = FS_RESULT_FATAL; + break; } - else - ReturnValue = (u32)newPos; - } - else - { - // Must clear the failbits, since subsequent seeks don't care about - // past failure on Wii - m_pFileHandle.Clear(); - ERROR_LOG(WII_IPC_FILEIO, "FILEIO: Seek failed - %s", m_Name.c_str()); } + CloseFile(); } else { - PanicAlert("CWII_IPC_HLE_Device_FileIO Unsupported seek mode %i", Mode); + ReturnValue = FS_FILE_NOT_EXIST; } - Memory::Write_U32(ReturnValue, _CommandAddress + 0x4); return true; @@ -235,7 +248,8 @@ bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress) const u32 Address = Memory::Read_U32(_CommandAddress + 0xC); // Read to this memory address const u32 Size = Memory::Read_U32(_CommandAddress + 0x10); - if (m_pFileHandle != NULL) + + if(OpenFile()) { if (m_Mode == ISFS_OPEN_WRITE) { @@ -244,15 +258,24 @@ bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress) else { INFO_LOG(WII_IPC_FILEIO, "FileIO: Read 0x%x bytes to 0x%08x from %s", Size, Address, m_Name.c_str()); - + m_pFileHandle.Seek(m_SeekPos, SEEK_SET); ReturnValue = (u32)fread(Memory::GetPointer(Address), 1, Size, m_pFileHandle.GetHandle()); if (ReturnValue != Size && ferror(m_pFileHandle.GetHandle())) + { ReturnValue = FS_EACCESS; + } + else + { + m_SeekPos += Size; + } + } + CloseFile(); } else { - ERROR_LOG(WII_IPC_FILEIO, "FileIO: Failed to read from %s (Addr=0x%08x Size=0x%x) - file not open", m_Name.c_str(), Address, Size); + ERROR_LOG(WII_IPC_FILEIO, "FileIO: Failed to read from %s (Addr=0x%08x Size=0x%x) - file could not be opened or does not exist", m_Name.c_str(), Address, Size); + ReturnValue = FS_FILE_NOT_EXIST; } Memory::Write_U32(ReturnValue, _CommandAddress + 0x4); @@ -265,9 +288,8 @@ bool CWII_IPC_HLE_Device_FileIO::Write(u32 _CommandAddress) const u32 Address = Memory::Read_U32(_CommandAddress + 0xC); // Write data from this memory address const u32 Size = Memory::Read_U32(_CommandAddress + 0x10); - INFO_LOG(WII_IPC_FILEIO, "FileIO: Write 0x%04x bytes from 0x%08x to %s", Size, Address, m_Name.c_str()); - if (m_pFileHandle) + if(OpenFile()) { if (m_Mode == ISFS_OPEN_READ) { @@ -275,9 +297,20 @@ bool CWII_IPC_HLE_Device_FileIO::Write(u32 _CommandAddress) } else { + INFO_LOG(WII_IPC_FILEIO, "FileIO: Write 0x%04x bytes from 0x%08x to %s", Size, Address, m_Name.c_str()); + m_pFileHandle.Seek(m_SeekPos, SEEK_SET); if (m_pFileHandle.WriteBytes(Memory::GetPointer(Address), Size)) + { ReturnValue = Size; + m_SeekPos += Size; + } } + CloseFile(); + } + else + { + ERROR_LOG(WII_IPC_FILEIO, "FileIO: Failed to read from %s (Addr=0x%08x Size=0x%x) - file could not be opened or does not exist", m_Name.c_str(), Address, Size); + ReturnValue = FS_FILE_NOT_EXIST; } Memory::Write_U32(ReturnValue, _CommandAddress + 0x4); @@ -296,20 +329,30 @@ bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress) //u32 BufferInSize = Memory::Read_U32(_CommandAddress + 0x14); //u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18); //u32 BufferOutSize = Memory::Read_U32(_CommandAddress + 0x1C); + + // Return Value + u32 ReturnValue = 0; // no error switch(Parameter) { case ISFS_IOCTL_GETFILESTATS: { - m_FileLength = (u32)m_pFileHandle.GetSize(); - const u32 Position = (u32)m_pFileHandle.Tell(); + if(OpenFile()) + { + m_FileLength = (u32)m_pFileHandle.GetSize(); - const u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18); - INFO_LOG(WII_IPC_FILEIO, "FileIO: ISFS_IOCTL_GETFILESTATS"); - INFO_LOG(WII_IPC_FILEIO, " File: %s, Length: %i, Pos: %i", m_Name.c_str(), m_FileLength, Position); + const u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18); + INFO_LOG(WII_IPC_FILEIO, "FileIO: ISFS_IOCTL_GETFILESTATS"); + INFO_LOG(WII_IPC_FILEIO, " File: %s, Length: %i, Pos: %i", m_Name.c_str(), m_FileLength, m_SeekPos); - Memory::Write_U32(m_FileLength, BufferOut); - Memory::Write_U32(Position, BufferOut+4); + Memory::Write_U32(m_FileLength, BufferOut); + Memory::Write_U32(m_SeekPos, BufferOut+4); + CloseFile(); + } + else + { + ReturnValue = FS_FILE_NOT_EXIST; + } } break; @@ -321,8 +364,6 @@ bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress) } - // Return Value - const u32 ReturnValue = 0; // no error Memory::Write_U32(ReturnValue, _CommandAddress + 0x4); return true; 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 d1f51b7dfc..b7f3de3d62 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 @@ -39,6 +39,9 @@ public: bool IOCtl(u32 _CommandAddress); void DoState(PointerWrap &p); + bool OpenFile(); + void CloseFile(); + private: enum { @@ -77,6 +80,8 @@ private: u32 m_FileLength; u32 m_Mode; + u32 m_SeekPos; + std::string m_Filename; }; From 880992b10ff2d93e69a740ed82a04e6ee271b2f4 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Wed, 7 Mar 2012 00:21:31 +1300 Subject: [PATCH 027/185] Fixed DoState and removed unneeded class variable. --- .../Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 29 ++----------------- .../Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h | 1 - 2 files changed, 3 insertions(+), 27 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 7b38639ade..98a85d25ca 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 @@ -85,7 +85,6 @@ void HLE_IPC_CreateVirtualFATFilesystem() 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_pFileHandle(NULL) - , m_FileLength(0) , m_Mode(0) , m_SeekPos(0) { @@ -99,10 +98,6 @@ CWII_IPC_HLE_Device_FileIO::~CWII_IPC_HLE_Device_FileIO() bool CWII_IPC_HLE_Device_FileIO::Close(u32 _CommandAddress, bool _bForce) { INFO_LOG(WII_IPC_FILEIO, "FileIO: Close %s (DeviceID=%08x)", m_Name.c_str(), m_DeviceID); - - //m_pFileHandle.Close(); - - m_FileLength = 0; m_Mode = 0; // Close always return 0 for success @@ -339,7 +334,7 @@ bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress) { if(OpenFile()) { - m_FileLength = (u32)m_pFileHandle.GetSize(); + u32 m_FileLength = (u32)m_pFileHandle.GetSize(); const u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18); INFO_LOG(WII_IPC_FILEIO, "FileIO: ISFS_IOCTL_GETFILESTATS"); @@ -371,25 +366,7 @@ bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress) void CWII_IPC_HLE_Device_FileIO::DoState(PointerWrap &p) { - bool have_file_handle = m_pFileHandle; - s32 seek = (have_file_handle) ? (s32)m_pFileHandle.Tell() : 0; - - p.Do(have_file_handle); p.Do(m_Mode); - p.Do(seek); - - if (p.GetMode() == PointerWrap::MODE_READ) - { - if (have_file_handle) - { - // TODO: isn't it naive and error-prone to assume that the file hasn't changed since we created the savestate? - Open(0, m_Mode); - _dbg_assert_msg_(WII_IPC_HLE, m_pFileHandle, "bad filehandle"); - } - else - Close(0, true); - } - - if (have_file_handle) - m_pFileHandle.Seek(seek, SEEK_SET); + p.Do(m_SeekPos); + p.Do(m_Filename); } 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 b7f3de3d62..ff34a43a20 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 @@ -77,7 +77,6 @@ private: }; File::IOFile m_pFileHandle; - u32 m_FileLength; u32 m_Mode; u32 m_SeekPos; From 09217a6c47968d3d411c664514fbc9a50e03d970 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 6 Mar 2012 21:38:33 +0100 Subject: [PATCH 028/185] Update PokePark Wii game ini. Needs to have texture cache accuracy set to mid setting. --- Data/User/GameConfig/R8AJ01.ini | 6 ++++-- Data/User/GameConfig/R8AP01.ini | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Data/User/GameConfig/R8AJ01.ini b/Data/User/GameConfig/R8AJ01.ini index 546d2f51ca..594e651a76 100644 --- a/Data/User/GameConfig/R8AJ01.ini +++ b/Data/User/GameConfig/R8AJ01.ini @@ -1,7 +1,9 @@ # R8AJ01 - Pokepark Wii [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 = 2 -EmulationIssues = Stuck on loading screen after movie (see issue 2917). +EmulationStateId = 4 +EmulationIssues = NPCs sporadically disappear. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video_Settings] +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/R8AP01.ini b/Data/User/GameConfig/R8AP01.ini index a1863578f0..1c06c00d3d 100644 --- a/Data/User/GameConfig/R8AP01.ini +++ b/Data/User/GameConfig/R8AP01.ini @@ -1,8 +1,8 @@ # R8AP01 - PokePark Wii [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 = 2 -EmulationIssues = Stuck on loading screen after movie (see issue 2917). +EmulationStateId = 4 +EmulationIssues = NPCs sporadically disappear. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -13,3 +13,5 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 512 From 6fc8cdf12d41ea9f9be2d345face72ddf1fe045d Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Wed, 7 Mar 2012 20:08:14 -0800 Subject: [PATCH 029/185] revert r90a2096a24f4 behavior changes in PixelEngine.cpp. Thanks to Autoran1 for finding the responsible commit. Fixes Scrubbing Serena Beach Countdown in both SC and DC. Fixes issue 1498. --- Source/Core/VideoCommon/Src/PixelEngine.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp index 456e0fb535..8164bc41da 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.cpp +++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp @@ -269,6 +269,10 @@ void Read16(u16& _uReturnValue, const u32 _iAddress) case PE_PERF_5L: case PE_PERF_5H: INFO_LOG(PIXELENGINE, "(r16) perf counter @ %08x", _iAddress); + // git r90a2096a24f4 (svn r3663) added the PE_PERF cases, without setting + // _uReturnValue to anything, this reverts to the previous behaviour which allows + // The timer in SMS:Scrubbing Serena Beach to countdown correctly + _uReturnValue = 1; break; default: From c2e6fdf09f33f7765526fac680d13af9ba744125 Mon Sep 17 00:00:00 2001 From: marcosvitali Date: Thu, 8 Mar 2012 02:47:55 -0300 Subject: [PATCH 030/185] - I've fixed possibles random hangs in DC mode. - I've fixed hangs in DC mode in (Simpsons, Monkey Island, Pokemon XD, etc) - I've implemented accurate manage of Pixel Engine Interrupts, now the GPU loop is stopped when a PE Interrupt needs to be managed and resume when Pixel Engine finish, I think now, the Fifo in DC mode is more accurate than SC mode. :) Time to close the big fifo Issue 3694 (snif), please if you have a possible fifo issue report this like a game issue. I was working with Skid_AU together, especially thanks for him. Test a lot all games, and compare the performance with the master maybe this accuracy has a cost (not a lot). I think now the fifo is very stable, overflow fixed, random hang fixed, if you have a game with a hang with this rev and not in master please report this. --- Source/Core/VideoCommon/Src/CommandProcessor.cpp | 5 +++-- Source/Core/VideoCommon/Src/Fifo.cpp | 3 ++- Source/Core/VideoCommon/Src/PixelEngine.cpp | 5 +++++ Source/Core/VideoCommon/Src/PixelEngine.h | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index 38b342b76c..4fd7e88f5e 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -596,8 +596,8 @@ void SetCpStatusRegister() // Here always there is one fifo attached to the GPU m_CPStatusReg.Breakpoint = fifo.bFF_Breakpoint; - m_CPStatusReg.ReadIdle = (fifo.CPReadPointer == fifo.CPWritePointer) || (fifo.CPReadPointer == fifo.CPBreakpoint); - m_CPStatusReg.CommandIdle = !fifo.CPReadWriteDistance; + m_CPStatusReg.ReadIdle = (fifo.CPReadPointer == fifo.CPWritePointer) || (fifo.CPReadPointer == fifo.CPBreakpoint) ; + m_CPStatusReg.CommandIdle = !fifo.CPReadWriteDistance || (IsOnThread() && PixelEngine::WaitingForPEInterrupt()); m_CPStatusReg.UnderflowLoWatermark = fifo.bFF_LoWatermark; m_CPStatusReg.OverflowHiWatermark = fifo.bFF_HiWatermark; @@ -620,6 +620,7 @@ void SetCpControlRegister() if (!fifo.bFF_GPReadEnable && m_CPCtrlReg.GPReadEnable && !m_CPCtrlReg.BPEnable) { + ProcessFifoEvents(); PixelEngine::ResetSetFinish(); } diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp index 5cb3252816..2e60055c97 100644 --- a/Source/Core/VideoCommon/Src/Fifo.cpp +++ b/Source/Core/VideoCommon/Src/Fifo.cpp @@ -22,6 +22,7 @@ #include "Atomic.h" #include "OpcodeDecoding.h" #include "CommandProcessor.h" +#include "PixelEngine.h" #include "ChunkFile.h" #include "Fifo.h" #include "HW/Memmap.h" @@ -137,7 +138,7 @@ void RunGpuLoop() CommandProcessor::SetCpStatus(); // check if we are able to run this buffer - while (!CommandProcessor::interruptWaiting && fifo.bFF_GPReadEnable && fifo.CPReadWriteDistance && !AtBreakpoint()) + while (GpuRunningState && !CommandProcessor::interruptWaiting && fifo.bFF_GPReadEnable && fifo.CPReadWriteDistance && !AtBreakpoint() && !PixelEngine::WaitingForPEInterrupt()) { if (!GpuRunningState) break; diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp index ec0683742f..09cb9b8a5c 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.cpp +++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp @@ -468,4 +468,9 @@ void ResetSetToken() } CommandProcessor::interruptTokenWaiting = false; } + +bool WaitingForPEInterrupt() +{ + return CommandProcessor::interruptFinishWaiting || CommandProcessor::interruptTokenWaiting || interruptSetFinish || interruptSetToken; +} } // end of namespace PixelEngine diff --git a/Source/Core/VideoCommon/Src/PixelEngine.h b/Source/Core/VideoCommon/Src/PixelEngine.h index dd0304fbe1..5e64300ef3 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.h +++ b/Source/Core/VideoCommon/Src/PixelEngine.h @@ -80,7 +80,7 @@ void SetToken(const u16 _token, const int _bSetTokenAcknowledge); void SetFinish(void); void ResetSetFinish(void); void ResetSetToken(void); -bool AllowIdleSkipping(); +bool WaitingForPEInterrupt(); // Bounding box functionality. Paper Mario (both) are a couple of the few games that use it. extern u16 bbox[4]; From 63176ba38d55b2489291e56ef1fa6c34a7f7a9d4 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 8 Mar 2012 10:00:40 +0100 Subject: [PATCH 031/185] Revert "Updated English translation, fixes issue 5214." This reverts commit cbab8329076320f27e7286b436fef9f4a3296f57. As glennricster said in the comments, the modification should not be done in that way. --- Languages/po/en.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Languages/po/en.po b/Languages/po/en.po index cf04ba0512..f08b1e1cdf 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -4588,7 +4588,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the rightmost value." +"If unsure, use the second-fastest value from the right." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 From b69a1d225a0736a1fabbb6b03bcdb5815f681de0 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 8 Mar 2012 10:01:40 +0100 Subject: [PATCH 032/185] Use -std=gnu++0x instead of -std=c++0x Bluez uses the non standard "typeof" instead of "__typeof__" in bluetooth.h. Both GCC and Clang reject that with std=c++0x but accept it with gnu++0x. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c59e3f7c07..b64c5b6f61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -552,7 +552,7 @@ option(UNITTESTS "Build unitests" OFF) ######################################## # Start compiling our code # -add_definitions(-std=c++0x) +add_definitions(-std=gnu++0x) add_subdirectory(Source) From 41652d6b1f391fdcd0f599463f689c0299cdc007 Mon Sep 17 00:00:00 2001 From: marcosvitali Date: Fri, 9 Mar 2012 01:33:29 -0300 Subject: [PATCH 033/185] I've fixed Metroid Prime 3 and 2 desync. And other games with desync because of FIFO Reset. That happens because FIFO_RW_DISTANCE_HI must be written first, for checking fifo.CPReadWriteDistance == 0, so some fifo resets was not managed in the right way. I didn't test Metroid 2 desync reported in Issue 4336 but I think is the same. About the flickering in MP2, I don't know for my is not related or yes, but you can test anyway. Fixed Issue 3902 Well now the FIFO is 99.99% finished :) --- Source/Core/VideoCommon/Src/CommandProcessor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index 4fd7e88f5e..a6e68f6298 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -388,10 +388,6 @@ void Write16(const u16 _Value, const u32 _Address) case FIFO_RW_DISTANCE_HI: WriteHigh((u32 &)fifo.CPReadWriteDistance, _Value); - DEBUG_LOG(COMMANDPROCESSOR,"try to write to FIFO_RW_DISTANCE_HI : %04x", _Value); - break; - case FIFO_RW_DISTANCE_LO: - WriteLow((u32 &)fifo.CPReadWriteDistance, _Value & 0xFFE0); if (fifo.CPReadWriteDistance == 0) { GPFifo::ResetGatherPipe(); @@ -401,6 +397,10 @@ void Write16(const u16 _Value, const u32 _Address) ResetVideoBuffer(); } IncrementCheckContextId(); + DEBUG_LOG(COMMANDPROCESSOR,"try to write to FIFO_RW_DISTANCE_HI : %04x", _Value); + break; + case FIFO_RW_DISTANCE_LO: + WriteLow((u32 &)fifo.CPReadWriteDistance, _Value & 0xFFE0); DEBUG_LOG(COMMANDPROCESSOR,"try to write to FIFO_RW_DISTANCE_LO : %04x", _Value); break; From 104603467be6cc15e63dfb5cadec8044edd1da46 Mon Sep 17 00:00:00 2001 From: marcosvitali Date: Fri, 9 Mar 2012 18:58:23 -0300 Subject: [PATCH 034/185] This commit fix games hanging because of my prior Revision c2e6fdf09f33 The external exceptions in dolphin are checking frequently but is different to real HW, so sometime the game is in a loop checking GPU STATUS, the exceptions doesn't checked, and the game hang.\ For solve this I need a trick: still waiting for the exception handler be linked but if CommandProcecsor is reading the GPStatus, resume this. This fixed "TimeSplitters: Future Perfect" broken in the Revision c2e6fdf09f33 and surely others games. --- Source/Core/VideoCommon/Src/CommandProcessor.cpp | 10 +++++++--- Source/Core/VideoCommon/Src/PixelEngine.cpp | 14 ++++++++------ Source/Core/VideoCommon/Src/PixelEngine.h | 1 + 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index a6e68f6298..77c02d1692 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -574,7 +574,7 @@ void ProcessFifoAllDistance() if (IsOnThread()) { while (!CommandProcessor::interruptWaiting && fifo.bFF_GPReadEnable && - fifo.CPReadWriteDistance && !AtBreakpoint()) + fifo.CPReadWriteDistance && !AtBreakpoint() && !PixelEngine::WaitingForPEInterrupt()) Common::YieldCPU(); } bProcessFifoAllDistance = false; @@ -597,10 +597,12 @@ void SetCpStatusRegister() m_CPStatusReg.Breakpoint = fifo.bFF_Breakpoint; m_CPStatusReg.ReadIdle = (fifo.CPReadPointer == fifo.CPWritePointer) || (fifo.CPReadPointer == fifo.CPBreakpoint) ; - m_CPStatusReg.CommandIdle = !fifo.CPReadWriteDistance || (IsOnThread() && PixelEngine::WaitingForPEInterrupt()); + m_CPStatusReg.CommandIdle = !fifo.CPReadWriteDistance; m_CPStatusReg.UnderflowLoWatermark = fifo.bFF_LoWatermark; m_CPStatusReg.OverflowHiWatermark = fifo.bFF_HiWatermark; - + + PixelEngine::ResumeWaitingForPEInterrupt(); + INFO_LOG(COMMANDPROCESSOR,"\t Read from STATUS_REGISTER : %04x", m_CPStatusReg.Hex); DEBUG_LOG(COMMANDPROCESSOR, "(r) status: iBP %s | fReadIdle %s | fCmdIdle %s | iOvF %s | iUndF %s" , m_CPStatusReg.Breakpoint ? "ON" : "OFF" @@ -609,6 +611,8 @@ void SetCpStatusRegister() , m_CPStatusReg.OverflowHiWatermark ? "ON" : "OFF" , m_CPStatusReg.UnderflowLoWatermark ? "ON" : "OFF" ); + + } void SetCpControlRegister() diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp index 09cb9b8a5c..750e8fbb40 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.cpp +++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp @@ -356,22 +356,16 @@ void UpdateInterrupts() void UpdateTokenInterrupt(bool active) { - if(interruptSetToken != active) - { ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, active); interruptSetToken = active; - } } void UpdateFinishInterrupt(bool active) { - if(interruptSetFinish != active) - { ProcessorInterface::SetInterrupt(INT_CAUSE_PE_FINISH, active); interruptSetFinish = active; if (active) State::ProcessRequestedStates(0); - } } // TODO(mb2): Refactor SetTokenINT_OnMainThread(u64 userdata, int cyclesLate). @@ -473,4 +467,12 @@ bool WaitingForPEInterrupt() { return CommandProcessor::interruptFinishWaiting || CommandProcessor::interruptTokenWaiting || interruptSetFinish || interruptSetToken; } + +void ResumeWaitingForPEInterrupt() +{ + interruptSetFinish = false; + interruptSetToken = false; + CommandProcessor::interruptFinishWaiting = false; + CommandProcessor::interruptTokenWaiting = false; +} } // end of namespace PixelEngine diff --git a/Source/Core/VideoCommon/Src/PixelEngine.h b/Source/Core/VideoCommon/Src/PixelEngine.h index 5e64300ef3..64f959009f 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.h +++ b/Source/Core/VideoCommon/Src/PixelEngine.h @@ -81,6 +81,7 @@ void SetFinish(void); void ResetSetFinish(void); void ResetSetToken(void); bool WaitingForPEInterrupt(); +void ResumeWaitingForPEInterrupt(); // Bounding box functionality. Paper Mario (both) are a couple of the few games that use it. extern u16 bbox[4]; From 61d5624c2d4c64e34184dc2ade69a8bdeae711c7 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 11 Oct 2011 23:25:14 -0500 Subject: [PATCH 035/185] Update translation files for recent changes in the code. --- Languages/po/ar.po | 295 +++++++++++++++++++++++++++++ Languages/po/ca.po | 248 ++++++++++++++++++++++++ Languages/po/cs.po | 263 ++++++++++++++++++++++++++ Languages/po/de.po | 245 ++++++++++++++++++++++++ Languages/po/dolphin-emu.pot | 243 ++++++++++++++++++++++++ Languages/po/el.po | 353 +++++++++++++++++++++++++++++++++++ Languages/po/en.po | 243 ++++++++++++++++++++++++ Languages/po/es.po | 319 +++++++++++++++++++++++++++++++ Languages/po/fr.po | 312 +++++++++++++++++++++++++++++++ Languages/po/he.po | 243 ++++++++++++++++++++++++ Languages/po/hu.po | 272 +++++++++++++++++++++++++++ Languages/po/it.po | 245 ++++++++++++++++++++++++ Languages/po/ja.po | 263 ++++++++++++++++++++++++++ Languages/po/ko.po | 245 ++++++++++++++++++++++++ Languages/po/nb.po | 245 ++++++++++++++++++++++++ Languages/po/nl.po | 245 ++++++++++++++++++++++++ Languages/po/pl.po | 276 +++++++++++++++++++++++++++ Languages/po/pt.po | 248 ++++++++++++++++++++++++ Languages/po/pt_BR.po | 276 +++++++++++++++++++++++++++ Languages/po/ru.po | 245 ++++++++++++++++++++++++ Languages/po/sr.po | 243 ++++++++++++++++++++++++ Languages/po/tr.po | 245 ++++++++++++++++++++++++ Languages/po/zh_CN.po | 245 ++++++++++++++++++++++++ Languages/po/zh_TW.po | 245 ++++++++++++++++++++++++ 24 files changed, 6302 insertions(+) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 845b571a9a..322a2c504f 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -7,9 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-16 11:25-0500\n" "Last-Translator: mansoor\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-07-20 13:33+0300\n" +"Last-Translator: \n" +>>>>>>> Update translation files for recent changes in the code. "Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" @@ -418,6 +424,10 @@ msgid "Accurate VBeam emulation" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -529,9 +539,15 @@ msgstr "أض٠باتش" msgid "Add new pane" msgstr "إضاÙØ© جزء جديد" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "أضÙ" @@ -585,8 +601,13 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملÙات الجيم كيوب (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Ø­Ùظ جميع الحالات (sav, s##)" @@ -615,8 +636,14 @@ msgstr "" "إذا لم تكن متأكدا اترك هذا غير محددة." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "بديل ويموت" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "محاكاة ويموت" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -671,7 +698,11 @@ msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙØŸ " msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙات؟" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -692,7 +723,11 @@ msgstr "صوت الخلÙية :" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "تلقائي" @@ -807,7 +842,11 @@ msgid "Blue Right" msgstr "اليمين أزرق" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "أسÙÙ„" @@ -840,7 +879,11 @@ msgstr "لاستعراض الدليل الإخراج" msgid "Buffer:" msgstr "العازلة :" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1082,7 +1125,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "إغلاق" @@ -1191,7 +1238,11 @@ msgstr "توصيل ويموت 3" msgid "Connect Wiimote 4" msgstr "توصيل ويموت 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "توصيل" @@ -1384,7 +1435,11 @@ msgid "DSP Emulator Engine" msgstr "محرك محاكي الصوت" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulation (سريع)" @@ -1613,7 +1668,11 @@ msgstr "" msgid "Divide" msgstr "انقسام" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" @@ -1642,12 +1701,21 @@ msgstr "إعدادات تحكم الوي" msgid "Dolphin FIFO" msgstr "دولÙين" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "إعدادات تحكم الجيم كيوب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "إعدادات تحكم الجيم كيوب" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1741,9 +1809,15 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Dutch" @@ -1879,15 +1953,22 @@ msgstr "BAT تمكين" msgid "Enable Block Merging" msgstr "تمكين منع الدمج" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "تمكين التخزين المؤقت" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "تمكين الاسرار " @@ -2035,9 +2116,15 @@ msgstr "" msgid "End" msgstr "نهاية" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "English" @@ -2066,6 +2153,7 @@ msgstr "المساواة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "خطأ" @@ -2077,6 +2165,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "خطأ" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "خطأ ÙÙŠ تحميل اللغة المختارة. يتراجع إلى النظام الاÙتراضية." @@ -2511,9 +2605,15 @@ msgstr "إطارات لتسجيل" msgid "Free Look" msgstr "تحكم بكاميرا اللعبة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "French" @@ -2580,7 +2680,11 @@ msgid "Gamecube &Pad Settings" msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " @@ -2603,8 +2707,12 @@ msgstr "" "(إما غير رمز سيئة أو نوع رمز غير مدعومة حتى الآن.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "عام" @@ -2613,9 +2721,15 @@ msgstr "عام" msgid "General Settings" msgstr "الإعدادات العامة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "German" @@ -2637,6 +2751,10 @@ msgid "Greater Than" msgstr "أكبر من" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2745,8 +2863,12 @@ msgid "Hotkey Configuration" msgstr "إعدادات الاختصارات" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "الاختصارات" @@ -2955,7 +3077,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "wad تثبيت" @@ -3034,9 +3160,15 @@ msgstr "تسجيل المل٠غير صالح" msgid "Invalid state" msgstr "غير صالح حالة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italian" @@ -3189,11 +3321,19 @@ msgstr "8 تحميل حالة" msgid "Load State..." msgstr "تحميل حالة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "تحميل قائمة نظام الوي" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "تحميل قائمة نظام الوي" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "تحميل قائمة نظام الوي %d%c" @@ -3273,7 +3413,11 @@ msgstr "MMU سرعة هاك" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "العصا الأيسر" @@ -3304,7 +3448,11 @@ msgid "Memory Byte" msgstr "ذاكرة بايت" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "بطاقة الذاكرة" @@ -3500,7 +3648,11 @@ msgstr "التبويب" msgid "NP Up" msgstr "Ùوق" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3587,7 +3739,11 @@ msgstr "لا يساوي" msgid "Not Set" msgstr "غير مجموعة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "غير متصل" @@ -3648,7 +3804,10 @@ msgstr "Ùقط %d كتل متاحة" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Ùتح" @@ -3779,8 +3938,13 @@ msgstr "باتش" msgid "Paths" msgstr "مسارات" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "وقÙØ©" @@ -3800,8 +3964,13 @@ msgstr "مشهد %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "بدأ اللعبه" @@ -3827,7 +3996,11 @@ msgstr "خيارات التشغيل" msgid "Players" msgstr "لاعبين" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -4038,10 +4211,17 @@ msgstr "تحديث قائمة" msgid "Refresh game list" msgstr "تحديث القائمة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "إزالة" @@ -4060,7 +4240,10 @@ msgid "Render to Main Window" msgstr "تقدم إلى الشاشة الرئيسية" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "إعادة ضبط" @@ -4103,7 +4286,11 @@ msgstr "Ø­Ùظ الحالة" msgid "Safe" msgstr "آمنة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "معدل العينة :" @@ -4185,9 +4372,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" +<<<<<<< HEAD msgstr "EFB Copia a escala" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +msgstr "" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Ùحص %s" @@ -4227,12 +4420,21 @@ msgstr "" msgid "Select" msgstr "حدد" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "اختر مل٠تسجيل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "اختر مل٠تسجيل" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملÙ" @@ -4258,6 +4460,7 @@ msgstr "اختر النواÙØ° العائمة" msgid "Select the file to load" msgstr "حدد المل٠لتحميل" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "حدد Ø­Ùظ الملÙ" @@ -4267,6 +4470,17 @@ msgid "Select the state to load" msgstr "حدد حالة التحميل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "حدد Ø­Ùظ الملÙ" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "حدد حالة التحميل" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "حدد حالة الحÙظ" @@ -4640,9 +4854,15 @@ msgstr "Ùشل إنشاء المخزن المؤقت الصوت : %s" msgid "Space" msgstr "مجال" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spanish" @@ -4686,7 +4906,11 @@ msgstr "" msgid "Standard Controller" msgstr "وحدة تحكم القياسية" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4721,7 +4945,10 @@ msgstr "عصا" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "اغلق اللعبه" @@ -4798,7 +5025,10 @@ msgstr "الجدول الأيمن" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "اخذ لقطه من الشاشه" @@ -4811,12 +5041,23 @@ msgid "Test" msgstr "اختبار" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +<<<<<<< HEAD msgid "Texture" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" msgstr "" +======= +#, fuzzy +msgid "Texture" +msgstr "Texturesتعطيل " + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +#, fuzzy +msgid "Texture Cache" +msgstr "إزالة التخزين المؤقت" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" @@ -5031,12 +5272,19 @@ msgstr "تبديل جميع أنواع السجل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "اللعب بالشاشة كاملة" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "أعلى" @@ -5143,6 +5391,18 @@ msgstr "تلقى رسالة مجهولة مع معر٠: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"مؤشر غير معرو٠%#08x\n" +"مواصلة?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5365,7 +5625,11 @@ msgstr "" msgid "Wii Save Import" msgstr "استيراد Ø­Ùظ الوي" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "ملÙات Ø­Ùظ الوي (*.bin)|*.bin" @@ -5396,7 +5660,11 @@ msgstr "" "أو ربما هو بسبب الخمول وقت مستقطع أو لسبب آخر.\n" "هل تريد إعادة الاتصال على الÙور?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "ويموت متصل" @@ -5428,9 +5696,15 @@ msgstr "نواÙØ° اليمين" msgid "Word Wrap" msgstr "كلمة ختامية" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "العمل" @@ -5661,10 +5935,13 @@ msgstr "أو" #~ msgid "< as Default Profile >" #~ msgstr "< الوضع الاÙتراضي >" +<<<<<<< HEAD #, fuzzy #~ msgid "AOSound" #~ msgstr "&الصوت" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Accurate Texture Cache" #~ msgstr "دقة المظهر السطحي المؤقت" @@ -5702,6 +5979,7 @@ msgstr "أو" #~ "the EFB scale.\n" #~ "ومن الأÙضل Ù„ تعيين نسبة العرض إلى الارتÙاع لتمتد عند استخدامه." +<<<<<<< HEAD #~ msgid "Bad gameini filename" #~ msgstr "Nombre de archivo gameini incorrecto" @@ -5736,6 +6014,8 @@ msgstr "أو" #~ msgid "Config..." #~ msgstr "إعدادات" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Configuration profile" #~ msgstr "التكوين الشخصي" @@ -5836,6 +6116,7 @@ msgstr "أو" #~ msgid "Enable CPU Access" #~ msgstr "CPU Access تمكين" +<<<<<<< HEAD #~ msgid "Enable Copy to EFB" #~ msgstr "Habilitar Copiado al EFB" @@ -5851,12 +6132,15 @@ msgstr "أو" #~ msgid "Enable JIT Dynarec" #~ msgstr "تمكين صÙحات" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Enable OpenCL" #~ msgstr "OpenCL تمكين " #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "تمكين شاشة التوقÙ" +<<<<<<< HEAD #, fuzzy #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" @@ -5930,6 +6214,8 @@ msgstr "أو" #~ msgid "Force Bi/Trilinear Filtering" #~ msgstr "Forzar Filtro Bi/Tri-linear" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Fractional" #~ msgstr "جزئي" @@ -6072,6 +6358,7 @@ msgstr "أو" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "اللازمة لاستعمال الخط القرص اليابانية." +<<<<<<< HEAD #, fuzzy #~ msgid "Run" #~ msgstr "Enter" @@ -6079,6 +6366,8 @@ msgstr "أو" #~ msgid "Running script...\n" #~ msgstr "Ejecutando script...\n" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Scale:" #~ msgstr "النطاق :" @@ -6136,6 +6425,7 @@ msgstr "أو" #~ "عرض إحصاءات مختلÙØ©.\n" #~ "وهذا Ù…Ùيد Ùقط لأغراض التصحيح." +<<<<<<< HEAD #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" @@ -6175,12 +6465,15 @@ msgstr "أو" #~ msgid "Specify an audio plugin" #~ msgstr "حدد الخلÙية مل٠Ùيديو" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Start Renderer in Fullscreen" #~ msgstr "بدء ÙÙŠ كمال ملء الشاشة" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "بدء التقديم ÙÙŠ إطار وضع ملء الشاشة." +<<<<<<< HEAD #~ msgid "The file " #~ msgstr "El archivo " @@ -6201,6 +6494,8 @@ msgstr "أو" #~ "مؤشر غير معرو٠%#08x\n" #~ "مواصلة?" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Use FPS For Limiting" #~ msgstr "لحد عدد الاطارات" diff --git a/Languages/po/ca.po b/Languages/po/ca.po index f78b52303b..bb6dd4f690 100644 --- a/Languages/po/ca.po +++ b/Languages/po/ca.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-08-19 08:36-0500\n" "Last-Translator: Jordi Coma \n" "Language-Team: Catalan \n" @@ -564,9 +568,15 @@ msgstr "Afegeix Pegat" msgid "Add new pane" msgstr "Afegeix un nou panell" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Afegir ..." @@ -634,8 +644,13 @@ msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tots els fitxers GameCube GCM (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tots els Estats (savi, s##\")" @@ -724,7 +739,11 @@ 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à irrecuperable!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -745,7 +764,11 @@ msgstr "Suport d'àudio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error en obrir el dispositiu AO \n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -861,7 +884,11 @@ msgid "Blue Right" msgstr "Blau dret" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Abaix" @@ -894,7 +921,11 @@ msgstr "Examineu el directori de sortida" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1151,7 +1182,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Tancar" @@ -1260,7 +1295,11 @@ msgstr "Connectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Connectar Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Connectant ..." @@ -1451,7 +1490,11 @@ msgid "DSP Emulator Engine" msgstr "Motor d'emulació DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulació DSP HLE (ràpid)" @@ -1682,7 +1725,11 @@ msgstr "" msgid "Divide" msgstr "Divideix" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" @@ -1711,12 +1758,21 @@ msgstr "Configuració de Wiimote emulat" msgid "Dolphin FIFO" msgstr "FIFO Dolphin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Configuració del control GC Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Configuració del control GC Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" @@ -1813,9 +1869,15 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holandès" @@ -1960,15 +2022,22 @@ msgstr "Habilitar les millors tècniques disponibles" msgid "Enable Block Merging" msgstr "Habilitar fusió de Bloc" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Habilitar memòria cau" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Activar Trucs" @@ -2121,9 +2190,15 @@ msgstr "" msgid "End" msgstr "Fi" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Anglès" @@ -2152,6 +2227,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2163,6 +2239,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Error" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2621,9 +2703,15 @@ msgstr "Imatges a Enregistrar" msgid "Free Look" msgstr "Visió lliure" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francès" @@ -2690,7 +2778,11 @@ msgid "Gamecube &Pad Settings" msgstr "Configuració control «&Gamecube»" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" @@ -2713,8 +2805,12 @@ msgstr "" "(Pot ser un codi incorrecte o el tipus de codi encara no està suportat.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2723,9 +2819,15 @@ msgstr "General" msgid "General Settings" msgstr "Configuració General" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Alemany" @@ -2859,8 +2961,12 @@ msgid "Hotkey Configuration" msgstr "Tecla d'accés de configuració" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Tecles d'accés" @@ -3085,7 +3191,11 @@ msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Instal·lant WAD ..." @@ -3167,9 +3277,15 @@ msgstr "Enregistrament de fitxer invàlid" msgid "Invalid state" msgstr "Estat invàlid" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italià" @@ -3327,11 +3443,19 @@ msgstr "Carregar ranura d'estat 8" msgid "Load State..." msgstr "Carregar Estat..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Carregar el menú del sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Carregar el menú del sistema Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar menú del sistema Wii %d%c" @@ -3413,7 +3537,11 @@ msgstr "Modificació de velocitat MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arxius MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Palanca principal" @@ -3444,7 +3572,11 @@ msgid "Memory Byte" msgstr "Byte de memòria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Targeta de memòria" @@ -3644,7 +3776,11 @@ msgstr "NP Tabulador" msgid "NP Up" msgstr "NP Amunt" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3731,7 +3867,11 @@ msgstr "No igual" msgid "Not Set" msgstr "Sense establir" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "No està connectat" @@ -3792,7 +3932,10 @@ msgstr "Només queden %d blocs disponibles" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Obrir" @@ -3923,8 +4066,13 @@ msgstr "Pegats" msgid "Paths" msgstr "Camins" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3944,8 +4092,13 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Executar" @@ -3971,7 +4124,11 @@ msgstr "Opcions de reproducció" msgid "Players" msgstr "Jugadors" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Confirmeu ..." @@ -4183,10 +4340,17 @@ msgstr "Actualitzar llista" msgid "Refresh game list" msgstr "Actualitza la llista de jocs" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Treure" @@ -4205,7 +4369,10 @@ msgid "Render to Main Window" msgstr "Renderitzar a la finestra principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4248,7 +4415,11 @@ msgstr "&Desa l'estat" msgid "Safe" msgstr "Segur" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Freqüència de mostreig:" @@ -4332,7 +4503,11 @@ msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." msgid "Scaled EFB Copy" msgstr "Copia EFB escalada" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Escanejant %s" @@ -4372,12 +4547,21 @@ msgstr "La secció %s no trobada a SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Seleccionar el fitxer de gravació" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Seleccionar el fitxer de gravació" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleccionar un fitxer WAD de Wii per instal·lar" @@ -4402,6 +4586,7 @@ msgstr "Seleccioneu finestres flotants" msgid "Select the file to load" msgstr "Seleccioneu el fitxer a carregar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Seleccioneu el fitxer de partida desada" @@ -4411,6 +4596,17 @@ msgid "Select the state to load" msgstr "Seleccioneu l'estat a carregar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Seleccioneu el fitxer de partida desada" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Seleccioneu l'estat a carregar" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Seleccioneu l'estat a desar" @@ -4793,9 +4989,15 @@ msgstr "Ha fallat la creació del buffer de so: %s" msgid "Space" msgstr "Espai" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Espanyol" @@ -4840,7 +5042,11 @@ msgstr "Palanca quadrada" msgid "Standard Controller" msgstr "Control estàndard" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4875,7 +5081,10 @@ msgstr "Palanca" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Aturar" @@ -4952,7 +5161,10 @@ msgstr "Taula dreta" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Capturar pantalla" @@ -5198,12 +5410,19 @@ msgstr "Activar tots els tipus de registre de Log" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Activar pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Dalt" @@ -5313,6 +5532,18 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Missatge desconegut amb id: %d rebut des del jugador: Expulsant jugador %d!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Punter desconegud %#08x\n" +"Voleu continuar?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5538,7 +5769,11 @@ msgstr "Arrel de la NAND:" msgid "Wii Save Import" msgstr "Importar partida guardada Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -5569,7 +5804,11 @@ msgstr "" "o potser és perquè l'esteu fent servir fora de temps o una altra raó. \n" "Vols tornar a connectar-lo immediatament?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote connectat" @@ -5601,9 +5840,15 @@ msgstr "Finestra dreta" msgid "Word Wrap" msgstr "Envoltant de paraula" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Treballant ..." @@ -6175,6 +6420,7 @@ msgstr "| O" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Iniciar la finestra de renderitzat a pantalla completa." +<<<<<<< HEAD #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6182,6 +6428,8 @@ msgstr "| O" #~ "Punter desconegud %#08x\n" #~ "Voleu continuar?" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Use FPS For Limiting" #~ msgstr "Limitar imatges/s (FPS)" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 1937128a37..b441cc4434 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-15 14:50+0100\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-08-10 20:37+0100\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" "Language: Czech\n" @@ -427,6 +432,10 @@ msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -552,9 +561,15 @@ msgstr "PÅ™idat Záplatu" msgid "Add new pane" msgstr "PÅ™idat nový panel" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "PÅ™idat..." @@ -622,8 +637,13 @@ msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" @@ -652,8 +672,14 @@ msgstr "" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Střídat Äasování Wiimote" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Emulovaný Wiimote" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -710,7 +736,11 @@ msgstr "" 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!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "PomÄ›r Stran:" @@ -731,7 +761,11 @@ msgstr "Backend Zvuku:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Chyba pÅ™i otevírání zařízení zvukového výstupu.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -846,7 +880,11 @@ msgid "Blue Right" msgstr "Modrá vpravo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Dole" @@ -879,7 +917,11 @@ msgstr "Procházet pro výstupní adresář" msgid "Buffer:" msgstr "Vyrovnávací paměť:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1122,7 +1164,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zavřít" @@ -1231,7 +1277,11 @@ msgstr "PÅ™ipojit Wiimote 3" msgid "Connect Wiimote 4" msgstr "PÅ™ipojit Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "PÅ™ipojuji..." @@ -1421,7 +1471,11 @@ msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" @@ -1652,7 +1706,11 @@ msgstr "" msgid "Divide" msgstr "RozdÄ›lit" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" @@ -1681,12 +1739,21 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Nastavení" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1782,9 +1849,15 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "NizozemÅ¡tina" @@ -1927,15 +2000,22 @@ msgstr "Zapnout BAT" msgid "Enable Block Merging" msgstr "Zapnout SluÄování Bloků" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Povolit vyrovnávací paměť" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Povolit Cheaty" @@ -2091,9 +2171,15 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "AngliÄtina" @@ -2122,6 +2208,7 @@ msgstr "Rovná se" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Chyba" @@ -2133,6 +2220,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Chyba" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2589,9 +2682,15 @@ msgstr "Snímky k Nahrání" msgid "Free Look" msgstr "Rozhlížení pomocí myÅ¡i" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "FrancouzÅ¡tina" @@ -2658,7 +2757,11 @@ msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2681,8 +2784,12 @@ msgstr "" "(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Obecné" @@ -2691,9 +2798,15 @@ msgstr "Obecné" msgid "General Settings" msgstr "Obecná Nastavení" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "NÄ›mÄina" @@ -2715,6 +2828,10 @@ msgid "Greater Than" msgstr "VÄ›tší než" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2823,8 +2940,12 @@ msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Klávesové zkratky" @@ -3045,7 +3166,11 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " "nepodporuje." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3127,9 +3252,15 @@ msgstr "Neplatný soubor s nahrávkou" msgid "Invalid state" msgstr "Neplatný stav" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "ItalÅ¡tina" @@ -3287,11 +3418,19 @@ msgstr "Nahrát Slot Stavu 8" msgid "Load State..." msgstr "Nahrát Stav..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Nahrát Systémové Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" @@ -3373,7 +3512,11 @@ msgstr "MMU Hack Rychlosti" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Soubory MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hlavní Stick" @@ -3404,7 +3547,11 @@ msgid "Memory Byte" msgstr "Bajt PamÄ›ti" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Paměťová karta" @@ -3602,7 +3749,11 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3689,7 +3840,11 @@ msgstr "Nerovná se" msgid "Not Set" msgstr "Nenastaven" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "NepÅ™ipojen" @@ -3750,7 +3905,10 @@ msgstr "Pouze bloky %d jsou dostupné" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Otevřít" @@ -3880,8 +4038,13 @@ msgstr "Záplaty" msgid "Paths" msgstr "Cesty" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pozastavit" @@ -3901,8 +4064,13 @@ msgstr "Perspektiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Spustit" @@ -3928,7 +4096,11 @@ msgstr "Možnosti PÅ™ehrávání" msgid "Players" msgstr "HráÄi" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -4139,10 +4311,17 @@ msgstr "Obnovit Seznam" msgid "Refresh game list" msgstr "Obnovit seznam her" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Odstranit" @@ -4161,7 +4340,10 @@ msgid "Render to Main Window" msgstr "Vykreslit do Hlavního okna" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetovat" @@ -4204,7 +4386,11 @@ msgstr "Uložit Sta&v" msgid "Safe" msgstr "BezpeÄná" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" @@ -4288,7 +4474,11 @@ msgstr "Uložený stav filmu %s je poÅ¡kozen, nahrávání filmu je zastaveno... msgid "Scaled EFB Copy" msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Skenuji %s" @@ -4328,12 +4518,21 @@ msgstr "Sekce %s nebyla v SYSCONF nalezena" msgid "Select" msgstr "Vybrat" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Vyberte Soubor s Nahrávkou" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -4359,6 +4558,7 @@ msgstr "Vybrat plovoucí okna" msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" @@ -4368,6 +4568,17 @@ msgid "Select the state to load" msgstr "Vyberte stav k nahrání" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Vyberte soubor s uloženou hrou" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Vyberte stav k nahrání" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -4746,9 +4957,15 @@ msgstr "VytvoÅ™ení vyrovnávací pamÄ›ti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" @@ -4792,7 +5009,11 @@ msgstr "ÄŒtvercový Stick" msgid "Standard Controller" msgstr "Standardní OvladaÄ" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4827,7 +5048,10 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Zastavit" @@ -4904,7 +5128,10 @@ msgstr "Deska vpravo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "VytvoÅ™it Snímek Obrazovky" @@ -5148,12 +5375,19 @@ msgstr "Zapnout VÅ¡echny Typy Záznamů" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "PÅ™epnout na Celou Obrazovku" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "NahoÅ™e" @@ -5262,6 +5496,18 @@ msgstr "PÅ™ijata neznámá zpráva s id : %d" 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!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Neznámý ukazatel %#08x\n" +"PokraÄovat?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5484,7 +5730,11 @@ msgstr "Wii KoÅ™en NAND:" msgid "Wii Save Import" msgstr "Import uložených pozic Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -5515,7 +5765,11 @@ msgstr "" "nebo je to vyprÅ¡ení limitu neaktivity, nebo z jiného důvodu.\n" "Chcete ho hned znovu pÅ™ipojit?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote PÅ™ipojen" @@ -5547,9 +5801,15 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Pracuji..." @@ -6163,6 +6423,7 @@ msgstr "| NEBO" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky." +<<<<<<< HEAD #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6170,6 +6431,8 @@ msgstr "| NEBO" #~ "Neznámý ukazatel %#08x\n" #~ "PokraÄovat?" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Use FPS For Limiting" #~ msgstr "Použít SzS pro Omezení" diff --git a/Languages/po/de.po b/Languages/po/de.po index e33919c10f..8772af3d05 100644 --- a/Languages/po/de.po +++ b/Languages/po/de.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-02-17 01:23+0100\n" "Last-Translator: LucasX \n" "Language-Team: \n" @@ -551,9 +555,15 @@ msgstr "Patch hinzufügen" msgid "Add new pane" msgstr "Neue Palette hinzufügen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Hinzufügen..." @@ -622,8 +632,13 @@ msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM Dateien (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" @@ -706,7 +721,11 @@ 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." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -727,7 +746,11 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisch" @@ -841,7 +864,11 @@ msgid "Blue Right" msgstr "Blau rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Unten" @@ -874,7 +901,11 @@ msgstr "Ausgabeverzeichnis auswählen" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1113,7 +1144,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Schließen" @@ -1223,7 +1258,11 @@ msgstr "Wiimote 3 verbinden" msgid "Connect Wiimote 4" msgstr "Wiimote 4 verbinden" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Verbinden..." @@ -1415,7 +1454,11 @@ msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emulation (schnell)" @@ -1632,7 +1675,11 @@ msgstr "" msgid "Divide" msgstr "Dividieren" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" @@ -1662,12 +1709,21 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Konfiguration" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Konfiguration" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" @@ -1755,9 +1811,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holländisch" @@ -1885,16 +1947,23 @@ msgstr "BAT aktivieren" msgid "Enable Block Merging" msgstr "Blockvereinigung aktivieren" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Cache verwenden" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Cheats aktivieren" @@ -2033,9 +2102,15 @@ msgstr "" msgid "End" msgstr "Ende" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Englisch" @@ -2064,6 +2139,7 @@ msgstr "Gleich" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Fehler" @@ -2075,6 +2151,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Fehler" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2535,9 +2617,15 @@ msgstr "" msgid "Free Look" msgstr "Frei Umsehen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Französisch" @@ -2606,7 +2694,11 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube-&Pad Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Cards (*.raw,*.gcp)" @@ -2630,8 +2722,12 @@ msgstr "" "unterstützt.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Allgemein" @@ -2641,9 +2737,15 @@ msgstr "Allgemein" msgid "General Settings" msgstr "Interface Einstellungen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Deutsch" @@ -2768,8 +2870,12 @@ msgid "Hotkey Configuration" msgstr "Tastenkürzel Einstellungen" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Tastenkürzel" @@ -2984,7 +3090,11 @@ msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "WAD ins Wii-Menü installieren..." @@ -3070,9 +3180,15 @@ msgstr "Ungültige Aufnahmedatei" msgid "Invalid state" msgstr "Ungültiger Status" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italienisch" @@ -3231,12 +3347,20 @@ msgstr "Status aus Slot 8 laden" msgid "Load State..." msgstr "Status laden..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Wii-Menü laden (%d %c)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii-Menü laden (%d %c)" @@ -3321,7 +3445,11 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark Dateien(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Main Stick" @@ -3353,7 +3481,11 @@ msgid "Memory Byte" msgstr "Speicher" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Memory Card" @@ -3540,7 +3672,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Hoch" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3628,7 +3764,11 @@ msgstr "Ungleich" msgid "Not Set" msgstr "Nicht Festgelegt" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Nicht Verbunden" @@ -3689,7 +3829,10 @@ msgstr "Nur %d Blöcke verfügbar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Öffnen" @@ -3821,8 +3964,13 @@ msgstr "Patches" msgid "Paths" msgstr "Pfade" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3843,8 +3991,13 @@ msgstr "Perspektive %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Start" @@ -3871,7 +4024,11 @@ msgstr "Optionen" msgid "Players" msgstr "Spieler" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -4087,10 +4244,17 @@ msgstr "Liste aktualisieren" msgid "Refresh game list" msgstr "Spieleliste aktualisieren" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Entfernen" @@ -4109,7 +4273,10 @@ msgid "Render to Main Window" msgstr "Im Hauptfenster Rendern" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Zurücksetzen" @@ -4152,7 +4319,11 @@ msgstr "S&tatus speichern" msgid "Safe" msgstr "Sicher" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Abtastrate:" @@ -4237,7 +4408,11 @@ msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." msgid "Scaled EFB Copy" msgstr "EFB Scaled Copy" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Suche..." @@ -4277,12 +4452,21 @@ msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" msgid "Select" msgstr "Auswählen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Aufnahmedatei auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Aufnahmedatei auswählen" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Speicherdatei zum Importieren auswählen" @@ -4309,6 +4493,7 @@ msgstr "Wähle unverankerte Fenster" msgid "Select the file to load" msgstr "Datei zum Laden auswählen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Wii-Spielstand auswählen" @@ -4318,6 +4503,17 @@ msgid "Select the state to load" msgstr "Status zum Laden auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Wii-Spielstand auswählen" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Status zum Laden auswählen" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Status zum Speichern auswählen" @@ -4673,9 +4869,15 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s" msgid "Space" msgstr "Leertaste" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spanisch" @@ -4711,7 +4913,11 @@ msgstr "" msgid "Standard Controller" msgstr "Standard-Controller" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4746,7 +4952,10 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" @@ -4819,7 +5028,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Screenshot erstellen" @@ -5065,12 +5277,19 @@ msgstr "Alle umschalten" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Vollbildmodus wechseln" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Oben" @@ -5175,6 +5394,18 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Unbekannte Meldung mit ID %d erhalten von Spieler %d, Spieler herausgeworfen!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Unbekanter Pointer %#08x\n" +"Fortfahren?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5385,7 +5616,11 @@ msgstr "DVD Laufwerk:" msgid "Wii Save Import" msgstr "Wii Spielstand importieren" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii Speicherdateien (*.bin)|*.bin" @@ -5416,7 +5651,11 @@ msgstr "" "oder die Wiimote war zulange inaktiv oder andere Ursachen.\n" "Soll die Wiimote jetzt wieder verbunden werden?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Verbunden" @@ -5449,9 +5688,15 @@ msgstr "Windows Rechts" msgid "Word Wrap" msgstr "Zeilenumbruch" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Arbeite..." diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index ea882faa37..dd44453140 100644 --- a/Languages/po/dolphin-emu.pot +++ b/Languages/po/dolphin-emu.pot @@ -8,7 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -506,9 +510,15 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "" @@ -562,8 +572,13 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -641,7 +656,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -662,7 +681,11 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -770,7 +793,11 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "" @@ -803,7 +830,11 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1025,7 +1056,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1134,7 +1169,11 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "" @@ -1309,7 +1348,11 @@ msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1519,7 +1562,11 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1548,12 +1595,21 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1636,9 +1692,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "" @@ -1761,15 +1823,22 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -1895,9 +1964,15 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "" @@ -1926,6 +2001,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -1937,6 +2013,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2351,9 +2433,15 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "" @@ -2419,7 +2507,11 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2440,8 +2532,12 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2450,9 +2546,15 @@ msgstr "" msgid "General Settings" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "" @@ -2567,8 +2669,12 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "" @@ -2758,7 +2864,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -2835,9 +2945,15 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "" @@ -2988,11 +3104,19 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3069,7 +3193,11 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3100,7 +3228,11 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "" @@ -3277,7 +3409,11 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3364,7 +3500,11 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "" @@ -3425,7 +3565,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "" @@ -3551,8 +3694,13 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3572,8 +3720,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "" @@ -3599,7 +3752,11 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3805,10 +3962,17 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "" @@ -3824,7 +3988,10 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -3867,7 +4034,11 @@ msgstr "" msgid "Safe" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -3951,7 +4122,11 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" @@ -3991,12 +4166,21 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4019,6 +4203,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "" @@ -4028,6 +4213,17 @@ msgid "Select the state to load" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4361,9 +4557,15 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "" @@ -4399,7 +4601,11 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4434,7 +4640,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4506,7 +4715,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "" @@ -4718,12 +4930,19 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "" @@ -4825,6 +5044,16 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5026,7 +5255,11 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5053,7 +5286,11 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "" @@ -5085,9 +5322,15 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "" diff --git a/Languages/po/el.po b/Languages/po/el.po index 81814c796e..30b56b762f 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-09-13 17:28+0200\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" "Language: Greek\n" @@ -426,13 +431,21 @@ msgstr "Επιτάχυνση" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Accuracy:" +<<<<<<< HEAD msgstr "ΑκÏίβεια:" +======= +msgstr "" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "ΑκÏιβής VBeam εξομοίωση" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -560,9 +573,15 @@ msgstr "ΠÏοσθήκη Patch" msgid "Add new pane" msgstr "ΠÏοσθήκη νέου pane" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "ΠÏοσθήκη..." @@ -618,8 +637,13 @@ msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" @@ -648,8 +672,14 @@ msgstr "" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Εναλλακτικός ΧÏονισμός Wiimote" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Εξομοιωμένο Wiimote" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -708,7 +738,11 @@ msgstr "" "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " "πάντα!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -729,7 +763,11 @@ msgstr "Backend Ήχου:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Αυτόματα" @@ -764,11 +802,14 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +<<<<<<< HEAD "ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" "Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα στις " "υφές.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" @@ -846,7 +887,11 @@ msgid "Blue Right" msgstr "Δεξί Μπλε" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Βάση" @@ -879,7 +924,11 @@ msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1082,7 +1131,11 @@ msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάÏτα μνήμης:" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1124,7 +1177,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Κλείσιμο" @@ -1233,7 +1290,11 @@ msgstr "ΣÏνδεση Wiimote 3" msgid "Connect Wiimote 4" msgstr "ΣÏνδεση Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Γίνεται ΣÏνδεση..." @@ -1352,7 +1413,11 @@ msgstr "ΔημιουÏγία νέας οπτικής" msgid "Created by KDE-Look.org" msgstr "ΔημιουÏγήθηκε από KDE-Look.org" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1429,7 +1494,11 @@ msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" @@ -1660,7 +1729,11 @@ msgstr "" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" @@ -1689,12 +1762,21 @@ msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Ρυθμίσεις Dolphin GCPad" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1706,7 +1788,11 @@ msgstr "Ρυθμίσεις Dolphin Wiimote" msgid "Dolphin at &Google Code" msgstr "Dolphin στο &Google Code" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1714,7 +1800,11 @@ msgstr "" "Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εÏÏεση " "αÏχείων..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1792,9 +1882,15 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Ολλανδικά" @@ -1939,6 +2035,7 @@ msgstr "ΕνεÏγοποίηση BAT" msgid "Enable Block Merging" msgstr "ΕνεÏγοποίηση Block Merging" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" @@ -1948,6 +2045,14 @@ msgid "Enable Cache" msgstr "ΕνεÏγοποίηση Cache" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#, fuzzy +msgid "Enable Cache" +msgstr "ΕνεÏγοποίηση Cheat" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "ΕνεÏγοποίηση Cheat" @@ -2048,7 +2153,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2104,9 +2213,15 @@ msgstr "" msgid "End" msgstr "Τέλος" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Αγγλικά" @@ -2135,6 +2250,7 @@ msgstr "Ίσο" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Σφάλμα" @@ -2146,11 +2262,18 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Σφάλμα" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " "συστήματος." +<<<<<<< HEAD #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format @@ -2158,6 +2281,8 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format @@ -2431,11 +2556,19 @@ msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 msgid "Fast" +<<<<<<< HEAD msgstr "ΓÏήγοÏη" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Fast Mipmaps" msgstr "ΓÏήγοÏα Mipmaps" +======= +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." @@ -2605,9 +2738,15 @@ msgstr "ΚαÏέ ΠÏος ΕγγÏαφή" msgid "Free Look" msgstr "ΕλεÏθεÏη Ματιά" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Γαλλικά" @@ -2674,7 +2813,11 @@ msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -2697,8 +2840,12 @@ msgstr "" "(ή είναι ένας κακός κωδικός ή ο Ï„Ïπος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζεται.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Γενικά" @@ -2707,9 +2854,15 @@ msgstr "Γενικά" msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "ΓεÏμανικά" @@ -2733,6 +2886,10 @@ msgid "Greater Than" msgstr "ΜεγαλÏτεÏο από" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2843,8 +3000,12 @@ msgid "Hotkey Configuration" msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" @@ -2925,7 +3086,11 @@ msgstr "" "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = " "Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +>>>>>>> Update translation files for recent changes in the code. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." @@ -3071,7 +3236,11 @@ msgstr "" "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει " "ακόμα." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3153,9 +3322,15 @@ msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" msgid "Invalid state" msgstr "Μη έγκυÏο κατάσταση" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Ιταλικά" @@ -3313,11 +3488,19 @@ msgstr "ΦόÏτωση Σημείου Αποθήκευσης 8" msgid "Load State..." msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii %d%c" @@ -3399,7 +3582,11 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ΚÏÏιο Stick" @@ -3430,7 +3617,11 @@ msgid "Memory Byte" msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "ΚάÏτα Μνήμης" @@ -3630,7 +3821,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3717,7 +3912,11 @@ msgstr "Όχι ίσο" msgid "Not Set" msgstr "Μη ΟÏισμένο" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -3778,7 +3977,10 @@ msgstr "Διαθέσιμα μόνο %d μπλοκ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Άνοιγμα" @@ -3910,8 +4112,13 @@ msgstr "Patches" msgid "Paths" msgstr "Φάκελοι" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "ΠαÏση" @@ -3931,8 +4138,13 @@ msgstr "Οπτική %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "ΑναπαÏαγωγή" @@ -3958,7 +4170,11 @@ msgstr "Ρυθμίσεις ΑναπαÏαγωγής" msgid "Players" msgstr "Παίχτες" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -4169,10 +4385,17 @@ msgstr "Ανανέωση Λίστας" msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "ΑφαίÏεση" @@ -4191,7 +4414,10 @@ msgid "Render to Main Window" msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Επανεκκίνηση" @@ -4232,9 +4458,15 @@ msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Safe" +<<<<<<< HEAD msgstr "Ασφαλής" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" @@ -4318,7 +4550,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" +<<<<<<< HEAD msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" +======= +msgstr "" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format @@ -4360,12 +4596,21 @@ msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" msgid "Select" msgstr "Επιλογή" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" @@ -4391,6 +4636,7 @@ msgstr "Επιλέξτε αιωÏοÏμενα παÏάθυÏα" msgid "Select the file to load" msgstr "Επιλέξτε το αÏχείο για φόÏτωση" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" @@ -4400,6 +4646,17 @@ msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Επιλέξτε αÏχείο αποθήκευσης" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Επιλέξτε το σημείο φόÏτωσης" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -4475,7 +4732,11 @@ msgstr "ΔιαχωÏιστής" msgid "Serbian" msgstr "ΣεÏβικά" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4704,6 +4965,7 @@ msgid "Skip EFB Access from CPU" msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +<<<<<<< HEAD msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4729,9 +4991,29 @@ msgstr "" "ΜεÏικές φοÏές μποÏεί να βελτιώσει την οπτική ποιότητα.\n" "Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της cache " "υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" +======= +msgid "" +"Skip the destination alpha pass used in many games for various graphical " +"effects.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"ΠαÏάλειψη του destination alpha pass που χÏησιμοποιείται από πολλά παιχνίδια " +"σε διάφοÏα γÏαφικά εφέ.\n" +>>>>>>> Update translation files for recent changes in the code. "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +msgid "" +"Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" +"Sometimes also increases visual quality.\n" +"If you're experiencing any issues, try raising texture cache accuracy or " +"disable this option.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4785,9 +5067,15 @@ msgstr "Αποτυχία δημιουÏγίας buffer ήχου: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Ισπανικά" @@ -4832,7 +5120,11 @@ msgstr "ΤετÏάγωνο Stick" msgid "Standard Controller" msgstr "Τυπικός Controller" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4867,7 +5159,10 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Διακοπή" @@ -4880,11 +5175,14 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +<<<<<<< HEAD "Αποθήκευση των EFB αντιγÏάφων σε GPU αντικείμενα υφών.\n" "Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα " "παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" @@ -4944,7 +5242,10 @@ msgstr "Δεξί Table" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "ΔημιουÏγία Στιγμιότυπου" @@ -4957,12 +5258,23 @@ msgid "Test" msgstr "Τέστ" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +<<<<<<< HEAD msgid "Texture" msgstr "Υφή" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" msgstr "Cache Υφών" +======= +#, fuzzy +msgid "Texture" +msgstr "Εξαγωγή Υφών" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +#, fuzzy +msgid "Texture Cache" +msgstr "ΚαθαÏισμός Cache" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" @@ -5034,10 +5346,13 @@ msgid "" "\n" "If unsure, use the second-fastest value from the right." msgstr "" +<<<<<<< HEAD "Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να " "χάσει ανανεώσεις των υφών από την RAM.\n" "\n" "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από δεξιά." +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" @@ -5199,12 +5514,19 @@ msgstr "Εναλλαγή Όλων ΤÏπων ΚαταγÏαφής " #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Εναλλαγή ΠλήÏους Οθόνης" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "ΚοÏυφή" @@ -5314,6 +5636,18 @@ msgstr "Ελήφθη άγνωστο μήνυμα με id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ελήφθη άγνωστο μήνυμα με:%d από τον παίκτη:%d ΑποσÏνδεση παίκτη!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Άγνωστος δείκτης %#08x\n" +"Συνέχεια;" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5540,7 +5874,11 @@ msgstr "Wii NAND Ρίζα:" msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -5571,7 +5909,11 @@ msgstr "" "ή πιθανόν να οφείλεται σε χÏόνο αδÏάνειας ή κάποιον άλλο λόγο.\n" "Θέλετε να γίνει άμεση επανασÏνδεση;" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -5603,9 +5945,15 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Σε εÏγασία..." @@ -5817,6 +6165,7 @@ msgstr "zNear ΔιόÏθωση: " msgid "| OR" msgstr "| OR" +<<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "" #~ "Δεν μποÏεί να γίνει εγγÏαφή ταινιών σε λειτουÏγία μόνο για ανάγνωση." @@ -5827,3 +6176,7 @@ msgstr "| OR" #~ msgstr "" #~ "Άγνωστος δείκτης %#08x\n" #~ "Συνέχεια;" +======= +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "ΑπενεÏγοποίηση Ηχείου Wiimote" +>>>>>>> Update translation files for recent changes in the code. diff --git a/Languages/po/en.po b/Languages/po/en.po index f08b1e1cdf..2563333e4e 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -505,9 +509,15 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "" @@ -561,8 +571,13 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -640,7 +655,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -661,7 +680,11 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -769,7 +792,11 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "" @@ -802,7 +829,11 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1024,7 +1055,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1133,7 +1168,11 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "" @@ -1308,7 +1347,11 @@ msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1518,7 +1561,11 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1547,12 +1594,21 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1635,9 +1691,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "" @@ -1760,15 +1822,22 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -1894,9 +1963,15 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "" @@ -1925,6 +2000,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -1936,6 +2012,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2350,9 +2432,15 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "" @@ -2418,7 +2506,11 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2439,8 +2531,12 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2449,9 +2545,15 @@ msgstr "" msgid "General Settings" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "" @@ -2566,8 +2668,12 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "" @@ -2757,7 +2863,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -2834,9 +2944,15 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "" @@ -2987,11 +3103,19 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3068,7 +3192,11 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3099,7 +3227,11 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "" @@ -3276,7 +3408,11 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3363,7 +3499,11 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "" @@ -3424,7 +3564,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "" @@ -3550,8 +3693,13 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3571,8 +3719,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "" @@ -3598,7 +3751,11 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3804,10 +3961,17 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "" @@ -3823,7 +3987,10 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -3866,7 +4033,11 @@ msgstr "" msgid "Safe" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -3950,7 +4121,11 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" @@ -3990,12 +4165,21 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4018,6 +4202,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "" @@ -4027,6 +4212,17 @@ msgid "Select the state to load" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4360,9 +4556,15 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "" @@ -4398,7 +4600,11 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4433,7 +4639,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4505,7 +4714,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "" @@ -4717,12 +4929,19 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "" @@ -4824,6 +5043,16 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5025,7 +5254,11 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5052,7 +5285,11 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "" @@ -5084,9 +5321,15 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "" diff --git a/Languages/po/es.po b/Languages/po/es.po index f989ce37bf..10b8c05209 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-09 00:28+0100\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-08-11 15:30+0100\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" "Language: Spanish\n" @@ -431,6 +436,10 @@ msgid "Accurate VBeam emulation" msgstr "Emulación de VBeam Precisa" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -559,9 +568,15 @@ msgstr "Añadir Parche" msgid "Add new pane" msgstr "Añadir nueva ventana" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Añadir..." @@ -630,8 +645,13 @@ msgstr "Todas las imágenes GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos los archivos Gamecube GCM (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" @@ -660,8 +680,14 @@ msgstr "" "Si está inseguro, déjelo sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Sincronización alternativa del Wiimote" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Wiimote emulado" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -718,7 +744,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "¿Seguro que quiere borrar este archivo? ¡Desaparecerá para siempre!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -739,7 +769,11 @@ msgstr "Motor de Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error al abrir dispositivo AO.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -855,7 +889,11 @@ msgid "Blue Right" msgstr "Azul derecha" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Inferior" @@ -888,7 +926,11 @@ msgstr "Busca un directorio de salida" msgid "Buffer:" msgstr "Búfer" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1095,7 +1137,11 @@ msgstr "Escoge un archivo a abrir" msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1137,7 +1183,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Cerrar" @@ -1246,7 +1296,11 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Conectando..." @@ -1364,7 +1418,11 @@ msgstr "Crear nueva perspectiva" msgid "Created by KDE-Look.org" msgstr "Creado por KDE-Look.org" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1438,7 +1496,11 @@ msgid "DSP Emulator Engine" msgstr "Motor de emulación DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulación DSP HLE (rápido)" @@ -1669,7 +1731,11 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" @@ -1698,12 +1764,21 @@ msgstr "Configuración de wiimote emulado de Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Configuración de GCPad Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Configuración de GCPad Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" @@ -1715,7 +1790,11 @@ msgstr "Configuración de wiimote de Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin en &Google Code" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1723,7 +1802,11 @@ msgstr "" "Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para " "buscar..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1799,9 +1882,15 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holandés" @@ -1940,15 +2029,22 @@ msgstr "Habilitar BAT" msgid "Enable Block Merging" msgstr "Habilitar asociación de bloques" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Habilitar caché" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Habilitar trucos" @@ -2048,7 +2144,11 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2103,9 +2203,15 @@ msgstr "" msgid "End" msgstr "Fin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Inglés" @@ -2134,6 +2240,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2145,6 +2252,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Error" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2153,6 +2266,7 @@ msgstr "" #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format msgid "" +<<<<<<< HEAD "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" @@ -2160,6 +2274,8 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" +======= +>>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2603,9 +2719,15 @@ msgstr "Frames a grabar" msgid "Free Look" msgstr "Cámara libre" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francés" @@ -2672,7 +2794,11 @@ msgid "Gamecube &Pad Settings" msgstr "&Configuración del mando Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" @@ -2695,8 +2821,12 @@ msgstr "" "(puede ser un código incorrecto o su tipo no es soportado todavía.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2705,9 +2835,15 @@ msgstr "General" msgid "General Settings" msgstr "Ajustes generales" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Alemán" @@ -2730,6 +2866,10 @@ msgid "Greater Than" msgstr "Mayor que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2739,10 +2879,17 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +<<<<<<< HEAD "Mejora bastante la calidad de las texturas generadas usando los efectos de " "renderización para la textura.\n" "Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" "Reduce ligeramente el desempeño y posiblemente cause fallos (altamente " +======= +"Aumenta bastante la calidad de las texturas generadas utilizando los efectos " +"de renderización para la textura.\n" +"Aumentar la resolución interna va a mejorar el efecto de esta definición.\n" +"Diminuye ligeramente el desempenño y probablemente provoca fallos (aunque es " +>>>>>>> Update translation files for recent changes in the code. "improbable).\n" "\n" "Si está inseguro, déjelo marcado." @@ -2840,8 +2987,12 @@ msgid "Hotkey Configuration" msgstr "Configuración de atajos" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Atajos" @@ -2922,7 +3073,11 @@ msgstr "" "Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF = " "Rápido)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +>>>>>>> Update translation files for recent changes in the code. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." @@ -3066,7 +3221,11 @@ msgstr "" "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " "todavía." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3148,9 +3307,15 @@ msgstr "Archivo de grabación no válido" msgid "Invalid state" msgstr "Estado no válido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3308,11 +3473,19 @@ msgstr "&Cargar estado 8" msgid "Load State..." msgstr "Cargar estado..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Cargar Menú de sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Cargar Menú de sistema Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Cargar Menú de sistema Wii %d %c" @@ -3394,7 +3567,11 @@ msgstr "Hack de velocidad MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Archivos MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" @@ -3425,7 +3602,11 @@ msgid "Memory Byte" msgstr "Byte de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Tarjeta de memoria" @@ -3523,9 +3704,12 @@ msgid "" msgstr "" "Mueva el puntero del ratón sobre una opción para obtener una descripción " "detallada.\n" +<<<<<<< HEAD "\n" "\n" "\n" +======= +>>>>>>> Update translation files for recent changes in the code. "\n" "\n" "\n" @@ -3626,7 +3810,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Arriba" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3713,7 +3901,11 @@ msgstr "No Igual" msgid "Not Set" msgstr "No Definido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Sin conectar" @@ -3774,7 +3966,10 @@ msgstr "Solo %d bloques disponibles" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Abrir" @@ -3906,8 +4101,13 @@ msgstr "Parches" msgid "Paths" msgstr "Directorios" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3927,8 +4127,13 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Reproducir" @@ -3954,7 +4159,11 @@ msgstr "Opciones de reproducción" msgid "Players" msgstr "Jugadores" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Confirme, por favor..." @@ -4165,10 +4374,17 @@ msgstr "Actualizar lista" msgid "Refresh game list" msgstr "Actualizar lista de juegos" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Eliminar" @@ -4187,7 +4403,10 @@ msgid "Render to Main Window" msgstr "Renderizar a ventana principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4230,7 +4449,11 @@ msgstr "Guardar estado" msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Frecuencia del sonido:" @@ -4356,12 +4579,21 @@ msgstr "No se ha encontrado la sección %s en SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Seleccionar archivo de grabación" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Seleccionar archivo de grabación" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" @@ -4387,6 +4619,7 @@ msgstr "Selecciona las ventanas flotantes" msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Selecciona el archivo de guardado" @@ -4396,6 +4629,17 @@ msgid "Select the state to load" msgstr "Selecciona el estado para cargar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Selecciona el archivo de guardado" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Selecciona el estado para cargar" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Selecciona el estado para guardar" @@ -4470,7 +4714,11 @@ msgstr "Separador" msgid "Serbian" msgstr "Serbio" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4699,6 +4947,7 @@ msgid "Skip EFB Access from CPU" msgstr "Saltar el acceso al EFB desde la CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +<<<<<<< HEAD msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4719,6 +4968,28 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +======= +msgid "" +"Skip the destination alpha pass 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" +"\n" +"Si está inseguro, déjelo sin marcar." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +msgid "" +"Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" +"Sometimes also increases visual quality.\n" +"If you're experiencing any issues, try raising texture cache accuracy or " +"disable this option.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +>>>>>>> Update translation files for recent changes in the code. "Aumenta ligeramente las copias de EFB a la RAM al sacrificar exactitud de " "emulación.\n" "A veces también aumenta la calidad visual.\n" @@ -4779,9 +5050,15 @@ msgstr "Falló la creación del búfer de sonido: %s" msgid "Space" msgstr "Espacio" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Español" @@ -4825,7 +5102,11 @@ msgstr "Stick cuadrado" msgid "Standard Controller" msgstr "Control estándar" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4860,7 +5141,10 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Detener" @@ -4940,7 +5224,10 @@ msgstr "Tabla derecha" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Captura de pantalla" @@ -5191,12 +5478,19 @@ msgstr "Alternar todos los tipos de registro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Cambiar a pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Superior" @@ -5303,6 +5597,17 @@ msgstr "Se recibió un mensaje desconocido de id: %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" +<<<<<<< HEAD +======= +msgstr "" +"Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" + +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +>>>>>>> Update translation files for recent changes in the code. msgstr "" "Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" @@ -5532,7 +5837,11 @@ msgstr "Raíz de la NAND de Wii:" msgid "Wii Save Import" msgstr "Importar guardado de Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -5563,7 +5872,11 @@ msgstr "" "o mucho tiempo de espera, o alguna otra razón.\n" "¿Desea reconectarlo inmediatamente?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote conectado" @@ -5595,9 +5908,15 @@ msgstr "Windows Derecha" msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Trabajando..." diff --git a/Languages/po/fr.po b/Languages/po/fr.po index fcd5a4244f..56cb368da8 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-28 23:40+0100\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-08-10 17:42+0100\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: Pascal\n" "Language-Team: \n" "Language: French\n" @@ -429,6 +434,10 @@ msgid "Accurate VBeam emulation" msgstr "Emulation fidèle VBeam" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -556,9 +565,15 @@ msgstr "Ajouter un patch" msgid "Add new pane" msgstr "Ajouter un nouveau panneau" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Ajouter..." @@ -627,8 +642,13 @@ msgstr "Toutes les images GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" @@ -657,8 +677,14 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Délai alternatif de communication avec la Wiimote" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Wiimote émulée" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -718,7 +744,11 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé " "définitivement !" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -739,7 +769,11 @@ msgstr "Moteur audio :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -858,7 +892,11 @@ msgid "Blue Right" msgstr "Bleu Droite" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Bas" @@ -891,7 +929,11 @@ msgstr "Parcourir un dossier de destination" msgid "Buffer:" msgstr "Buffer :" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1099,7 +1141,11 @@ msgstr "Choisir un fichier à ouvrir" msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1141,7 +1187,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fermer" @@ -1250,7 +1300,11 @@ msgstr "Connecter la 3è Wiimote" msgid "Connect Wiimote 4" msgstr "Connecter la 4è Wiimote" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Connexion..." @@ -1369,7 +1423,11 @@ msgstr "Créer une nouvelle perspective" msgid "Created by KDE-Look.org" msgstr "Créé par KDE-Look.org" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1443,7 +1501,11 @@ msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" @@ -1674,7 +1736,11 @@ msgstr "" msgid "Divide" msgstr "Diviser" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" @@ -1703,12 +1769,21 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Configuration de la manette GC pour Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Configuration de la manette GC pour Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -1720,7 +1795,11 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1728,7 +1807,11 @@ msgstr "" "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des " "fichiers..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1805,9 +1888,15 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Néerlandais" @@ -1951,15 +2040,22 @@ msgstr "Activer BAT" msgid "Enable Block Merging" msgstr "Activer l'assemblage de blocs" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activer le cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Activer les Cheats" @@ -2060,7 +2156,11 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2116,9 +2216,15 @@ msgstr "" msgid "End" msgstr "Fin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Anglais" @@ -2147,6 +2253,7 @@ msgstr "Egal" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erreur" @@ -2158,6 +2265,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Erreur" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2167,6 +2280,7 @@ msgstr "" #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format msgid "" +<<<<<<< HEAD "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" @@ -2174,6 +2288,8 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" +======= +>>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2619,9 +2735,15 @@ msgstr "Images à enregistrer :" msgid "Free Look" msgstr "Vue libre" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Français" @@ -2688,7 +2810,11 @@ msgid "Gamecube &Pad Settings" msgstr "Paramètres de la &manette GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" @@ -2711,8 +2837,12 @@ msgstr "" "(ou c'est un mauvais code, ou il n'est pas encore pris en charge.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Général" @@ -2721,9 +2851,15 @@ msgstr "Général" msgid "General Settings" msgstr "Paramètres généraux" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Allemand" @@ -2746,6 +2882,10 @@ msgid "Greater Than" msgstr "Plus grand que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2759,8 +2899,11 @@ msgstr "" "effets de rendu vers texture.\n" "Le fait d'augmenter la résolution interne améliore l'impact de cette " "option.\n" +<<<<<<< HEAD "Baisse légèrement les performances et peut provoquer quelques pépins (mais " "peu probable).\n" +======= +>>>>>>> Update translation files for recent changes in the code. "\n" "Dans le doute, cochez cette case." @@ -2859,8 +3002,12 @@ msgid "Hotkey Configuration" msgstr "Configuration des raccourcis clavier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Raccourcis clavier" @@ -2941,7 +3088,11 @@ msgstr "" "Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = " "Compatible, OFF = Vitesse)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +>>>>>>> Update translation files for recent changes in the code. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." @@ -3085,7 +3236,11 @@ msgstr "" "InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas " "encore en charge." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Installation du WAD..." @@ -3167,9 +3322,15 @@ msgstr "Fichier d'enregitrement non valide" msgid "Invalid state" msgstr "Etat non valide" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italien" @@ -3327,11 +3488,19 @@ msgstr "Charger l'état du Slot 8" msgid "Load State..." msgstr "Charger un état..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Charger le Menu Système Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Charger le Menu Système Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" @@ -3415,7 +3584,11 @@ msgstr "Hack de vitesse pour le MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Fichiers MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" @@ -3446,7 +3619,11 @@ msgid "Memory Byte" msgstr "Octet mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Carte mémoire" @@ -3647,7 +3824,11 @@ msgstr "NP Tabulation" msgid "NP Up" msgstr "NP Haut" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3734,7 +3915,11 @@ msgstr "Différent" msgid "Not Set" msgstr "Non défini" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Non connectée" @@ -3795,7 +3980,10 @@ msgstr "%d blocs disponibles seulement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Ouvrir" @@ -3927,8 +4115,13 @@ msgstr "Patchs" msgid "Paths" msgstr "Chemins" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3948,8 +4141,13 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Démarrer" @@ -3975,7 +4173,11 @@ msgstr "Options de lecture" msgid "Players" msgstr "Joueurs" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4187,10 +4389,17 @@ msgstr "Rafraîchir la liste" msgid "Refresh game list" msgstr "Rafraîchir la liste des jeux" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Retirer" @@ -4209,7 +4418,10 @@ msgid "Render to Main Window" msgstr "Rendu dans la fenêtre principale" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4252,7 +4464,11 @@ msgstr "Sau&vegarder l'état" msgid "Safe" msgstr "Sûr " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Echantillonnage :" @@ -4378,12 +4594,21 @@ msgstr "La section %s n'a pas été trouvée dans SYSCONF" msgid "Select" msgstr "Select" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Sélectionner le fichier d'enregistrement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Sélectionner le fichier d'enregistrement" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -4409,6 +4634,7 @@ msgstr "Sélectionner les fenêtres flottantes" msgid "Select the file to load" msgstr "Sélectionner le fichier à charger" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" @@ -4418,6 +4644,17 @@ msgid "Select the state to load" msgstr "Sélectionner l'état à charger" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Sélectionner le fichier à enregistrer" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Sélectionner l'état à charger" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -4493,7 +4730,11 @@ msgstr "Séparateur" msgid "Serbian" msgstr "Serbe" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4722,6 +4963,7 @@ msgid "Skip EFB Access from CPU" msgstr "Ignorer l'accès à l'EFB depuis le CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +<<<<<<< HEAD msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4742,6 +4984,28 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +======= +msgid "" +"Skip the destination alpha pass 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" +"\n" +"Dans le doute, décochez cette case." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +msgid "" +"Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" +"Sometimes also increases visual quality.\n" +"If you're experiencing any issues, try raising texture cache accuracy or " +"disable this option.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +>>>>>>> Update translation files for recent changes in the code. "Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision " "de l'émulation.\n" "Améliore parfois la qualité visuelle.\n" @@ -4803,9 +5067,15 @@ msgstr "Echec de la création du buffer audio : %s" msgid "Space" msgstr "Espace" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Espagnol" @@ -4849,7 +5119,11 @@ msgstr "Stick carré" msgid "Standard Controller" msgstr "Contrôleur standard" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4884,7 +5158,10 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arrêter" @@ -4961,7 +5238,10 @@ msgstr "Table Droite" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Capture d'écran" @@ -5211,12 +5491,19 @@ msgstr "Activer tous les types de journaux" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Activer le plein écran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Haut" @@ -5323,6 +5610,17 @@ msgstr "Reception d'un message inconnu avec l'ID : %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" +<<<<<<< HEAD +======= +msgstr "" +"Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" + +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +>>>>>>> Update translation files for recent changes in the code. msgstr "" "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" @@ -5551,7 +5849,11 @@ msgstr "Racine de la NAND (Wii) :" msgid "Wii Save Import" msgstr "Importer une sauvegarde Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -5582,7 +5884,11 @@ msgstr "" "ou bien c'est dû à un temps d'attente trop long, ou encore autre chose.\n" "Voulez-vous la reconnecter tout de suite ?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote connectée" @@ -5614,9 +5920,15 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Travail..." diff --git a/Languages/po/he.po b/Languages/po/he.po index 498fb36d91..857ec27567 100644 --- a/Languages/po/he.po +++ b/Languages/po/he.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-01-08 20:50+0200\n" "Last-Translator: Ely \n" "Language-Team: \n" @@ -506,9 +510,15 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "" @@ -562,8 +572,13 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -641,7 +656,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -662,7 +681,11 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -771,7 +794,11 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "" @@ -804,7 +831,11 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1026,7 +1057,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1135,7 +1170,11 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "" @@ -1310,7 +1349,11 @@ msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1520,7 +1563,11 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1549,13 +1596,22 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Dolphin GCPad Configuration" msgstr "הגדרות גרפיקה" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1638,9 +1694,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "" @@ -1763,15 +1825,22 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -1897,9 +1966,15 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "" @@ -1928,6 +2003,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -1939,6 +2015,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2353,9 +2435,15 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "" @@ -2424,7 +2512,11 @@ msgid "Gamecube &Pad Settings" msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2445,8 +2537,12 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2456,9 +2552,15 @@ msgstr "" msgid "General Settings" msgstr "הגדרות קול" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "" @@ -2573,8 +2675,12 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "" @@ -2764,7 +2870,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -2841,9 +2951,15 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "" @@ -2994,11 +3110,19 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3076,7 +3200,11 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3107,7 +3235,11 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "" @@ -3284,7 +3416,11 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3371,7 +3507,11 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "" @@ -3432,7 +3572,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "" @@ -3558,8 +3701,13 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3579,8 +3727,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "" @@ -3606,7 +3759,11 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3812,10 +3969,17 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "" @@ -3831,7 +3995,10 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -3874,7 +4041,11 @@ msgstr "" msgid "Safe" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -3958,7 +4129,11 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" @@ -3998,12 +4173,21 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4026,6 +4210,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "" @@ -4035,6 +4220,17 @@ msgid "Select the state to load" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4370,9 +4566,15 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "" @@ -4408,7 +4610,11 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4443,7 +4649,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4515,7 +4724,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "" @@ -4727,12 +4939,19 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "" @@ -4834,6 +5053,16 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5036,7 +5265,11 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5063,7 +5296,11 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "" @@ -5095,9 +5332,15 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index d39eec28db..2a61a06212 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:41-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-06-04 14:29+0100\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: Delirious \n" "Language-Team: Delirious \n" "Language: Hungarian\n" @@ -74,7 +79,11 @@ msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s tisztítása sikertelen. Valószínűleg a képfájl sérült." #: Source/Core/Core/Src/HW/GCMemcard.cpp:97 +<<<<<<< HEAD #, c-format +======= +#, fuzzy, c-format +>>>>>>> Update translation files for recent changes in the code. msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" @@ -83,7 +92,11 @@ msgstr "" " A kártya fájlmérete nem megfelelÅ‘ (0x%x bájt)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:112 +<<<<<<< HEAD #, c-format +======= +#, fuzzy, c-format +>>>>>>> Update translation files for recent changes in the code. msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" @@ -429,6 +442,10 @@ msgid "Accurate VBeam emulation" msgstr "Pontos VBeam emuláció" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -554,9 +571,15 @@ msgstr "Patch hozzáadása" msgid "Add new pane" msgstr "Új mezÅ‘ hozzáadása" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Hozzáadás..." @@ -626,8 +649,13 @@ msgstr "Minden GC/Wii képfájl (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Minden Gamecube GCM fájl (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" @@ -656,8 +684,14 @@ msgstr "" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Változtatható Wiimote idÅ‘zítés" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Emulált Wiimote" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -715,7 +749,11 @@ msgstr "" 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!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -736,7 +774,11 @@ msgstr "Hang feldolgozó:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatikus" @@ -853,7 +895,11 @@ msgid "Blue Right" msgstr "Kék jobbra" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Lent" @@ -886,7 +932,11 @@ msgstr "Kimeneti könyvtár tallózása" msgid "Buffer:" msgstr "Puffer:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1132,7 +1182,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Bezárás" @@ -1241,7 +1295,11 @@ msgstr "Wiimote 3 csatlakoztatása" msgid "Connect Wiimote 4" msgstr "Wiimote 4 csatlakoztatása" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Csatlakozás..." @@ -1431,7 +1489,11 @@ msgid "DSP Emulator Engine" msgstr "DSP emulátor motor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emuláció (gyors)" @@ -1664,7 +1726,11 @@ msgstr "" msgid "Divide" msgstr "Megosztás" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Le akarod állítani az éppen működÅ‘ emulációt?" @@ -1693,12 +1759,21 @@ msgstr "Dolphin emulált Wiimote beállítások" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad beállítások" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad beállítások" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" @@ -1795,9 +1870,15 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holland" @@ -1941,15 +2022,22 @@ msgstr "BAT használata" msgid "Enable Block Merging" msgstr "Blokk csatlakozás használata" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Gyorsítótár használata" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Csalások használata" @@ -2105,9 +2193,15 @@ msgstr "" msgid "End" msgstr "Vége" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Angol" @@ -2136,6 +2230,7 @@ msgstr "EgyenlÅ‘" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hiba" @@ -2147,6 +2242,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Hiba" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2606,9 +2707,15 @@ msgstr "RögzítendÅ‘ képkockák" msgid "Free Look" msgstr "Szabad nézet" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francia" @@ -2675,7 +2782,11 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube &irányító beállítások" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" @@ -2698,8 +2809,12 @@ msgstr "" "(vagy rossz a kód vagy a kód típus még nem támogatott.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Ãltalános" @@ -2708,9 +2823,15 @@ msgstr "Ãltalános" msgid "General Settings" msgstr "Ãltalános beállítások" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Német" @@ -2732,6 +2853,10 @@ msgid "Greater Than" msgstr "Nagyobb mint" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2842,8 +2967,12 @@ msgid "Hotkey Configuration" msgstr "Gyorsbillentyű beállítások" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Gyorsbill." @@ -3068,7 +3197,11 @@ msgid "" msgstr "" "InstallExceptionHandler elÅ‘idézve, de ez a platform még nem támogatja azt." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "WAD telepítése..." @@ -3150,9 +3283,15 @@ msgstr "Nem megfelelÅ‘ rögzített fájl" msgid "Invalid state" msgstr "Nem megfelelÅ‘ mentés" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Olasz" @@ -3310,11 +3449,19 @@ msgstr "Ãllás betöltése a 8. helyrÅ‘l" msgid "Load State..." msgstr "Ãllás betöltése..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wii rendszer menü betöltése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Wii rendszer menü betöltése" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii rendszer menü betöltése %d%c" @@ -3396,7 +3543,11 @@ msgstr "MMU sebesség növelÅ‘ hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark fájlok (*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "FÅ‘kar" @@ -3427,7 +3578,11 @@ msgid "Memory Byte" msgstr "Memória bájt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Memóriakártya" @@ -3625,7 +3780,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3712,7 +3871,11 @@ msgstr "Nem egyenlÅ‘" msgid "Not Set" msgstr "Nincs beállítva" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Nincs csatlakoztatva" @@ -3773,7 +3936,10 @@ msgstr "Csak %d blokk szabad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Megnyitás" @@ -3904,8 +4070,13 @@ msgstr "Javítások" msgid "Paths" msgstr "Mappák" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Szünet" @@ -3925,8 +4096,13 @@ msgstr "%d perspektíva" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Indítás" @@ -3952,7 +4128,11 @@ msgstr "Visszajátszási lehetÅ‘ségek" msgid "Players" msgstr "Játékosok" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -4163,10 +4343,17 @@ msgstr "A lista frissítése" msgid "Refresh game list" msgstr "Játéklista frissítése" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Törlés" @@ -4185,7 +4372,10 @@ msgid "Render to Main Window" msgstr "Megjelenítés a fÅ‘ablakban" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Alapra állítás" @@ -4228,7 +4418,11 @@ msgstr "Ãl&lás mentése" msgid "Safe" msgstr "Biztonságos" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Mintavételezési frekvencia:" @@ -4312,7 +4506,11 @@ msgstr "%s állásmentés videója sérült, videó rögzítése leáll..." msgid "Scaled EFB Copy" msgstr "Méretezett EFB másolat" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Keresés %s" @@ -4352,12 +4550,21 @@ msgstr "%s rész nem található a SYSCONF fájlban" msgid "Select" msgstr "Választás" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Válassz rögzítendÅ‘ fájlt" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Válassz rögzítendÅ‘ fájlt" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendÅ‘ Wii WAD fájlt" @@ -4383,6 +4590,7 @@ msgstr "Válassz lebegÅ‘ ablakokat" msgid "Select the file to load" msgstr "BetöltendÅ‘ fájl kiválasztása" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Válassz mentési fájlt" @@ -4392,6 +4600,17 @@ msgid "Select the state to load" msgstr "Válassz betöltendÅ‘ állásmentést" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Válassz mentési fájlt" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Válassz betöltendÅ‘ állásmentést" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Válassz mentendÅ‘ állást" @@ -4773,9 +4992,15 @@ msgstr "Hang puffer létrehozása sikertelen: %s" msgid "Space" msgstr "Szóköz" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spanyol" @@ -4819,7 +5044,11 @@ msgstr "Negyzetes kar" msgid "Standard Controller" msgstr "Normál irányító" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4854,7 +5083,10 @@ msgstr "Kar" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Leállítás" @@ -4910,6 +5142,10 @@ msgstr "TAJVAN" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "TAS Input" msgstr "TAS bemenet" @@ -4932,7 +5168,10 @@ msgstr "Tábla jobbra" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Pillanatkép készítése" @@ -5178,12 +5417,19 @@ msgstr "Minden napló típus kijelölése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Váltás teljes nézetre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Fent" @@ -5294,6 +5540,18 @@ msgstr "" "Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettÅ‘l a játékostól:%d " "Játékos kirúgása!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Ismeretlen mutató %#08x\n" +"Folytatod?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5517,7 +5775,11 @@ msgstr "Wii NAND gyökér könyvtár:" msgid "Wii Save Import" msgstr "Wii mentés importálása" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -5548,7 +5810,11 @@ msgstr "" "esetleg az üresjárati idÅ‘korlát letelt vagy egyéb ok miatt történt.\n" "Újra akarod csatlakoztatni most?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote csatlakoztatva" @@ -5580,9 +5846,15 @@ msgstr "Jobb Windows" msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Folyamatban..." diff --git a/Languages/po/it.po b/Languages/po/it.po index 6be9fd979c..c27de2da97 100644 --- a/Languages/po/it.po +++ b/Languages/po/it.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-04-08 20:40+0100\n" "Last-Translator: RebuMan, Dolphin Team\n" "Language-Team: \n" @@ -552,9 +556,15 @@ msgstr "Aggiungi Patch" msgid "Add new pane" msgstr "Aggiungi nuovo riquadro" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Aggiungi..." @@ -626,8 +636,13 @@ msgstr "Tutti i file di immagine GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tutti i file GCM GameCube (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)" @@ -711,7 +726,11 @@ 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!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspetto:" @@ -732,7 +751,11 @@ msgstr "Interfaccia Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -845,7 +868,11 @@ msgid "Blue Right" msgstr "Blu Destro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Sotto" @@ -878,7 +905,11 @@ msgstr "Cerca una directory di destinazione" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1116,7 +1147,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Chiudi" @@ -1226,7 +1261,11 @@ msgstr "Collega Wiimote 3" msgid "Connect Wiimote 4" msgstr "Collega Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Connessione in corso..." @@ -1415,7 +1454,11 @@ msgid "DSP Emulator Engine" msgstr "Motore di Emulazione DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulazione DSP HLE (veloce)" @@ -1635,7 +1678,11 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Divide" msgstr "/" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" @@ -1664,12 +1711,21 @@ msgstr "Dolphin - Configurazione Wiimote Emulato" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin - Configurazione Controlli GC" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin - Configurazione Controlli GC" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" @@ -1758,9 +1814,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Olandese" @@ -1889,16 +1951,23 @@ msgstr "Attiva BAT" msgid "Enable Block Merging" msgstr "Attiva Unione Blocchi" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Attiva Cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Abilita Trucchi" @@ -2039,9 +2108,15 @@ msgstr "" msgid "End" msgstr "Fine" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Inglese" @@ -2070,6 +2145,7 @@ msgstr "Uguale" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Errore/i" @@ -2081,6 +2157,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Errore/i" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2545,9 +2627,15 @@ msgstr "Fotogrammi da Registrare:" msgid "Free Look" msgstr "Visuale Libera" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francese" @@ -2615,7 +2703,11 @@ msgid "Gamecube &Pad Settings" msgstr "Impostazioni &Controlli GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" @@ -2638,8 +2730,12 @@ msgstr "" "(codice corrotto oppure tipo di codice non ancora supportato.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generale" @@ -2649,9 +2745,15 @@ msgstr "Generale" msgid "General Settings" msgstr "Impostazioni Interfaccia" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Tedesco" @@ -2776,8 +2878,12 @@ msgid "Hotkey Configuration" msgstr "Configurazione Tasti di Scelta Rapida" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Tasti di Scelta Rapida" @@ -2991,7 +3097,11 @@ msgstr "" "E' stata sollevata un'Eccezione all'Installazione, tuttavia questa " "piattaforma non la supporta ancora." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Installazione WAD..." @@ -3075,9 +3185,15 @@ msgstr "File di registrazione non valido" msgid "Invalid state" msgstr "Stato non valido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3236,12 +3352,20 @@ msgstr "Carica Stato di Gioco dall'Ingresso 8" msgid "Load State..." msgstr "Carica Stato di Gioco..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Carica il Menu di Sistema Wii %d%c" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carica il Menu di Sistema Wii %d%c" @@ -3324,7 +3448,11 @@ msgstr "Hack Velocità MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "File MadCatz Gameshark(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Levetta Principale" @@ -3355,7 +3483,11 @@ msgid "Memory Byte" msgstr "Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Scheda di Memoria" @@ -3541,7 +3673,11 @@ msgstr "TN Tab" msgid "NP Up" msgstr "TN Su" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3628,7 +3764,11 @@ msgstr "Diverso" msgid "Not Set" msgstr "Non Impostato" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Non collegato" @@ -3689,7 +3829,10 @@ msgstr "Solo %d blocchi disponibili" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Apri" @@ -3823,8 +3966,13 @@ msgstr "Patches" msgid "Paths" msgstr "Percorsi" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3845,8 +3993,13 @@ msgstr "Prospettiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Gioca" @@ -3872,7 +4025,11 @@ msgstr "Opzioni di Riproduzione" msgid "Players" msgstr "Giocatori" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Per favore confermare..." @@ -4086,10 +4243,17 @@ msgstr "Aggiorna Elenco" msgid "Refresh game list" msgstr "Aggiorna elenco giochi" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Rimuovi" @@ -4108,7 +4272,10 @@ msgid "Render to Main Window" msgstr "Rendering nella finestra Principale" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetta" @@ -4151,7 +4318,11 @@ msgstr "Sa&lva Stato di Gioco" msgid "Safe" msgstr "Accurata" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Frequenza di Campionamento:" @@ -4236,7 +4407,11 @@ msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." msgid "Scaled EFB Copy" msgstr "Scala Copie EFB" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Ricerca..." @@ -4276,12 +4451,21 @@ msgstr "Sezione %s non trovata in SYSCONF" msgid "Select" msgstr "Seleziona" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Seleziona il File di Registrazione" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Seleziona il File di Registrazione" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" @@ -4307,6 +4491,7 @@ msgstr "Seleziona finestre libere/mobili" msgid "Select the file to load" msgstr "Seleziona il file da caricare" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Seleziona il file di salvataggio" @@ -4316,6 +4501,17 @@ msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Seleziona il file di salvataggio" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Seleziona lo stato di gioco da caricare" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" @@ -4670,9 +4866,15 @@ msgstr "Creazione buffer audio non riuscita: %s" msgid "Space" msgstr "Spazio" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spagnolo" @@ -4708,7 +4910,11 @@ msgstr "Levetta Quadrata" msgid "Standard Controller" msgstr "Controller Standard" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4743,7 +4949,10 @@ msgstr "Levetta" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arresta" @@ -4816,7 +5025,10 @@ msgstr "Semipiano destro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Genera un'Istantanea di Gioco" @@ -5061,12 +5273,19 @@ msgstr "Seleziona/Deseleziona tutti i Tipi di Log" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Commuta a Schermo Intero" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Sopra" @@ -5172,6 +5391,18 @@ msgstr "" "Messaggio sconosciuto avente id:%d ricevuto dal giocatore:%d Giocatore " "espluso!!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Puntatore %#08x sconosciuto\n" +"Continuare?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5384,7 +5615,11 @@ msgstr "Origine DVD:" msgid "Wii Save Import" msgstr "Importa Salvataggi Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Salva i file Wii (*.bin)|*.bin" @@ -5415,7 +5650,11 @@ msgstr "" " o forse è dovuto ad altri motivi. \n" "Vuoi riconnettersi immediatamente?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Collegato" @@ -5448,9 +5687,15 @@ msgstr "Windows Destro" msgid "Word Wrap" msgstr "Adatta Testo" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Attività in corso..." diff --git a/Languages/po/ja.po b/Languages/po/ja.po index d0e94ebb39..dc9751b1b1 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-12 20:45+0900\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-08-19 08:37-0500\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: DanbSky\n" "Language-Team: \n" "Language: Japanese\n" @@ -426,6 +431,10 @@ msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -550,9 +559,15 @@ msgstr "パッãƒã‚’追加" msgid "Add new pane" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "追加" @@ -618,8 +633,13 @@ msgstr "å…¨ã¦ã® GC/Wii イメージ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "GC GCMファイル (gcm)|*.gcm" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "å…¨ã¦ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイル (sav, s##)" @@ -648,8 +668,14 @@ msgstr "" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Wii リモコンをエミュレート" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -707,7 +733,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿå…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "アスペクト比：" @@ -728,7 +758,11 @@ msgstr "出力API (Audio Backend)" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error opening AO device.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -843,7 +877,11 @@ msgid "Blue Right" msgstr "é’ - å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "下部" @@ -876,7 +914,11 @@ msgstr "出力先をé¸æŠž" msgid "Buffer:" msgstr "ãƒãƒƒãƒ•ã‚¡ï¼š" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1123,7 +1165,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "é–‰ã˜ã‚‹" @@ -1232,7 +1278,11 @@ msgstr "3Pã®Wii リモコンを接続ï¼åˆ‡æ–­" msgid "Connect Wiimote 4" msgstr "4Pã®Wii リモコンを接続ï¼åˆ‡æ–­" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "接続中..." @@ -1423,7 +1473,11 @@ msgid "DSP Emulator Engine" msgstr "DSPエミュレーション方å¼" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP-HLE エミュレーション (高速)" @@ -1654,7 +1708,11 @@ msgstr "" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "動作中ã®ã‚²ãƒ¼ãƒ ã‚’åœæ­¢ã—ã¾ã™ã‹ï¼Ÿ" @@ -1683,12 +1741,21 @@ msgstr "Wii リモコンã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³è¨­å®š" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "GCコントローラ設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "GCコントローラ設定" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" @@ -1785,9 +1852,15 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "オランダ語" @@ -1931,15 +2004,22 @@ msgstr "Enable BAT" msgid "Enable Block Merging" msgstr "Enable Block Merging" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Enable Cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ã‚’有効化" @@ -2093,9 +2173,15 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "英語" @@ -2124,6 +2210,7 @@ msgstr "ã«ä¸€è‡´ã™ã‚‹" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "エラー" @@ -2135,6 +2222,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "エラー" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2593,9 +2686,15 @@ msgstr "録画フレーム数設定" msgid "Free Look" msgstr "フリールック" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "フランス語" @@ -2662,7 +2761,11 @@ msgid "Gamecube &Pad Settings" msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp" @@ -2685,8 +2788,12 @@ msgstr "" "(コードã«å•é¡ŒãŒã‚ã‚‹ã‹ã€ã¾ã ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„タイプã®ã‚³ãƒ¼ãƒ‰ã§ã™)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2695,9 +2802,15 @@ msgstr "一般" msgid "General Settings" msgstr "一般" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "ドイツ語" @@ -2720,6 +2833,10 @@ msgid "Greater Than" msgstr "より大ãã„" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2829,8 +2946,12 @@ msgid "Hotkey Configuration" msgstr "ホットキーã®è¨­å®š" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "ホットキー" @@ -3053,7 +3174,11 @@ msgstr "" "InstallExceptionHandler ãŒå‘¼ã³å‡ºã•ã‚Œã¾ã—ãŸãŒã€ã“ã®ãƒ—ラットフォームã¯ã¾ã ã‚µ" "ãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "WADファイルを追加ã—ã¦ã„ã¾ã™..." @@ -3135,9 +3260,15 @@ msgstr "ä¸æ­£ãªéŒ²ç”»ãƒ•ã‚¡ã‚¤ãƒ«" msgid "Invalid state" msgstr "ä¸æ­£ãªã‚»ãƒ¼ãƒ–ï¼ãƒ­ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "イタリア語" @@ -3295,11 +3426,19 @@ msgstr "ステートロード - スロット 8" msgid "Load State..." msgstr "ファイルã‹ã‚‰ãƒ­ãƒ¼ãƒ‰" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wiiメニューを起動" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Wiiメニューを起動" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wiiメニューを起動 ( ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š%d %c )" @@ -3382,7 +3521,11 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark セーブファイル(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "コントロールスティック" @@ -3413,7 +3556,11 @@ msgid "Memory Byte" msgstr "メモリãƒã‚¤ãƒˆ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "メモリーカード" @@ -3609,7 +3756,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3696,7 +3847,11 @@ msgstr "ã«ä¸€è‡´ã—ãªã„" msgid "Not Set" msgstr "未確èª" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "未接続" @@ -3757,7 +3912,10 @@ msgstr "残り %d ブロックã—ã‹ã‚ã‚Šã¾ã›ã‚“ï¼" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "é–‹ã" @@ -3888,8 +4046,13 @@ msgstr "パッãƒ" msgid "Paths" msgstr "フォルダ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "一時åœæ­¢" @@ -3909,8 +4072,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "開始" @@ -3936,7 +4104,11 @@ msgstr "å†ç”Ÿã‚ªãƒ—ション" msgid "Players" msgstr "プレイヤー一覧" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "確èª" @@ -4148,10 +4320,17 @@ msgstr "ゲームリストをå†æ›´æ–°" msgid "Refresh game list" msgstr "ゲームリストをå†æ›´æ–°ã—ã¾ã™" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "削除" @@ -4170,7 +4349,10 @@ msgid "Render to Main Window" msgstr "メインウィンドウ部分ã«æç”»" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "åˆæœŸåŒ–" @@ -4213,7 +4395,11 @@ msgstr "ステートセーブ(&V)" msgid "Safe" msgstr "Safe" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "サンプルレート" @@ -4297,7 +4483,11 @@ msgstr "Savestate movie %s ã®ç ´æを確èªã—ã¾ã—ãŸã€‚録画を中止㗠msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "確èªä¸­... .%s" @@ -4337,12 +4527,21 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "é¸æŠž" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "録画ファイルをé¸æŠž" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "録画ファイルをé¸æŠž" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "追加ã™ã‚‹WADファイルをé¸æŠž" @@ -4368,6 +4567,7 @@ msgstr "" msgid "Select the file to load" msgstr "ロードã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "セーブファイルをé¸æŠž" @@ -4377,6 +4577,17 @@ msgid "Select the state to load" msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "セーブファイルをé¸æŠž" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "ステートセーブã®ä¿å­˜å…ˆã‚’é¸æŠž" @@ -4755,9 +4966,15 @@ msgstr "Sound buffer creation failed: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "スペイン語" @@ -4801,7 +5018,11 @@ msgstr "丸ã¿" msgid "Standard Controller" msgstr "標準コントローラ" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4836,7 +5057,10 @@ msgstr "スティック" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -4913,7 +5137,10 @@ msgstr "å³ãƒ†ãƒ¼ãƒ–ル" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "スクリーンショット" @@ -5164,12 +5391,19 @@ msgstr "å…¨ã¦ã®ãƒ­ã‚°æƒ…報をé¸æŠžï¼è§£é™¤" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "フルスクリーン表示切り替ãˆ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "上部" @@ -5278,6 +5512,18 @@ msgstr "次ã®IDã‹ã‚‰ä¸æ˜Žãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å—ä¿¡ : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Unknown message with id:%d received from player:%d Kicking player!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"ä¸æ˜Žãªãƒã‚¤ãƒ³ã‚¿ %#08x\n" +"続ã‘ã¾ã™ã‹ï¼Ÿ" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5501,7 +5747,11 @@ msgstr "Wii NANDルート" msgid "Wii Save Import" msgstr "Wiiã®ã‚»ãƒ¼ãƒ–データをインãƒãƒ¼ãƒˆ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -5532,7 +5782,11 @@ msgstr "" "ã¾ãŸã¯ã—ã°ã‚‰ã入力ãŒãªã‹ã£ãŸãŸã‚çœé›»åŠ›ãƒ¢ãƒ¼ãƒ‰ã«å…¥ã£ãŸã®ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“\n" "å†æŽ¥ç¶šã—ã¾ã™ã‹ï¼Ÿ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wii リモコン接続中" @@ -5564,9 +5818,15 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ワードラップ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "動作中..." @@ -6263,6 +6523,7 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "音声や効果音ã®å†ç”Ÿã«ã‚ˆã使用ã•ã‚Œã¾ã™" +<<<<<<< HEAD #~ msgid "" #~ "Unknown pointer %#08x\n" @@ -6270,6 +6531,8 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgstr "" #~ "Unknown pointer %#08x\n" #~ "Continue?" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Use FPS For Limiting" #~ msgstr "有効化" diff --git a/Languages/po/ko.po b/Languages/po/ko.po index 3f8323714e..6378880eee 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-07-07 10:24+0900\n" "Last-Translator: \n" "Language-Team: \n" @@ -549,9 +553,15 @@ msgstr "패치 추가" msgid "Add new pane" msgstr "새로운 ì°½ 추가" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "추가..." @@ -619,8 +629,13 @@ msgstr "모든 GC/Wii ì´ë¯¸ì§€ë“¤ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임í브 GCM 파ì¼ë“¤ (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "모든 ìƒíƒœë“¤ 저장 (sav, s##)" @@ -708,7 +723,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ì´ íŒŒì¼ì„ ì •ë§ë¡œ 지우고 싶습니까? ê·¸ê²ƒì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -729,7 +748,11 @@ msgstr "오디오 백엔드:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO 장치를 열기 ì—러.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "ìžë™" @@ -844,7 +867,11 @@ msgid "Blue Right" msgstr "파랑 오른쪽" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "아래" @@ -877,7 +904,11 @@ msgstr "출력 디렉토리 둘러보기" msgid "Buffer:" msgstr "버í¼:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1118,7 +1149,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "닫기" @@ -1227,7 +1262,11 @@ msgstr "위모트 3 ì—°ê²°" msgid "Connect Wiimote 4" msgstr "위모트 4 ì—°ê²°" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "연결중..." @@ -1418,7 +1457,11 @@ msgid "DSP Emulator Engine" msgstr "DSP ì—뮬레ì´í„° 엔진" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE ì—뮬레ì´ì…˜ (빠름)" @@ -1647,7 +1690,11 @@ msgstr "" msgid "Divide" msgstr "나누기" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "현재 ì—뮬레ì´ì…˜ì„ 중단하고 싶습니까?" @@ -1676,12 +1723,21 @@ msgstr "ëŒí•€ ì—ë®¬ëœ ìœ„ëª¨íŠ¸ 환경설정" msgid "Dolphin FIFO" msgstr "ëŒí•€ FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "ëŒí•€ GC패드 환경설정" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "ëŒí•€ GC패드 환경설정" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "ëŒí•€ TAS ë™ì˜ìƒ (*.dtm)" @@ -1777,9 +1833,15 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "네ëœëž€ë“œì–´" @@ -1922,15 +1984,22 @@ msgstr "BAT 활성" msgid "Enable Block Merging" msgstr "ë¸”ë¡ í•©ì¹˜ê¸° 활성" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "ìºì‰¬ 활성" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "치트 활성" @@ -2081,9 +2150,15 @@ msgstr "" msgid "End" msgstr "ë" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "ì˜ì–´" @@ -2112,6 +2187,7 @@ msgstr "ê°™ìŒ" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "ì—러" @@ -2123,6 +2199,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "ì—러" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "ì„ íƒëœ 언어 로딩 ì—러. 시스템 기본으로 ëŒì•„갑니다." @@ -2577,9 +2659,15 @@ msgstr "녹화할 프레임" msgid "Free Look" msgstr "ìžìœ ë¡œìš´ 보기" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "프랑스어" @@ -2646,7 +2734,11 @@ msgid "Gamecube &Pad Settings" msgstr "게임í브 패드 설정(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임í브 메모리 카드들 (*.raw,*.gcp)" @@ -2669,8 +2761,12 @@ msgstr "" "(ìž˜ëª»ëœ ì½”ë“œì´ê±°ë‚˜ 코드 íƒ€ìž…ì´ ì•„ì§ ì§€ì›ì•Šëœë‹¤.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "ì¼ë°˜" @@ -2679,9 +2775,15 @@ msgstr "ì¼ë°˜" msgid "General Settings" msgstr "ì¼ë°˜ 설정" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "ë…ì¼ì–´" @@ -2811,8 +2913,12 @@ msgid "Hotkey Configuration" msgstr "단축키 설정" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "단축키들" @@ -3034,7 +3140,11 @@ msgstr "" "InstallExceptionHandler 호출ë¨, 하지만 ì´ í”Œëž«í¼ì€ ì•„ì§ ê·¸ê²ƒì„ ì§€ì›í•˜ì§€ 않습" "니다." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "WAD 설치하기..." @@ -3116,9 +3226,15 @@ msgstr "비ì í•© ê¸°ë¡ íŒŒì¼" msgid "Invalid state" msgstr "비ì í•© ìƒíƒœ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "ì´íƒˆë¦¬ì•„ì–´" @@ -3276,11 +3392,19 @@ msgstr "슬롯8 ìƒíƒœ 로드" msgid "Load State..." msgstr "ìƒíƒœ 로드..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wii 시스템 메뉴 로드" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Wii 시스템 메뉴 로드" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii 시스템 메뉴 %d %c 로드" @@ -3362,7 +3486,11 @@ msgstr "MMU 스피드 핵" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz ê²Œìž„ìƒ¤í¬ íŒŒì¼ë“¤(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ë©”ì¸ ìŠ¤í‹±" @@ -3393,7 +3521,11 @@ msgid "Memory Byte" msgstr "메모리 ë°”ì´íŠ¸" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "메모리 ì¹´ë“œ" @@ -3591,7 +3723,11 @@ msgstr "NP 탭" msgid "NP Up" msgstr "NP 위" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3678,7 +3814,11 @@ msgstr "같지 ì•ŠìŒ" msgid "Not Set" msgstr "설정 안함" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "ì—°ê²°ë˜ì§€ ì•ŠìŒ" @@ -3739,7 +3879,10 @@ msgstr "%d 블럭들만 유용한" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "열기" @@ -3867,8 +4010,13 @@ msgstr "패치" msgid "Paths" msgstr "경로" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "ì¼ì‹œì •ì§€" @@ -3888,8 +4036,13 @@ msgstr "ê´€ì  %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr " 실행 " @@ -3915,7 +4068,11 @@ msgstr "ìž¬ìƒ ì˜µì…˜" msgid "Players" msgstr "플레ì´ì–´" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "확ì¸í•´ì£¼ì„¸ìš”..." @@ -4127,10 +4284,17 @@ msgstr "ëª©ë¡ ìƒˆë¡œ 고침" msgid "Refresh game list" msgstr "게임 ëª©ë¡ ìƒˆë¡œ 고침" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "제거" @@ -4149,7 +4313,10 @@ msgid "Render to Main Window" msgstr "ë©”ì¸ ìœˆë„ìš°ì— ë Œë”" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "리셋" @@ -4192,7 +4359,11 @@ msgstr "ìƒíƒœ 저장(&v) " msgid "Safe" msgstr "안전" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "샘플율:" @@ -4276,7 +4447,11 @@ msgstr "%s ì˜ìƒ ìƒíƒœì €ìž¥ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤, ì˜ìƒ ê¸°ë¡ ì¤‘ì§€... msgid "Scaled EFB Copy" msgstr "스케ì¼ëœ EFB 복사" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "스ìºë‹ %s" @@ -4316,12 +4491,21 @@ msgstr "섹션 %s를 SYSCONFì—ì„œ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "Select" msgstr "ì„ íƒ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD íŒŒì¼ ì„ íƒ" @@ -4347,6 +4531,7 @@ msgstr "유ë™ì ì¸ 윈ë„우즈 ì„ íƒ" msgid "Select the file to load" msgstr "로드할 íŒŒì¼ ì„ íƒ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "저장 파ì¼ì„ ì„ íƒ" @@ -4356,6 +4541,17 @@ msgid "Select the state to load" msgstr "로드할 ìƒíƒœ ì„ íƒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "저장 파ì¼ì„ ì„ íƒ" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "로드할 ìƒíƒœ ì„ íƒ" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "저장할 ìƒíƒœ ì„ íƒ" @@ -4730,9 +4926,15 @@ msgstr "사운드 ë²„í¼ ìƒì„± 실패했습니다: %s" msgid "Space" msgstr "스페ì´ìŠ¤" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "스페ì¸ì–´" @@ -4776,7 +4978,11 @@ msgstr "스퀘어 스틱" msgid "Standard Controller" msgstr "표준 컨트롤러" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4811,7 +5017,10 @@ msgstr "스틱" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "중지" @@ -4887,7 +5096,10 @@ msgstr "í…Œì´ë¸” 오른쪽" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "스í¬ë¦°ìƒ· ì°ê¸°" @@ -5129,12 +5341,19 @@ msgstr "모든 로그 타입 토글" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "전체화면 토글" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "위" @@ -5242,6 +5461,18 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "id:%dì˜ ì•Œë ¤ì§€ì§€ ì•Šì€ ë©”ì‹œì§€, 플레ì´ì–´:%d 플레ì´ì–´ 킥킹으로 부터 전달ëœ!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"알려지지 ì•Šì€ í¬ì¸í„° %#08x\n" +"계ì†í•©ë‹ˆê¹Œ?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5463,7 +5694,11 @@ msgstr "Wii NAND 루트:" msgid "Wii Save Import" msgstr "Wii 저장 가져오기" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파ì¼ë“¤ (*.bin)|*.bin" @@ -5494,7 +5729,11 @@ msgstr "" "í˜¹ì€ ì•„ë§ˆë„ ì•„ì´ë“¤ 타임 아웃ì´ê±°ë‚˜ 다른 ì›ì¸ ë•Œë¬¸ì¸ ê²ƒ 같습니다.\n" "ë‹¹ì‹ ì€ ì¦‰ì‹œ 재연결 하고 싶습니까?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "위모트가 ì—°ê²°ë¨" @@ -5527,9 +5766,15 @@ msgstr "윈ë„우즈 오른쪽" msgid "Word Wrap" msgstr "ìžë™ 줄바꿈" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "ìž‘ë™ì¤‘..." diff --git a/Languages/po/nb.po b/Languages/po/nb.po index d922644cbf..f916e21416 100644 --- a/Languages/po/nb.po +++ b/Languages/po/nb.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-06-06 20:15+0100\n" "Last-Translator: Knut \n" "Language-Team: Norwegian \n" @@ -555,9 +559,15 @@ msgstr "Legg til Patch" msgid "Add new pane" msgstr "Legg til ny rute" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Legg til..." @@ -625,8 +635,13 @@ msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" @@ -718,7 +733,11 @@ msgstr "" "Er du sikker pÃ¥ at du vil slette denne filen?\n" "Den vil bli borte for alltid!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -739,7 +758,11 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Feil ved Ã¥pning av AO-device.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisk" @@ -854,7 +877,11 @@ msgid "Blue Right" msgstr "BlÃ¥ Høyre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Bunn" @@ -887,7 +914,11 @@ msgstr "Bla etter lagringssted" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1130,7 +1161,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Lukk" @@ -1239,7 +1274,11 @@ msgstr "Koble til Wiimote 3" msgid "Connect Wiimote 4" msgstr "Koble til Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Kobler til..." @@ -1429,7 +1468,11 @@ msgid "DSP Emulator Engine" msgstr "CPU Emulatormotor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulering (raskt)" @@ -1660,7 +1703,11 @@ msgstr "" msgid "Divide" msgstr "Del" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pÃ¥gÃ¥ende emulering?" @@ -1689,12 +1736,21 @@ msgstr "Dolphin Emulert Wiimote Konfigurasjon" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC-kontroll konfigurasjon" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC-kontroll konfigurasjon" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" @@ -1790,9 +1846,15 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Nederlansk" @@ -1935,15 +1997,22 @@ msgstr "Aktiver BAT" msgid "Enable Block Merging" msgstr "Aktiver Block Merging" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Aktiver cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Aktiver Juksekoder" @@ -2098,9 +2167,15 @@ msgstr "" msgid "End" msgstr "Slutt" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Engelsk" @@ -2129,6 +2204,7 @@ msgstr "Lik" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Feil" @@ -2140,6 +2216,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Feil" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Feil ved lasting av valgt sprÃ¥k. Faller tilbake til systemstandarden." @@ -2595,9 +2677,15 @@ msgstr "Bilder Til Opptak" msgid "Free Look" msgstr "Fri Utkikk" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Fransk" @@ -2664,7 +2752,11 @@ msgid "Gamecube &Pad Settings" msgstr "Innstillinger for &GameCube-kontroll" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" @@ -2687,8 +2779,12 @@ msgstr "" "(Enten en dÃ¥rlig kode, eller sÃ¥ støttes ikke kodeformatet.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generelt" @@ -2697,9 +2793,15 @@ msgstr "Generelt" msgid "General Settings" msgstr "Generelle Innstillinger" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Tysk" @@ -2830,8 +2932,12 @@ msgid "Hotkey Configuration" msgstr "Konfigurer Snarveistaster" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Snarveistaster" @@ -3050,7 +3156,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Installer WAD..." @@ -3132,9 +3242,15 @@ msgstr "Ugyldig opptaksfil" msgid "Invalid state" msgstr "Ugyldig save state" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italiensk" @@ -3292,11 +3408,19 @@ msgstr "Last Inn Save State Slot 8" msgid "Load State..." msgstr "Last Inn Save State..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Last inn Wii System Meny" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Last inn Wii System Meny" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Last inn Wii System Meny %d %c" @@ -3378,7 +3502,11 @@ msgstr "Ytelses-hack for MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark-filer(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hoved-joystick" @@ -3409,7 +3537,11 @@ msgid "Memory Byte" msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Minnekort" @@ -3607,7 +3739,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Opp" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3694,7 +3830,11 @@ msgstr "Ikke Lik" msgid "Not Set" msgstr "Ikke Satt" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Ikke tilkoblet" @@ -3755,7 +3895,10 @@ msgstr "Kun %d blokker tilgjengelig" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Ã…pne" @@ -3886,8 +4029,13 @@ msgstr "Patcher" msgid "Paths" msgstr "Mappestier" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3907,8 +4055,13 @@ msgstr "Perspektiv %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Spill" @@ -3934,7 +4087,11 @@ msgstr "Avspillingsalterntiver" msgid "Players" msgstr "Spillere" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -4147,10 +4304,17 @@ msgstr "Oppdater liste" msgid "Refresh game list" msgstr "Oppdater spilliste" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Fjern" @@ -4169,7 +4333,10 @@ msgid "Render to Main Window" msgstr "Render til Hovedvindu" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Restart" @@ -4212,7 +4379,11 @@ msgstr "Lagre Sa&ve State" msgid "Safe" msgstr "Sikker" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Samplingsratio:" @@ -4296,7 +4467,11 @@ msgstr "Save State-film %s er korrupt, opptak avsluttes..." msgid "Scaled EFB Copy" msgstr "Skalert EFB-kopi" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Søker i %s" @@ -4336,12 +4511,21 @@ msgstr "Seksjon %s ikke funnet i SYSCONF" msgid "Select" msgstr "Velg" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Velg Opptaksfil" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Velg Opptaksfil" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil Ã¥ innstallere" @@ -4367,6 +4551,7 @@ msgstr "Velg flytvindu" msgid "Select the file to load" msgstr "Velg fil Ã¥ laste" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Velg lagringsfil" @@ -4376,6 +4561,17 @@ msgid "Select the state to load" msgstr "Velg en save state Ã¥ laste" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Velg lagringsfil" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Velg en save state Ã¥ laste" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Velg en save state Ã¥ lagre" @@ -4752,9 +4948,15 @@ msgstr "Laging av lydbuffer mislyktes: %s" msgid "Space" msgstr "Mellomrom" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spansk" @@ -4797,7 +4999,11 @@ msgstr "Kvadrat-joystick" msgid "Standard Controller" msgstr "Standardkontroller" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4832,7 +5038,10 @@ msgstr "Joystick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" @@ -4910,7 +5119,10 @@ msgstr "Tabell Høyre" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Ta Skjermbilde" @@ -5153,12 +5365,19 @@ msgstr "Vipp Alle Loggtyper" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Vipp Mellom Vindu/Fullskjerm" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Topp" @@ -5265,6 +5484,18 @@ msgstr "Ukjent melding mottatt med ID: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ukjent melding mottatt med ID: %d fra spiller: %d Sparker spiller!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Ukjent peker %#08x\n" +"Fortsett?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5487,7 +5718,11 @@ msgstr "Wii NAND-rot:" msgid "Wii Save Import" msgstr "Importer Wii-lagringsfil" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -5518,7 +5753,11 @@ msgstr "" "eller kanskje den koblet seg fra pga. inaktivitet.\n" "Vil du koble til igjen øyeblikkelig?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Tilkoblet" @@ -5551,9 +5790,15 @@ msgstr "Windows Høyre" msgid "Word Wrap" msgstr "Ordkrumning" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Arbeider..." diff --git a/Languages/po/nl.po b/Languages/po/nl.po index e77719aeb3..76e2b607fc 100644 --- a/Languages/po/nl.po +++ b/Languages/po/nl.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-08-07 16:43+0100\n" "Last-Translator: Goost \n" "Language-Team: DevPro Team. \n" @@ -556,9 +560,15 @@ msgstr "Voeg Patch toe" msgid "Add new pane" msgstr "Voeg een nieuwe paneel toe" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Voeg toe..." @@ -626,8 +636,13 @@ msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Opgeslagen Staten (sav, s##)" @@ -718,7 +733,11 @@ msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet " "terug te halen!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -739,7 +758,11 @@ msgstr "Geluid Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -850,7 +873,11 @@ msgid "Blue Right" msgstr "Blauw Rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Onder" @@ -883,7 +910,11 @@ msgstr "Zoek een uitvoer folder" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1128,7 +1159,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Sluit" @@ -1238,7 +1273,11 @@ msgstr "Verbind Wiimote 3" msgid "Connect Wiimote 4" msgstr "Verbind Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Verbinden..." @@ -1429,7 +1468,11 @@ msgid "DSP Emulator Engine" msgstr "DSP Emulator Motor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulatie (snel)" @@ -1662,7 +1705,11 @@ msgstr "" msgid "Divide" msgstr "Verdelen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" @@ -1691,12 +1738,21 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Configuratie" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Configuratie" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" @@ -1791,9 +1847,15 @@ msgstr "" "\n" "In geval van twijfel leeg laten." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Nederlands" @@ -1936,16 +1998,23 @@ msgstr "Activeer BAT" msgid "Enable Block Merging" msgstr "Activeer Block Merging" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Activeer Cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Activeer Cheats" @@ -2101,9 +2170,15 @@ msgstr "" msgid "End" msgstr "Einde" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Engels" @@ -2132,6 +2207,7 @@ msgstr "Gelijk" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error (Fout)" @@ -2143,6 +2219,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Error (Fout)" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2605,9 +2687,15 @@ msgstr "Frames om op te nemen" msgid "Free Look" msgstr "Vrije kijk" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Frans" @@ -2675,7 +2763,11 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube &Pad Instellingen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" @@ -2698,8 +2790,12 @@ msgstr "" "(ofwel een onjuiste code of het type code is nog niet ondersteund.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Algemeen" @@ -2708,9 +2804,15 @@ msgstr "Algemeen" msgid "General Settings" msgstr "Algemene Instellingen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Duits" @@ -2841,8 +2943,12 @@ msgid "Hotkey Configuration" msgstr "Sneltoets Configuratie" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Hotkeys" @@ -3067,7 +3173,11 @@ msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "WAD aan het installeren..." @@ -3150,9 +3260,15 @@ msgstr "Onjuist opname bestand" msgid "Invalid state" msgstr "Onjuiste staat" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italië" @@ -3310,12 +3426,20 @@ msgstr "Laad staat 8" msgid "Load State..." msgstr "Laad staat..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Laad Wii System Menu(%d %c)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Laad Wii System Menu(%d %c)" @@ -3397,7 +3521,11 @@ msgstr "MMU Snelheids Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark bestanden(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3428,7 +3556,11 @@ msgid "Memory Byte" msgstr "Geheugen Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Geheugen Kaart" @@ -3627,7 +3759,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Omhoog" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3714,7 +3850,11 @@ msgstr "Niet gelijk" msgid "Not Set" msgstr "Niet ingesteld" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Niet verbonden" @@ -3775,7 +3915,10 @@ msgstr "Er zijn maar %d blocks beschikaarr" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Open" @@ -3907,8 +4050,13 @@ msgstr "Patches" msgid "Paths" msgstr "Pad" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauze" @@ -3928,8 +4076,13 @@ msgstr "Perspectief %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Speel" @@ -3955,7 +4108,11 @@ msgstr "Terugspeel Opties" msgid "Players" msgstr "Spelers" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -4168,10 +4325,17 @@ msgstr "Lijst Verversen" msgid "Refresh game list" msgstr "Ververs de speellijst" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Verwijder" @@ -4191,7 +4355,10 @@ msgid "Render to Main Window" msgstr "Geef weer op hoofdscherm" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Opnieuw" @@ -4234,7 +4401,11 @@ msgstr "S&la Staat Op" msgid "Safe" msgstr "Opslaan" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Sample Rate:" @@ -4319,7 +4490,11 @@ msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." msgid "Scaled EFB Copy" msgstr "EFB Verkleinde Kopie" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Scannen van %s" @@ -4359,12 +4534,21 @@ msgstr "Sectie %s niet gevonden in SYSCONF" msgid "Select" msgstr "Selecteer" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Selecteer de opname Bestand" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Selecteer de opname Bestand" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" @@ -4390,6 +4574,7 @@ msgstr "Selecteer zwevende vensters" msgid "Select the file to load" msgstr "Selecteer het bestand om het te laden" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Selecteer het save - bestand" @@ -4399,6 +4584,17 @@ msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Selecteer het save - bestand" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Selecteer de Staat om te laden" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" @@ -4771,9 +4967,15 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s" msgid "Space" msgstr "Ruimte" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spaans" @@ -4817,7 +5019,11 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4852,7 +5058,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" @@ -4924,7 +5133,10 @@ msgstr "Rechter Tabel" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Neem een Schermafdruk" @@ -5170,12 +5382,19 @@ msgstr "Zet Alle Log Types Aan" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Volledig Scherm Inschakelen" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Boven" @@ -5285,6 +5504,18 @@ msgstr "" "Onbekend bericht ontvagen met id : %d ontvangen van speler: %d Speler " "eruitgeschopt!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Onbekende pointer %#08x\n" +"Doorgaan?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5508,7 +5739,11 @@ msgstr "Wii NAND basismap:" msgid "Wii Save Import" msgstr "Wii Save Importeren" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -5539,7 +5774,11 @@ msgstr "" "of misschien is het te wijten aan een time-out of een andere reden.\n" "Wilt u meteen opnieuw verbinden?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Connected" @@ -5572,9 +5811,15 @@ msgstr "Venster Rechts" msgid "Word Wrap" msgstr "Regelafbreking" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Werken..." diff --git a/Languages/po/pl.po b/Languages/po/pl.po index 6aab51aec9..39aa254b51 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-08-12 17:04+0100\n" "Last-Translator: Krzysztof Baszczok \n" "Language-Team: Polish \n" @@ -554,9 +558,15 @@ msgstr "Dodaj Å‚atkÄ™" msgid "Add new pane" msgstr "Dodaj nowy panel" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Dodaj..." @@ -624,8 +634,13 @@ msgstr "Wszystkie obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" @@ -713,7 +728,11 @@ msgstr "" 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!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -734,7 +753,11 @@ msgstr "Audio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: BÅ‚Ä…d otwarcia urzÄ…dzenia AO.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -849,7 +872,11 @@ msgid "Blue Right" msgstr "Niebieski prawo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Dół" @@ -882,7 +909,11 @@ msgstr "Szukaj folderu wyjÅ›ciowego" msgid "Buffer:" msgstr "Bufor:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1083,7 +1114,11 @@ msgstr "Wybierz plik do otwarcia" msgid "Choose a memory card:" msgstr "Wybierz kartÄ™ pamiÄ™ci:" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1125,7 +1160,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zamknij" @@ -1234,7 +1273,11 @@ msgstr "PoÅ‚Ä…cz Wiilot 3" msgid "Connect Wiimote 4" msgstr "PoÅ‚Ä…cz Wiilot 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "ÅÄ…czÄ™..." @@ -1350,7 +1393,11 @@ msgstr "Utwórz nowÄ… perspektywÄ™" msgid "Created by KDE-Look.org" msgstr "Utworzone przez KDE-Look.org" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1426,7 +1473,11 @@ msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulacja (szybkie)" @@ -1657,7 +1708,11 @@ msgstr "" msgid "Divide" msgstr "Podziel" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualnÄ… emulacjÄ™?" @@ -1686,12 +1741,21 @@ msgstr "Konfiguracja emulowanego Wiilota" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Konfiguracja GCPad'a" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Konfiguracja GCPad'a" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" @@ -1703,7 +1767,11 @@ msgstr "Konfiguracja Wiilot'a" msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1711,7 +1779,11 @@ msgstr "" "Program nie mógÅ‚ znaleść żadnych obrazów GC/Wii ISO. Kliknij tutaj by " "przeglÄ…dać pliki..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1787,9 +1859,15 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holenderski" @@ -1933,15 +2011,22 @@ msgstr "WÅ‚Ä…cz BAT" msgid "Enable Block Merging" msgstr "WÅ‚Ä…cz Å‚Ä…czenie bloków" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "WÅ‚Ä…cz cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "WÅ‚Ä…cz kody" @@ -2040,7 +2125,11 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2096,9 +2185,15 @@ msgstr "" msgid "End" msgstr "Koniec" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Angielski" @@ -2127,6 +2222,7 @@ msgstr "Równy" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "BÅ‚Ä…d" @@ -2138,6 +2234,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "BÅ‚Ä…d" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." @@ -2145,6 +2247,7 @@ msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format msgid "" +<<<<<<< HEAD "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" @@ -2152,6 +2255,8 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" +======= +>>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2592,9 +2697,15 @@ msgstr "Ramki do nagrania" msgid "Free Look" msgstr "Free Look" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francuski" @@ -2661,7 +2772,11 @@ msgid "Gamecube &Pad Settings" msgstr "Ustawienia &pada GC" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamiÄ™ci GC (*.raw,*.gcp)" @@ -2684,8 +2799,12 @@ msgstr "" "(zÅ‚y kod albo typ kodu nie jest jeszcze wspierany)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Główne" @@ -2694,9 +2813,15 @@ msgstr "Główne" msgid "General Settings" msgstr "Ustawienia ogólne" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Niemiecki" @@ -2825,8 +2950,12 @@ msgid "Hotkey Configuration" msgstr "Konfiguracja skrótów klawiszowych" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Skróty klawiszowe" @@ -2906,7 +3035,11 @@ msgstr "" "JeÅ›li FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, OFF " "= szybko)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +>>>>>>> Update translation files for recent changes in the code. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." @@ -3047,7 +3180,11 @@ msgid "" msgstr "" "InstallExceptionHandler wywoÅ‚any, ale ta platforma nie wspiera go jeszcze." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Instalacja WAD..." @@ -3129,9 +3266,15 @@ msgstr "NewÅ‚aÅ›ciwy plik nagrania" msgid "Invalid state" msgstr "NiewÅ‚aÅ›ciwy stan" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "WÅ‚oski" @@ -3289,11 +3432,19 @@ msgstr "Wczytaj stan Slot 8" msgid "Load State..." msgstr "Wczytaj stan..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wczytaj Wii System Menu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Wczytaj Wii System Menu" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wczytaj Wii System Menu %d %c" @@ -3375,7 +3526,11 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Pliki MadCatz Gameshark(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Główna gaÅ‚ka" @@ -3406,7 +3561,11 @@ msgid "Memory Byte" msgstr "Bajt pamiÄ™ci" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Karta pamiÄ™ci" @@ -3604,7 +3763,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3691,7 +3854,11 @@ msgstr "Nie równe" msgid "Not Set" msgstr "Nie ustawiono" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Nie poÅ‚Ä…czono" @@ -3752,7 +3919,10 @@ msgstr "DostÄ™pnych tylko %d bloków" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Otwórz" @@ -3883,8 +4053,13 @@ msgstr "Patche" msgid "Paths" msgstr "Åšcieżki" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3904,8 +4079,13 @@ msgstr "Perspekrtywa %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Play" @@ -3931,7 +4111,11 @@ msgstr "Opcje playback'u" msgid "Players" msgstr "Gracze" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Potwierdź..." @@ -4142,10 +4326,17 @@ msgstr "OdÅ›wież listÄ™" msgid "Refresh game list" msgstr "OdÅ›wież listÄ™ gier" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "UsuÅ„" @@ -4164,7 +4355,10 @@ msgid "Render to Main Window" msgstr "Generuj w oknie głównym" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4207,7 +4401,11 @@ msgstr "Zapisz &stan" msgid "Safe" msgstr "Bezpieczny" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Wskaźnik próbkowania:" @@ -4291,7 +4489,11 @@ msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "SknaujÄ™ %s" @@ -4331,12 +4533,21 @@ msgstr "Nie odnaleziono sekcji %s w SYSCONF" msgid "Select" msgstr "Select" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Wybierz plik nagrania" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Wybierz plik nagrania" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" @@ -4362,6 +4573,7 @@ msgstr "Select floating windows" msgid "Select the file to load" msgstr "Wybierz plik do wczytania" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Wybierz plik do zapisu" @@ -4371,6 +4583,17 @@ msgid "Select the state to load" msgstr "Wybierz stan do wczytania" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Wybierz plik do zapisu" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Wybierz stan do wczytania" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Wybierz stan do zapisu" @@ -4443,7 +4666,11 @@ msgstr "Separator" msgid "Serbian" msgstr "Serbski" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +>>>>>>> Update translation files for recent changes in the code. 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" @@ -4745,9 +4972,15 @@ msgstr "Utworzenie bufora dźwiÄ™ku nie powiodÅ‚o siÄ™: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "HiszpaÅ„ski" @@ -4791,7 +5024,11 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "Standard Controller" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4826,7 +5063,10 @@ msgstr "GaÅ‚ka" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" @@ -4903,7 +5143,10 @@ msgstr "Talerz prawo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Zrób zdjÄ™cie" @@ -5148,12 +5391,19 @@ msgstr "PrzeÅ‚Ä…cz wszystkie typy logów" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "PrzeÅ‚Ä…cz na peÅ‚ny ekran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Góra" @@ -5262,6 +5512,18 @@ msgstr "Nieznana wiadomość o ID: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Nieznana wiadomość o ID: %d od gracza: %d Gracz wylatuje!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Nieznany wskaźnik %#08x\n" +"Kontynuować?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5484,7 +5746,11 @@ msgstr "ŹródÅ‚o Wii NAND:" msgid "Wii Save Import" msgstr "Import zapisów Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -5515,7 +5781,11 @@ msgstr "" "lub zbyt dÅ‚ugi czas nieobecnoÅ›ci lub coÅ› innego.\n" "PoÅ‚Ä…czyć ponownie?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiilot poÅ‚Ä…czony" @@ -5547,9 +5817,15 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Zawijanie wierszy" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "PracujÄ™..." diff --git a/Languages/po/pt.po b/Languages/po/pt.po index 84a31dafc3..62025d0da8 100644 --- a/Languages/po/pt.po +++ b/Languages/po/pt.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-07-23 15:53-0000\n" "Last-Translator: Zilaan \n" "Language-Team: Zilaan \n" @@ -556,9 +560,15 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Adicionar..." @@ -627,8 +637,13 @@ msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos os ficheiros Gamecube GCM (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" @@ -718,7 +733,11 @@ msgstr "" "Tem a certeza que quer eliminar este ficheiro? Será eliminado " "permanentemente!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -739,7 +758,11 @@ msgstr "Ãudio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -855,7 +878,11 @@ msgid "Blue Right" msgstr "Azul Direita" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Inferior" @@ -888,7 +915,11 @@ msgstr "Procurar por pasta de destino" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1136,7 +1167,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fechar" @@ -1245,7 +1280,11 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "A conectar..." @@ -1436,7 +1475,11 @@ msgid "DSP Emulator Engine" msgstr "Motor de Emulador DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulação de DSP HLE (rápido)" @@ -1667,7 +1710,11 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" @@ -1696,12 +1743,21 @@ msgstr "Configuração da emulação de Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Configuração de GCPad " #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Configuração de GCPad " + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" @@ -1798,9 +1854,15 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holandês" @@ -1944,15 +2006,22 @@ msgstr "Activar BAT" msgid "Enable Block Merging" msgstr "Activar Fusão de blocos" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activar Cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Activar Cheats" @@ -2108,9 +2177,15 @@ msgstr "" msgid "End" msgstr "Fim" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Inglês" @@ -2139,6 +2214,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" @@ -2150,6 +2226,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Erro" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2610,9 +2692,15 @@ msgstr "Quadros para Gravar" msgid "Free Look" msgstr "Vista Livre" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francês" @@ -2679,7 +2767,11 @@ msgid "Gamecube &Pad Settings" msgstr "Definições de Comando &Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" @@ -2702,8 +2794,12 @@ msgstr "" "(Ou é um código com erros ou o tipo de código não é suportado.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2712,9 +2808,15 @@ msgstr "Geral" msgid "General Settings" msgstr "Definições Gerais" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Alemão" @@ -2844,8 +2946,12 @@ msgid "Hotkey Configuration" msgstr "Configuração de Teclas de atalho" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Teclas de Atalho" @@ -3069,7 +3175,11 @@ msgid "" msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "A Instalar WAD..." @@ -3151,9 +3261,15 @@ msgstr "Ficheiro de Gravação inválido" msgid "Invalid state" msgstr "Estado Inválido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3311,11 +3427,19 @@ msgstr "Carregar Estado Slot 8" msgid "Load State..." msgstr "Carregar Estado..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Carregar Sistema de Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Carregar Sistema de Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Sistema de Menu Wii %d%c" @@ -3397,7 +3521,11 @@ msgstr "MMU Hack de velocidade" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ficheiros MadCatz Gameshark(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick Principal" @@ -3428,7 +3556,11 @@ msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Cartão de memória" @@ -3627,7 +3759,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3714,7 +3850,11 @@ msgstr "Não igual" msgid "Not Set" msgstr "Não definido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Não conectado" @@ -3775,7 +3915,10 @@ msgstr "Apenas %d blocos disponíveis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Abrir" @@ -3906,8 +4049,13 @@ msgstr "Patches" msgid "Paths" msgstr "Caminhos" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3927,8 +4075,13 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Começar" @@ -3954,7 +4107,11 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Por favor confirme..." @@ -4167,10 +4324,17 @@ msgstr "Actualizar Lista" msgid "Refresh game list" msgstr "Actualizar lista de Jogos" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Remover" @@ -4189,7 +4353,10 @@ msgid "Render to Main Window" msgstr "Renderizar para a Janela Principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4232,7 +4399,11 @@ msgstr "Gua&rdar Estado" msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4316,7 +4487,11 @@ msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..." msgid "Scaled EFB Copy" msgstr "Cópia EFB Escalada" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "A procurar %s" @@ -4356,12 +4531,21 @@ msgstr "Selecção %s não encontrada em SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Seleccione o Ficheiro de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Seleccione o Ficheiro de Gravação" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" @@ -4387,6 +4571,7 @@ msgstr "Seleccionar janelas flutuantes" msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" @@ -4396,6 +4581,17 @@ msgid "Select the state to load" msgstr "Seleccione o estado para carregar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Seleccione o ficheiro de jogo guardado" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Seleccione o estado para carregar" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Seleccione o estado para gravar" @@ -4776,9 +4972,15 @@ msgstr "Criação do buffer de som falhou: %s" msgid "Space" msgstr "Espaço" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Espanhol" @@ -4822,7 +5024,11 @@ msgstr "Stick quadrado" msgid "Standard Controller" msgstr "Comando padrão" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4857,7 +5063,10 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" @@ -4934,7 +5143,10 @@ msgstr "Table Direita" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Tirar Screenshot" @@ -5185,12 +5397,19 @@ msgstr "Alternar Todos os Tipos de Relatório" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Alternar Ecrã Inteiro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Topo" @@ -5299,6 +5518,18 @@ msgstr "" "Mensagem desconhecida com a id:%d recebida pelo jogador:%d Excluindo o " "jogador!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Apontador desconhecido %#08x\n" +"Continuar?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5524,7 +5755,11 @@ msgstr "Raiz de NAND Wii:" msgid "Wii Save Import" msgstr "Importação de Jogo Guardado Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -5556,7 +5791,11 @@ msgstr "" "razão.\n" "Quer reconectar imediatamente?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5589,9 +5828,15 @@ msgstr "Janelas Direita" msgid "Word Wrap" msgstr "Moldar o texto" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "A trabalhar..." @@ -6204,6 +6449,7 @@ msgstr "| OU" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Começar a janela renderizada em ecrã inteiro" +<<<<<<< HEAD #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6211,6 +6457,8 @@ msgstr "| OU" #~ "Apontador desconhecido %#08x\n" #~ "Continuar?" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Use FPS For Limiting" #~ msgstr "Usar FPS como limitador" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 81320cdc3f..8f2c968751 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:38-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-09-11 23:35-0300\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" "Language: \n" @@ -558,9 +563,15 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painél" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Adicionar..." @@ -628,8 +639,13 @@ msgstr "Todas as imagens CG/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos os arquivos Gamecube CGM (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" @@ -719,7 +735,11 @@ msgstr "" "Você tem certeza que quer deletar este arquivo? Ele ficará perdido para " "sempre!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -740,7 +760,11 @@ msgstr "Backend de Audio" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -856,7 +880,11 @@ msgid "Blue Right" msgstr "Azul Direito" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Embaixo" @@ -889,7 +917,11 @@ msgstr "Procurar por um diretório de saída" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1094,7 +1126,11 @@ msgstr "Escolher um arquivo para abrir" msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1136,7 +1172,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fechar" @@ -1245,7 +1285,11 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Conectando..." @@ -1362,7 +1406,11 @@ msgstr "Criar nova perspectiva" msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1436,7 +1484,11 @@ msgid "DSP Emulator Engine" msgstr "Engine de Emulação do DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulação HLE do DSP (rápido)" @@ -1667,7 +1719,11 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" @@ -1696,12 +1752,21 @@ msgstr "Configuração de Wiimote Emulado do Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Configuração do GCPad do Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Configuração do GCPad do Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS Dolphin (*.dtm)" @@ -1713,7 +1778,11 @@ msgstr "Configuração de Wiimote Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin no &Google Code" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1721,7 +1790,11 @@ msgstr "" "Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por " "arquivos..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1797,9 +1870,15 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holandês" @@ -1943,15 +2022,22 @@ msgstr "Ativar BAT" msgid "Enable Block Merging" msgstr "Ativar Block Merging" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Ativar Cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Ativar Cheats" @@ -2051,7 +2137,11 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2107,9 +2197,15 @@ msgstr "" msgid "End" msgstr "Fim" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Inglês" @@ -2138,6 +2234,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" @@ -2149,6 +2246,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Erro" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." @@ -2156,6 +2259,7 @@ msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format msgid "" +<<<<<<< HEAD "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" @@ -2163,6 +2267,8 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" +======= +>>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2605,9 +2711,15 @@ msgstr "QUadros para Capturar" msgid "Free Look" msgstr "Olhar Livre" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francês" @@ -2674,7 +2786,11 @@ msgid "Gamecube &Pad Settings" msgstr "Configurações de &Controle de Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" @@ -2697,8 +2813,12 @@ msgstr "" "(É um código ruim ou um tipo de código não suportado.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2707,9 +2827,15 @@ msgstr "Geral" msgid "General Settings" msgstr "Configurações Gerais" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Alemão" @@ -2840,8 +2966,12 @@ msgid "Hotkey Configuration" msgstr "Configuração de hotkey" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Hotkeys" @@ -2921,7 +3051,11 @@ msgstr "" "Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = Compatível, " "OFF = Rápido)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +>>>>>>> Update translation files for recent changes in the code. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." @@ -3065,7 +3199,11 @@ msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3147,9 +3285,15 @@ msgstr "Arquivo de gravação inválido" msgid "Invalid state" msgstr "Estado Salvo Inválido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3307,11 +3451,19 @@ msgstr "Carregar Estado do Slot 8" msgid "Load State..." msgstr "Carregar State..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Carregar Menu de Sistema do Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Carregar Menu de Sistema do Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Menu de Sistema do Wii %d %c" @@ -3394,7 +3546,11 @@ msgstr "Hack de velocidade MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arquivos de Gameshark MadCatz(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Analógico Principal" @@ -3425,7 +3581,11 @@ msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Cartão de memoria" @@ -3624,7 +3784,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3711,7 +3875,11 @@ msgstr "Não igual" msgid "Not Set" msgstr "Indefinido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Não conectado" @@ -3772,7 +3940,10 @@ msgstr "Apenas %d blocos disponíveis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Abrir" @@ -3903,8 +4074,13 @@ msgstr "Patches" msgid "Paths" msgstr "Diretórios" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausar" @@ -3924,8 +4100,13 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Executar" @@ -3951,7 +4132,11 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Favor confirmar..." @@ -4162,10 +4347,17 @@ msgstr "Atualizar Lista" msgid "Refresh game list" msgstr "Atualizar a lista de jogos" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Remover" @@ -4184,7 +4376,10 @@ msgid "Render to Main Window" msgstr "Renderizar na Janela Principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4227,7 +4422,11 @@ msgstr "Sal&var estado atual" msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4311,7 +4510,11 @@ msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." msgid "Scaled EFB Copy" msgstr "Cópia Escalada do EFB" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Escaneando %s" @@ -4351,12 +4554,21 @@ msgstr "A seção %s não foi encontrada no SYSCONF" msgid "Select" msgstr "Selecionar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Selecione o arquivo de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Selecione o arquivo de Gravação" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" @@ -4381,6 +4593,7 @@ msgstr "Selecionar Janelas flutuantes" msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Selecione o arquivo de salva" @@ -4390,6 +4603,17 @@ msgid "Select the state to load" msgstr "Selecione um estado para carregar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Selecione o arquivo de salva" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Selecione um estado para carregar" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Selecione um estado para salvar" @@ -4463,7 +4687,11 @@ msgstr "Separador" msgid "Serbian" msgstr "Sérvio" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4770,9 +4998,15 @@ msgstr "Falha na criação do buffer de som: %s" msgid "Space" msgstr "Barra de Espaço" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Espanhol" @@ -4816,7 +5050,11 @@ msgstr "Analógico Quadrado" msgid "Standard Controller" msgstr "Controle Padrão" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4851,7 +5089,10 @@ msgstr "Analógico" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" @@ -4928,7 +5169,10 @@ msgstr "Direita da Mesa" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Capturar Tela" @@ -5176,12 +5420,19 @@ msgstr "Ligar/Desligar Todos os Logs" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Ir para Tela Cheia" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Topo" @@ -5289,6 +5540,17 @@ msgstr "Menssagem desconhecida recebida com identificação: %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" +<<<<<<< HEAD +======= +msgstr "" +"Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" + +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +>>>>>>> Update translation files for recent changes in the code. msgstr "" "Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" @@ -5517,7 +5779,11 @@ msgstr "Raiz do Wii NAND" msgid "Wii Save Import" msgstr "Importar Save de Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Arquivos de Salva do Wii (*.bin)|*.bin" @@ -5548,7 +5814,11 @@ msgstr "" "ou talvez tenha sido pelo tempo parado ou por outra razão.\n" "Você quer reconectar imediatamente?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5580,9 +5850,15 @@ msgstr "Janelas da Direita" msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Funcionando..." diff --git a/Languages/po/ru.po b/Languages/po/ru.po index be14918713..02636c4777 100644 --- a/Languages/po/ru.po +++ b/Languages/po/ru.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-01-20 14:40+0300\n" "Last-Translator: firnis \n" "Language-Team: Russian <>\n" @@ -539,9 +543,15 @@ msgstr "Добавление патча" msgid "Add new pane" msgstr "Добавить панель" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Добавить..." @@ -596,8 +606,13 @@ msgstr "Ð’Ñе образа от GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Ð’Ñе GCM-файлы Gamecube (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Файлы быÑтрых Ñохранений (sav, s##)" @@ -678,7 +693,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтот файл? Он иÑчезнет навÑегда!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Соотношение Ñторон:" @@ -700,7 +719,11 @@ msgstr "СиÑтема вывода" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва вывода звука.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Ðвто" @@ -815,7 +838,11 @@ msgid "Blue Right" msgstr "СинÑÑ Ñправа" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Ñнизу" @@ -848,7 +875,11 @@ msgstr "Укажите папку Ð´Ð»Ñ ÑохранениÑ" msgid "Buffer:" msgstr "Буфер:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1082,7 +1113,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Закрыть" @@ -1192,7 +1227,11 @@ msgstr "Подключить Wiimote 3" msgid "Connect Wiimote 4" msgstr "Подключить Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Подключение..." @@ -1378,7 +1417,11 @@ msgid "DSP Emulator Engine" msgstr "Режим ÑмулÑции CPU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1594,7 +1637,11 @@ msgstr "" msgid "Divide" msgstr "/" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Ð’Ñ‹ хотите оÑтановить ÑмулÑцию?" @@ -1624,12 +1671,21 @@ msgstr "ÐаÑтройки Ñмулируемого Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "ÐаÑтройки Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "ÐаÑтройки Dolphin GCPad" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1717,9 +1773,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Dutch" msgstr "Dutch" @@ -1847,16 +1909,23 @@ msgstr "Включить BAT" msgid "Enable Block Merging" msgstr "Включить Ñовмещение блоков" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "кÑшировать" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Включить чит-коды" @@ -1997,9 +2066,15 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "English" msgstr "English" @@ -2029,6 +2104,7 @@ msgstr "Равно" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Ошибки" @@ -2040,6 +2116,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Ошибки" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Ошибка загрузки выбранного Ñзыка. ВозвращаемÑÑ Ðº Ñтандартному." @@ -2474,9 +2556,15 @@ msgstr "" msgid "Free Look" msgstr "Свободный обзор" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "French" msgstr "French" @@ -2546,7 +2634,11 @@ msgid "Gamecube &Pad Settings" msgstr "Опции &контроллера Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памÑти Gamecube (*.raw,*.gcp)" @@ -2567,8 +2659,12 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Общие" @@ -2578,9 +2674,15 @@ msgstr "Общие" msgid "General Settings" msgstr "ÐаÑтройки интерфейÑа" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "German" msgstr "German" @@ -2708,8 +2810,12 @@ msgid "Hotkey Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Клавиши" @@ -2926,7 +3032,11 @@ msgid "" msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "УÑтанавливаетÑÑ WAD в меню Wii..." @@ -3011,9 +3121,15 @@ msgstr "Ðеверный файл запиÑи" msgid "Invalid state" msgstr "Ðеверное Ñохранение" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Italian" msgstr "Italian" @@ -3179,12 +3295,20 @@ msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" msgid "Load State..." msgstr "Загрузить игру..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Загрузить Wii System Menu (%d %c)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Загрузить Wii System Menu (%d %c)" @@ -3268,7 +3392,11 @@ msgstr "УÑкорить MMU (Ñпидхак)" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Файлы Gameshark MadCatz (*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3300,7 +3428,11 @@ msgid "Memory Byte" msgstr "Па&мÑÑ‚ÑŒ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Карта памÑти" @@ -3478,7 +3610,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Вверх" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3567,7 +3703,11 @@ msgstr "Ðе равно" msgid "Not Set" msgstr "ÐеизвеÑтно" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Ðе подключено" @@ -3628,7 +3768,10 @@ msgstr "ДоÑтупно только %d блоков" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Открыть" @@ -3754,8 +3897,13 @@ msgstr "Патчи" msgid "Paths" msgstr "Папки" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Пауза" @@ -3776,8 +3924,13 @@ msgstr "Точка %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "ЗапуÑк" @@ -3805,7 +3958,11 @@ msgstr "Опции" msgid "Players" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4030,10 +4187,17 @@ msgstr "&Обновить ÑпиÑок игр" msgid "Refresh game list" msgstr "Обновление ÑпиÑка игр" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Удалить" @@ -4052,7 +4216,10 @@ msgid "Render to Main Window" msgstr "Выводить изображение в главное окно" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð½Ð°Ñтроек" @@ -4095,7 +4262,11 @@ msgstr "БыÑтрое &Ñохранение" msgid "Safe" msgstr "безопаÑное" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Sample Rate:" msgstr "ЧаÑтота" @@ -4188,7 +4359,11 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "ПоиÑк..." @@ -4228,12 +4403,21 @@ msgstr "Ð¡ÐµÐºÑ†Ð¸Ñ %s не найдена в SYSCONF" msgid "Select" msgstr "Выбрать" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°" @@ -4260,6 +4444,7 @@ msgstr "" msgid "Select the file to load" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Выберите файл Ñохранений Wii" @@ -4269,6 +4454,17 @@ msgid "Select the state to load" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Выберите файл Ñохранений Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Выберите или укажите файл Ð´Ð»Ñ Ð±Ñ‹Ñтрого ÑохранениÑ" @@ -4629,9 +4825,15 @@ msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð°ÑƒÐ´Ð¸Ð¾-буфера %s." msgid "Space" msgstr "Пробел" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Spanish" msgstr "Spanish" @@ -4669,7 +4871,11 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4706,7 +4912,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Стоп" @@ -4778,7 +4987,10 @@ msgstr "ÐŸÑ€Ð°Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Сделать Ñкриншот" @@ -5023,12 +5235,19 @@ msgstr "Включить вÑе" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Включение полноÑкранного режима" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Ñверху" @@ -5132,6 +5351,18 @@ msgstr "Получено неизвеÑтное Ñообщение Ñ id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Получено неизвеÑтное Ñообщение Ñ id : %d от игрока:%d Игрок выкинут!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"ÐеизвеÑтный указатель %#08x\n" +"Продолжить?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5342,7 +5573,11 @@ msgstr "DVD-диÑк:" msgid "Wii Save Import" msgstr "Импорт Ñохранений Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы Ñохранений Wii (*.bin)|*.bin" @@ -5369,7 +5604,11 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote подключен" @@ -5405,9 +5644,15 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Подождите..." diff --git a/Languages/po/sr.po b/Languages/po/sr.po index 7f9c8580a6..098435044b 100644 --- a/Languages/po/sr.po +++ b/Languages/po/sr.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-03-02 21:58+0100\n" "Last-Translator: nikolassj\n" "Language-Team: \n" @@ -508,9 +512,15 @@ msgstr "Dodaj Patch " msgid "Add new pane" msgstr "Dodaj nova okna" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Dodaj..." @@ -564,8 +574,13 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -645,7 +660,11 @@ msgstr "" 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!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -666,7 +685,11 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -777,7 +800,11 @@ msgid "Blue Right" msgstr "Blue right " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Donji deo/dno" @@ -810,7 +837,11 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1037,7 +1068,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zatvori" @@ -1146,7 +1181,11 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Povezivanje..." @@ -1321,7 +1360,11 @@ msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1533,7 +1576,11 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1563,12 +1610,21 @@ msgstr "" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1651,9 +1707,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "" @@ -1776,15 +1838,22 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -1910,9 +1979,15 @@ msgstr "" msgid "End" msgstr "Kraj" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "" @@ -1941,6 +2016,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -1952,6 +2028,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Error" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2368,9 +2450,15 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "" @@ -2438,7 +2526,11 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2459,8 +2551,12 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2470,9 +2566,15 @@ msgstr "" msgid "General Settings" msgstr "Opcije Uredjaja " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Nemacki " @@ -2589,8 +2691,12 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "" @@ -2786,7 +2892,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -2864,9 +2974,15 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italianski " @@ -3018,12 +3134,20 @@ msgstr "Ucitaj State Slot 8" msgid "Load State..." msgstr "Ucitaj State" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Ucitaj Wii Sistem Meni (%d %c)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Ucitaj Wii Sistem Meni (%d %c)" @@ -3100,7 +3224,11 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3132,7 +3260,11 @@ msgid "Memory Byte" msgstr "&Memorija" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "" @@ -3309,7 +3441,11 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3396,7 +3532,11 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "" @@ -3457,7 +3597,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Otvori " @@ -3583,8 +3726,13 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauza " @@ -3605,8 +3753,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Pokreni " @@ -3633,7 +3786,11 @@ msgstr "Opcije " msgid "Players" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3841,10 +3998,17 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "" @@ -3860,7 +4024,10 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset/Restart " @@ -3903,7 +4070,11 @@ msgstr "" msgid "Safe" msgstr "Siguran " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -3987,7 +4158,11 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Skeniranje..." @@ -4027,12 +4202,21 @@ msgstr "" msgid "Select" msgstr "Izaberi " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Izaberi Snimani fajl" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Izaberi Snimani fajl" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " @@ -4059,6 +4243,7 @@ msgstr "" msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" @@ -4068,6 +4253,17 @@ msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Izaberi \"snimani fajl/the save state\"" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Izaberi state za ucitavanje " + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" @@ -4403,9 +4599,15 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "" @@ -4441,7 +4643,11 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4476,7 +4682,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr " Zaustavi" @@ -4548,7 +4757,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "" @@ -4762,12 +4974,19 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "" @@ -4869,6 +5088,16 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5076,7 +5305,11 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5103,7 +5336,11 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "" @@ -5136,9 +5373,15 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Radi..." diff --git a/Languages/po/tr.po b/Languages/po/tr.po index 31ca12822d..fe7e7a4688 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-08-19 08:38-0500\n" "Last-Translator: nlgzrgn \n" "Language-Team: nlgzrgn \n" @@ -555,9 +559,15 @@ msgstr "Yama Ekle" msgid "Add new pane" msgstr "Bölme ekle" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Ekle..." @@ -627,8 +637,13 @@ msgstr "Tüm GC/Wii kalıpları (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" @@ -717,7 +732,11 @@ msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Bu dosyayı gerçekten silmek istiyor musunuz? Ama geri döndürülemeyecektir!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -738,7 +757,11 @@ msgstr "Ses Arka Ucu:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO sürücüyü açarken hata.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Otomatik" @@ -853,7 +876,11 @@ msgid "Blue Right" msgstr "Mavi SaÄŸ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Alt" @@ -886,7 +913,11 @@ msgstr "Çıkış klasörü için gözat" msgid "Buffer:" msgstr "Tampon:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1131,7 +1162,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Kapat" @@ -1240,7 +1275,11 @@ msgstr "Wiimote 3'ü BaÄŸla" msgid "Connect Wiimote 4" msgstr "Wiimote 4'ü BaÄŸla" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "BaÄŸlanıyor..." @@ -1434,7 +1473,11 @@ msgid "DSP Emulator Engine" msgstr "Ses Emülatörü Motoru" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emülasyonu (Hızlı)" @@ -1665,7 +1708,11 @@ msgstr "" msgid "Divide" msgstr "Böl" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" @@ -1694,12 +1741,21 @@ msgstr "Dolphin Taklit Wiimote Yapılandırması" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC Kolu Yapılandırması" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC Kolu Yapılandırması" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" @@ -1796,9 +1852,15 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Flemenkçe" @@ -1942,15 +2004,22 @@ msgstr "BAT'a Ä°zin Ver" msgid "Enable Block Merging" msgstr "Blok BirleÅŸimine Ä°zin Ver" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "ÖnbelleÄŸe izin ver" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Hilelere Ä°zin Ver" @@ -2106,9 +2175,15 @@ msgstr "" msgid "End" msgstr "Son" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Ä°ngilizce" @@ -2137,6 +2212,7 @@ msgstr "EÅŸit" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hata" @@ -2148,6 +2224,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Hata" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 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." @@ -2602,9 +2684,15 @@ msgstr "Çekilecek Kareler" msgid "Free Look" msgstr "Serbest Bakış" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Fransızca" @@ -2671,7 +2759,11 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube Kolu Ayarları (&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" @@ -2694,8 +2786,12 @@ msgstr "" "(kötü bir kod veya türü henüz desteklenmiyor.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Genel" @@ -2704,9 +2800,15 @@ msgstr "Genel" msgid "General Settings" msgstr "Genel Ayarlar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Almanca" @@ -2835,8 +2937,12 @@ msgid "Hotkey Configuration" msgstr "Kısayol TuÅŸu Yapılandırması" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "TuÅŸlar" @@ -3059,7 +3165,11 @@ msgstr "" "Kurulum Özel Durum Ä°ÅŸleyici çaÄŸrıldı, ama bu platform henüz bunu " "desteklemiyor." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "WAD kuruluyor..." @@ -3141,9 +3251,15 @@ msgstr "Hatalı çekim dosyası" msgid "Invalid state" msgstr "Hatalı durum" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Ä°talyanca" @@ -3301,11 +3417,19 @@ msgstr "Durumu Yükle : 8" msgid "Load State..." msgstr "Durumu Yükle..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wii Sistem Menüsünü Yükle" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Wii Sistem Menüsünü Yükle" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii Sistem Menüsünü Yükle %d%c" @@ -3387,7 +3511,11 @@ msgstr "MMU Hız Hilesi" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark dosyaları(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Ana Çubuk" @@ -3418,7 +3546,11 @@ msgid "Memory Byte" msgstr "Hafıza Baytı" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Hafıza Kartı" @@ -3616,7 +3748,11 @@ msgstr "NP Sekme" msgid "NP Up" msgstr "NP Yukarı" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3703,7 +3839,11 @@ msgstr "EÅŸit DeÄŸil" msgid "Not Set" msgstr "Ayarlanmamış" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "BaÄŸlı deÄŸil" @@ -3764,7 +3904,10 @@ msgstr "Sadece %d blok kullanılabilir" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Aç" @@ -3895,8 +4038,13 @@ msgstr "Yamalar" msgid "Paths" msgstr "Yollar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Duraklat" @@ -3916,8 +4064,13 @@ msgstr "Perspektif %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Oynat" @@ -3943,7 +4096,11 @@ msgstr "Oynatma Seçenekleri" msgid "Players" msgstr "Oyuncular" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -4154,10 +4311,17 @@ msgstr "Listeyi Yenile" msgid "Refresh game list" msgstr "Oyun Listesini Yenile" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Kaldır" @@ -4176,7 +4340,10 @@ msgid "Render to Main Window" msgstr "Ana pencerede yorumla" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Sıfırla" @@ -4219,7 +4386,11 @@ msgstr "Durumu Kaydet (&V)" msgid "Safe" msgstr "Güvenli" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Örnek Oran:" @@ -4303,7 +4474,11 @@ msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." msgid "Scaled EFB Copy" msgstr "Boyutlandırılmış EFB Kopyası" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Taranıyor %s" @@ -4343,12 +4518,21 @@ msgstr "SYSCONF içinde %s bölümü bulunamadı" msgid "Select" msgstr "Seç" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Çekim Dosyasını Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Çekim Dosyasını Seç" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" @@ -4374,6 +4558,7 @@ msgstr "Sabit olmayan pencereyi seçin" msgid "Select the file to load" msgstr "Yüklemek için dosyayı seçin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Kayıt dosyasını seçin" @@ -4383,6 +4568,17 @@ msgid "Select the state to load" msgstr "Yüklemek için durum seçin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Kayıt dosyasını seçin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Yüklemek için durum seçin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" @@ -4759,9 +4955,15 @@ msgstr "Ses tamponu oluÅŸturulamadı: %s" msgid "Space" msgstr "BoÅŸluk" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Ä°spanyolca" @@ -4805,7 +5007,11 @@ msgstr "Kare Çubuk" msgid "Standard Controller" msgstr "Varsayılan Denetim Aygıtı" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4840,7 +5046,10 @@ msgstr "Çubuk" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Durdur" @@ -4917,7 +5126,10 @@ msgstr "Tablo SaÄŸ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Ekran Görüntüsü Al" @@ -5160,12 +5372,19 @@ msgstr "Tüm GeçmiÅŸ Türlerini Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Tam Ekran Moduna Geç" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Ãœst" @@ -5274,6 +5493,18 @@ msgstr "Åžu ID ile bilinmeyen mesaj alındı : %d" 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!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Bilinmeyen iÅŸaretleyici %#08x\n" +"Devam?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5496,7 +5727,11 @@ msgstr "Wii NAND Kök Dizini:" msgid "Wii Save Import" msgstr "Wii Kaydı Al" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -5527,7 +5762,11 @@ msgstr "" "bir zaman aşımı olabilir veya baÅŸka bir ÅŸey olabilir. \n" "Tekrar baÄŸlamak istiyor musunuz?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote BaÄŸlandı" @@ -5559,9 +5798,15 @@ msgstr "Pencereleri SaÄŸa Döşe" msgid "Word Wrap" msgstr "Heceleme" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Çalışıyor..." diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index 10e394fc88..331fbb422d 100644 --- a/Languages/po/zh_CN.po +++ b/Languages/po/zh_CN.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-01-09 13:55-0800\n" "Last-Translator: thegfw \n" "Language-Team: \n" @@ -536,9 +540,15 @@ msgstr "添加补ä¸" msgid "Add new pane" msgstr "添加新é¢æ¿" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "添加..." @@ -592,8 +602,13 @@ msgstr "所有 GC/Wii é•œåƒ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "æ‰€æœ‰å­˜æ¡£çŠ¶æ€ (sav, s##)" @@ -674,7 +689,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?这将是永久性的删除!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "高宽比:" @@ -695,7 +714,11 @@ msgstr "音频åŽç«¯:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: 打开 AO 设备错误.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自动" @@ -807,7 +830,11 @@ msgid "Blue Right" msgstr "è“ å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "底部" @@ -840,7 +867,11 @@ msgstr "æµè§ˆè¾“出目录" msgid "Buffer:" msgstr "缓冲区:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1075,7 +1106,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "关闭" @@ -1185,7 +1220,11 @@ msgstr "连接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "连接 Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "连接中..." @@ -1371,7 +1410,11 @@ msgid "DSP Emulator Engine" msgstr "音频模拟引擎" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "音频 HLE 模拟(很快)" @@ -1591,7 +1634,11 @@ msgstr "按模拟器显示输入读å–" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "您确定是å¦åœæ­¢å½“å‰æ¨¡æ‹Ÿ?" @@ -1621,12 +1668,21 @@ msgstr "Dolphin 模拟 Wiimote 设置" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 手柄设置" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC 手柄设置" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" @@ -1710,9 +1766,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "è·å…°è¯­" @@ -1840,16 +1902,23 @@ msgstr "å¯ç”¨ BAT" msgid "Enable Block Merging" msgstr "å¯ç”¨åŒºå—åˆå¹¶" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "å¯ç”¨ç¼“å­˜" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "å¯ç”¨ä½œå¼Š" @@ -1984,9 +2053,15 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "英语" @@ -2015,6 +2090,7 @@ msgstr "等于" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "错误" @@ -2026,6 +2102,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "错误" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Error loading selected language. Falling back to system default." @@ -2480,9 +2562,15 @@ msgstr "" msgid "Free Look" msgstr "自由视点" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "法语" @@ -2550,7 +2638,11 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube 手柄设置(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube å†…å­˜å¡ (*.raw,*.gcp)" @@ -2573,8 +2665,12 @@ msgstr "" "(either a bad code or the code type is not yet supported.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "常规" @@ -2584,9 +2680,15 @@ msgstr "常规" msgid "General Settings" msgstr "ç•Œé¢è®¾ç½®" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "德语" @@ -2708,8 +2810,12 @@ msgid "Hotkey Configuration" msgstr "热键设置" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "热键" @@ -2919,7 +3025,11 @@ msgid "" msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "安装 WAD 到 Wii èœå•ä¸­..." @@ -3004,9 +3114,15 @@ msgstr "无效录制文件" msgid "Invalid state" msgstr "Invalid state" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "æ„大利语" @@ -3165,12 +3281,20 @@ msgstr "载入存档æ’槽 8" msgid "Load State..." msgstr "载入状æ€..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "载入 Wii 系统èœå•(%d %c)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "载入 Wii 系统èœå•(%d %c)" @@ -3251,7 +3375,11 @@ msgstr "MMU 速度破解" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 文件(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主摇æ†" @@ -3283,7 +3411,11 @@ msgid "Memory Byte" msgstr "内存(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "内存å¡" @@ -3467,7 +3599,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3555,7 +3691,11 @@ msgstr "ä¸ç­‰äºŽ" msgid "Not Set" msgstr "未设置" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "未连接" @@ -3616,7 +3756,10 @@ msgstr "åªæœ‰ %d 区å—有效" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "打开" @@ -3747,8 +3890,13 @@ msgstr "è¡¥ä¸" msgid "Paths" msgstr "路径" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "æš‚åœ" @@ -3769,8 +3917,13 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "开始" @@ -3797,7 +3950,11 @@ msgstr "选项" msgid "Players" msgstr "玩家" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "请确认..." @@ -4012,10 +4169,17 @@ msgstr "刷新列表" msgid "Refresh game list" msgstr "刷新游æˆåˆ—表" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "移除" @@ -4034,7 +4198,10 @@ msgid "Render to Main Window" msgstr "附加到主窗å£" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "é‡ç½®" @@ -4077,7 +4244,11 @@ msgstr "ä¿å­˜çŠ¶æ€(&V)" msgid "Safe" msgstr "安全" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "采样率:" @@ -4162,7 +4333,11 @@ msgstr "Savestate movie %s is corrupted, movie recording stopping..." msgid "Scaled EFB Copy" msgstr "EFB 比例å¤åˆ¶" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "扫æ中..." @@ -4202,12 +4377,21 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "选择" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "选择录制文件" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "选择录制文件" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "选择è¦å¯¼å…¥çš„存档" @@ -4234,6 +4418,7 @@ msgstr "选择浮动窗å£" msgid "Select the file to load" msgstr "选择è¦è½½å…¥çš„文件" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "选择一个存档文件" @@ -4243,6 +4428,17 @@ msgid "Select the state to load" msgstr "选择è¦è½½å…¥çš„状æ€" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "选择一个存档文件" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "选择è¦è½½å…¥çš„状æ€" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "选择è¦ä¿å­˜çš„状æ€" @@ -4591,9 +4787,15 @@ msgstr "声音缓冲区创建失败: %s" msgid "Space" msgstr "空格" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "西ç­ç‰™è¯­" @@ -4629,7 +4831,11 @@ msgstr "æ–¹å—é”®" msgid "Standard Controller" msgstr "标准控制器" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4664,7 +4870,10 @@ msgstr "摇æ†" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -4737,7 +4946,10 @@ msgstr "Table Right" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "å±å¹•æˆªå›¾(&T)" @@ -4973,12 +5185,19 @@ msgstr "切æ¢æ‰€æœ‰æ—¥å¿—类型" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "切æ¢å…¨å±" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "顶部" @@ -5082,6 +5301,18 @@ msgstr "Unknown message received with id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Unknown message with id:%d received from player:%d Kicking player!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"未知指针 %#08x\n" +"继续?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5292,7 +5523,11 @@ msgstr "DVD 根目录:" msgid "Wii Save Import" msgstr "导入 Wii 存档" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5323,7 +5558,11 @@ msgstr "" "or maybe it is due to idle time out or other reason.\n" "Do you want to reconnect immediately?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote 已连接" @@ -5356,9 +5595,15 @@ msgstr "窗å£å³ä¾§" msgid "Word Wrap" msgstr "自动æ¢è¡Œ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "工作中..." diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index 9c59bbbd6d..ab270c846f 100644 --- a/Languages/po/zh_TW.po +++ b/Languages/po/zh_TW.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-03-15 02:51+0800\n" "Last-Translator: khiav \n" "Language-Team: khiav&yrbn \n" @@ -536,9 +540,15 @@ msgstr "新增修正" msgid "Add new pane" msgstr "新增é¢ç‰ˆ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "新增..." @@ -605,8 +615,13 @@ msgstr "所有 GC/Wii 映åƒæª” (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "所有å³æ™‚存檔 (sav, s##)" @@ -687,7 +702,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？刪了之後就回ä¸ä¾†äº†å“¦ï¼" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "ç•«é¢æ¯”例：" @@ -708,7 +727,11 @@ msgstr "è²éŸ³è£ç½®ï¼š" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon：開啟 AO è£ç½®å‡ºéŒ¯ã€‚\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -820,7 +843,11 @@ msgid "Blue Right" msgstr "è— å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "下方" @@ -853,7 +880,11 @@ msgstr "ç€è¦½è¼¸å‡ºçš„資料夾" msgid "Buffer:" msgstr "ç·©è¡ï¼š" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1084,7 +1115,11 @@ msgstr "在éŠæˆ²åŸ·è¡Œæ™‚客戶端斷開連接ï¼ï¼ç¶²è·¯å°æˆ°å·²ç¶“被關閉 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "關閉" @@ -1194,7 +1229,11 @@ msgstr "連接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "連接 Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "正在連接..." @@ -1379,7 +1418,11 @@ msgid "DSP Emulator Engine" msgstr "DSP 模擬引擎" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 模擬器 (å¿«)" @@ -1599,7 +1642,11 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "您è¦åœæ­¢ç›®å‰çš„模擬嗎？" @@ -1629,12 +1676,21 @@ msgstr "Dolphin 模擬 Wiimote 設定" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 控制器設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC 控制器設定" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" @@ -1718,9 +1774,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Dutch" @@ -1846,16 +1908,23 @@ msgstr "é–‹å•Ÿ BAT" msgid "Enable Block Merging" msgstr "é–‹å•Ÿå¡Šåˆä½µ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "é–‹å•Ÿå¿«å–" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "開啟作弊" @@ -1987,9 +2056,15 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "English" @@ -2018,6 +2093,7 @@ msgstr "等於" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "錯誤" @@ -2029,6 +2105,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "錯誤" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "讀å–é¸æ“‡çš„語系出錯。返回使用系統é è¨­å€¼ã€‚" @@ -2481,9 +2563,15 @@ msgstr "" msgid "Free Look" msgstr "自由視點" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "French" @@ -2551,7 +2639,11 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube 控制器設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube è¨˜æ†¶å¡ (*.raw,*.gcp)" @@ -2574,8 +2666,12 @@ msgstr "" "(一個æ毀的代碼或ä¸æ”¯æ´çš„代碼類型。)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2585,9 +2681,15 @@ msgstr "一般" msgid "General Settings" msgstr "ç•Œé¢è¨­å®š" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "German" @@ -2709,8 +2811,12 @@ msgid "Hotkey Configuration" msgstr "å¿«æ·éµè¨­å®š" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "å¿«æ·éµ" @@ -2912,7 +3018,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler，但是這個平å°å°šæœªæ”¯æ´æ­¤åŠŸèƒ½ã€‚" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "æ­£åœ¨å®‰è£ WAD 至 Wii é¸å–®..." @@ -2996,9 +3106,15 @@ msgstr "無效的錄åƒæª”" msgid "Invalid state" msgstr "無效的狀態" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italian" @@ -3157,12 +3273,20 @@ msgstr "讀å–儲存格 8" msgid "Load State..." msgstr "讀å–進度檔..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" @@ -3243,7 +3367,11 @@ msgstr "MMU 速度修正" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 檔案(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主æ–æ¡¿" @@ -3275,7 +3403,11 @@ msgid "Memory Byte" msgstr "記憶å¡(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "記憶å¡" @@ -3459,7 +3591,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3547,7 +3683,11 @@ msgstr "ä¸ç›¸ç­‰" msgid "Not Set" msgstr "未設定" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "未連接" @@ -3608,7 +3748,10 @@ msgstr "僅 %d 個å€å¡Šå¯ç”¨" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "é–‹å•Ÿ" @@ -3737,8 +3880,13 @@ msgstr "修正" msgid "Paths" msgstr "路徑" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "æš«åœ" @@ -3759,8 +3907,13 @@ msgstr "ç‰ˆå¼ %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "執行" @@ -3787,7 +3940,11 @@ msgstr "é¸é …" msgid "Players" msgstr "玩家" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "請確èª..." @@ -4001,10 +4158,17 @@ msgstr "更新列表" msgid "Refresh game list" msgstr "æ›´æ–°éŠæˆ²åˆ—表" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "移除" @@ -4023,7 +4187,10 @@ msgid "Render to Main Window" msgstr "渲染至主視窗" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "é‡ç½®" @@ -4066,7 +4233,11 @@ msgstr "儲存進度(&V)" msgid "Safe" msgstr "安全" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "å–樣率：" @@ -4151,7 +4322,11 @@ msgstr "儲存的影片 %s 是æ毀的，影片錄製åœæ­¢..." msgid "Scaled EFB Copy" msgstr "EFB 縮放複製" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "正在掃瞄..." @@ -4191,12 +4366,21 @@ msgstr "é …ç›® %s 在 SYSCONF 中找ä¸åˆ°" msgid "Select" msgstr "é¸æ“‡" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "é¸æ“‡å·²éŒ„製的檔案" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "é¸æ“‡å·²éŒ„製的檔案" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "é¸æ“‡è¦å®‰è£çš„ Wii WAD" @@ -4222,6 +4406,7 @@ msgstr "é¸æ“‡æµ®å‹•è¦–窗" msgid "Select the file to load" msgstr "é¸æ“‡è¦è®€å–的檔案" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "é¸æ“‡å­˜æª”" @@ -4231,6 +4416,17 @@ msgid "Select the state to load" msgstr "é¸æ“‡è¦è®€å–的進度" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "é¸æ“‡å­˜æª”" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "é¸æ“‡è¦è®€å–的進度" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "é¸æ“‡è¦å„²å­˜çš„進度" @@ -4578,9 +4774,15 @@ msgstr "è²éŸ³ç·©è¡å»ºç«‹å¤±æ•—：%s" msgid "Space" msgstr "Space" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spanish" @@ -4616,7 +4818,11 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "標準控制器" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4651,7 +4857,10 @@ msgstr "æ–æ¡¿" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -4724,7 +4933,10 @@ msgstr "Table å³" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "截å–ç•«é¢" @@ -4950,12 +5162,19 @@ msgstr "å…¨é¸/全部å–消" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "切æ›å…¨èž¢å¹•" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "上方" @@ -5059,6 +5278,18 @@ msgstr "接收到帶有未知 id 的錯誤訊æ¯ï¼š%d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "知訊æ¯å¸¶æœ‰ id:%d 接收於玩家:%d 正在æ出玩家ï¼" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"未知的指示器 %#08x\n" +"是å¦ç¹¼çºŒï¼Ÿ" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5269,7 +5500,11 @@ msgstr "DVD 根：" msgid "Wii Save Import" msgstr "匯入 Wii 存檔" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5300,7 +5535,11 @@ msgstr "" "或閒置的時間太久。\n" "是å¦è¦é‡æ–°é€£æŽ¥ï¼Ÿ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote 已連接" @@ -5333,9 +5572,15 @@ msgstr "視窗 å³" msgid "Word Wrap" msgstr "自動æ›è¡Œ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "執行中..." From 828205df22f7a4006c396c51ea1b09270f7e455d Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 15 Oct 2011 09:08:15 -0500 Subject: [PATCH 036/185] Update Greek and Czech translations --- Languages/po/cs.po | 733 ++++++++++++++++++++++++++++++--------------- Languages/po/el.po | 680 +++++++++++++++++++++++++++++++---------- 2 files changed, 1011 insertions(+), 402 deletions(-) diff --git a/Languages/po/cs.po b/Languages/po/cs.po index b441cc4434..5de197a7a6 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -8,12 +8,17 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-15 14:50+0100\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-08-10 20:37+0100\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-08-10 08:30-0500\n" +"PO-Revision-Date: 2011-10-15 14:50+0100\n" +>>>>>>> Update Greek and Czech translations "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" "Language: Czech\n" @@ -35,7 +40,7 @@ msgstr " Hra : " msgid "! NOT" msgstr "! NE" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -77,7 +82,7 @@ msgstr "%s už existuje, pÅ™epsat?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s nelze vyÄistit. Obraz je pravdÄ›podobnÄ› poÅ¡kozen." -#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -86,7 +91,7 @@ msgstr "" "%s nelze naÄíst jako paměťovou kartu\n" "Soubor karty je neplatný (0x%x bajtů)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -95,7 +100,7 @@ msgstr "" "%s nelze naÄíst jako paměťovou kartu\n" "Velikost karty je neplatná (0x%x bajtů)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -312,7 +317,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(NEZNÃMÃ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(vypnuto)" @@ -324,7 +329,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "3D Vision" msgstr "3D Vision" @@ -336,7 +341,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 msgid "" msgstr "<Žádné rozliÅ¡ení nenalezeno>" @@ -423,17 +428,17 @@ msgstr "O Dolphinu" msgid "Acceleration" msgstr "Zrychlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 -msgid "Accuracy:" -msgstr "PÅ™esnost:" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD ======= +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +>>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. msgid "" @@ -441,7 +446,7 @@ msgid "" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, check EFB to Texture instead." +"If unsure, leave this checked." msgstr "" "PÅ™esnÄ› emulovat EFB kopie.\n" "NÄ›které hry na tomto závisí pro urÄité grafické efekty nebo herní funkce.\n" @@ -540,12 +545,12 @@ msgstr "Action Replay: Normální Kód %i: Neplatný podtyp %08x (%s)" msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normální Kód 0: Neplatný Podtyp %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 msgid "Adapter:" msgstr "Adaptér:" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 msgid "Add" msgstr "PÅ™idat" @@ -561,6 +566,7 @@ msgstr "PÅ™idat Záplatu" msgid "Add new pane" msgstr "PÅ™idat nový panel" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -570,6 +576,11 @@ msgstr "PÅ™idat nový panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +>>>>>>> Update Greek and Czech translations msgid "Add..." msgstr "PÅ™idat..." @@ -617,7 +628,7 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Upravte tlak analogového ovládání potÅ™ebný k aktivaci tlaÄítek." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 msgid "Advanced" msgstr "PokroÄilé" @@ -637,6 +648,7 @@ msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -644,6 +656,10 @@ msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update Greek and Czech translations msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" @@ -659,7 +675,7 @@ msgstr "VÅ¡echny komprimované soubory GC/WII ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "VÅ¡echny soubory (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -671,6 +687,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD msgid "Alternate Wiimote Timing" @@ -682,10 +699,13 @@ msgstr "Emulovaný Wiimote" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +>>>>>>> Update Greek and Czech translations msgid "Anisotropic Filtering:" msgstr "Anizotropní Filtrování:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Vyhlazení okrajů" @@ -705,7 +725,7 @@ msgstr "ZavadÄ›Ä aplikace:" msgid "Apply" msgstr "Použít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -740,8 +760,12 @@ msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +>>>>>>> Update Greek and Czech translations msgid "Aspect Ratio:" msgstr "PomÄ›r Stran:" @@ -765,20 +789,24 @@ msgstr "AudioCommon: Chyba pÅ™i otevírání zařízení zvukového výstupu.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +>>>>>>> Update Greek and Czech translations msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Násobek 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Auto (Velikost Okna)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Auto adjust Window Size" msgstr "Automaticky upravovat Velikost Okna" @@ -792,18 +820,6 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Automaticky vytvoÅ™it mipmapy, radÄ›ji než dekódovat je z pamÄ›ti.\n" -"Trochu zlepší výkon, ale může způsobit malé chyby pamÄ›ti.\n" -"\n" -"Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "ZpÄ›t" @@ -812,8 +828,8 @@ msgstr "ZpÄ›t" msgid "Backend Settings" msgstr "Nastavení Backendu" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -847,7 +863,7 @@ msgstr "Plakát:" msgid "Bar" msgstr "Vibráto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Základní" @@ -859,7 +875,7 @@ msgstr "Základní nastavení" msgid "Bass" msgstr "Basy" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Kontrolní souÄet AlokaÄní Tabulky Bloku selhal" @@ -879,12 +895,17 @@ msgstr "Modrá vlevo" msgid "Blue Right" msgstr "Modrá vpravo" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +>>>>>>> Update Greek and Czech translations msgid "Bottom" msgstr "Dole" @@ -917,13 +938,18 @@ msgstr "Procházet pro výstupní adresář" msgid "Buffer:" msgstr "Vyrovnávací paměť:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 msgid "Buttons" msgstr "TlaÄítka" @@ -939,11 +965,11 @@ msgstr "Kr-Stick" msgid "CPU Emulator Engine" msgstr "Jádro Emulátoru Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 msgid "Cache Display Lists" msgstr "Ukládat pÅ™edvyt. obj. do vyr. pam." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -958,7 +984,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -973,8 +999,8 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 msgid "Cancel" msgstr "ZruÅ¡it" @@ -1018,10 +1044,10 @@ msgstr "Nelze najít Wiimote podle bz: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Nelze najít Wiimote pomocí obslužné rutiny spojení %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Nelze Äíst ze zásuvného modulu DVD - DVD-Rozhraní: Závažná chyba" @@ -1144,10 +1170,10 @@ msgstr "Kruhový Stick" msgid "Classic" msgstr "Klasické" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "VyÄistit" @@ -1162,14 +1188,18 @@ msgid "" msgstr "" "Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit ruÄnÄ›." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +>>>>>>> Update Greek and Czech translations msgid "Close" msgstr "Zavřít" @@ -1277,11 +1307,15 @@ msgstr "PÅ™ipojit Wiimote 3" msgid "Connect Wiimote 4" msgstr "PÅ™ipojit Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:608 +>>>>>>> Update Greek and Czech translations msgid "Connecting..." msgstr "PÅ™ipojuji..." @@ -1349,7 +1383,7 @@ 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 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1419,11 +1453,11 @@ msgstr "Tvůrce:" msgid "Critical" msgstr "Kritické" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Crop" msgstr "Oříznout" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1470,12 +1504,17 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +>>>>>>> Update Greek and Czech translations msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" @@ -1524,7 +1563,7 @@ msgstr "Mrtvá Zóna" msgid "Debug" msgstr "LadÄ›ní" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Debugging" msgstr "LadÄ›ní" @@ -1557,8 +1596,8 @@ msgstr "Výchozí ISO:" msgid "Default font" msgstr "Výchozí typ písma" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 msgid "Delete" msgstr "Smazat" @@ -1566,12 +1605,12 @@ msgstr "Smazat" msgid "Delete Save" msgstr "Smazat Uloženou Hru" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 #, c-format msgid "Delete the existing file '%s'?" msgstr "Vymazat existující soubor '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 msgid "Description" msgstr "Popis" @@ -1602,15 +1641,15 @@ msgstr "Nastavení Zařízení" msgid "Dial" msgstr "Kruhová stupnice" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1618,28 +1657,32 @@ msgstr "" "Kontrolní souÄet adresáře\n" "i záložní kontrolní souÄet Adresáře selhal" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 msgid "Disable" msgstr "Zakázat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Disable Fog" msgstr "Zakázat Mlhu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Disable Lighting" msgstr "Zakázat OsvÄ›tlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Disable Per-Pixel Depth" msgstr "Zakázat Hloubku Podle Pixelu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Textures" msgstr "Zakázat Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Disable Wiimote Speaker" +msgstr "Zakázat Reproduktor Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1653,7 +1696,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1669,7 +1712,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Disable texturing.\n" "\n" @@ -1688,11 +1731,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Chyba Ätení disku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1706,11 +1749,15 @@ msgstr "" msgid "Divide" msgstr "RozdÄ›lit" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +>>>>>>> Update Greek and Czech translations msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" @@ -1718,7 +1765,7 @@ msgstr "Chcete souÄasnou emulaci zastavit?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafická Nastavení" @@ -1739,6 +1786,7 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1748,12 +1796,19 @@ msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +>>>>>>> Update Greek and Czech translations msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +>>>>>>> Update Greek and Czech translations msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1781,8 +1836,8 @@ msgstr "" "Dolphin je v souÄasnosti nastaven na skrytí vÅ¡ech her. KliknÄ›te zde dvakrát " "pro zobrazení vÅ¡ech her..." -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 msgid "Down" msgstr "Dolů" @@ -1807,19 +1862,19 @@ msgstr "Atrapa" msgid "Dump Audio" msgstr "Vypsat Zvuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Dump EFB Target" msgstr "Vypsat Cíl EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 msgid "Dump Frames" msgstr "Vypsat Snímky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 msgid "Dump Textures" msgstr "Vypsat Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1829,7 +1884,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1839,7 +1894,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1849,6 +1904,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1858,6 +1914,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +>>>>>>> Update Greek and Czech translations msgid "Dutch" msgstr "NizozemÅ¡tina" @@ -1865,7 +1926,7 @@ msgstr "NizozemÅ¡tina" msgid "E&xit" msgstr "O&dejít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 msgid "EFB Copies" msgstr "EFB Kopie" @@ -1918,7 +1979,7 @@ msgstr "Upravit" msgid "Effect" msgstr "Efekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Embedded Frame Buffer" msgstr "VnoÅ™ená Vyr. PamÄ›t Snímků" @@ -1926,7 +1987,7 @@ msgstr "VnoÅ™ená Vyr. PamÄ›t Snímků" msgid "Emu Thread already running" msgstr "Vlákno Emulace již běží" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1940,7 +2001,7 @@ msgstr "" "\n" "Pokud si nejste jisti, zaÅ¡krtnÄ›te místo tohoto virtuální emulaci XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1968,7 +2029,7 @@ msgstr "Stav Emulace:" msgid "Enable" msgstr "Povolit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -2000,6 +2061,7 @@ msgstr "Zapnout BAT" msgid "Enable Block Merging" msgstr "Zapnout SluÄování Bloků" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -2014,6 +2076,8 @@ msgstr "Povolit vyrovnávací paměť" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" @@ -2031,7 +2095,7 @@ msgstr "Povolit dvojité jádro" msgid "Enable Dual Core (speedup)" msgstr "Zapnout dvojité jádro (zrychlení)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Enable Hotkeys" msgstr "Povolit klávesové zkratky" @@ -2047,8 +2111,8 @@ msgstr "Povolit PÅ™eskakování NeÄinných Příkazů (zrychlení)" msgid "Enable MMU" msgstr "Zapnout MMU" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Povolit Progresivní Skenování" @@ -2060,7 +2124,7 @@ msgstr "Povolit SpoÅ™iÄ Obrazovky" msgid "Enable WideScreen" msgstr "Povolit Å irokoúhlou obrazovku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Enable Wireframe" msgstr "Povolit DrátÄ›ný Model" @@ -2157,7 +2221,7 @@ msgstr "" "Povolí Jednotku Správy PamÄ›ti, potÅ™ebnou v nÄ›jakých hrách. (ZAPNUTO = " "Kompatibilní, VYPNUTO = Rychlé)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2171,6 +2235,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2180,11 +2245,16 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +>>>>>>> Update Greek and Czech translations msgid "English" msgstr "AngliÄtina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "Enhancements" msgstr "VylepÅ¡ení" @@ -2206,6 +2276,7 @@ msgstr "Záznam 1/%d" msgid "Equal" msgstr "Rovná se" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD @@ -2221,12 +2292,20 @@ msgid "" msgstr "" ======= +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Error" msgstr "Chyba" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:356 +>>>>>>> Update Greek and Czech translations 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." @@ -2309,7 +2388,7 @@ msgstr "Exportovat Uloženou hru jako..." msgid "Extension" msgstr "Rozšíření" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "External Frame Buffer" msgstr "VnÄ›jší Vyr. Paměť Snímků" @@ -2431,7 +2510,7 @@ msgstr "Nelze nahrát hid.dll" msgid "Failed to read banner.bin" msgstr "Nelze Äíst z banner.bin" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2439,7 +2518,7 @@ msgstr "" "Nelze správnÄ› Äíst zálohu alokaÄní tabulky bloku\n" "(0x8000-0x9FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2452,7 +2531,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Nelze Äíst data ze souboru %d" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2460,7 +2539,7 @@ msgstr "" "Nelze správnÄ› Äíst zálohu adresáře\n" "(0x4000-0x5FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2468,7 +2547,7 @@ msgstr "" "Nelze správnÄ› Äíst adresář\n" "(0x2000-0x3FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2476,7 +2555,7 @@ msgstr "" "Nelze správnÄ› Äíst hlaviÄku\n" "(0x0000-0x1FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2508,14 +2587,6 @@ msgstr "Zápis hlaviÄky selhal pro %s" msgid "Failed to write header for file %d" msgstr "Selhal zápis hlaviÄky souboru %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 -msgid "Fast" -msgstr "Rychlá" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Fast Mipmaps" -msgstr "Rychlé Mipmapy" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rychlá verze MMU. Nefunguje v každé hÅ™e." @@ -2544,7 +2615,7 @@ msgstr "" "Soubor nelze otevřít\n" "nebo nemá platnou příponu" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2582,11 +2653,11 @@ msgstr "První blok" msgid "Fix Checksums" msgstr "Spravit Kontrolní SouÄty" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Force 16:9" msgstr "Vynutit 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Force 4:3" msgstr "Vynutit 4:3" @@ -2594,11 +2665,11 @@ msgstr "Vynutit 4:3" msgid "Force Console as NTSC-J" msgstr "Donutit konzoli být jako NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Force Texture Filtering" msgstr "Vynutit Filtrování Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2632,7 +2703,7 @@ msgstr "" "Pokud není zaÅ¡krtnuto, Dolphin standardnÄ› pÅ™ejde na NTSC-U a automaticky " "zapne toto nastavení pÅ™i hraní Japonských her." -#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2658,7 +2729,7 @@ msgstr "Snímek" msgid "Frame Advance" msgstr "Postup Snímkem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 msgid "Frame Dumps use FFV1" msgstr "Uložení snímků použije FFV1" @@ -2678,10 +2749,11 @@ msgstr "Limit Snímků:" msgid "Frames To Record" msgstr "Snímky k Nahrání" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 msgid "Free Look" msgstr "Rozhlížení pomocí myÅ¡i" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2691,6 +2763,11 @@ msgstr "Rozhlížení pomocí myÅ¡i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +>>>>>>> Update Greek and Czech translations msgid "French" msgstr "FrancouzÅ¡tina" @@ -2707,7 +2784,7 @@ msgstr "Z" msgid "FullScr" msgstr "CelObr" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "Fullscreen resolution:" msgstr "RozliÅ¡ení celé obrazovky:" @@ -2756,12 +2833,17 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +>>>>>>> Update Greek and Czech translations msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2783,6 +2865,7 @@ msgstr "" "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n" "(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován.)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 @@ -2791,6 +2874,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +>>>>>>> Update Greek and Czech translations msgid "General" msgstr "Obecné" @@ -2798,6 +2886,7 @@ msgstr "Obecné" msgid "General Settings" msgstr "Obecná Nastavení" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2807,6 +2896,11 @@ msgstr "Obecná Nastavení" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +>>>>>>> Update Greek and Czech translations msgid "German" msgstr "NÄ›mÄina" @@ -2827,17 +2921,19 @@ msgstr "Grafická nastavení" msgid "Greater Than" msgstr "VÄ›tší než" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD ======= +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +>>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. msgid "" -"Greatly increases quality of textures generated using render to texture " +"Greatly increases quality of textures generated using render-to-texture " "effects.\n" "Raising the internal resolution will improve the effect of this setting.\n" -"Slightly decreases performance and possibly causes issues (although " -"unlikely).\n" "\n" "If unsure, leave this checked." msgstr "" @@ -2872,11 +2968,11 @@ msgstr "Kytara" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Byl zavolán HCI_CMD_INQUIRY, prosím ohlaste!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 msgid "Hacks" msgstr "Hacky" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Kontrolní souÄet hlaviÄky selhal" @@ -2912,7 +3008,7 @@ msgstr "" msgid "Hide" msgstr "Skrýt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Skrýt kurzor myÅ¡i" @@ -2939,6 +3035,7 @@ msgstr "Hostovat" msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 @@ -2946,6 +3043,10 @@ msgstr "Nastavení klávesových zkratek" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +>>>>>>> Update Greek and Czech translations msgid "Hotkeys" msgstr "Klávesové zkratky" @@ -3032,11 +3133,11 @@ 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, aby to bylo úÄinné." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 msgid "Ignore Format Changes" msgstr "Ignorovat ZmÄ›ny Formátu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3050,7 +3151,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3092,7 +3193,7 @@ msgstr "" "\"Importovaný soubor má příponu sav\n" "ale nemá správnou hlaviÄku\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3104,7 +3205,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -3122,8 +3223,8 @@ msgstr "Ve HÅ™e" msgid "In-Game" msgstr "Ve HÅ™e" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 msgid "Info" msgstr "Info" @@ -3166,11 +3267,15 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " "nepodporuje." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +>>>>>>> Update Greek and Czech translations msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3199,7 +3304,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "VnitÅ™ní chyba LZO - lzo_init() selhalo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "VnitÅ™ní RozliÅ¡ení:" @@ -3252,6 +3357,7 @@ msgstr "Neplatný soubor s nahrávkou" msgid "Invalid state" msgstr "Neplatný stav" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3261,6 +3367,11 @@ msgstr "Neplatný stav" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +>>>>>>> Update Greek and Czech translations msgid "Italian" msgstr "ItalÅ¡tina" @@ -3322,8 +3433,8 @@ msgstr "Poslední PÅ™epsaný Stav" msgid "Last Saved State" msgstr "Poslední Uložený Stav" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 msgid "Left" msgstr "Vlevo" @@ -3370,7 +3481,7 @@ msgstr "Limitovat podle SzS" msgid "Load" msgstr "Nahrát" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 msgid "Load Custom Textures" msgstr "Nahrát Vlastní Textury" @@ -3418,6 +3529,7 @@ msgstr "Nahrát Slot Stavu 8" msgid "Load State..." msgstr "Nahrát Stav..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3431,11 +3543,18 @@ msgstr "Nahrát Systémové Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +msgid "Load Wii System Menu" +msgstr "Nahrát Systémové Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +>>>>>>> Update Greek and Czech translations #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3477,8 +3596,8 @@ msgstr "Typy Záznamu" msgid "Logger Outputs" msgstr "Výstup ZapisovaÄe" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 #: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Logging" msgstr "Protokolování" @@ -3512,12 +3631,16 @@ msgstr "MMU Hack Rychlosti" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Soubory MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 msgid "Main Stick" msgstr "Hlavní Stick" @@ -3546,12 +3669,17 @@ msgstr "Pam. karta již otevÅ™ena" msgid "Memory Byte" msgstr "Bajt PamÄ›ti" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +>>>>>>> Update Greek and Czech translations msgid "Memory Card" msgstr "Paměťová karta" @@ -3580,7 +3708,7 @@ msgstr "" "%s\n" "ChtÄ›li byste starý soubor zkopírovat do nového umístÄ›ní?\n" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "Velikost paměťové karty se neshoduje s velikosti hlaviÄky" @@ -3597,7 +3725,7 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Misc" msgstr "Ostatní" @@ -3610,7 +3738,7 @@ msgstr "Ostatní Nastavení" msgid "Modifier" msgstr "Modifikátor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3635,7 +3763,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3749,13 +3877,17 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Jméno:" @@ -3840,11 +3972,15 @@ msgstr "Nerovná se" msgid "Not Set" msgstr "Nenastaven" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:607 +>>>>>>> Update Greek and Czech translations msgid "Not connected" msgstr "NepÅ™ipojen" @@ -3873,8 +4009,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "PoÄet Kódů:" -#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 msgid "Nunchuk" msgstr "NunÄak" @@ -3903,12 +4039,15 @@ msgstr "Logická Adresa:" msgid "Only %d blocks available" msgstr "Pouze bloky %d jsou dostupné" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +>>>>>>> Update Greek and Czech translations msgid "Open" msgstr "Otevřít" @@ -3938,11 +4077,11 @@ msgstr "OpenAL: nelze nalézt zvuková zařízení" msgid "OpenAL: can't open device %s" msgstr "OpenAL: nelze otevřít zařízení %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "OpenCL Texture Decoder" msgstr "OpenCL Dekodér Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "OpenMP Texture Decoder" msgstr "OpenMP Dekodér Textury" @@ -3973,8 +4112,8 @@ msgstr "" "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:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Other" msgstr "Jiné" @@ -4038,6 +4177,7 @@ msgstr "Záplaty" msgid "Paths" msgstr "Cesty" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4045,11 +4185,15 @@ msgstr "Cesty" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pozastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Per-Pixel Lighting" msgstr "OsvÄ›tlení Podle Pixelu" @@ -4062,15 +4206,20 @@ msgstr "Dokonalá" msgid "Perspective %d" msgstr "Perspektiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +>>>>>>> Update Greek and Czech translations msgid "Play" msgstr "Spustit" @@ -4096,11 +4245,15 @@ msgstr "Možnosti PÅ™ehrávání" msgid "Players" msgstr "HráÄi" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update Greek and Czech translations msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -4145,7 +4298,7 @@ msgstr "PortugalÅ¡tina" msgid "Portuguese (Brazilian)" msgstr "PortugalÅ¡tina (Brazilská)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Efekt Následného Zpracování:" @@ -4219,7 +4372,7 @@ msgstr "TlaÄítko R" msgid "R-Analog" msgstr "Pravý Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "RAM" msgstr "RAM" @@ -4236,7 +4389,7 @@ msgstr "Rozsah" msgid "Read-only mode" msgstr "Režim pouze pro Ätení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Real" msgstr "Opravdová" @@ -4296,9 +4449,9 @@ msgstr "" "\n" "Pokud si nejste jisti, vyberte Žádný." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 msgid "Refresh" msgstr "Obnovit" @@ -4311,6 +4464,7 @@ msgstr "Obnovit Seznam" msgid "Refresh game list" msgstr "Obnovit seznam her" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4322,10 +4476,16 @@ msgstr "Obnovit seznam her" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +>>>>>>> Update Greek and Czech translations msgid "Remove" msgstr "Odstranit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4335,16 +4495,20 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Vykreslit do Hlavního okna" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 msgid "Reset" msgstr "Resetovat" @@ -4356,8 +4520,8 @@ msgstr "Výsledky" msgid "Return" msgstr "Enter" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 msgid "Right" msgstr "Vpravo" @@ -4382,6 +4546,7 @@ msgstr "RuÅ¡tina" msgid "Sa&ve State" msgstr "Uložit Sta&v" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Safe" msgstr "BezpeÄná" @@ -4389,14 +4554,16 @@ msgstr "BezpeÄná" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 msgid "Save" msgstr "Uložit" @@ -4470,6 +4637,7 @@ msgstr "Uložit dekomprimované GCM/ISO" msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Uložený stav filmu %s je poÅ¡kozen, nahrávání filmu je zastaveno..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" @@ -4477,6 +4645,8 @@ msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. #, c-format @@ -4513,8 +4683,8 @@ msgstr "Hledat Podadresáře" msgid "Section %s not found in SYSCONF" msgstr "Sekce %s nebyla v SYSCONF nalezena" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 msgid "Select" msgstr "Vybrat" @@ -4527,12 +4697,16 @@ msgstr "Vyberte Soubor s Nahrávkou" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +>>>>>>> Update Greek and Czech translations msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -4558,6 +4732,7 @@ msgstr "Vybrat plovoucí okna" msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4570,15 +4745,22 @@ msgstr "Vyberte stav k nahrání" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +>>>>>>> Update Greek and Czech translations msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +>>>>>>> Update Greek and Czech translations msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -4716,11 +4898,11 @@ msgstr "Zobrazit Panel Nás&trojů" msgid "Show Drives" msgstr "Zobrazit Disky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Show EFB Copy Regions" msgstr "Zobrazit EFB Regiony Kopie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Show FPS" msgstr "Zobrazit Snímky za Sekundu" @@ -4732,7 +4914,7 @@ msgstr "Zobrazit Francii" msgid "Show GameCube" msgstr "Zobrazit GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Show Input Display" msgstr "Zobrazit Obrazovku Vstupu" @@ -4768,7 +4950,7 @@ msgstr "Zobrazit Platformy" msgid "Show Regions" msgstr "Zobrazit Regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Show Statistics" msgstr "Zobrazit Statistiky" @@ -4822,7 +5004,7 @@ msgstr "Zobrazit ikonu uložení" msgid "Show save title" msgstr "Zobrazit název uložení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4842,7 +5024,7 @@ msgstr "Zobrazit tuto zprávu nápovÄ›dy" msgid "Show unknown" msgstr "Zobrazit neznámé" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4868,15 +5050,15 @@ msgstr "Velikost" msgid "Skip BIOS" msgstr "PÅ™eskoÄit BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Skip Dest. Alpha Pass" msgstr "Vypnout Průchod Cíl. Průhl." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 msgid "Skip EFB Access from CPU" msgstr "PÅ™eskoÄit EFB Přístup z Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4888,22 +5070,6 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 -msgid "" -"Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" -"Sometimes also increases visual quality.\n" -"If you're experiencing any issues, try raising texture cache accuracy or " -"disable this option.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Lehce zrychlí kopie EFB do RAM obÄ›továním pÅ™esnosti emulace.\n" -"NÄ›kdy také zvýší kvalitu obrazu.\n" -"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost textury, " -"nebo tuto možnost vypnout.\n" -"\n" -"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." - #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4957,6 +5123,7 @@ msgstr "VytvoÅ™ení vyrovnávací pamÄ›ti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4966,6 +5133,11 @@ msgstr "Mezerník" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +>>>>>>> Update Greek and Czech translations msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" @@ -4973,7 +5145,7 @@ msgstr "Å panÄ›lÅ¡tina" msgid "Speaker Volume:" msgstr "Hlasitost Reproduktoru:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "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 " @@ -5009,13 +5181,17 @@ msgstr "ÄŒtvercový Stick" msgid "Standard Controller" msgstr "Standardní OvladaÄ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -5045,32 +5221,21 @@ msgstr "Ukládání stavu" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Zastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 -msgid "" -"Store EFB copies in GPU texture objects.\n" -"This is not so accurate, but it works well enough for most games and gives a " -"great speedup over EFB to RAM.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Ukládat EFB kopie do objektů textury grafického procesoru.\n" -"Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává vÄ›tší " -"zrychlení než EFB do RAM.\n" -"\n" -"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Stretch to Window" msgstr "Roztáhnout do Okna" @@ -5104,8 +5269,8 @@ msgstr "Jazyk Systému:" msgid "TAIWAN" msgstr "TCHAJ-WAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 msgid "TAS Input" msgstr "TAS Vstup" @@ -5125,13 +5290,17 @@ msgstr "Deska vlevo" msgid "Table Right" msgstr "Deska vpravo" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations msgid "Take Screenshot" msgstr "VytvoÅ™it Snímek Obrazovky" @@ -5143,15 +5312,7 @@ msgstr "" msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 -msgid "Texture" -msgstr "Textura" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 -msgid "Texture Cache" -msgstr "Vyrovnávací Paměť Textur" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Texture Format Overlay" msgstr "PÅ™ekryv Formátu Textury" @@ -5196,7 +5357,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Soubor %s je už otevÅ™en, hlaviÄka souboru nebude zapsána." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:281 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Zadaný soubor (%s) neexistuje" @@ -5213,23 +5374,11 @@ msgstr "Jméno nemůže obsahovat znak ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Výsledný rozÅ¡ifrovaný kód AR neobsahuje žádné řádky." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 -msgid "" -"The safer you adjust this, the less likely the emulator will be missing any " -"texture updates from RAM.\n" -"\n" -"If unsure, use the second-fastest value from the right." -msgstr "" -"Čím bezpeÄnÄ›jší toto bude, tím bude ménÄ› pravdÄ›podobné, že emulátoru budou " -"chybÄ›t jakékoliv aktualizace textur z RAM.\n" -"\n" -"Pokud si nejste jisti, použijte druhou nejrychlejší hodnotu zprava." - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:353 +#: Source/Core/DolphinWX/Src/Main.cpp:363 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5298,7 +5447,7 @@ msgstr "" 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." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5373,9 +5522,9 @@ msgstr "Do" msgid "Toggle All Log Types" msgstr "Zapnout VÅ¡echny Typy Záznamů" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. @@ -5388,6 +5537,14 @@ msgstr "PÅ™epnout na Celou Obrazovku" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +msgid "Toggle Fullscreen" +msgstr "PÅ™epnout na Celou Obrazovku" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +>>>>>>> Update Greek and Czech translations msgid "Top" msgstr "NahoÅ™e" @@ -5395,7 +5552,7 @@ msgstr "NahoÅ™e" msgid "Traditional Chinese" msgstr "TradiÄní ČínÅ¡tina" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:375 msgid "Tried to load an unknown file type." msgstr "Pokus o naÄtení souboru neznámého typu." @@ -5431,8 +5588,8 @@ msgstr "Typ" msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5507,9 +5664,13 @@ msgstr "" "Neznámý ukazatel %#08x\n" "PokraÄovat?" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 msgid "Up" msgstr "Nahoru" @@ -5526,7 +5687,7 @@ msgstr "Svislý Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Použít režim EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "Use Fullscreen" msgstr "Použít Celou Obrazovku" @@ -5538,7 +5699,7 @@ msgstr "Použít Å estnáctkovou soustavu" msgid "Use Panic Handlers" msgstr "Použít Obslužné Rutiny Paniky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5551,7 +5712,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5565,11 +5726,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Utility" msgstr "Pomůcky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 msgid "V-Sync" msgstr "V-Synch" @@ -5593,7 +5754,8 @@ msgstr "Úroveň" msgid "Video" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 msgid "Virtual" msgstr "Virtuální" @@ -5620,21 +5782,21 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/Common/Src/MsgHandler.cpp:67 msgid "Warning" msgstr "Varování" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:240 msgid "Warning - starting DOL in wrong console mode!" msgstr "Varování - DOL se spouÅ¡tí ve Å¡patném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:290 msgid "Warning - starting ELF in wrong console mode!" msgstr "Varování - ELF se spouÅ¡tí ve Å¡patném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:185 msgid "Warning - starting ISO in wrong console mode!" msgstr "Varování - ISO se spouÅ¡tí ve Å¡patném režimu konzole!" @@ -5706,7 +5868,7 @@ msgstr "WaveFileWriter - soubor není otevÅ™en." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Widescreen Hack" msgstr "Hack Å irokoúhlého obrazu" @@ -5730,11 +5892,15 @@ msgstr "Wii KoÅ™en NAND:" msgid "Wii Save Import" msgstr "Import uložených pozic Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +>>>>>>> Update Greek and Czech translations msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -5742,8 +5908,8 @@ msgstr "Wii soubory s uložením (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD Nelze Äíst ze souboru" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 #: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:16 msgid "Wiimote" msgstr "Wiimote" @@ -5765,11 +5931,15 @@ msgstr "" "nebo je to vyprÅ¡ení limitu neaktivity, nebo z jiného důvodu.\n" "Chcete ho hned znovu pÅ™ipojit?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:609 +>>>>>>> Update Greek and Czech translations msgid "Wiimote Connected" msgstr "Wiimote PÅ™ipojen" @@ -5801,12 +5971,16 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. @@ -5915,7 +6089,7 @@ msgstr "Nulový kód, který dolphin nezná: %08x" msgid "[ waiting ]" msgstr "[ Äekám ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5931,7 +6105,7 @@ msgstr "" msgid "[Custom]" msgstr "[Vlastní]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5950,7 +6124,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -6057,6 +6231,9 @@ msgstr "| NEBO" #~ msgid "< as Default Profile >" #~ msgstr "< jako Výchozí Profil >" +#~ msgid "Accuracy:" +#~ msgstr "PÅ™esnost:" + #~ msgid "Accurate Texture Cache" #~ msgstr "Precizní Vyrovnávací Paměť Textur" @@ -6076,6 +6253,9 @@ msgstr "| NEBO" #~ "ale zapnutí této možnosti může mít také velký negativní dopad na výkon " #~ "pokud hra tuto funkci hodnÄ› využívá." +#~ msgid "Alternate Wiimote Timing" +#~ msgstr "Střídat Äasování Wiimote" + #~ msgid "Auto [recommended]" #~ msgstr "Auto [doporuÄeno]" @@ -6088,6 +6268,17 @@ msgstr "| NEBO" #~ "nastavená pomocí zmÄ›ny velikosti EFB.\n" #~ "PÅ™i používání tohoto je nejlepší nastavit pomÄ›r stran na roztáhnutí." +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Automaticky vytvoÅ™it mipmapy, radÄ›ji než dekódovat je z pamÄ›ti.\n" +#~ "Trochu zlepší výkon, ale může způsobit malé chyby pamÄ›ti.\n" +#~ "\n" +#~ "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6124,9 +6315,6 @@ msgstr "| NEBO" #~ msgid "Danish" #~ msgstr "DánÅ¡tina" -#~ msgid "Disable Wiimote Speaker" -#~ msgstr "Zakázat Reproduktor Wiimote" - #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6172,6 +6360,9 @@ msgstr "| NEBO" #~ msgid "Enable CPU Access" #~ msgstr "Povolit Přístup k Procesoru" +#~ msgid "Enable Cache" +#~ msgstr "Povolit vyrovnávací paměť" + #~ msgid "Enable Copy to EFB" #~ msgstr "Povolit Kopírování do EFB" @@ -6230,6 +6421,12 @@ msgstr "| NEBO" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Nelze nahrát DSP ROM : %s" +#~ msgid "Fast" +#~ msgstr "Rychlá" + +#~ msgid "Fast Mipmaps" +#~ msgstr "Rychlé Mipmapy" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6343,9 +6540,15 @@ msgstr "| NEBO" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Nutné pro použití Japonského písma ROM" +#~ msgid "Safe" +#~ msgstr "BezpeÄná" + #~ msgid "Scale:" #~ msgstr "ZmÄ›na Velikosti:" +#~ msgid "Scaled EFB Copy" +#~ msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" + #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Vyberte rozliÅ¡ení v režimu celé obrazovky" @@ -6390,6 +6593,21 @@ msgstr "| NEBO" #~ "Zobrazí různé statistiky.\n" #~ "Jsou užiteÄné pouze pro úÄely ladÄ›ní." +#~ msgid "" +#~ "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" +#~ "Sometimes also increases visual quality.\n" +#~ "If you're experiencing any issues, try raising texture cache accuracy or " +#~ "disable this option.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Lehce zrychlí kopie EFB do RAM obÄ›továním pÅ™esnosti emulace.\n" +#~ "NÄ›kdy také zvýší kvalitu obrazu.\n" +#~ "Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost " +#~ "textury, nebo tuto možnost vypnout.\n" +#~ "\n" +#~ "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + #~ msgid "Slot" #~ msgstr "Slot" @@ -6423,6 +6641,7 @@ msgstr "| NEBO" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky." +<<<<<<< HEAD <<<<<<< HEAD #~ msgid "" #~ "Unknown pointer %#08x\n" @@ -6433,6 +6652,38 @@ msgstr "| NEBO" ======= >>>>>>> Update translation files for recent changes in the code. +======= +#~ msgid "" +#~ "Store EFB copies in GPU texture objects.\n" +#~ "This is not so accurate, but it works well enough for most games and " +#~ "gives a great speedup over EFB to RAM.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Ukládat EFB kopie do objektů textury grafického procesoru.\n" +#~ "Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává " +#~ "vÄ›tší zrychlení než EFB do RAM.\n" +#~ "\n" +#~ "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + +#~ msgid "Texture" +#~ msgstr "Textura" + +#~ msgid "Texture Cache" +#~ msgstr "Vyrovnávací Paměť Textur" + +#~ msgid "" +#~ "The safer you adjust this, the less likely the emulator will be missing " +#~ "any texture updates from RAM.\n" +#~ "\n" +#~ "If unsure, use the second-fastest value from the right." +#~ msgstr "" +#~ "Čím bezpeÄnÄ›jší toto bude, tím bude ménÄ› pravdÄ›podobné, že emulátoru " +#~ "budou chybÄ›t jakékoliv aktualizace textur z RAM.\n" +#~ "\n" +#~ "Pokud si nejste jisti, použijte druhou nejrychlejší hodnotu zprava." + +>>>>>>> Update Greek and Czech translations #~ msgid "Use FPS For Limiting" #~ msgstr "Použít SzS pro Omezení" diff --git a/Languages/po/el.po b/Languages/po/el.po index 30b56b762f..c9e9dda7d7 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -8,12 +8,17 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-09-13 17:28+0200\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-08-10 08:30-0500\n" +"PO-Revision-Date: 2011-10-15 11:16+0200\n" +>>>>>>> Update Greek and Czech translations "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" "Language: Greek\n" @@ -37,7 +42,7 @@ msgstr "Παιχνίδι : " msgid "! NOT" msgstr "! NOT" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -81,7 +86,7 @@ msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "" "%s απέτυχε να γίνει scrubbed. Πιθανότατα το αÏχείο εικόνας είναι φθαÏμένο." -#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -90,7 +95,7 @@ msgstr "" "%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης\n" " Το μέγεθος του αÏχείου της κάÏτας δεν είναι έγκυÏο (0x%x bytes)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -99,7 +104,7 @@ msgstr "" "%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης\n" " Το μέγεθος της κάÏτας δεν είναι έγκυÏο (0x%x bytes)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -318,7 +323,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(ΑΓÎΩΣΤΟ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(ανενεÏγό)" @@ -330,7 +335,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "3D Vision" msgstr "3D Vision" @@ -342,7 +347,7 @@ msgstr "8 bit" msgid "" msgstr "<Εισάγετε όνομα εδώ>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 msgid "" msgstr "<Δε βÏέθηκαν αναλÏσεις>" @@ -429,6 +434,7 @@ msgstr "Σχετικά με το Dolphin" msgid "Acceleration" msgstr "Επιτάχυνση" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Accuracy:" <<<<<<< HEAD @@ -437,13 +443,19 @@ msgstr "ΑκÏίβεια:" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "ΑκÏιβής VBeam εξομοίωση" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD ======= +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +>>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. msgid "" @@ -451,7 +463,7 @@ msgid "" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, check EFB to Texture instead." +"If unsure, leave this checked." msgstr "" "Εξομοιώνει με ακÏίβεια τα EFB αντίγÏαφα.\n" "Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες " @@ -552,12 +564,12 @@ msgstr "Action Replay: Normal Code %i: Μη έγκυÏο subtype %08x (%s)" msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Code 0: Μη έγκυÏο Subtype %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 msgid "Adapter:" msgstr "ΠÏοσαÏμογέας:" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 msgid "Add" msgstr "ΠÏοσθήκη" @@ -573,6 +585,7 @@ msgstr "ΠÏοσθήκη Patch" msgid "Add new pane" msgstr "ΠÏοσθήκη νέου pane" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -582,6 +595,11 @@ msgstr "ΠÏοσθήκη νέου pane" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +>>>>>>> Update Greek and Czech translations msgid "Add..." msgstr "ΠÏοσθήκη..." @@ -617,7 +635,7 @@ msgstr "" "ΡÏθμιση της απαιτοÏμενης πίεσης του Î±Î½Î±Î»Î¿Î³Î¹ÎºÎ¿Ï Ï‡ÎµÎ¹ÏιστηÏίου για την " "ενεÏγοποίηση των κουμπιών." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 msgid "Advanced" msgstr "Για Ï€ÏοχωÏημένους" @@ -637,6 +655,7 @@ msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -644,6 +663,10 @@ msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update Greek and Czech translations msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" @@ -659,7 +682,7 @@ msgstr "Όλα τα συμπιεσμένα αÏχεία GC/Wii ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "Όλα τα αÏχεία (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -671,6 +694,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD msgid "Alternate Wiimote Timing" @@ -682,10 +706,13 @@ msgstr "Εξομοιωμένο Wiimote" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +>>>>>>> Update Greek and Czech translations msgid "Anisotropic Filtering:" msgstr "ΑνισοτÏοπικό ΦιλτÏάÏισμα:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Εξομάλυνση ΟÏίων:" @@ -705,7 +732,7 @@ msgstr "Apploader:" msgid "Apply" msgstr "ΕφαÏμογή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -742,8 +769,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +>>>>>>> Update Greek and Czech translations msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -767,20 +798,24 @@ msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +>>>>>>> Update Greek and Czech translations msgid "Auto" msgstr "Αυτόματα" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Αυτόματα (Πολλαπλάσιο του 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Αυτόματα (Μέγεθος ΠαÏαθÏÏου)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Auto adjust Window Size" msgstr "Αυτόματη ΠÏοσαÏμογή Μεγέθους ΠαÏαθÏÏου" @@ -795,6 +830,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Automatically generate mipmaps rather than decoding them from memory.\n" @@ -811,6 +847,8 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "Πίσω" @@ -819,8 +857,8 @@ msgstr "Πίσω" msgid "Backend Settings" msgstr "Backend Ρυθμίσεις" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -854,7 +892,7 @@ msgstr "Εικονίδιο:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Βασικές" @@ -866,7 +904,7 @@ msgstr "Βασικές Ρυθμίσεις" msgid "Bass" msgstr "Μπάσο" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Αποτυχία ελέγχου checksum για τον BAT" @@ -886,12 +924,17 @@ msgstr "ΑÏιστεÏÏŒ Μπλε" msgid "Blue Right" msgstr "Δεξί Μπλε" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +>>>>>>> Update Greek and Czech translations msgid "Bottom" msgstr "Βάση" @@ -924,13 +967,18 @@ msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 msgid "Buttons" msgstr "Κουμπιά" @@ -946,11 +994,11 @@ msgstr "Stick ΚάμεÏας" msgid "CPU Emulator Engine" msgstr "Μηχανή Εξομοίωσης CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -966,7 +1014,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -981,8 +1029,8 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 msgid "Cancel" msgstr "ΆκυÏο" @@ -1026,10 +1074,10 @@ msgstr "Αποτυχία εÏÏεσης WiiMote με bd: %02x:%02x:%02x:%02x:%02 msgid "Cant find WiiMote by connection handle %02x" msgstr "Αδυναμία εÏÏεσης του WiiMote με handle σÏνδεσης %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interface: ΚÏίσιμο Σφάλμα" @@ -1156,10 +1204,10 @@ msgstr "Κυκλικό Stick" msgid "Classic" msgstr "Κλασικό ΧειÏιστήÏιο" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "ΚαθάÏισ." @@ -1175,14 +1223,18 @@ msgstr "" "Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει " "απενεÏγοποιηθεί. Θα Ï€Ïέπει να σταματήσετε χειÏοκίνητα το παιχνίδι." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +>>>>>>> Update Greek and Czech translations msgid "Close" msgstr "Κλείσιμο" @@ -1290,11 +1342,15 @@ msgstr "ΣÏνδεση Wiimote 3" msgid "Connect Wiimote 4" msgstr "ΣÏνδεση Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:608 +>>>>>>> Update Greek and Czech translations msgid "Connecting..." msgstr "Γίνεται ΣÏνδεση..." @@ -1365,7 +1421,7 @@ msgstr "" "(ο καθοÏισμός των χειÏιστηÏίων ενώ το παιχνίδι Ï„Ïέχει δεν υποστηÏίζεται Ï€Ïος " "το παÏόν)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1442,11 +1498,11 @@ msgstr "ΔημιουÏγός: " msgid "Critical" msgstr "ΚÏίσιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Crop" msgstr "Κόψιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1493,12 +1549,17 @@ msgstr "Ήχος (DSP)" msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +>>>>>>> Update Greek and Czech translations msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" @@ -1547,7 +1608,7 @@ msgstr "ÎεκÏή Ζώνη" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Debugging" msgstr "Debugging" @@ -1580,8 +1641,8 @@ msgstr "ΠÏοεπιλεγμένο ISO:" msgid "Default font" msgstr "ΠÏοεπιλεγμένη γÏαμματοσειÏά" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 msgid "Delete" msgstr "ΔιαγÏαφή" @@ -1589,12 +1650,12 @@ msgstr "ΔιαγÏαφή" msgid "Delete Save" msgstr "ΔιαγÏαφή Αποθήκευσης" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 #, c-format msgid "Delete the existing file '%s'?" msgstr "ΔιαγÏαφή του υπάÏχοντος αÏχείου '%s';" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 msgid "Description" msgstr "ΠεÏιγÏαφή" @@ -1625,15 +1686,15 @@ msgstr "Ρυθμίσεις Συσκευής" msgid "Dial" msgstr "Dial" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1641,28 +1702,32 @@ msgstr "" "Το checksum του Καταλόγου απέτυχε\n" " καθώς και το checksum του εφεδÏÎ¹ÎºÎ¿Ï ÎšÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… απέτυχε" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 msgid "Disable" msgstr "ΑπενεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Disable Fog" msgstr "ΑπενεÏγοποίηση Ομίχλης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Disable Lighting" msgstr "ΑπενεÏγοποίηση ΦωτισμοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Disable Per-Pixel Depth" msgstr "ΑπενεÏγοποίηση Βάθους ανά Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Textures" msgstr "ΑπενεÏγοποίηση Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Disable Wiimote Speaker" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1676,7 +1741,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1692,7 +1757,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Disable texturing.\n" "\n" @@ -1711,11 +1776,11 @@ msgstr "Δίσκος" msgid "Disc Read Error" msgstr "Σφάλμα Ανάγνωσης Δίσκου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1729,11 +1794,15 @@ msgstr "" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +>>>>>>> Update Greek and Czech translations msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" @@ -1741,7 +1810,7 @@ msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξο msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Ρυθμίσεις ΓÏαφικών Dolphin %s" @@ -1762,6 +1831,7 @@ msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1771,12 +1841,19 @@ msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +>>>>>>> Update Greek and Czech translations msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +>>>>>>> Update Greek and Czech translations msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1812,8 +1889,8 @@ msgstr "" "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ " "εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 msgid "Down" msgstr "Κάτω" @@ -1838,19 +1915,19 @@ msgstr "Dummy" msgid "Dump Audio" msgstr "Εξαγωγή Ήχου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Dump EFB Target" msgstr "Εξαγωγή EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 msgid "Dump Frames" msgstr "Εξαγωγή ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 msgid "Dump Textures" msgstr "Εξαγωγή Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1861,7 +1938,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1872,7 +1949,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1882,6 +1959,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1891,6 +1969,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +>>>>>>> Update Greek and Czech translations msgid "Dutch" msgstr "Ολλανδικά" @@ -1898,7 +1981,7 @@ msgstr "Ολλανδικά" msgid "E&xit" msgstr "Έ&ξοδος" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 msgid "EFB Copies" msgstr "EFB ΑντίγÏαφα" @@ -1952,7 +2035,7 @@ msgstr "ΕπεξεÏγασία..." msgid "Effect" msgstr "Εφέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" @@ -1960,7 +2043,7 @@ msgstr "Embedded Frame Buffer" msgid "Emu Thread already running" msgstr "Το νήμα εξομοίωσης εκτελείται ήδη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1975,7 +2058,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε εικονική XFB εξομοίωση." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -2003,7 +2086,7 @@ msgstr "Κατάσταση ΛειτουÏγίας:" msgid "Enable" msgstr "ΕνεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -2035,6 +2118,7 @@ msgstr "ΕνεÏγοποίηση BAT" msgid "Enable Block Merging" msgstr "ΕνεÏγοποίηση Block Merging" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -2051,6 +2135,8 @@ msgstr "ΕνεÏγοποίηση Cache" msgid "Enable Cache" msgstr "ΕνεÏγοποίηση Cheat" +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" @@ -2068,7 +2154,7 @@ msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα" msgid "Enable Dual Core (speedup)" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Enable Hotkeys" msgstr "ΕνεÏγοποίηση ΣυντομεÏσεων" @@ -2084,8 +2170,8 @@ msgstr "ΕνεÏγοποίηση Idle Skipping (επιτάχυνση)" msgid "Enable MMU" msgstr "ΕνεÏγοποίηση MMU" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "ΕνεÏγοποίηση ΠÏοοδευτικής ΣάÏωσης" @@ -2097,7 +2183,7 @@ msgstr "ΕνεÏγοποίηση ΠÏοφÏλαξης Οθόνης" msgid "Enable WideScreen" msgstr "ΕνεÏγοποίηση ΕυÏείας Οθόνης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Enable Wireframe" msgstr "ΕνεÏγοποίηση Wireframe" @@ -2199,7 +2285,7 @@ msgstr "" "ΕνεÏγοποιεί τη Μονάδα ΔιαχείÏισης Μνήμης, απαÏαίτητο για μεÏικά παιχνίδια. " "(ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2213,6 +2299,7 @@ msgstr "" msgid "End" msgstr "Τέλος" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2222,11 +2309,16 @@ msgstr "Τέλος" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +>>>>>>> Update Greek and Czech translations msgid "English" msgstr "Αγγλικά" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "Enhancements" msgstr "Βελτιώσεις" @@ -2248,6 +2340,7 @@ msgstr "ΕγγÏαφή 1/%d" msgid "Equal" msgstr "Ίσο" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD @@ -2263,12 +2356,20 @@ msgid "" msgstr "" ======= +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Error" msgstr "Σφάλμα" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:356 +>>>>>>> Update Greek and Czech translations msgid "Error loading selected language. Falling back to system default." msgstr "" "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " @@ -2357,7 +2458,7 @@ msgstr "Εξαγωγή αποθήκευσης ως..." msgid "Extension" msgstr "Επέκταση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "External Frame Buffer" msgstr "ΕξωτεÏικό Frame Buffer" @@ -2480,7 +2581,7 @@ msgstr "Αποτυχία φόÏτωσης hid.dll" msgid "Failed to read banner.bin" msgstr "Αποτυχία ανάγνωσης banner.bin" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2488,7 +2589,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του αντιγÏάφου ασφαλείας του BAT\n" "(0x8000-0x9FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2501,7 +2602,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Αποτυχία ανάγνωσης δεδομένων από το αÏχείο %d" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2509,7 +2610,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του αντιγÏάφου ασφαλείας των φακέλων\n" "(0x4000-0x5FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2517,7 +2618,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης των φακέλων\n" "(0x2000-0x3FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2525,7 +2626,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης της κεφαλίδας\n" "(0x0000-0x1FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2554,6 +2655,7 @@ msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το msgid "Failed to write header for file %d" msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το αÏχείο %d" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 msgid "Fast" <<<<<<< HEAD @@ -2570,6 +2672,8 @@ msgid "Fast Mipmaps" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "ΓÏήγοÏη έκδοση του MMU. Δε δουλεÏει για όλα τα παιχνίδια." @@ -2598,7 +2702,7 @@ msgstr "" "Το αÏχείο απέτυχε στο άνοιγμα\n" "ή δεν έχει έγκυÏη επέκταση" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2636,11 +2740,11 @@ msgstr "ΠÏώτο Μπλοκ" msgid "Fix Checksums" msgstr "ΕπιδιόÏθωση Checksum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Force 16:9" msgstr "Επιβολή 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Force 4:3" msgstr "Επιβολή 4:3" @@ -2648,11 +2752,11 @@ msgstr "Επιβολή 4:3" msgid "Force Console as NTSC-J" msgstr "Επιβολή της Κονσόλας ως NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Force Texture Filtering" msgstr "Επιβολή ΦιλτÏαÏίσματος Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2688,7 +2792,7 @@ msgstr "" "Άμα αφεθεί αποεπιλεγμένο, το dolphin Ï€Ïοεπιλέγει τη NTSC-U και ενεÏγοποιεί " "αυτόματα αυτήν την ÏÏθμιση όταν παίζονται Ιαπωνικά παιχνίδια." -#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2714,7 +2818,7 @@ msgstr "ΚαÏέ" msgid "Frame Advance" msgstr "ΠÏοώθηση ανά ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 msgid "Frame Dumps use FFV1" msgstr "FFV1 Για Τα Εξαγώμενα ΚαÏέ" @@ -2734,10 +2838,11 @@ msgstr "ΠεÏιοÏισμός ΚαÏέ:" msgid "Frames To Record" msgstr "ΚαÏέ ΠÏος ΕγγÏαφή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 msgid "Free Look" msgstr "ΕλεÏθεÏη Ματιά" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2747,6 +2852,11 @@ msgstr "ΕλεÏθεÏη Ματιά" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +>>>>>>> Update Greek and Czech translations msgid "French" msgstr "Γαλλικά" @@ -2763,7 +2873,7 @@ msgstr "Από" msgid "FullScr" msgstr "ΠλήÏης Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "Fullscreen resolution:" msgstr "Ανάλυση ΠλήÏους Οθόνης:" @@ -2812,12 +2922,17 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +>>>>>>> Update Greek and Czech translations msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -2839,6 +2954,7 @@ msgstr "" "Ο Κωδικός Gecko απέτυχε να εκτελεστεί (CT%i CST%i) (%s)\n" "(ή είναι ένας κακός κωδικός ή ο Ï„Ïπος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζεται.)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 @@ -2847,6 +2963,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +>>>>>>> Update Greek and Czech translations msgid "General" msgstr "Γενικά" @@ -2854,6 +2975,7 @@ msgstr "Γενικά" msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2863,6 +2985,11 @@ msgstr "Γενικές Ρυθμίσεις" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +>>>>>>> Update Greek and Czech translations msgid "German" msgstr "ΓεÏμανικά" @@ -2885,17 +3012,19 @@ msgstr "Ρυθμίσεις ΓÏαφικών" msgid "Greater Than" msgstr "ΜεγαλÏτεÏο από" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD ======= +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +>>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. msgid "" -"Greatly increases quality of textures generated using render to texture " +"Greatly increases quality of textures generated using render-to-texture " "effects.\n" "Raising the internal resolution will improve the effect of this setting.\n" -"Slightly decreases performance and possibly causes issues (although " -"unlikely).\n" "\n" "If unsure, leave this checked." msgstr "" @@ -2931,11 +3060,11 @@ msgstr "ΚιθάÏα" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Γίνεται κλήση του HCI_CMD_INQUIRY, παÏακαλώ αναφέÏετε!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 msgid "Hacks" msgstr "Hacks" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Αποτυχία ελέγχου κεφαλίδας" @@ -2971,7 +3100,7 @@ msgstr "" msgid "Hide" msgstr "ΑπόκÏυψη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "ΑπόκÏυψη Δείκτη ΠοντικιοÏ" @@ -2999,6 +3128,7 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 @@ -3006,6 +3136,10 @@ msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +>>>>>>> Update Greek and Czech translations msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" @@ -3100,11 +3234,11 @@ msgstr "" "θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει " "αποτέλεσμα. " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 msgid "Ignore Format Changes" msgstr "Αγνόηση Αλλαγών Format" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3118,7 +3252,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3161,7 +3295,7 @@ msgstr "" "Το εισαγώμενο αÏχείο έχει sav επέκταση\n" "άλλα δεν έχει σωστή κεφαλίδα." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3173,7 +3307,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -3192,8 +3326,8 @@ msgstr "Εντός ΠαιχνιδιοÏ" msgid "In-Game" msgstr "Εντός ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 msgid "Info" msgstr "ΠληÏοφοÏίες" @@ -3236,11 +3370,15 @@ msgstr "" "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει " "ακόμα." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +>>>>>>> Update Greek and Czech translations msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3269,7 +3407,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "ΕσωτεÏικό Σφάλμα LZO - αποτυχία lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "ΕσωτεÏική Ανάλυση:" @@ -3322,6 +3460,7 @@ msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" msgid "Invalid state" msgstr "Μη έγκυÏο κατάσταση" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3331,6 +3470,11 @@ msgstr "Μη έγκυÏο κατάσταση" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +>>>>>>> Update Greek and Czech translations msgid "Italian" msgstr "Ιταλικά" @@ -3392,8 +3536,8 @@ msgstr "Τελευταίο ΕπαναγÏαμμένο Σημείο Αποθ." msgid "Last Saved State" msgstr "Τελευταίο Αποθηκευμένο Σημείο Αποθ." -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 msgid "Left" msgstr "ΑÏιστεÏά" @@ -3440,7 +3584,7 @@ msgstr "ΠεÏιοÏισμός με βάση τα ΚαÏέ" msgid "Load" msgstr "ΦόÏτωσ." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 msgid "Load Custom Textures" msgstr "ΦόÏτωση ΤÏοποποιημένων Υφών" @@ -3488,6 +3632,7 @@ msgstr "ΦόÏτωση Σημείου Αποθήκευσης 8" msgid "Load State..." msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3501,11 +3646,18 @@ msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +msgid "Load Wii System Menu" +msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +>>>>>>> Update Greek and Czech translations #, c-format msgid "Load Wii System Menu %d%c" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3547,8 +3699,8 @@ msgstr "ΤÏποι ΚαταγÏαφής" msgid "Logger Outputs" msgstr "Έξοδοι ΚαταγÏαφής" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 #: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Logging" msgstr "ΚαταγÏαφή" @@ -3582,12 +3734,16 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 msgid "Main Stick" msgstr "ΚÏÏιο Stick" @@ -3616,12 +3772,17 @@ msgstr "Η κάÏτα μνήμης είναι ήδη ανοιχτή" msgid "Memory Byte" msgstr "Memory Byte" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +>>>>>>> Update Greek and Czech translations msgid "Memory Card" msgstr "ΚάÏτα Μνήμης" @@ -3650,7 +3811,7 @@ msgstr "" "%s\n" "Θέλετε να αντιγÏάψετε το παλιό αÏχείο σε αυτή την νέα τοποθεσία;\n" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" "Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της " @@ -3669,7 +3830,7 @@ msgstr "ΜικÏόφωνο" msgid "Min" msgstr "Ελάχιστη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Misc" msgstr "ΔιάφοÏα" @@ -3682,7 +3843,7 @@ msgstr "ΔιάφοÏες Ρυθμίσεις" msgid "Modifier" msgstr "Modifier" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3708,7 +3869,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "ΜοτέÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3821,13 +3982,17 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Όνομα:" @@ -3912,11 +4077,15 @@ msgstr "Όχι ίσο" msgid "Not Set" msgstr "Μη ΟÏισμένο" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:607 +>>>>>>> Update Greek and Czech translations msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -3945,8 +4114,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "ΑÏιθμός Κωδικών: " -#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 msgid "Nunchuk" msgstr "Nunchuk" @@ -3975,12 +4144,15 @@ msgstr "Offset:" msgid "Only %d blocks available" msgstr "Διαθέσιμα μόνο %d μπλοκ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +>>>>>>> Update Greek and Czech translations msgid "Open" msgstr "Άνοιγμα" @@ -4010,11 +4182,11 @@ msgstr "OpenAL: αδυναμία εÏÏεσης συσκευών ήχου" msgid "OpenAL: can't open device %s" msgstr "OpenAL: αδυναμία ανοίγματος της συσκευής %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "OpenCL Texture Decoder" msgstr "OpenCL Αποκωδικοποιητής Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "OpenMP Texture Decoder" msgstr "OpenMP Αποκωδικοποιητής Υφών" @@ -4046,8 +4218,8 @@ msgstr "" "Κάντε δεξί κλίκ, εξάγετε όλα τα αÏχεία αποθήκευσης\n" "και εισάγετέ τα σε μία νέα κάÏτα μνήμης.\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Other" msgstr "Άλλα" @@ -4112,6 +4284,7 @@ msgstr "Patches" msgid "Paths" msgstr "Φάκελοι" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4119,11 +4292,15 @@ msgstr "Φάκελοι" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "ΠαÏση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Per-Pixel Lighting" msgstr "Φωτισμός ανά Pixel" @@ -4136,15 +4313,20 @@ msgstr "Τέλειο" msgid "Perspective %d" msgstr "Οπτική %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +>>>>>>> Update Greek and Czech translations msgid "Play" msgstr "ΑναπαÏαγωγή" @@ -4170,11 +4352,15 @@ msgstr "Ρυθμίσεις ΑναπαÏαγωγής" msgid "Players" msgstr "Παίχτες" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update Greek and Czech translations msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -4219,7 +4405,7 @@ msgstr "ΠοÏτογαλικά" msgid "Portuguese (Brazilian)" msgstr "ΠοÏτογαλικά (Î’Ïαζιλιάνικα)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Post-Processing Εφέ:" @@ -4293,7 +4479,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Αναλογική" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "RAM" msgstr "RAM" @@ -4310,7 +4496,7 @@ msgstr "ΕÏÏος" msgid "Read-only mode" msgstr "Μόνο Για Ανάγνωση (ΕγγÏαφής)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Real" msgstr "ΠÏαγματικό" @@ -4370,9 +4556,9 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε Καμία." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 msgid "Refresh" msgstr "Ανανέωση" @@ -4385,6 +4571,7 @@ msgstr "Ανανέωση Λίστας" msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4396,10 +4583,16 @@ msgstr "Ανανέωση λίστας παιχνιδιών" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +>>>>>>> Update Greek and Czech translations msgid "Remove" msgstr "ΑφαίÏεση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4409,16 +4602,20 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 msgid "Reset" msgstr "Επανεκκίνηση" @@ -4430,8 +4627,8 @@ msgstr "Αποτελέσματα" msgid "Return" msgstr "Return" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 msgid "Right" msgstr "Δεξιά" @@ -4456,6 +4653,7 @@ msgstr "Ρώσικα" msgid "Sa&ve State" msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Safe" <<<<<<< HEAD @@ -4465,14 +4663,16 @@ msgstr "Ασφαλής" ======= msgstr "" +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 msgid "Save" msgstr "Αποθήκ." @@ -4548,6 +4748,7 @@ msgstr "" "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της " "εγγÏαφής της ταινίας..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" <<<<<<< HEAD @@ -4557,6 +4758,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update Greek and Czech translations #, c-format msgid "Scanning %s" msgstr "Ανίχνευση %s" @@ -4591,8 +4795,8 @@ msgstr "Αναζήτηση σε Υποφακέλους" msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 msgid "Select" msgstr "Επιλογή" @@ -4605,12 +4809,16 @@ msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Select The Recording File" msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +>>>>>>> Update Greek and Czech translations msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" @@ -4636,6 +4844,7 @@ msgstr "Επιλέξτε αιωÏοÏμενα παÏάθυÏα" msgid "Select the file to load" msgstr "Επιλέξτε το αÏχείο για φόÏτωση" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4648,15 +4857,22 @@ msgstr "Επιλέξτε το σημείο φόÏτωσης" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +>>>>>>> Update Greek and Czech translations msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +>>>>>>> Update Greek and Czech translations msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -4803,11 +5019,11 @@ msgstr "Εμφάνιση ΓÏαμμής &ΕÏγαλείων" msgid "Show Drives" msgstr "Εμφάνιση Οδηγών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Show EFB Copy Regions" msgstr "Εμφάνιση ΠεÏιοχών EFB ΑντιγÏαφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Show FPS" msgstr "Εμφάνιση FPS" @@ -4819,7 +5035,7 @@ msgstr "Εμφάνιση Γαλλίας" msgid "Show GameCube" msgstr "Εμφάνιση GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Show Input Display" msgstr "Εμφάνιση ΠÏοβολής ΧειÏισμών" @@ -4855,7 +5071,7 @@ msgstr "Εμφάνιση ΠλατφόÏμας" msgid "Show Regions" msgstr "Εμφάνιση ΠεÏιοχών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Show Statistics" msgstr "Εμφάνιση Στατιστικών" @@ -4910,7 +5126,7 @@ msgstr "Εμφάνιση αποθηκευμένου εικονιδίου" msgid "Show save title" msgstr "Εμφάνιση αποθηκευμένου τίτλου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4930,7 +5146,7 @@ msgstr "Εμφάνιση Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος βοήθειας" msgid "Show unknown" msgstr "Εμφάνιση Αγνώστων" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4956,16 +5172,20 @@ msgstr "Μέγεθος" msgid "Skip BIOS" msgstr "ΠαÏάλειψη BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Skip Dest. Alpha Pass" msgstr "ΠαÏάλειψη Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 msgid "Skip EFB Access from CPU" msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 <<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +>>>>>>> Update Greek and Czech translations msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4977,6 +5197,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" @@ -5014,6 +5235,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -5067,6 +5290,7 @@ msgstr "Αποτυχία δημιουÏγίας buffer ήχου: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -5076,6 +5300,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +>>>>>>> Update Greek and Czech translations msgid "Spanish" msgstr "Ισπανικά" @@ -5083,7 +5312,7 @@ msgstr "Ισπανικά" msgid "Speaker Volume:" msgstr "Ένταση ηχείου:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "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 " @@ -5120,13 +5349,17 @@ msgstr "ΤετÏάγωνο Stick" msgid "Standard Controller" msgstr "Τυπικός Controller" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Εκκίνηση" @@ -5156,17 +5389,21 @@ msgstr "Σημεία Αποθήκευσης" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Διακοπή" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Store EFB copies in GPU texture objects.\n" @@ -5185,6 +5422,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +>>>>>>> Update Greek and Czech translations msgid "Stretch to Window" msgstr "ΠÏοσαÏμογή στο ΠαÏάθυÏο" @@ -5218,8 +5458,8 @@ msgstr "Γλώσσα Συστήματος:" msgid "TAIWAN" msgstr "ΤΑΪΒΑÎ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 msgid "TAS Input" msgstr "TAS Είσοδος" @@ -5239,13 +5479,17 @@ msgstr "ΑÏιστεÏÏŒ Table" msgid "Table Right" msgstr "Δεξί Table" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations msgid "Take Screenshot" msgstr "ΔημιουÏγία Στιγμιότυπου" @@ -5257,6 +5501,7 @@ msgstr "" msgid "Test" msgstr "Τέστ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 <<<<<<< HEAD msgid "Texture" @@ -5277,6 +5522,9 @@ msgstr "ΚαθαÏισμός Cache" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +>>>>>>> Update Greek and Czech translations msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" @@ -5321,7 +5569,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Το αÏχείο %s ήταν ήδη ανοιχτό, η κεφαλίδα του αÏχείου δε θα γÏαφεί." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:281 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Το αÏχείο που επιλέξατε (%s) δεν υπάÏχει" @@ -5339,6 +5587,7 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" "Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5354,12 +5603,14 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" msgstr "" "Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:363 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5431,7 +5682,7 @@ msgstr "" "Αυτό μποÏεί να Ï€Ïοκαλέσει καθυστεÏήσεις στο ÎœÎµÎ½Î¿Ï Wii και σε μεÏικά " "παιχνίδια." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5512,9 +5763,9 @@ msgstr "Εώς" msgid "Toggle All Log Types" msgstr "Εναλλαγή Όλων ΤÏπων ΚαταγÏαφής " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. @@ -5527,6 +5778,14 @@ msgstr "Εναλλαγή ΠλήÏους Οθόνης" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +msgid "Toggle Fullscreen" +msgstr "Εναλλαγή ΠλήÏους Οθόνης" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +>>>>>>> Update Greek and Czech translations msgid "Top" msgstr "ΚοÏυφή" @@ -5534,7 +5793,7 @@ msgstr "ΚοÏυφή" msgid "Traditional Chinese" msgstr "Κινέζικα ΠαÏαδοσιακά " -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:375 msgid "Tried to load an unknown file type." msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπου αÏχείο." @@ -5570,8 +5829,8 @@ msgstr "ΤÏπος" msgid "UDP Port:" msgstr "ΠόÏτα UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5647,9 +5906,13 @@ msgstr "" "Άγνωστος δείκτης %#08x\n" "Συνέχεια;" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 msgid "Up" msgstr "Πάνω" @@ -5666,7 +5929,7 @@ msgstr "Κάθετη Θέση Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "ΧÏήση ΛειτουÏγίας EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "Use Fullscreen" msgstr "ΧÏήση ΠλήÏους Οθόνης" @@ -5678,7 +5941,7 @@ msgstr "ΧÏήση Hex" msgid "Use Panic Handlers" msgstr "ΧÏήση Οθονών ΠανικοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5691,7 +5954,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5706,11 +5969,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Utility" msgstr "ΕÏγαλεία" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 msgid "V-Sync" msgstr "Κάθετος ΣυγχÏονισμός" @@ -5734,7 +5997,8 @@ msgstr "Αναλυτικότητα" msgid "Video" msgstr "Βίντεο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 msgid "Virtual" msgstr "Εικονικό" @@ -5762,21 +6026,21 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/Common/Src/MsgHandler.cpp:67 msgid "Warning" msgstr "ΠÏοειδοποίηση" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:240 msgid "Warning - starting DOL in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση DOL σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:290 msgid "Warning - starting ELF in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ELF σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:185 msgid "Warning - starting ISO in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ISO σε λάθος λειτουÏγία κονσόλας!" @@ -5850,7 +6114,7 @@ msgstr "WaveFileWriter - το αÏχείο δεν είναι ανοιχτό." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Widescreen Hack" msgstr "Hack ΕυÏείας Οθόνης" @@ -5874,11 +6138,15 @@ msgstr "Wii NAND Ρίζα:" msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +>>>>>>> Update Greek and Czech translations msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -5886,8 +6154,8 @@ msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Αδυναμία ανάγνωσης από αÏχείο" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 #: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:16 msgid "Wiimote" msgstr "Wiimote" @@ -5909,11 +6177,15 @@ msgstr "" "ή πιθανόν να οφείλεται σε χÏόνο αδÏάνειας ή κάποιον άλλο λόγο.\n" "Θέλετε να γίνει άμεση επανασÏνδεση;" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:609 +>>>>>>> Update Greek and Czech translations msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -5945,12 +6217,16 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. @@ -6058,7 +6334,7 @@ msgstr "Άγνωστος Zero code: %08x" msgid "[ waiting ]" msgstr "[ σε αναμονή ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -6074,7 +6350,7 @@ msgstr "" msgid "[Custom]" msgstr "[ΠÏοσαÏμοζόμενο]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -6093,7 +6369,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -6165,6 +6441,7 @@ msgstr "zNear ΔιόÏθωση: " msgid "| OR" msgstr "| OR" +<<<<<<< HEAD <<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "" @@ -6180,3 +6457,84 @@ msgstr "| OR" #~ msgid "Disable Wiimote Speaker" #~ msgstr "ΑπενεÏγοποίηση Ηχείου Wiimote" >>>>>>> Update translation files for recent changes in the code. +======= +#~ msgid "Accuracy:" +#~ msgstr "ΑκÏίβεια:" + +#~ msgid "Alternate Wiimote Timing" +#~ msgstr "Εναλλακτικός ΧÏονισμός Wiimote" + +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" +#~ "Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα " +#~ "στις υφές.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." + +#~ msgid "Enable Cache" +#~ msgstr "ΕνεÏγοποίηση Cache" + +#~ msgid "Fast" +#~ msgstr "ΓÏήγοÏη" + +#~ msgid "Fast Mipmaps" +#~ msgstr "ΓÏήγοÏα Mipmaps" + +#~ msgid "Safe" +#~ msgstr "Ασφαλής" + +#~ msgid "Scaled EFB Copy" +#~ msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" + +#~ msgid "" +#~ "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" +#~ "Sometimes also increases visual quality.\n" +#~ "If you're experiencing any issues, try raising texture cache accuracy or " +#~ "disable this option.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της " +#~ "εξομοίωσης.\n" +#~ "ΜεÏικές φοÏές μποÏεί να βελτιώσει την οπτική ποιότητα.\n" +#~ "Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της " +#~ "cache υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." + +#~ msgid "" +#~ "Store EFB copies in GPU texture objects.\n" +#~ "This is not so accurate, but it works well enough for most games and " +#~ "gives a great speedup over EFB to RAM.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Αποθήκευση των EFB αντιγÏάφων σε GPU αντικείμενα υφών.\n" +#~ "Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα " +#~ "παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." + +#~ msgid "Texture" +#~ msgstr "Υφή" + +#~ msgid "Texture Cache" +#~ msgstr "Cache Υφών" + +#~ msgid "" +#~ "The safer you adjust this, the less likely the emulator will be missing " +#~ "any texture updates from RAM.\n" +#~ "\n" +#~ "If unsure, use the second-fastest value from the right." +#~ msgstr "" +#~ "Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής " +#~ "να χάσει ανανεώσεις των υφών από την RAM.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από " +#~ "δεξιά." +>>>>>>> Update Greek and Czech translations From 5f21e0150b5bcea2660d81a79b736e7921f2461a Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 15 Oct 2011 11:26:41 -0500 Subject: [PATCH 037/185] The actual update of the Greek and Czech translations. The last commit was a partial reversion by accident. --- Languages/po/cs.po | 718 +++++++++++++++++-------- Languages/po/el.po | 1284 ++++++++++++++++++++++++-------------------- 2 files changed, 1210 insertions(+), 792 deletions(-) diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 5de197a7a6..00f3a3c290 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-15 14:50+0100\n" ======= @@ -17,6 +18,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= "POT-Creation-Date: 2011-08-10 08:30-0500\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> The actual update of the Greek and Czech translations. The last commit "PO-Revision-Date: 2011-10-15 14:50+0100\n" >>>>>>> Update Greek and Czech translations "Last-Translator: ZbynÄ›k Schwarz \n" @@ -40,7 +44,7 @@ msgstr " Hra : " msgid "! NOT" msgstr "! NE" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -82,7 +86,7 @@ msgstr "%s už existuje, pÅ™epsat?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s nelze vyÄistit. Obraz je pravdÄ›podobnÄ› poÅ¡kozen." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -91,7 +95,7 @@ msgstr "" "%s nelze naÄíst jako paměťovou kartu\n" "Soubor karty je neplatný (0x%x bajtů)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -100,7 +104,7 @@ msgstr "" "%s nelze naÄíst jako paměťovou kartu\n" "Velikost karty je neplatná (0x%x bajtů)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -317,7 +321,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(NEZNÃMÃ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(vypnuto)" @@ -329,7 +333,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -341,7 +345,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "<Žádné rozliÅ¡ení nenalezeno>" @@ -428,10 +432,15 @@ msgstr "O Dolphinu" msgid "Acceleration" msgstr "Zrychlení" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "PÅ™esnost:" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD @@ -441,12 +450,15 @@ msgstr "Precizní emulace VBeam" >>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "PÅ™esnÄ› emulovat EFB kopie.\n" "NÄ›které hry na tomto závisí pro urÄité grafické efekty nebo herní funkce.\n" @@ -545,12 +557,12 @@ msgstr "Action Replay: Normální Kód %i: Neplatný podtyp %08x (%s)" msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normální Kód 0: Neplatný Podtyp %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Adaptér:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "PÅ™idat" @@ -566,6 +578,7 @@ msgstr "PÅ™idat Záplatu" msgid "Add new pane" msgstr "PÅ™idat nový panel" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -581,6 +594,11 @@ msgstr "PÅ™idat nový panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Add..." msgstr "PÅ™idat..." @@ -628,7 +646,7 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Upravte tlak analogového ovládání potÅ™ebný k aktivaci tlaÄítek." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "PokroÄilé" @@ -648,6 +666,7 @@ msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -660,6 +679,10 @@ msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" @@ -675,7 +698,7 @@ msgstr "VÅ¡echny komprimované soubory GC/WII ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "VÅ¡echny soubory (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -687,6 +710,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD @@ -702,10 +726,17 @@ msgstr "Emulovaný Wiimote" ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Alternate Wiimote Timing" +msgstr "Střídat Äasování Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Anisotropic Filtering:" msgstr "Anizotropní Filtrování:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Vyhlazení okrajů" @@ -725,7 +756,7 @@ msgstr "ZavadÄ›Ä aplikace:" msgid "Apply" msgstr "Použít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -761,11 +792,15 @@ msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" msgstr "PomÄ›r Stran:" @@ -790,23 +825,27 @@ msgstr "AudioCommon: Chyba pÅ™i otevírání zařízení zvukového výstupu.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Násobek 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Auto (Velikost Okna)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Automaticky upravovat Velikost Okna" @@ -820,6 +859,18 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +msgid "" +"Automatically generate mipmaps rather than decoding them from memory.\n" +"Increases performance a bit but might cause minor texture defects.\n" +"\n" +"If unsure, leave this checked." +msgstr "" +"Automaticky vytvoÅ™it mipmapy, radÄ›ji než dekódovat je z pamÄ›ti.\n" +"Trochu zlepší výkon, ale může způsobit malé chyby pamÄ›ti.\n" +"\n" +"Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." + #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "ZpÄ›t" @@ -828,8 +879,8 @@ msgstr "ZpÄ›t" msgid "Backend Settings" msgstr "Nastavení Backendu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -863,7 +914,7 @@ msgstr "Plakát:" msgid "Bar" msgstr "Vibráto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Základní" @@ -875,7 +926,7 @@ msgstr "Základní nastavení" msgid "Bass" msgstr "Basy" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Kontrolní souÄet AlokaÄní Tabulky Bloku selhal" @@ -895,6 +946,7 @@ msgstr "Modrá vlevo" msgid "Blue Right" msgstr "Modrá vpravo" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD @@ -906,6 +958,10 @@ msgstr "Modrá vpravo" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Bottom" msgstr "Dole" @@ -938,6 +994,7 @@ msgstr "Procházet pro výstupní adresář" msgid "Buffer:" msgstr "Vyrovnávací paměť:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 @@ -949,7 +1006,11 @@ msgstr "Vyrovnávací paměť:" >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "TlaÄítka" @@ -965,11 +1026,11 @@ msgstr "Kr-Stick" msgid "CPU Emulator Engine" msgstr "Jádro Emulátoru Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Ukládat pÅ™edvyt. obj. do vyr. pam." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -984,7 +1045,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -999,8 +1060,8 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "ZruÅ¡it" @@ -1044,10 +1105,10 @@ msgstr "Nelze najít Wiimote podle bz: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Nelze najít Wiimote pomocí obslužné rutiny spojení %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Nelze Äíst ze zásuvného modulu DVD - DVD-Rozhraní: Závažná chyba" @@ -1170,10 +1231,10 @@ msgstr "Kruhový Stick" msgid "Classic" msgstr "Klasické" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "VyÄistit" @@ -1188,18 +1249,22 @@ msgid "" msgstr "" "Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit ruÄnÄ›." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 ======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Close" msgstr "Zavřít" @@ -1307,6 +1372,7 @@ msgstr "PÅ™ipojit Wiimote 3" msgid "Connect Wiimote 4" msgstr "PÅ™ipojit Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 @@ -1316,6 +1382,9 @@ msgstr "PÅ™ipojit Wiimote 4" ======= #: Source/Core/DolphinWX/Src/Main.cpp:608 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Connecting..." msgstr "PÅ™ipojuji..." @@ -1383,7 +1452,7 @@ 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:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1453,11 +1522,11 @@ msgstr "Tvůrce:" msgid "Critical" msgstr "Kritické" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Oříznout" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1504,6 +1573,7 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD @@ -1515,6 +1585,10 @@ msgstr "Jádro Emulátoru DSP" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" @@ -1563,7 +1637,7 @@ msgstr "Mrtvá Zóna" msgid "Debug" msgstr "LadÄ›ní" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "LadÄ›ní" @@ -1596,8 +1670,8 @@ msgstr "Výchozí ISO:" msgid "Default font" msgstr "Výchozí typ písma" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Smazat" @@ -1605,12 +1679,12 @@ msgstr "Smazat" msgid "Delete Save" msgstr "Smazat Uloženou Hru" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "Vymazat existující soubor '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "Popis" @@ -1641,15 +1715,15 @@ msgstr "Nastavení Zařízení" msgid "Dial" msgstr "Kruhová stupnice" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1657,32 +1731,28 @@ msgstr "" "Kontrolní souÄet adresáře\n" "i záložní kontrolní souÄet Adresáře selhal" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "Zakázat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Zakázat Mlhu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Zakázat OsvÄ›tlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "Zakázat Hloubku Podle Pixelu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Zakázat Textury" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "Zakázat Reproduktor Wiimote" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1696,7 +1766,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1712,7 +1782,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1731,11 +1801,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Chyba Ätení disku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1749,6 +1819,7 @@ msgstr "" msgid "Divide" msgstr "RozdÄ›lit" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1758,6 +1829,9 @@ msgstr "RozdÄ›lit" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" @@ -1765,7 +1839,7 @@ msgstr "Chcete souÄasnou emulaci zastavit?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafická Nastavení" @@ -1786,6 +1860,7 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1799,16 +1874,23 @@ msgstr "Dolphin GCPad Nastavení" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1836,8 +1918,8 @@ 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/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Dolů" @@ -1862,19 +1944,19 @@ msgstr "Atrapa" msgid "Dump Audio" msgstr "Vypsat Zvuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Vypsat Cíl EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Vypsat Snímky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Vypsat Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1884,7 +1966,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1894,7 +1976,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1904,6 +1986,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1919,6 +2002,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Dutch" msgstr "NizozemÅ¡tina" @@ -1926,7 +2014,7 @@ msgstr "NizozemÅ¡tina" msgid "E&xit" msgstr "O&dejít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "EFB Kopie" @@ -1979,7 +2067,7 @@ msgstr "Upravit" msgid "Effect" msgstr "Efekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "VnoÅ™ená Vyr. PamÄ›t Snímků" @@ -1987,7 +2075,7 @@ msgstr "VnoÅ™ená Vyr. PamÄ›t Snímků" msgid "Emu Thread already running" msgstr "Vlákno Emulace již běží" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -2001,7 +2089,7 @@ msgstr "" "\n" "Pokud si nejste jisti, zaÅ¡krtnÄ›te místo tohoto virtuální emulaci XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -2029,7 +2117,7 @@ msgstr "Stav Emulace:" msgid "Enable" msgstr "Povolit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -2061,6 +2149,7 @@ msgstr "Zapnout BAT" msgid "Enable Block Merging" msgstr "Zapnout SluÄování Bloků" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 @@ -2069,15 +2158,20 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Povolit vyrovnávací paměť" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= ======= >>>>>>> Update Greek and Czech translations +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" @@ -2095,7 +2189,7 @@ msgstr "Povolit dvojité jádro" msgid "Enable Dual Core (speedup)" msgstr "Zapnout dvojité jádro (zrychlení)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "Povolit klávesové zkratky" @@ -2111,8 +2205,8 @@ msgstr "Povolit PÅ™eskakování NeÄinných Příkazů (zrychlení)" msgid "Enable MMU" msgstr "Zapnout MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Povolit Progresivní Skenování" @@ -2124,7 +2218,7 @@ msgstr "Povolit SpoÅ™iÄ Obrazovky" msgid "Enable WideScreen" msgstr "Povolit Å irokoúhlou obrazovku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "Povolit DrátÄ›ný Model" @@ -2221,7 +2315,7 @@ msgstr "" "Povolí Jednotku Správy PamÄ›ti, potÅ™ebnou v nÄ›jakých hrách. (ZAPNUTO = " "Kompatibilní, VYPNUTO = Rychlé)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2235,6 +2329,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2250,11 +2345,16 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "English" msgstr "AngliÄtina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "VylepÅ¡ení" @@ -2276,6 +2376,7 @@ msgstr "Záznam 1/%d" msgid "Equal" msgstr "Rovná se" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 @@ -2296,16 +2397,24 @@ msgstr "" >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Chyba" +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 ======= #: Source/Core/DolphinWX/Src/Main.cpp:356 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:346 +>>>>>>> The actual update of the Greek and Czech translations. The last commit 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." @@ -2388,7 +2497,7 @@ msgstr "Exportovat Uloženou hru jako..." msgid "Extension" msgstr "Rozšíření" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "VnÄ›jší Vyr. Paměť Snímků" @@ -2510,7 +2619,7 @@ msgstr "Nelze nahrát hid.dll" msgid "Failed to read banner.bin" msgstr "Nelze Äíst z banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2518,7 +2627,7 @@ msgstr "" "Nelze správnÄ› Äíst zálohu alokaÄní tabulky bloku\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2531,7 +2640,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Nelze Äíst data ze souboru %d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2539,7 +2648,7 @@ msgstr "" "Nelze správnÄ› Äíst zálohu adresáře\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2547,7 +2656,7 @@ msgstr "" "Nelze správnÄ› Äíst adresář\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2555,7 +2664,7 @@ msgstr "" "Nelze správnÄ› Äíst hlaviÄku\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2587,6 +2696,14 @@ msgstr "Zápis hlaviÄky selhal pro %s" msgid "Failed to write header for file %d" msgstr "Selhal zápis hlaviÄky souboru %d" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Rychlá" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "Rychlé Mipmapy" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rychlá verze MMU. Nefunguje v každé hÅ™e." @@ -2615,7 +2732,7 @@ msgstr "" "Soubor nelze otevřít\n" "nebo nemá platnou příponu" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2653,11 +2770,11 @@ msgstr "První blok" msgid "Fix Checksums" msgstr "Spravit Kontrolní SouÄty" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Vynutit 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Vynutit 4:3" @@ -2665,11 +2782,11 @@ msgstr "Vynutit 4:3" msgid "Force Console as NTSC-J" msgstr "Donutit konzoli být jako NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Vynutit Filtrování Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2703,7 +2820,7 @@ msgstr "" "Pokud není zaÅ¡krtnuto, Dolphin standardnÄ› pÅ™ejde na NTSC-U a automaticky " "zapne toto nastavení pÅ™i hraní Japonských her." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2729,7 +2846,7 @@ msgstr "Snímek" msgid "Frame Advance" msgstr "Postup Snímkem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "Uložení snímků použije FFV1" @@ -2749,10 +2866,11 @@ msgstr "Limit Snímků:" msgid "Frames To Record" msgstr "Snímky k Nahrání" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Rozhlížení pomocí myÅ¡i" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2768,6 +2886,11 @@ msgstr "Rozhlížení pomocí myÅ¡i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "French" msgstr "FrancouzÅ¡tina" @@ -2784,7 +2907,7 @@ msgstr "Z" msgid "FullScr" msgstr "CelObr" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "RozliÅ¡ení celé obrazovky:" @@ -2833,6 +2956,7 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD @@ -2844,6 +2968,10 @@ msgstr "Nastavení Gamecube &Pad" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2865,6 +2993,7 @@ msgstr "" "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n" "(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován.)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD @@ -2879,6 +3008,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "General" msgstr "Obecné" @@ -2886,6 +3020,7 @@ msgstr "Obecné" msgid "General Settings" msgstr "Obecná Nastavení" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2901,6 +3036,11 @@ msgstr "Obecná Nastavení" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "German" msgstr "NÄ›mÄina" @@ -2921,6 +3061,7 @@ msgstr "Grafická nastavení" msgid "Greater Than" msgstr "VÄ›tší než" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD @@ -2930,10 +3071,15 @@ msgstr "VÄ›tší než" >>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"Greatly increases quality of textures generated using render to texture " "effects.\n" "Raising the internal resolution will improve the effect of this setting.\n" +"Slightly decreases performance and possibly causes issues (although " +"unlikely).\n" "\n" "If unsure, leave this checked." msgstr "" @@ -2968,11 +3114,11 @@ msgstr "Kytara" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Byl zavolán HCI_CMD_INQUIRY, prosím ohlaste!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Hacky" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Kontrolní souÄet hlaviÄky selhal" @@ -3008,7 +3154,7 @@ msgstr "" msgid "Hide" msgstr "Skrýt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Skrýt kurzor myÅ¡i" @@ -3035,6 +3181,7 @@ msgstr "Hostovat" msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD @@ -3047,6 +3194,10 @@ msgstr "Nastavení klávesových zkratek" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Hotkeys" msgstr "Klávesové zkratky" @@ -3133,11 +3284,11 @@ 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, aby to bylo úÄinné." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Ignorovat ZmÄ›ny Formátu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3151,7 +3302,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3193,7 +3344,7 @@ msgstr "" "\"Importovaný soubor má příponu sav\n" "ale nemá správnou hlaviÄku\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3205,7 +3356,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -3223,8 +3374,8 @@ msgstr "Ve HÅ™e" msgid "In-Game" msgstr "Ve HÅ™e" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Info" @@ -3267,6 +3418,7 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " "nepodporuje." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3276,6 +3428,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3304,7 +3459,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "VnitÅ™ní chyba LZO - lzo_init() selhalo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "VnitÅ™ní RozliÅ¡ení:" @@ -3357,6 +3512,7 @@ msgstr "Neplatný soubor s nahrávkou" msgid "Invalid state" msgstr "Neplatný stav" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3372,6 +3528,11 @@ msgstr "Neplatný stav" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Italian" msgstr "ItalÅ¡tina" @@ -3433,8 +3594,8 @@ msgstr "Poslední PÅ™epsaný Stav" msgid "Last Saved State" msgstr "Poslední Uložený Stav" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Vlevo" @@ -3481,7 +3642,7 @@ msgstr "Limitovat podle SzS" msgid "Load" msgstr "Nahrát" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "Nahrát Vlastní Textury" @@ -3529,6 +3690,7 @@ msgstr "Nahrát Slot Stavu 8" msgid "Load State..." msgstr "Nahrát Stav..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3550,11 +3712,18 @@ msgstr "Nahrát Systémové Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Nahrát Systémové Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3596,8 +3765,8 @@ msgstr "Typy Záznamu" msgid "Logger Outputs" msgstr "Výstup ZapisovaÄe" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "Protokolování" @@ -3631,6 +3800,7 @@ msgstr "MMU Hack Rychlosti" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Soubory MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 @@ -3640,7 +3810,10 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)" ======= >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hlavní Stick" @@ -3669,6 +3842,7 @@ msgstr "Pam. karta již otevÅ™ena" msgid "Memory Byte" msgstr "Bajt PamÄ›ti" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD @@ -3680,6 +3854,10 @@ msgstr "Bajt PamÄ›ti" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Memory Card" msgstr "Paměťová karta" @@ -3708,7 +3886,7 @@ msgstr "" "%s\n" "ChtÄ›li byste starý soubor zkopírovat do nového umístÄ›ní?\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "Velikost paměťové karty se neshoduje s velikosti hlaviÄky" @@ -3725,7 +3903,7 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "Ostatní" @@ -3738,7 +3916,7 @@ msgstr "Ostatní Nastavení" msgid "Modifier" msgstr "Modifikátor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3763,7 +3941,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3877,6 +4055,7 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3885,9 +4064,11 @@ msgstr "NK Nahoru" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Jméno:" @@ -3972,6 +4153,7 @@ msgstr "Nerovná se" msgid "Not Set" msgstr "Nenastaven" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 @@ -3981,6 +4163,9 @@ msgstr "Nenastaven" ======= #: Source/Core/DolphinWX/Src/Main.cpp:607 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Not connected" msgstr "NepÅ™ipojen" @@ -4009,8 +4194,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "PoÄet Kódů:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "NunÄak" @@ -4039,6 +4224,7 @@ msgstr "Logická Adresa:" msgid "Only %d blocks available" msgstr "Pouze bloky %d jsou dostupné" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD <<<<<<< HEAD @@ -4048,6 +4234,10 @@ msgstr "Pouze bloky %d jsou dostupné" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Open" msgstr "Otevřít" @@ -4077,11 +4267,11 @@ msgstr "OpenAL: nelze nalézt zvuková zařízení" msgid "OpenAL: can't open device %s" msgstr "OpenAL: nelze otevřít zařízení %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "OpenCL Dekodér Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "OpenMP Dekodér Textury" @@ -4112,8 +4302,8 @@ msgstr "" "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:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "Jiné" @@ -4177,6 +4367,7 @@ msgstr "Záplaty" msgid "Paths" msgstr "Cesty" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4187,13 +4378,15 @@ msgstr "Cesty" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pozastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "OsvÄ›tlení Podle Pixelu" @@ -4206,6 +4399,7 @@ msgstr "Dokonalá" msgid "Perspective %d" msgstr "Perspektiva %d" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD @@ -4220,6 +4414,12 @@ msgstr "Perspektiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Play" msgstr "Spustit" @@ -4245,6 +4445,7 @@ msgstr "Možnosti PÅ™ehrávání" msgid "Players" msgstr "HráÄi" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4254,6 +4455,9 @@ msgstr "HráÄi" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -4298,7 +4502,7 @@ msgstr "PortugalÅ¡tina" msgid "Portuguese (Brazilian)" msgstr "PortugalÅ¡tina (Brazilská)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Efekt Následného Zpracování:" @@ -4372,7 +4576,7 @@ msgstr "TlaÄítko R" msgid "R-Analog" msgstr "Pravý Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -4389,7 +4593,7 @@ msgstr "Rozsah" msgid "Read-only mode" msgstr "Režim pouze pro Ätení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Opravdová" @@ -4449,9 +4653,9 @@ msgstr "" "\n" "Pokud si nejste jisti, vyberte Žádný." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Obnovit" @@ -4464,6 +4668,7 @@ msgstr "Obnovit Seznam" msgid "Refresh game list" msgstr "Obnovit seznam her" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4482,10 +4687,16 @@ msgstr "Obnovit seznam her" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Remove" msgstr "Odstranit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4495,10 +4706,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Vykreslit do Hlavního okna" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD @@ -4508,7 +4720,10 @@ msgstr "Vykreslit do Hlavního okna" ======= >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetovat" @@ -4520,8 +4735,8 @@ msgstr "Výsledky" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Vpravo" @@ -4547,23 +4762,29 @@ msgid "Sa&ve State" msgstr "Uložit Sta&v" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Safe" msgstr "BezpeÄná" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= ======= >>>>>>> Update Greek and Czech translations +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Uložit" @@ -4638,15 +4859,21 @@ msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Uložený stav filmu %s je poÅ¡kozen, nahrávání filmu je zastaveno..." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= ======= >>>>>>> Update Greek and Czech translations +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. #, c-format @@ -4683,8 +4910,8 @@ msgstr "Hledat Podadresáře" msgid "Section %s not found in SYSCONF" msgstr "Sekce %s nebyla v SYSCONF nalezena" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Vybrat" @@ -4697,16 +4924,20 @@ msgstr "Vyberte Soubor s Nahrávkou" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -4732,6 +4963,7 @@ msgstr "Vybrat plovoucí okna" msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4748,19 +4980,26 @@ msgstr "Vyberte stav k nahrání" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -4898,11 +5137,11 @@ msgstr "Zobrazit Panel Nás&trojů" msgid "Show Drives" msgstr "Zobrazit Disky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Zobrazit EFB Regiony Kopie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Zobrazit Snímky za Sekundu" @@ -4914,7 +5153,7 @@ msgstr "Zobrazit Francii" msgid "Show GameCube" msgstr "Zobrazit GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Zobrazit Obrazovku Vstupu" @@ -4950,7 +5189,7 @@ msgstr "Zobrazit Platformy" msgid "Show Regions" msgstr "Zobrazit Regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Zobrazit Statistiky" @@ -5004,7 +5243,7 @@ msgstr "Zobrazit ikonu uložení" msgid "Show save title" msgstr "Zobrazit název uložení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -5024,7 +5263,7 @@ msgstr "Zobrazit tuto zprávu nápovÄ›dy" msgid "Show unknown" msgstr "Zobrazit neznámé" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -5050,15 +5289,15 @@ msgstr "Velikost" msgid "Skip BIOS" msgstr "PÅ™eskoÄit BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "Vypnout Průchod Cíl. Průhl." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "PÅ™eskoÄit EFB Přístup z Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -5070,6 +5309,22 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +msgid "" +"Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" +"Sometimes also increases visual quality.\n" +"If you're experiencing any issues, try raising texture cache accuracy or " +"disable this option.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Lehce zrychlí kopie EFB do RAM obÄ›továním pÅ™esnosti emulace.\n" +"NÄ›kdy také zvýší kvalitu obrazu.\n" +"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost textury, " +"nebo tuto možnost vypnout.\n" +"\n" +"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -5123,6 +5378,7 @@ msgstr "VytvoÅ™ení vyrovnávací pamÄ›ti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5138,6 +5394,11 @@ msgstr "Mezerník" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" @@ -5145,7 +5406,7 @@ msgstr "Å panÄ›lÅ¡tina" msgid "Speaker Volume:" msgstr "Hlasitost Reproduktoru:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "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 " @@ -5181,6 +5442,7 @@ msgstr "ÄŒtvercový Stick" msgid "Standard Controller" msgstr "Standardní OvladaÄ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 @@ -5189,9 +5451,11 @@ msgstr "Standardní OvladaÄ" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -5221,6 +5485,7 @@ msgstr "Ukládání stavu" msgid "Stick" msgstr "Stick" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD <<<<<<< HEAD @@ -5231,11 +5496,30 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Zastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +msgid "" +"Store EFB copies in GPU texture objects.\n" +"This is not so accurate, but it works well enough for most games and gives a " +"great speedup over EFB to RAM.\n" +"\n" +"If unsure, leave this checked." +msgstr "" +"Ukládat EFB kopie do objektů textury grafického procesoru.\n" +"Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává vÄ›tší " +"zrychlení než EFB do RAM.\n" +"\n" +"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "Roztáhnout do Okna" @@ -5269,8 +5553,8 @@ msgstr "Jazyk Systému:" msgid "TAIWAN" msgstr "TCHAJ-WAN" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Vstup" @@ -5290,10 +5574,10 @@ msgstr "Deska vlevo" msgid "Table Right" msgstr "Deska vpravo" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 @@ -5301,6 +5585,9 @@ msgstr "Deska vpravo" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Take Screenshot" msgstr "VytvoÅ™it Snímek Obrazovky" @@ -5312,7 +5599,15 @@ msgstr "" msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Textura" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "Vyrovnávací Paměť Textur" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "PÅ™ekryv Formátu Textury" @@ -5357,7 +5652,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Soubor %s je už otevÅ™en, hlaviÄka souboru nebude zapsána." -#: Source/Core/Core/Src/Boot/Boot.cpp:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Zadaný soubor (%s) neexistuje" @@ -5374,11 +5669,23 @@ msgstr "Jméno nemůže obsahovat znak ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Výsledný rozÅ¡ifrovaný kód AR neobsahuje žádné řádky." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" +"Čím bezpeÄnÄ›jší toto bude, tím bude ménÄ› pravdÄ›podobné, že emulátoru budou " +"chybÄ›t jakékoliv aktualizace textur z RAM.\n" +"\n" +"Pokud si nejste jisti, použijte druhou nejrychlejší hodnotu zprava." + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5447,7 +5754,7 @@ msgstr "" 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." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5522,6 +5829,7 @@ msgstr "Do" msgid "Toggle All Log Types" msgstr "Zapnout VÅ¡echny Typy Záznamů" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD <<<<<<< HEAD @@ -5538,13 +5846,19 @@ msgstr "PÅ™epnout na Celou Obrazovku" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. ======= +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "PÅ™epnout na Celou Obrazovku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Top" msgstr "NahoÅ™e" @@ -5552,7 +5866,7 @@ msgstr "NahoÅ™e" msgid "Traditional Chinese" msgstr "TradiÄní ČínÅ¡tina" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "Pokus o naÄtení souboru neznámého typu." @@ -5588,8 +5902,8 @@ msgstr "Typ" msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5664,13 +5978,17 @@ msgstr "" "Neznámý ukazatel %#08x\n" "PokraÄovat?" +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 ======= >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Nahoru" @@ -5687,7 +6005,7 @@ msgstr "Svislý Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Použít režim EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "Použít Celou Obrazovku" @@ -5699,7 +6017,7 @@ msgstr "Použít Å estnáctkovou soustavu" msgid "Use Panic Handlers" msgstr "Použít Obslužné Rutiny Paniky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5712,7 +6030,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5726,11 +6044,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Pomůcky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "V-Synch" @@ -5754,8 +6072,7 @@ msgstr "Úroveň" msgid "Video" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Virtuální" @@ -5782,21 +6099,21 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Varování" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "Varování - DOL se spouÅ¡tí ve Å¡patném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Varování - ELF se spouÅ¡tí ve Å¡patném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Varování - ISO se spouÅ¡tí ve Å¡patném režimu konzole!" @@ -5868,7 +6185,7 @@ msgstr "WaveFileWriter - soubor není otevÅ™en." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Hack Å irokoúhlého obrazu" @@ -5892,6 +6209,7 @@ msgstr "Wii KoÅ™en NAND:" msgid "Wii Save Import" msgstr "Import uložených pozic Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5901,6 +6219,9 @@ msgstr "Import uložených pozic Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -5908,8 +6229,8 @@ msgstr "Wii soubory s uložením (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD Nelze Äíst ze souboru" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5931,6 +6252,7 @@ msgstr "" "nebo je to vyprÅ¡ení limitu neaktivity, nebo z jiného důvodu.\n" "Chcete ho hned znovu pÅ™ipojit?" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 @@ -5940,6 +6262,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/Main.cpp:609 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Wiimote Connected" msgstr "Wiimote PÅ™ipojen" @@ -5971,6 +6296,7 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5981,6 +6307,9 @@ msgstr "Zalamování textu" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. @@ -6089,7 +6418,7 @@ msgstr "Nulový kód, který dolphin nezná: %08x" msgid "[ waiting ]" msgstr "[ Äekám ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -6105,7 +6434,7 @@ msgstr "" msgid "[Custom]" msgstr "[Vlastní]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -6124,7 +6453,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -6231,9 +6560,6 @@ msgstr "| NEBO" #~ msgid "< as Default Profile >" #~ msgstr "< jako Výchozí Profil >" -#~ msgid "Accuracy:" -#~ msgstr "PÅ™esnost:" - #~ msgid "Accurate Texture Cache" #~ msgstr "Precizní Vyrovnávací Paměť Textur" @@ -6253,9 +6579,6 @@ msgstr "| NEBO" #~ "ale zapnutí této možnosti může mít také velký negativní dopad na výkon " #~ "pokud hra tuto funkci hodnÄ› využívá." -#~ msgid "Alternate Wiimote Timing" -#~ msgstr "Střídat Äasování Wiimote" - #~ msgid "Auto [recommended]" #~ msgstr "Auto [doporuÄeno]" @@ -6268,17 +6591,6 @@ msgstr "| NEBO" #~ "nastavená pomocí zmÄ›ny velikosti EFB.\n" #~ "PÅ™i používání tohoto je nejlepší nastavit pomÄ›r stran na roztáhnutí." -#~ msgid "" -#~ "Automatically generate mipmaps rather than decoding them from memory.\n" -#~ "Increases performance a bit but might cause minor texture defects.\n" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Automaticky vytvoÅ™it mipmapy, radÄ›ji než dekódovat je z pamÄ›ti.\n" -#~ "Trochu zlepší výkon, ale může způsobit malé chyby pamÄ›ti.\n" -#~ "\n" -#~ "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." - #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6315,6 +6627,9 @@ msgstr "| NEBO" #~ msgid "Danish" #~ msgstr "DánÅ¡tina" +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "Zakázat Reproduktor Wiimote" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6360,9 +6675,6 @@ msgstr "| NEBO" #~ msgid "Enable CPU Access" #~ msgstr "Povolit Přístup k Procesoru" -#~ msgid "Enable Cache" -#~ msgstr "Povolit vyrovnávací paměť" - #~ msgid "Enable Copy to EFB" #~ msgstr "Povolit Kopírování do EFB" @@ -6421,12 +6733,6 @@ msgstr "| NEBO" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Nelze nahrát DSP ROM : %s" -#~ msgid "Fast" -#~ msgstr "Rychlá" - -#~ msgid "Fast Mipmaps" -#~ msgstr "Rychlé Mipmapy" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6540,15 +6846,9 @@ msgstr "| NEBO" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Nutné pro použití Japonského písma ROM" -#~ msgid "Safe" -#~ msgstr "BezpeÄná" - #~ msgid "Scale:" #~ msgstr "ZmÄ›na Velikosti:" -#~ msgid "Scaled EFB Copy" -#~ msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Vyberte rozliÅ¡ení v režimu celé obrazovky" @@ -6593,21 +6893,6 @@ msgstr "| NEBO" #~ "Zobrazí různé statistiky.\n" #~ "Jsou užiteÄné pouze pro úÄely ladÄ›ní." -#~ msgid "" -#~ "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" -#~ "Sometimes also increases visual quality.\n" -#~ "If you're experiencing any issues, try raising texture cache accuracy or " -#~ "disable this option.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Lehce zrychlí kopie EFB do RAM obÄ›továním pÅ™esnosti emulace.\n" -#~ "NÄ›kdy také zvýší kvalitu obrazu.\n" -#~ "Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost " -#~ "textury, nebo tuto možnost vypnout.\n" -#~ "\n" -#~ "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." - #~ msgid "Slot" #~ msgstr "Slot" @@ -6641,6 +6926,7 @@ msgstr "| NEBO" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #~ msgid "" @@ -6684,6 +6970,8 @@ msgstr "| NEBO" #~ "Pokud si nejste jisti, použijte druhou nejrychlejší hodnotu zprava." >>>>>>> Update Greek and Czech translations +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #~ msgid "Use FPS For Limiting" #~ msgstr "Použít SzS pro Omezení" diff --git a/Languages/po/el.po b/Languages/po/el.po index c9e9dda7d7..7a97de70b5 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:39-0600\n" ======= @@ -17,6 +18,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= "POT-Creation-Date: 2011-08-10 08:30-0500\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> The actual update of the Greek and Czech translations. The last commit "PO-Revision-Date: 2011-10-15 11:16+0200\n" >>>>>>> Update Greek and Czech translations "Last-Translator: Linktothepast \n" @@ -42,7 +46,7 @@ msgstr "Παιχνίδι : " msgid "! NOT" msgstr "! NOT" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -54,8 +58,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\" είναι ένα μη έγκυÏο αÏχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." +msgstr "Το \"%s\" είναι ένα μη έγκυÏο αÏχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:193 #, c-format @@ -83,10 +86,9 @@ msgstr "%s υπάÏχει ήδη, θέλετε αντικατάσταση;" #: Source/Core/DiscIO/Src/CompressedBlob.cpp:167 #, c-format msgid "%s failed to be scrubbed. Probably the image is corrupt." -msgstr "" -"%s απέτυχε να γίνει scrubbed. Πιθανότατα το αÏχείο εικόνας είναι φθαÏμένο." +msgstr "%s απέτυχε να γίνει scrubbed. Πιθανότατα το αÏχείο εικόνας είναι φθαÏμένο." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -95,7 +97,7 @@ msgstr "" "%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης\n" " Το μέγεθος του αÏχείου της κάÏτας δεν είναι έγκυÏο (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -104,15 +106,14 @@ msgstr "" "%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης\n" " Το μέγεθος της κάÏτας δεν είναι έγκυÏο (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format 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 bytes)" +"το αÏχείο δεν είναι αÏκετά μεγάλο ώστε να αποτελεί έγκυÏο αÏχείο κάÏτας μνήμης (0x%x bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -143,9 +144,7 @@ msgstr "Το %s είναι ήδη συμπιεσμένο! Δε γίνεται ν #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345 #, 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:199 #, c-format @@ -323,7 +322,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(ΑΓÎΩΣΤΟ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(ανενεÏγό)" @@ -335,7 +334,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -347,7 +346,7 @@ msgstr "8 bit" msgid "" msgstr "<Εισάγετε όνομα εδώ>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "<Δε βÏέθηκαν αναλÏσεις>" @@ -386,13 +385,11 @@ msgstr "" msgid "" "ALERT:\n" "\n" -"NetPlay will currently only work properly when using the following " -"settings:\n" +"NetPlay will currently only work properly when using the following settings:\n" " - Dual Core [OFF]\n" " - Audio Throttle [OFF]\n" " - DSP-HLE with \"Null Audio\" or DSP-LLE\n" -" - Manually set the exact number of controllers that will be used to " -"[Standard Controller]\n" +" - Manually set the exact number of controllers that will be used to [Standard Controller]\n" "\n" "All players should try to use the same Dolphin version and settings.\n" "Disable all memory cards or send them to all players before starting.\n" @@ -406,12 +403,10 @@ msgstr "" " - ΔÏο ΠυÏήνες [ΑÎΕÎΕΡΓΟ]\n" " - Throttle Ήχου [ΑÎΕÎΕΡΓΟ]\n" " - DSP-HLE με \"Null Audio\" ή DSP-LLE\n" -" - ΧειÏοκίνητη εισαγωγή του ακÏιβοÏÏ‚ αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ ελεγκτών που θα " -"χÏησιμοποιηθοÏν σαν [Τυπικός Ελεγκτής]\n" +" - ΧειÏοκίνητη εισαγωγή του ακÏιβοÏÏ‚ αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ ελεγκτών που θα χÏησιμοποιηθοÏν σαν [Τυπικός Ελεγκτής]\n" "\n" "Όλοι οι παίκτες Ï€Ïέπει να έχουν την ίδια έκδοση και Ïυθμίσεις του Dolphin.\n" -"ΑπενεÏγοποιήστε όλες τις κάÏτες μνήμης ή στείλτε τες σε όλους τους παίκτες " -"Ï€Ïιν την εκκίνηση.\n" +"ΑπενεÏγοποιήστε όλες τις κάÏτες μνήμης ή στείλτε τες σε όλους τους παίκτες Ï€Ïιν την εκκίνηση.\n" "Η υποστήÏιξη Wiimote δεν έχει ακόμα υλοποιηθεί.\n" "\n" "Θα Ï€Ïέπει να έχετε κάνει Ï€Ïοώθηση της πόÏτας TCP στον host!!" @@ -434,6 +429,7 @@ msgstr "Σχετικά με το Dolphin" msgid "Acceleration" msgstr "Επιτάχυνση" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Accuracy:" @@ -445,10 +441,17 @@ msgstr "" ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "ΑκÏίβεια:" + +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "ΑκÏιβής VBeam εξομοίωση" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD @@ -458,16 +461,17 @@ msgstr "ΑκÏιβής VBeam εξομοίωση" >>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" "Accurately emulate EFB copies.\n" -"Some games depend on this for certain graphical effects or gameplay " -"functionality.\n" +"Some games depend on this for certain graphical effects or gameplay functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "Εξομοιώνει με ακÏίβεια τα EFB αντίγÏαφα.\n" -"Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες " -"του gameplay.\n" +"Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες του gameplay.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε EFB ΑντίγÏαφα σε Υφή." @@ -493,38 +497,23 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "" -"Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) στην " -"ΠÏοσθήκη ÎšÏ‰Î´Î¹ÎºÎ¿Ï (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) στην ΠÏοσθήκη ÎšÏ‰Î´Î¹ÎºÎ¿Ï (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:756 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " -"(%s)" -msgstr "" -"Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Fill " -"και Slide (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" +msgstr "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Fill και Slide (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:549 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " -"Fill (%s)" -msgstr "" -"Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Ram " -"Write και Fill (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" +msgstr "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Ram Write και Fill (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:609 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " -"Pointer (%s)" -msgstr "" -"Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Write " -"To Pointer (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" +msgstr "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Write To Pointer (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -533,11 +522,8 @@ msgstr "Σφάλμα Action Replay: Μη έγκυÏη τιμή (%08x) σε Memor #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "" -"Σφάλμα Action Replay: Οι λειτουÏγίες Master Code και Write To CCXXXXXX δεν " -"έχουν υλοποιηθεί (%s)" +msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "Σφάλμα Action Replay: Οι λειτουÏγίες Master Code και Write To CCXXXXXX δεν έχουν υλοποιηθεί (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -564,12 +550,12 @@ msgstr "Action Replay: Normal Code %i: Μη έγκυÏο subtype %08x (%s)" msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Code 0: Μη έγκυÏο Subtype %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "ΠÏοσαÏμογέας:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "ΠÏοσθήκη" @@ -585,6 +571,7 @@ msgstr "ΠÏοσθήκη Patch" msgid "Add new pane" msgstr "ΠÏοσθήκη νέου pane" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -600,6 +587,11 @@ msgstr "ΠÏοσθήκη νέου pane" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Add..." msgstr "ΠÏοσθήκη..." @@ -611,8 +603,7 @@ msgstr "ΔιεÏθυνση :" msgid "" "Adds the specified value to zFar Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " -"the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." @@ -622,8 +613,7 @@ msgstr "" msgid "" "Adds the specified value to zNear Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " -"the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." @@ -631,11 +621,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "" -"ΡÏθμιση της απαιτοÏμενης πίεσης του Î±Î½Î±Î»Î¿Î³Î¹ÎºÎ¿Ï Ï‡ÎµÎ¹ÏιστηÏίου για την " -"ενεÏγοποίηση των κουμπιών." +msgstr "ΡÏθμιση της απαιτοÏμενης πίεσης του Î±Î½Î±Î»Î¿Î³Î¹ÎºÎ¿Ï Ï‡ÎµÎ¹ÏιστηÏίου για την ενεÏγοποίηση των κουμπιών." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Για Ï€ÏοχωÏημένους" @@ -655,6 +643,7 @@ msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -667,6 +656,10 @@ msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" @@ -682,18 +675,17 @@ msgstr "Όλα τα συμπιεσμένα αÏχεία GC/Wii ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "Όλα τα αÏχεία (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, " -"6 και 7 μέσα από το παÏάθυÏο εξομοίωσης.\n" +"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, 6 και 7 μέσα από το παÏάθυÏο εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD @@ -709,10 +701,17 @@ msgstr "Εξομοιωμένο Wiimote" ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Alternate Wiimote Timing" +msgstr "Εναλλακτικός ΧÏονισμός Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Anisotropic Filtering:" msgstr "ΑνισοτÏοπικό ΦιλτÏάÏισμα:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Εξομάλυνση ΟÏίων:" @@ -732,7 +731,7 @@ msgstr "Apploader:" msgid "Apply" msgstr "ΕφαÏμογή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -761,20 +760,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" -msgstr "" -"Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " -"πάντα!" +msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για πάντα!" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -799,23 +800,27 @@ msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" msgstr "Αυτόματα" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Αυτόματα (Πολλαπλάσιο του 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Αυτόματα (Μέγεθος ΠαÏαθÏÏου)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Αυτόματη ΠÏοσαÏμογή Μεγέθους ΠαÏαθÏÏου" @@ -825,12 +830,14 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική " -"ανάλυση.\n" +"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική ανάλυση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Automatically generate mipmaps rather than decoding them from memory.\n" @@ -839,6 +846,7 @@ msgid "" "If unsure, leave this checked." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD "ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" "Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα στις " "υφές.\n" @@ -849,6 +857,13 @@ msgstr "" ======= >>>>>>> Update Greek and Czech translations +======= +"ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" +"Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα στις υφές.\n" +"\n" +"Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." + +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "Πίσω" @@ -857,8 +872,8 @@ msgstr "Πίσω" msgid "Backend Settings" msgstr "Backend Ρυθμίσεις" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -892,7 +907,7 @@ msgstr "Εικονίδιο:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Βασικές" @@ -904,7 +919,7 @@ msgstr "Βασικές Ρυθμίσεις" msgid "Bass" msgstr "Μπάσο" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Αποτυχία ελέγχου checksum για τον BAT" @@ -924,6 +939,7 @@ msgstr "ΑÏιστεÏÏŒ Μπλε" msgid "Blue Right" msgstr "Δεξί Μπλε" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD @@ -935,6 +951,10 @@ msgstr "Δεξί Μπλε" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Bottom" msgstr "Βάση" @@ -967,6 +987,7 @@ msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 @@ -978,7 +999,11 @@ msgstr "Buffer:" >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Κουμπιά" @@ -994,27 +1019,23 @@ msgstr "Stick ΚάμεÏας" msgid "CPU Emulator Engine" msgstr "Μηχανή Εξομοίωσης CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" +"In contrast to pixel lighting (which is merely an enhancement), per-pixel depth calculations are necessary to properly emulate a small number of games.\n" "\n" "If unsure, leave this checked." msgstr "" "Υπολογισμός των τιμών βάθους των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" -"Αντίθετα με τον φωτισμό ανά pixel (που είναι απλά μία βελτίωση), οι " -"υπολογισμοί του βάθους ανά pixel είναι απαÏαίτητοι για την σωστή εξομοίωση " -"ενός μικÏÎ¿Ï Î±ÏÎ¹Î¸Î¼Î¿Ï Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹ÏŽÎ½.\n" +"Αντίθετα με τον φωτισμό ανά pixel (που είναι απλά μία βελτίωση), οι υπολογισμοί του βάθους ανά pixel είναι απαÏαίτητοι για την σωστή εξομοίωση ενός μικÏÎ¿Ï Î±ÏÎ¹Î¸Î¼Î¿Ï Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹ÏŽÎ½.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -1024,13 +1045,12 @@ msgid "" msgstr "" "Υπολογίζει τον φωτισμό των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" "Μειώνει την ταχÏτητα εξομοίωσης κατά κάποιο ποσοστό (ανάλογα με την GPU).\n" -"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες " -"φοÏές Ï€Ïοβλήματα.\n" +"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες φοÏές Ï€Ïοβλήματα.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "ΆκυÏο" @@ -1074,10 +1094,10 @@ msgstr "Αποτυχία εÏÏεσης WiiMote με bd: %02x:%02x:%02x:%02x:%02 msgid "Cant find WiiMote by connection handle %02x" msgstr "Αδυναμία εÏÏεσης του WiiMote με handle σÏνδεσης %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interface: ΚÏίσιμο Σφάλμα" @@ -1183,6 +1203,7 @@ msgstr "Επιλέξτε μια κάÏτα μνήμης:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " @@ -1190,6 +1211,10 @@ msgid "" msgstr "" "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που " "απαÏτίζονται μόνο από φακέλους)" +======= +msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" +msgstr "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που απαÏτίζονται μόνο από φακέλους)" +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 @@ -1204,10 +1229,10 @@ msgstr "Κυκλικό Stick" msgid "Classic" msgstr "Κλασικό ΧειÏιστήÏιο" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "ΚαθάÏισ." @@ -1216,25 +1241,25 @@ msgid "Clear failed." msgstr "Το καθάÏισμα απέτυχε." #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "" -"Client disconnect while game is running!! NetPlay is disabled. You must " -"manually stop the game." -msgstr "" -"Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει " -"απενεÏγοποιηθεί. Θα Ï€Ïέπει να σταματήσετε χειÏοκίνητα το παιχνίδι." +msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." +msgstr "Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει απενεÏγοποιηθεί. Θα Ï€Ïέπει να σταματήσετε χειÏοκίνητα το παιχνίδι." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 ======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Close" msgstr "Κλείσιμο" @@ -1342,6 +1367,7 @@ msgstr "ΣÏνδεση Wiimote 3" msgid "Connect Wiimote 4" msgstr "ΣÏνδεση Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 @@ -1351,6 +1377,9 @@ msgstr "ΣÏνδεση Wiimote 4" ======= #: Source/Core/DolphinWX/Src/Main.cpp:608 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Connecting..." msgstr "Γίνεται ΣÏνδεση..." @@ -1391,15 +1420,10 @@ msgstr "Αποτυχία εκκίνησης backend %s" #: 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 " -"backup. Please note that original Gamecube and Wii discs cannot be read by " -"most PC DVD drives." +msgid "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii backup. Please note that original Gamecube and Wii discs cannot be read by most PC DVD drives." msgstr "" -"Δεν μπόÏεσε να γίνει ανάγνωση \"%s\". Δεν υπάÏχει δίσκος στον οδηγό, ή δεν " -"είναι ένα αντίγÏαφο εικόνας GC/Wii.\n" -" Σημειώστε πως αυθεντικοί Gamecube και Wii δίσκοι δεν μποÏοÏν να αναγνωστοÏν " -"από τους πεÏισσότεÏους PC DVD οδηγοÏÏ‚." +"Δεν μπόÏεσε να γίνει ανάγνωση \"%s\". Δεν υπάÏχει δίσκος στον οδηγό, ή δεν είναι ένα αντίγÏαφο εικόνας GC/Wii.\n" +" Σημειώστε πως αυθεντικοί Gamecube και Wii δίσκοι δεν μποÏοÏν να αναγνωστοÏν από τους πεÏισσότεÏους PC DVD οδηγοÏÏ‚." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format @@ -1416,23 +1440,19 @@ 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" -"(ο καθοÏισμός των χειÏιστηÏίων ενώ το παιχνίδι Ï„Ïέχει δεν υποστηÏίζεται Ï€Ïος " -"το παÏόν)" +"Αδυναμία καθοÏÎ¹ÏƒÎ¼Î¿Ï Ï‡ÎµÎ¹ÏιστηÏίων. Ο παίκτης εγκατέλειψε ή το παιχνίδι Ï„Ïέχει!\n" +"(ο καθοÏισμός των χειÏιστηÏίων ενώ το παιχνίδι Ï„Ïέχει δεν υποστηÏίζεται Ï€Ïος το παÏόν)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" "\n" -"Are you running Dolphin from a CD/DVD, or is the save file maybe write " -"protected?" +"Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?" msgstr "" "Δεν μπόÏεσε να γίνει εγγÏαφή των αÏχείων της κάÏτας μνήμης %s.\n" "\n" -"Μήπως εκτελείτε το Dolphin από CD/DVD, ή το αποθηκευόμενο αÏχείο έχει " -"Ï€Ïοστασία εγγÏαφής;" +"Μήπως εκτελείτε το Dolphin από CD/DVD, ή το αποθηκευόμενο αÏχείο έχει Ï€Ïοστασία εγγÏαφής;" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" @@ -1473,12 +1493,17 @@ msgstr "ΔημιουÏγήθηκε από KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "ΔημιουÏγήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart." "com]" +======= +msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +msgstr "ΔημιουÏγήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" @@ -1486,9 +1511,7 @@ msgstr "ΔημιουÏγήθηκε από VistaIcons.com" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "" -"ΔημιουÏγήθηκε από black_rider και δημοσιεÏθηκε στο ForumW.org > Web " -"Developments" +msgstr "ΔημιουÏγήθηκε από black_rider και δημοσιεÏθηκε στο ForumW.org > Web Developments" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 msgid "Creator: " @@ -1498,11 +1521,11 @@ msgstr "ΔημιουÏγός: " msgid "Critical" msgstr "ΚÏίσιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Κόψιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1549,6 +1572,7 @@ msgstr "Ήχος (DSP)" msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD @@ -1560,6 +1584,10 @@ msgstr "Μηχανή Εξομοίωσης DSP" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" @@ -1608,7 +1636,7 @@ msgstr "ÎεκÏή Ζώνη" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "Debugging" @@ -1641,8 +1669,8 @@ msgstr "ΠÏοεπιλεγμένο ISO:" msgid "Default font" msgstr "ΠÏοεπιλεγμένη γÏαμματοσειÏά" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "ΔιαγÏαφή" @@ -1650,12 +1678,12 @@ msgstr "ΔιαγÏαφή" msgid "Delete Save" msgstr "ΔιαγÏαφή Αποθήκευσης" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "ΔιαγÏαφή του υπάÏχοντος αÏχείου '%s';" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "ΠεÏιγÏαφή" @@ -1665,12 +1693,8 @@ msgstr "Ανίχνευση" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -msgid "" -"Detected attempt to read more data from the DVD than fit inside the out " -"buffer. Clamp." -msgstr "" -"Εντοπίστηκε Ï€Ïοσπάθεια ανάγνωσης πεÏισσότεÏων δεδομένων από το DVD από όσα " -"χωÏάνε μέσα στο buffer. Clamp." +msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." +msgstr "Εντοπίστηκε Ï€Ïοσπάθεια ανάγνωσης πεÏισσότεÏων δεδομένων από το DVD από όσα χωÏάνε μέσα στο buffer. Clamp." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 @@ -1686,15 +1710,15 @@ msgstr "Ρυθμίσεις Συσκευής" msgid "Dial" msgstr "Dial" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1702,62 +1726,52 @@ msgstr "" "Το checksum του Καταλόγου απέτυχε\n" " καθώς και το checksum του εφεδÏÎ¹ÎºÎ¿Ï ÎšÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… απέτυχε" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "ΑπενεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "ΑπενεÏγοποίηση Ομίχλης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "ΑπενεÏγοποίηση ΦωτισμοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "ΑπενεÏγοποίηση Βάθους ανά Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "ΑπενεÏγοποίηση Υφών" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" -"Speeds up emulation a lot but causes heavy glitches in many games which rely " -"on them (especially homebrew applications).\n" +"Speeds up emulation a lot but causes heavy glitches in many games which rely on them (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "ΑπενεÏγοποιεί την XFB εξομοίωση.\n" -"ΕπιταχÏνει αÏκετά την εξομοίωση αλλά Ï€Ïοκαλεί μεγάλα ελαττώματα σε πολλά " -"παιχνίδια που βασίζονται σε αυτήν (ειδικά σε homebrew εφαÏμογές).\n" +"ΕπιταχÏνει αÏκετά την εξομοίωση αλλά Ï€Ïοκαλεί μεγάλα ελαττώματα σε πολλά παιχνίδια που βασίζονται σε αυτήν (ειδικά σε homebrew εφαÏμογές).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" -"These are often used for post-processing or render-to-texture effects, so " -"while checking this setting gives a great speedup it almost always also " -"causes issues.\n" +"These are often used for post-processing or render-to-texture effects, so while checking this setting gives a great speedup it almost always also causes issues.\n" "\n" "If unsure, leave this unchecked." msgstr "" "ΑπενεÏγοποιεί την εξομοίωση των EFB αντιγÏαφών.\n" -"ΧÏησιμοποιοÏνται συχνά για post-processing ή render-to-texture εφέ, έτσι αν " -"και επιλέγοντάς το αυξάνονται κατά Ï€Î¿Î»Ï Î¿Î¹ επιδόσεις, σχεδόν πάντα " -"Ï€ÏοκαλοÏνται Ï€Ïοβλήματα.\n" +"ΧÏησιμοποιοÏνται συχνά για post-processing ή render-to-texture εφέ, έτσι αν και επιλέγοντάς το αυξάνονται κατά Ï€Î¿Î»Ï Î¿Î¹ επιδόσεις, σχεδόν πάντα Ï€ÏοκαλοÏνται Ï€Ïοβλήματα.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1776,11 +1790,11 @@ msgstr "Δίσκος" msgid "Disc Read Error" msgstr "Σφάλμα Ανάγνωσης Δίσκου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1794,6 +1808,7 @@ msgstr "" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1803,6 +1818,9 @@ msgstr "Divide" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" @@ -1810,7 +1828,7 @@ msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξο msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Ρυθμίσεις ΓÏαφικών Dolphin %s" @@ -1831,6 +1849,7 @@ msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1844,16 +1863,23 @@ msgstr "Ρυθμίσεις Dolphin GCPad" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1869,6 +1895,7 @@ msgstr "Dolphin στο &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " @@ -1876,11 +1903,16 @@ msgid "" msgstr "" "Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εÏÏεση " "αÏχείων..." +======= +msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." +msgstr "Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εÏÏεση αÏχείων..." +>>>>>>> The actual update of the Greek and Czech translations. The last commit <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " @@ -1888,9 +1920,13 @@ msgid "" msgstr "" "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ " "εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." +======= +msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." +msgstr "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." +>>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Κάτω" @@ -1915,41 +1951,39 @@ msgstr "Dummy" msgid "Dump Audio" msgstr "Εξαγωγή Ήχου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Εξαγωγή EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Εξαγωγή ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Εξαγωγή Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή όλων των απεικονισμένων καÏέ σε ένα AVI αÏχείο στο User/Dump/" -"Frames/\n" +"Εξαγωγή όλων των απεικονισμένων καÏέ σε ένα AVI αÏχείο στο User/Dump/Frames/\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή των αποκωδικοποιημένων υφών του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï ÏƒÏ„Î¿ User/Dump/Textures/" -"/\n" +"Εξαγωγή των αποκωδικοποιημένων υφών του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï ÏƒÏ„Î¿ User/Dump/Textures//\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1959,6 +1993,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1974,6 +2009,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Dutch" msgstr "Ολλανδικά" @@ -1981,22 +2021,14 @@ msgstr "Ολλανδικά" msgid "E&xit" msgstr "Έ&ξοδος" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "EFB ΑντίγÏαφα" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, c-format -msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " -"version %d.%d -- If you recently upgraded your Dolphin distribution, a " -"reboot is probably required at this point to get Windows to see the new " -"driver." -msgstr "" -"ΣΦΑΛΜΑ: Αυτή η έκδοση του Dolphin απαιτεί TAP-Win32 οδηγοÏÏ‚ που να είναι " -"τουλάχιστον έκδοσης %d.%d -- Αν Ï€Ïόσφατα αναβαθμίσατε την διανομή του " -"Dolphin σας, μία επανεκκίνηση απαιτείται για να κάνει τα Windows να δοÏνε " -"τους νέους οδηγοÏÏ‚." +msgid "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least version %d.%d -- If you recently upgraded your Dolphin distribution, a reboot is probably required at this point to get Windows to see the new driver." +msgstr "ΣΦΑΛΜΑ: Αυτή η έκδοση του Dolphin απαιτεί TAP-Win32 οδηγοÏÏ‚ που να είναι τουλάχιστον έκδοσης %d.%d -- Αν Ï€Ïόσφατα αναβαθμίσατε την διανομή του Dolphin σας, μία επανεκκίνηση απαιτείται για να κάνει τα Windows να δοÏνε τους νέους οδηγοÏÏ‚." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -2035,7 +2067,7 @@ msgstr "ΕπεξεÏγασία..." msgid "Effect" msgstr "Εφέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" @@ -2043,34 +2075,27 @@ msgstr "Embedded Frame Buffer" msgid "Emu Thread already running" msgstr "Το νήμα εξομοίωσης εκτελείται ήδη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" -"Slows down emulation a lot and prohibits high-resolution rendering but is " -"necessary to emulate a number of games properly.\n" +"Slows down emulation a lot and prohibits high-resolution rendering but is necessary to emulate a number of games properly.\n" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" "Εξομοιώνει τα XFBs με ακÏίβεια.\n" -"ΕπιβÏαδÏνει αÏκετά την εξομοίωση και αποτÏέπει την απόδοση γÏαφικών υψηλής " -"ανάλυσης, αλλά είναι απαÏαίτητο για την σωστή εξομοίωση οÏισμένου αÏÎ¹Î¸Î¼Î¿Ï " -"παιχνιδιών.\n" +"ΕπιβÏαδÏνει αÏκετά την εξομοίωση και αποτÏέπει την απόδοση γÏαφικών υψηλής ανάλυσης, αλλά είναι απαÏαίτητο για την σωστή εξομοίωση οÏισμένου αÏÎ¹Î¸Î¼Î¿Ï Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹ÏŽÎ½.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε εικονική XFB εξομοίωση." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" -"Fixes many games which don't work without XFB emulation while not being as " -"slow as real XFB emulation. However, it may still fail for a lot of other " -"games (especially homebrew applications).\n" +"Fixes many games which don't work without XFB emulation while not being as slow as real XFB emulation. However, it may still fail for a lot of other games (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Εξομοιώνει XFBs χÏησιμοποιώντας GPU αντικείμενα υφής.\n" -"ΔιοÏθώνει πολλά παιχνίδια που δεν δουλεÏουν χωÏίς XFB εξομοίωση, χωÏίς " -"παÏάληλα να είναι αÏγή όπως η Ï€Ïαγματική XFB εξομοίωση. ΠαÏόλα αυτά μποÏεί " -"να αποτÏχει σε πολλά άλλα παιχνίδια (ειδικά homebrew εφαÏμογές).\n" +"ΔιοÏθώνει πολλά παιχνίδια που δεν δουλεÏουν χωÏίς XFB εξομοίωση, χωÏίς παÏάληλα να είναι αÏγή όπως η Ï€Ïαγματική XFB εξομοίωση. ΠαÏόλα αυτά μποÏεί να αποτÏχει σε πολλά άλλα παιχνίδια (ειδικά homebrew εφαÏμογές).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -2086,17 +2111,15 @@ msgstr "Κατάσταση ΛειτουÏγίας:" msgid "Enable" msgstr "ΕνεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" -"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " -"supported by your GPU.\n" +"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\n" "Possibly causes issues.\n" "Requires fullscreen to work.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιεί 3D εφέ μέσω στεÏεοσκοπίας χÏησιμοποιώντας την τεχνολογία 3D " -"Vision της Nvidia αν υποστηÏίζεται από την GPU.\n" +"ΕνεÏγοποιεί 3D εφέ μέσω στεÏεοσκοπίας χÏησιμοποιώντας την τεχνολογία 3D Vision της Nvidia αν υποστηÏίζεται από την GPU.\n" "Πιθανώς μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα.\n" "ΧÏειάζεται λειτουÏγία πλήÏης οθόνης για να λειτουÏγήσει.\n" "\n" @@ -2118,16 +2141,20 @@ msgstr "ΕνεÏγοποίηση BAT" msgid "Enable Block Merging" msgstr "ΕνεÏγοποίηση Block Merging" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "ΕνεÏγοποίηση Cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 @@ -2137,6 +2164,8 @@ msgstr "ΕνεÏγοποίηση Cheat" ======= >>>>>>> Update Greek and Czech translations +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" @@ -2154,7 +2183,7 @@ msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα" msgid "Enable Dual Core (speedup)" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "ΕνεÏγοποίηση ΣυντομεÏσεων" @@ -2170,8 +2199,8 @@ msgstr "ΕνεÏγοποίηση Idle Skipping (επιτάχυνση)" msgid "Enable MMU" msgstr "ΕνεÏγοποίηση MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "ΕνεÏγοποίηση ΠÏοοδευτικής ΣάÏωσης" @@ -2183,7 +2212,7 @@ msgstr "ΕνεÏγοποίηση ΠÏοφÏλαξης Οθόνης" msgid "Enable WideScreen" msgstr "ΕνεÏγοποίηση ΕυÏείας Οθόνης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "ΕνεÏγοποίηση Wireframe" @@ -2196,19 +2225,14 @@ msgid "" "If unsure, select 1x." msgstr "" "ΕνεÏγοποιεί το ανισοτÏοπικό φιλτÏάÏισμα.\n" -"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές " -"γωνίες.\n" +"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές γωνίες.\n" "ΜποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε έναν μικÏÏŒ αÏιθμό παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "" -"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " -"Compatible)" -msgstr "" -"ΕνεÏγοποιεί τη γÏήγοÏη Ï€Ïόσβαση δίσκου. ΑπαÏαίτητο για μεÏικά παιχνίδια. " -"(ΕÎΕΡΓΟ = ΓÏήγοÏο, ΑÎΕÎΕΡΓΟ = Συμβατό)" +msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" +msgstr "ΕνεÏγοποιεί τη γÏήγοÏη Ï€Ïόσβαση δίσκου. ΑπαÏαίτητο για μεÏικά παιχνίδια. (ΕÎΕΡΓΟ = ΓÏήγοÏο, ΑÎΕÎΕΡΓΟ = Συμβατό)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Enable pages" @@ -2221,21 +2245,18 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την " -"απεικόνιση.\n" +"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την απεικόνιση.\n" "Αν αυτό είναι απενεÏγοποιημένο, θα δημιουÏγηθεί ένα παÏάθυÏο απεικόνισης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" -"Enable this if you want to use the main Dolphin window for rendering rather " -"than a separate render window.\n" +"Enable this if you want to use the main Dolphin window for rendering rather than a separate render window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιήστε το αν θέλετε να χÏησιμοποιήσετε το κÏÏιο παÏάθυÏο του Dolphin " -"για απεικόνιση αντί για ξεχωÏιστό παÏάθυÏο απεικόνισης.\n" +"ΕνεÏγοποιήστε το αν θέλετε να χÏησιμοποιήσετε το κÏÏιο παÏάθυÏο του Dolphin για απεικόνιση αντί για ξεχωÏιστό παÏάθυÏο απεικόνισης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2243,6 +2264,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " @@ -2250,16 +2272,14 @@ msgid "" msgstr "" "ΕνεÏγοποιήστε το για να επιταχÏνετε το The Legend of Zelda: Twilight " "Princess. ΑπενεÏγοποιήστε το για τα υπόλοιπα παιχνίδια." +======= +msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." +msgstr "ΕνεÏγοποιήστε το για να επιταχÏνετε το The Legend of Zelda: Twilight Princess. ΑπενεÏγοποιήστε το για τα υπόλοιπα παιχνίδια." +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"ΕνεÏγοποιεί την Block Address Translation (BAT), μία λειτουÏγία της Μονάδας " -"ΔιαχείÏισης Μνήμης. ΑκÏιβές ως Ï€Ïος το υλικό, αλλά αÏγό στην εξομοίωση. " -"(ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" +msgid "Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)" +msgstr "ΕνεÏγοποιεί την Block Address Translation (BAT), μία λειτουÏγία της Μονάδας ΔιαχείÏισης Μνήμης. ΑκÏιβές ως Ï€Ïος το υλικό, αλλά αÏγό στην εξομοίωση. (ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" @@ -2272,20 +2292,15 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο " -"λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" +"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "" -"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " -"OFF = Fast)" -msgstr "" -"ΕνεÏγοποιεί τη Μονάδα ΔιαχείÏισης Μνήμης, απαÏαίτητο για μεÏικά παιχνίδια. " -"(ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" +msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" +msgstr "ΕνεÏγοποιεί τη Μονάδα ΔιαχείÏισης Μνήμης, απαÏαίτητο για μεÏικά παιχνίδια. (ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2299,6 +2314,7 @@ msgstr "" msgid "End" msgstr "Τέλος" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2314,11 +2330,16 @@ msgstr "Τέλος" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "English" msgstr "Αγγλικά" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "Βελτιώσεις" @@ -2340,6 +2361,7 @@ msgstr "ΕγγÏαφή 1/%d" msgid "Equal" msgstr "Ίσο" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 @@ -2360,10 +2382,15 @@ msgstr "" >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Σφάλμα" +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 @@ -2375,6 +2402,11 @@ msgstr "" "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " "συστήματος." <<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/Main.cpp:346 +msgid "Error loading selected language. Falling back to system default." +msgstr "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή συστήματος." +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format @@ -2387,13 +2419,8 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format -msgid "" -"Error: Trying to access %s fonts but they are not loaded. Games may not show " -"fonts correctly, or crash." -msgstr "" -"Σφάλμα: ΠÏοσπάθεια Ï€Ïόσβασης των %s γÏαμματοσειÏών αλλά δεν είναι " -"φοÏτωμένες. Τα παιχνίδια μποÏεί να μη δείχνουν τις γÏαμματοσειÏές σωστά, ή " -"να κÏασάÏουν." +msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." +msgstr "Σφάλμα: ΠÏοσπάθεια Ï€Ïόσβασης των %s γÏαμματοσειÏών αλλά δεν είναι φοÏτωμένες. Τα παιχνίδια μποÏεί να μη δείχνουν τις γÏαμματοσειÏές σωστά, ή να κÏασάÏουν." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2406,8 +2433,7 @@ msgstr "Euphoria" #: Source/Core/Core/Src/MemTools.cpp:214 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" -msgstr "" -"ΧειÏιστής εξαιÏέσεων - Ï€Ïόσβαση κάτω από την πεÏιοχή μνήμης. %08llx%08llx" +msgstr "ΧειÏιστής εξαιÏέσεων - Ï€Ïόσβαση κάτω από την πεÏιοχή μνήμης. %08llx%08llx" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Execute" @@ -2458,7 +2484,7 @@ msgstr "Εξαγωγή αποθήκευσης ως..." msgid "Extension" msgstr "Επέκταση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "ΕξωτεÏικό Frame Buffer" @@ -2559,12 +2585,10 @@ msgstr "" "Αποτυχία φόÏτωσης DSP ROM:\t%s\n" "\n" "Αυτό το αÏχείο χÏειάζεται για να χÏησιμοποιηθεί το DSP LLE.\n" -"Δεν συμπεÏιλαμβάνεται με το Dolphin γιατί πεÏιέχει δεδομένα πνευματικής " -"ιδιοκτησίας.\n" +"Δεν συμπεÏιλαμβάνεται με το Dolphin γιατί πεÏιέχει δεδομένα πνευματικής ιδιοκτησίας.\n" "ΧÏησιμοποιήστε το DSPSpy για να εξάγετε το αÏχείο από την κονσόλα σας.\n" "\n" -"ΜποÏείτε να χÏησιμοποιήσετε την DSP HLE μηχανή η οποία δεν χÏειάζεται ROM " -"dumps.\n" +"ΜποÏείτε να χÏησιμοποιήσετε την DSP HLE μηχανή η οποία δεν χÏειάζεται ROM dumps.\n" "(Επιλέξτε την από την καÏτέλα \"Ήχος\" του παÏαθÏÏου των γενικών Ïυθμίσεων.)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:99 @@ -2581,7 +2605,7 @@ msgstr "Αποτυχία φόÏτωσης hid.dll" msgid "Failed to read banner.bin" msgstr "Αποτυχία ανάγνωσης banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2589,7 +2613,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του αντιγÏάφου ασφαλείας του BAT\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2602,7 +2626,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Αποτυχία ανάγνωσης δεδομένων από το αÏχείο %d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2610,7 +2634,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του αντιγÏάφου ασφαλείας των φακέλων\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2618,7 +2642,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης των φακέλων\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2626,7 +2650,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης της κεφαλίδας\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2655,15 +2679,21 @@ msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το msgid "Failed to write header for file %d" msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το αÏχείο %d" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 msgid "Fast" <<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +msgid "Fast" +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgstr "ΓÏήγοÏη" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Fast Mipmaps" msgstr "ΓÏήγοÏα Mipmaps" +<<<<<<< HEAD ======= msgstr "" @@ -2674,6 +2704,9 @@ msgstr "" ======= >>>>>>> Update Greek and Czech translations +======= + +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "ΓÏήγοÏη έκδοση του MMU. Δε δουλεÏει για όλα τα παιχνίδια." @@ -2702,7 +2735,7 @@ msgstr "" "Το αÏχείο απέτυχε στο άνοιγμα\n" "ή δεν έχει έγκυÏη επέκταση" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2740,11 +2773,11 @@ msgstr "ΠÏώτο Μπλοκ" msgid "Fix Checksums" msgstr "ΕπιδιόÏθωση Checksum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Επιβολή 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Επιβολή 4:3" @@ -2752,11 +2785,11 @@ msgstr "Επιβολή 4:3" msgid "Force Console as NTSC-J" msgstr "Επιβολή της Κονσόλας ως NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Επιβολή ΦιλτÏαÏίσματος Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2764,8 +2797,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Επιβάλλει φιλτÏάÏισμα υφών ακόμα κι αν το παιχνίδι το έχει απενεÏγοποιήσει.\n" -"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα " -"σε οÏισμένα παιχνίδια.\n" +"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε οÏισμένα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2784,15 +2816,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" -"Left unchecked, dolphin defaults to NTSC-U and automatically enables this " -"setting when playing Japanese games." +"Left unchecked, dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games." msgstr "" -"Επιβάλει τη NTSC-J λειτουÏγία για να χÏησιμοποιηθεί η Ιαπωνική ROM " -"γÏαμματοσειÏά.\n" -"Άμα αφεθεί αποεπιλεγμένο, το dolphin Ï€Ïοεπιλέγει τη NTSC-U και ενεÏγοποιεί " -"αυτόματα αυτήν την ÏÏθμιση όταν παίζονται Ιαπωνικά παιχνίδια." +"Επιβάλει τη NTSC-J λειτουÏγία για να χÏησιμοποιηθεί η Ιαπωνική ROM γÏαμματοσειÏά.\n" +"Άμα αφεθεί αποεπιλεγμένο, το dolphin Ï€Ïοεπιλέγει τη NTSC-U και ενεÏγοποιεί αυτόματα αυτήν την ÏÏθμιση όταν παίζονται Ιαπωνικά παιχνίδια." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2818,7 +2847,7 @@ msgstr "ΚαÏέ" msgid "Frame Advance" msgstr "ΠÏοώθηση ανά ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "FFV1 Για Τα Εξαγώμενα ΚαÏέ" @@ -2838,10 +2867,11 @@ msgstr "ΠεÏιοÏισμός ΚαÏέ:" msgid "Frames To Record" msgstr "ΚαÏέ ΠÏος ΕγγÏαφή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "ΕλεÏθεÏη Ματιά" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2857,6 +2887,11 @@ msgstr "ΕλεÏθεÏη Ματιά" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "French" msgstr "Γαλλικά" @@ -2873,7 +2908,7 @@ msgstr "Από" msgid "FullScr" msgstr "ΠλήÏης Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "Ανάλυση ΠλήÏους Οθόνης:" @@ -2922,6 +2957,7 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD @@ -2933,6 +2969,10 @@ msgstr "Ρυθμίσεις Gamecube &Pad" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -2954,6 +2994,7 @@ msgstr "" "Ο Κωδικός Gecko απέτυχε να εκτελεστεί (CT%i CST%i) (%s)\n" "(ή είναι ένας κακός κωδικός ή ο Ï„Ïπος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζεται.)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD @@ -2968,6 +3009,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "General" msgstr "Γενικά" @@ -2975,6 +3021,7 @@ msgstr "Γενικά" msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2990,15 +3037,18 @@ msgstr "Γενικές Ρυθμίσεις" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "German" msgstr "ΓεÏμανικά" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" -msgstr "" -"GetARCode: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος %lu της λίστας των " -"κωδικών ar" +msgstr "GetARCode: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος %lu της λίστας των κωδικών ar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Graphics" @@ -3012,6 +3062,7 @@ msgstr "Ρυθμίσεις ΓÏαφικών" msgid "Greater Than" msgstr "ΜεγαλÏτεÏο από" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD @@ -3021,18 +3072,19 @@ msgstr "ΜεγαλÏτεÏο από" >>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" -"Greatly increases quality of textures generated using render-to-texture " -"effects.\n" +"Greatly increases quality of textures generated using render to texture effects.\n" "Raising the internal resolution will improve the effect of this setting.\n" +"Slightly decreases performance and possibly causes issues (although unlikely).\n" "\n" "If unsure, leave this checked." msgstr "" -"Βελτιώνει Ï€Î¿Î»Ï Ï„Î·Î½ ποιότητα των υφών που παÏάγονται χÏησιμοποιώντας render " -"to texture εφέ.\n" +"Βελτιώνει Ï€Î¿Î»Ï Ï„Î·Î½ ποιότητα των υφών που παÏάγονται χÏησιμοποιώντας render to texture εφέ.\n" "Μία αÏξηση της εσωτεÏικής ανάλυσης θα βελτιώσει το εφέ αυτής της ÏÏθμισης.\n" -"Μειώνει ελαφÏÏŽÏ‚ την επίδοση και είναι πιθανό να Ï€Ïοκαλέσει Ï€Ïοβλήματα (αν " -"και σπάνια).\n" +"Μειώνει ελαφÏÏŽÏ‚ την επίδοση και είναι πιθανό να Ï€Ïοκαλέσει Ï€Ïοβλήματα (αν και σπάνια).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -3060,11 +3112,11 @@ msgstr "ΚιθάÏα" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Γίνεται κλήση του HCI_CMD_INQUIRY, παÏακαλώ αναφέÏετε!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Hacks" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Αποτυχία ελέγχου κεφαλίδας" @@ -3100,7 +3152,7 @@ msgstr "" msgid "Hide" msgstr "ΑπόκÏυψη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "ΑπόκÏυψη Δείκτη ΠοντικιοÏ" @@ -3110,8 +3162,7 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο " -"εξομοίωσης.\n" +"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -3128,6 +3179,7 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD @@ -3140,6 +3192,10 @@ msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" @@ -3154,20 +3210,16 @@ msgstr "ΥβÏιδικό Wiimote" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" -msgstr "" -"IOCTL_ES_GETVIEWS: ΑπόπειÏα ανάγνωσης δεδομένων από ένα άγνωστο εισιτήÏιο: " -"%08x/%08x" +msgstr "IOCTL_ES_GETVIEWS: ΑπόπειÏα ανάγνωσης δεδομένων από ένα άγνωστο εισιτήÏιο: %08x/%08x" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 #, c-format msgid "" -"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " -"in your nand dump\n" +"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available in your nand dump\n" "TitleID %016llx.\n" " Dolphin will likely hang now" msgstr "" -"IOCTL_ES_LAUNCH: Το παιχνίδι Ï€Ïοσπάθησε να επαναφοÏτώσει ios ή έναν τίτλο " -"που δεν είναι διαθέσιμος στο nand dump\n" +"IOCTL_ES_LAUNCH: Το παιχνίδι Ï€Ïοσπάθησε να επαναφοÏτώσει ios ή έναν τίτλο που δεν είναι διαθέσιμος στο nand dump\n" "TitleID %016llx.\n" "Το Dolphin πιθανότατα θα κολλήσει Ï„ÏŽÏα." @@ -3214,56 +3266,50 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -msgid "" -"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -msgstr "" -"Αν τα FPS διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = " -"Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" +msgid "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" +msgstr "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." +======= +msgid "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you also have to disable Audio Throttle in DSP to make it effective." +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgstr "" -"Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, " -"PAL:50),\n" -"θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει " -"αποτέλεσμα. " +"Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, PAL:50),\n" +"θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει αποτέλεσμα. " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Αγνόηση Αλλαγών Format" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" -"Improves performance in many games without any negative effect. Causes " -"graphical defects in a small number of other games though.\n" +"Improves performance in many games without any negative effect. Causes graphical defects in a small number of other games though.\n" "\n" "If unsure, leave this checked." msgstr "" "Αγνοεί οποιαδήποτε αλλαγή στο EFB format.\n" -"Βελτιώνει τις επιδόσεις σε πολλά παιχνίδια χωÏίς αÏνητικές συνέπειες. " -"ΠÏοκαλεί όμως ελαττώματα στα γÏαφικά σε ένα μικÏÏŒ αÏιθμό παιχνιδιών.\n" +"Βελτιώνει τις επιδόσεις σε πολλά παιχνίδια χωÏίς αÏνητικές συνέπειες. ΠÏοκαλεί όμως ελαττώματα στα γÏαφικά σε ένα μικÏÏŒ αÏιθμό παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" -"Improves performance in some games, but might disable some gameplay-related " -"features or graphical effects.\n" +"Improves performance in some games, but might disable some gameplay-related features or graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Αγνοεί οποιοδήποτε αίτημα από την CPU για ανάγνωση ή εγγÏαφή στο EFB.\n" -"Βελτιώνει τις επιδόσεις σε οÏισμένα παιχνίδια, αλλά μποÏεί να " -"απενεÏγοποιήσει οÏισμένα χαÏακτηÏιστικά που σχετίζονται με το gameplay ή εφέ " -"γÏαφικών.\n" +"Βελτιώνει τις επιδόσεις σε οÏισμένα παιχνίδια, αλλά μποÏεί να απενεÏγοποιήσει οÏισμένα χαÏακτηÏιστικά που σχετίζονται με το gameplay ή εφέ γÏαφικών.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3295,26 +3341,23 @@ msgstr "" "Το εισαγώμενο αÏχείο έχει sav επέκταση\n" "άλλα δεν έχει σωστή κεφαλίδα." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" -"Improves performance but causes glitches in most games which rely on proper " -"fog emulation.\n" +"Improves performance but causes glitches in most games which rely on proper fog emulation.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί Ï€Ïοβλήματα σε παιχνίδια που βασίζονται " -"στη σωστή εξομοίωση της ομίχλης.\n" +"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί Ï€Ïοβλήματα σε παιχνίδια που βασίζονται στη σωστή εξομοίωση της ομίχλης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± " -"πεÏισσότεÏα παιχνίδια.\n" +"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± πεÏισσότεÏα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3326,8 +3369,8 @@ msgstr "Εντός ΠαιχνιδιοÏ" msgid "In-Game" msgstr "Εντός ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "ΠληÏοφοÏίες" @@ -3364,12 +3407,10 @@ msgid "Install to Wii Menu" msgstr "Εγκατάσταση στο ÎœÎµÎ½Î¿Ï Wii" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "" -"InstallExceptionHandler called, but this platform does not yet support it." -msgstr "" -"InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει " -"ακόμα." +msgid "InstallExceptionHandler called, but this platform does not yet support it." +msgstr "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει ακόμα." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3379,6 +3420,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3407,7 +3451,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "ΕσωτεÏικό Σφάλμα LZO - αποτυχία lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "ΕσωτεÏική Ανάλυση:" @@ -3460,6 +3504,7 @@ msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" msgid "Invalid state" msgstr "Μη έγκυÏο κατάσταση" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3475,6 +3520,11 @@ msgstr "Μη έγκυÏο κατάσταση" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Italian" msgstr "Ιταλικά" @@ -3536,8 +3586,8 @@ msgstr "Τελευταίο ΕπαναγÏαμμένο Σημείο Αποθ." msgid "Last Saved State" msgstr "Τελευταίο Αποθηκευμένο Σημείο Αποθ." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "ΑÏιστεÏά" @@ -3584,7 +3634,7 @@ msgstr "ΠεÏιοÏισμός με βάση τα ΚαÏέ" msgid "Load" msgstr "ΦόÏτωσ." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "ΦόÏτωση ΤÏοποποιημένων Υφών" @@ -3632,6 +3682,7 @@ msgstr "ΦόÏτωση Σημείου Αποθήκευσης 8" msgid "Load State..." msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3653,11 +3704,18 @@ msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #, c-format msgid "Load Wii System Menu %d%c" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3699,8 +3757,8 @@ msgstr "ΤÏποι ΚαταγÏαφής" msgid "Logger Outputs" msgstr "Έξοδοι ΚαταγÏαφής" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "ΚαταγÏαφή" @@ -3734,6 +3792,7 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 @@ -3743,7 +3802,10 @@ msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" ======= >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ΚÏÏιο Stick" @@ -3772,6 +3834,7 @@ msgstr "Η κάÏτα μνήμης είναι ήδη ανοιχτή" msgid "Memory Byte" msgstr "Memory Byte" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD @@ -3783,16 +3846,16 @@ msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Memory Card" msgstr "ΚάÏτα Μνήμης" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "" -"Memory Card Manager WARNING-Make backups before using, should be fixed but " -"could mangle stuff!" -msgstr "" -"ΔιαχειÏιστής ΚαÏτών Μνήμης ΠΡΟΕΙΔΟΠΟΙΗΣΗ-Κάντε αντίγÏαφα ασφαλείας Ï€Ïιν την " -"χÏήση, αν και διοÏθωμένος μποÏεί να χαλάσει Ï€Ïάγματα!" +msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" +msgstr "ΔιαχειÏιστής ΚαÏτών Μνήμης ΠΡΟΕΙΔΟΠΟΙΗΣΗ-Κάντε αντίγÏαφα ασφαλείας Ï€Ïιν την χÏήση, αν και διοÏθωμένος μποÏεί να χαλάσει Ï€Ïάγματα!" #: Source/Core/Core/Src/CoreParameter.cpp:369 #, c-format @@ -3811,11 +3874,9 @@ msgstr "" "%s\n" "Θέλετε να αντιγÏάψετε το παλιό αÏχείο σε αυτή την νέα τοποθεσία;\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "" -"Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της " -"κεφαλίδας." +msgstr "Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της κεφαλίδας." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" @@ -3830,7 +3891,7 @@ msgstr "ΜικÏόφωνο" msgid "Min" msgstr "Ελάχιστη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "ΔιάφοÏα" @@ -3843,15 +3904,13 @@ msgstr "ΔιάφοÏες Ρυθμίσεις" msgid "Modifier" msgstr "Modifier" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" -"Modify textures to show the format they're encoded in. Needs an emulation " -"reset in most cases.\n" +"Modify textures to show the format they're encoded in. Needs an emulation reset in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΤÏοποποιεί τις υφές ώστε να εμφανίζουν το format στο οποίο είναι " -"κωδικοποιημένες.\n" +"ΤÏοποποιεί τις υφές ώστε να εμφανίζουν το format στο οποίο είναι κωδικοποιημένες.\n" "ΧÏειάζεται επανεκκίνηση της εξομοίωσης στις πεÏισσότεÏες πεÏιπτώσεις.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3869,7 +3928,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "ΜοτέÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3879,8 +3938,7 @@ msgid "" "\n" "\n" msgstr "" -"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί " -"μία λεπτομεÏής πεÏιγÏαφή.\n" +"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί μία λεπτομεÏής πεÏιγÏαφή.\n" "\n" "\n" "\n" @@ -3891,12 +3949,8 @@ msgid "Multiply" msgstr "Multiply" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "" -"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " -"effect on emulated wiimotes." -msgstr "" -"ΑπενεÏγοποιεί το ηχείο του Wiimote. ΔιοÏθώνει τυχαίες αποσυνδέσεις σε " -"Ï€Ïαγματικά wiimotes. Δεν έχει καμία επίδÏαση σε εξομοιωμένα wiimotes." +msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." +msgstr "ΑπενεÏγοποιεί το ηχείο του Wiimote. ΔιοÏθώνει τυχαίες αποσυνδέσεις σε Ï€Ïαγματικά wiimotes. Δεν έχει καμία επίδÏαση σε εξομοιωμένα wiimotes." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Add" @@ -3982,6 +4036,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3990,9 +4045,11 @@ msgstr "NP Up" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Όνομα:" @@ -4077,6 +4134,7 @@ msgstr "Όχι ίσο" msgid "Not Set" msgstr "Μη ΟÏισμένο" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 @@ -4086,6 +4144,9 @@ msgstr "Μη ΟÏισμένο" ======= #: Source/Core/DolphinWX/Src/Main.cpp:607 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -4114,8 +4175,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "ΑÏιθμός Κωδικών: " -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchuk" @@ -4144,6 +4205,7 @@ msgstr "Offset:" msgid "Only %d blocks available" msgstr "Διαθέσιμα μόνο %d μπλοκ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD <<<<<<< HEAD @@ -4153,6 +4215,10 @@ msgstr "Διαθέσιμα μόνο %d μπλοκ" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Open" msgstr "Άνοιγμα" @@ -4182,11 +4248,11 @@ msgstr "OpenAL: αδυναμία εÏÏεσης συσκευών ήχου" msgid "OpenAL: can't open device %s" msgstr "OpenAL: αδυναμία ανοίγματος της συσκευής %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "OpenCL Αποκωδικοποιητής Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "OpenMP Αποκωδικοποιητής Υφών" @@ -4213,23 +4279,18 @@ msgid "" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -"Η σειÏά των αÏχείων στον Κατάλογο ΑÏχείων δεν ταιÏιάζει με την σειÏά των " -"block.\n" +"Η σειÏά των αÏχείων στον Κατάλογο ΑÏχείων δεν ταιÏιάζει με την σειÏά των block.\n" "Κάντε δεξί κλίκ, εξάγετε όλα τα αÏχεία αποθήκευσης\n" "και εισάγετέ τα σε μία νέα κάÏτα μνήμης.\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "Άλλα" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "" -"Other client disconnected while game is running!! NetPlay is disabled. You " -"manually stop the game." -msgstr "" -"Ο άλλος client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει " -"απενεÏγοποιηθεί. Σταματήστε χειÏοκίνητα το παιχνίδι." +msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." +msgstr "Ο άλλος client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει απενεÏγοποιηθεί. Σταματήστε χειÏοκίνητα το παιχνίδι." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4284,6 +4345,7 @@ msgstr "Patches" msgid "Paths" msgstr "Φάκελοι" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4294,13 +4356,15 @@ msgstr "Φάκελοι" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "ΠαÏση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "Φωτισμός ανά Pixel" @@ -4313,6 +4377,7 @@ msgstr "Τέλειο" msgid "Perspective %d" msgstr "Οπτική %d" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD @@ -4327,6 +4392,12 @@ msgstr "Οπτική %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Play" msgstr "ΑναπαÏαγωγή" @@ -4352,6 +4423,7 @@ msgstr "Ρυθμίσεις ΑναπαÏαγωγής" msgid "Players" msgstr "Παίχτες" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4361,6 +4433,9 @@ msgstr "Παίχτες" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -4405,7 +4480,7 @@ msgstr "ΠοÏτογαλικά" msgid "Portuguese (Brazilian)" msgstr "ΠοÏτογαλικά (Î’Ïαζιλιάνικα)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Post-Processing Εφέ:" @@ -4479,7 +4554,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Αναλογική" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -4496,7 +4571,7 @@ msgstr "ΕÏÏος" msgid "Read-only mode" msgstr "Μόνο Για Ανάγνωση (ΕγγÏαφής)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "ΠÏαγματικό" @@ -4556,9 +4631,9 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε Καμία." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Ανανέωση" @@ -4571,6 +4646,7 @@ msgstr "Ανανέωση Λίστας" msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4589,10 +4665,16 @@ msgstr "Ανανέωση λίστας παιχνιδιών" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Remove" msgstr "ΑφαίÏεση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4602,10 +4684,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD @@ -4615,7 +4698,10 @@ msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" ======= >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Επανεκκίνηση" @@ -4627,8 +4713,8 @@ msgstr "Αποτελέσματα" msgid "Return" msgstr "Return" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Δεξιά" @@ -4653,6 +4739,7 @@ msgstr "Ρώσικα" msgid "Sa&ve State" msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Safe" @@ -4665,14 +4752,20 @@ msgstr "" ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "Ασφαλής" + +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Αποθήκ." @@ -4744,9 +4837,11 @@ msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO" #: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "" -"Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της " -"εγγÏαφής της ταινίας..." +msgstr "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της εγγÏαφής της ταινίας..." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +msgid "Scaled EFB Copy" +msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 @@ -4789,14 +4884,16 @@ msgstr "ΦίλτÏο Αναζήτησης" msgid "Search Subfolders" msgstr "Αναζήτηση σε Υποφακέλους" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 +#: Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 +#: Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Επιλογή" @@ -4809,16 +4906,20 @@ msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" @@ -4844,6 +4945,7 @@ msgstr "Επιλέξτε αιωÏοÏμενα παÏάθυÏα" msgid "Select the file to load" msgstr "Επιλέξτε το αÏχείο για φόÏτωση" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4860,19 +4962,26 @@ msgstr "Επιλέξτε το σημείο φόÏτωσης" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -4890,8 +4999,7 @@ msgstr "" "Αυτόματα: ΧÏήση της τοπικής αναλογίας οθόνης (4:3)\n" "Επιβολή 16:9: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 16:9.\n" "Επιβολή 4:3: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 4:3.\n" -"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του " -"παÏαθÏÏου.\n" +"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του παÏαθÏÏου.\n" "\n" "Αν δεν είστε σίγουÏοι επιλέξτε Αυτόματα." @@ -4902,32 +5010,26 @@ msgstr "Επιλεγμένη γÏαμματοσειÏά" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Selects the display resolution used in fullscreen mode.\n" -"This should always be bigger than or equal to the internal resolution. " -"Performance impact is negligible.\n" +"This should always be bigger than or equal to the internal resolution. Performance impact is negligible.\n" "\n" "If unsure, use your desktop resolution.\n" "If still unsure, use the highest resolution which works for you." msgstr "" -"Επιλέγει την ανάλυση της οθόνης που θα χÏησιμοποιηθεί σε λειτουÏγία πλήÏους " -"οθόνης. Αυτή θα Ï€Ïέπει να είναι πάντα μεγαλÏτεÏη ή ίση με την εσωτεÏική " -"ανάλυση. Το αντίκτυπο στις επιδόσεις είναι αμελητέο.\n" +"Επιλέγει την ανάλυση της οθόνης που θα χÏησιμοποιηθεί σε λειτουÏγία πλήÏους οθόνης. Αυτή θα Ï€Ïέπει να είναι πάντα μεγαλÏτεÏη ή ίση με την εσωτεÏική ανάλυση. Το αντίκτυπο στις επιδόσεις είναι αμελητέο.\n" "\n" -"Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την ανάλυση της επιφάνειας εÏγασίας " -"σας.\n" +"Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την ανάλυση της επιφάνειας εÏγασίας σας.\n" "Αν πάλι δεν είστε σίγουÏοι, χÏησιμοποιήστε την υψηλότεÏη λειτουÏγική ανάλυση." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects what graphics API to use internally.\n" -"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " -"Direct3D 11 is somewhere between the two.\n" +"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. Direct3D 11 is somewhere between the two.\n" "Note that the Direct3D backends are only available on Windows.\n" "\n" "If unsure, use Direct3D 9." msgstr "" "Επιλέγει το API γÏαφικών που θα χÏησιμοποιηθεί εσωτεÏικά.\n" -"Το Direct3D 9 συνήθως είναι το γÏηγοÏότεÏο. Το OpenGL είναι πεÏισσότεÏο " -"ακÏιβές όμως. Το Direct3D 11 βÏίσκεται κάπου ενδιάμεσα Î¼ÎµÏ„Î±Î¾Ï Ï„Ï‰Î½ δÏο.\n" +"Το Direct3D 9 συνήθως είναι το γÏηγοÏότεÏο. Το OpenGL είναι πεÏισσότεÏο ακÏιβές όμως. Το Direct3D 11 βÏίσκεται κάπου ενδιάμεσα Î¼ÎµÏ„Î±Î¾Ï Ï„Ï‰Î½ δÏο.\n" "Σημειώστε ότι τα Direct3D backends είναι διαθέσιμα μόνο στα Windows.\n" "\n" "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε το Direct3D 9." @@ -4952,12 +5054,17 @@ msgstr "ΣεÏβικά" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "ΣειÏιακή ΘÏÏα 1 - Αυτή είναι η θÏÏα που χÏησιμοποιοÏν οι συσκευές όπως ο " "Ï€ÏοσαÏμογέας δικτÏου" +======= +msgid "Serial Port 1 - This is the port which devices such as the net adapter use" +msgstr "ΣειÏιακή ΘÏÏα 1 - Αυτή είναι η θÏÏα που χÏησιμοποιοÏν οι συσκευές όπως ο Ï€ÏοσαÏμογέας δικτÏου" +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -4975,9 +5082,7 @@ msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένη ΚάÏτα Μνήμης % #: Source/Core/Core/Src/ActionReplay.cpp:462 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" -msgstr "" -"SetARCode_IsActive: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος λίστας των " -"κωδικών ar %lu" +msgstr "SetARCode_IsActive: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος λίστας των κωδικών ar %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." @@ -5019,11 +5124,11 @@ msgstr "Εμφάνιση ΓÏαμμής &ΕÏγαλείων" msgid "Show Drives" msgstr "Εμφάνιση Οδηγών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Εμφάνιση ΠεÏιοχών EFB ΑντιγÏαφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Εμφάνιση FPS" @@ -5035,7 +5140,7 @@ msgstr "Εμφάνιση Γαλλίας" msgid "Show GameCube" msgstr "Εμφάνιση GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Εμφάνιση ΠÏοβολής ΧειÏισμών" @@ -5071,7 +5176,7 @@ msgstr "Εμφάνιση ΠλατφόÏμας" msgid "Show Regions" msgstr "Εμφάνιση ΠεÏιοχών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Εμφάνιση Στατιστικών" @@ -5098,12 +5203,10 @@ msgstr "Εμφάνιση επιβεβαίωσης Ï€Ïιν τη διακοπή #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "Show a message box when a potentially serious error has occured.\n" -"Disabling this may avoid annoying and non-fatal messages, but it may also " -"mean that Dolphin suddenly crashes without any explanation at all." +"Disabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all." msgstr "" "Εμφάνιση μηνÏματος όταν Ï€ÏοκÏψει ένα πιθανά σοβαÏÏŒ σφάλμα.\n" -"ΑπενεÏγοποιώντας αυτήν την επιλογή μποÏεί να γλιτώσετε από ενοχλητικά μη " -"κÏίσιμα σφάλματα, αλλά \n" +"ΑπενεÏγοποιώντας αυτήν την επιλογή μποÏεί να γλιτώσετε από ενοχλητικά μη κÏίσιμα σφάλματα, αλλά \n" "το Dolphin μποÏεί να κÏασάÏει ξαφνικά χωÏίς καμία εξήγηση. " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 @@ -5126,15 +5229,13 @@ msgstr "Εμφάνιση αποθηκευμένου εικονιδίου" msgid "Show save title" msgstr "Εμφάνιση αποθηκευμένου τίτλου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" -"Show the number of frames rendered per second as a measure of emulation " -"speed.\n" +"Show the number of frames rendered per second as a measure of emulation speed.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Εμφανίζει τον αÏιθμό των καÏέ που απεικονίζονται ανά δευτεÏόλεπτο, ως Ï„Ïόπο " -"μέτÏησης της ταχÏτητας εξομοίωσης.\n" +"Εμφανίζει τον αÏιθμό των καÏέ που απεικονίζονται ανά δευτεÏόλεπτο, ως Ï„Ïόπο μέτÏησης της ταχÏτητας εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5146,7 +5247,7 @@ msgstr "Εμφάνιση Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος βοήθειας" msgid "Show unknown" msgstr "Εμφάνιση Αγνώστων" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -5172,28 +5273,44 @@ msgstr "Μέγεθος" msgid "Skip BIOS" msgstr "ΠαÏάλειψη BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "ΠαÏάλειψη Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 <<<<<<< HEAD ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" -"Skip the destination alpha pass used in many games for various graphical " -"effects.\n" +"Skip the destination alpha pass 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" +"Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +msgid "" +"Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" +"Sometimes also increases visual quality.\n" +"If you're experiencing any issues, try raising texture cache accuracy or disable this option.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της εξομοίωσης.\n" +"ΜεÏικές φοÏές μποÏεί να βελτιώσει την οπτική ποιότητα.\n" +"Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της cache υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5261,16 +5378,13 @@ msgstr "Απεικόνιση ΛογισμικοÏ" #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:83 msgid "" -"Software rendering is an order of magnitude slower than using the other " -"backends.\n" +"Software rendering is an order of magnitude slower than using the other backends.\n" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -"Η απεικόνιση Î»Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÎ¿Ï ÎµÎ¯Î½Î±Î¹ αÏκετές βαθμίδες πιο αÏγή απ' ότι τα υπόλοιπα " -"backends.\n" +"Η απεικόνιση Î»Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÎ¿Ï ÎµÎ¯Î½Î±Î¹ αÏκετές βαθμίδες πιο αÏγή απ' ότι τα υπόλοιπα backends.\n" "Είναι μόνο χÏήσιμη για debugging σκοποÏÏ‚.\n" -"Θέλετε όντως να χÏησιμοποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε " -"σίγουÏοι, επιλέξτε 'Όχι'." +"Θέλετε όντως να χÏησιμοποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε σίγουÏοι, επιλέξτε 'Όχι'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" @@ -5290,6 +5404,7 @@ msgstr "Αποτυχία δημιουÏγίας buffer ήχου: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5305,6 +5420,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Spanish" msgstr "Ισπανικά" @@ -5312,24 +5432,15 @@ msgstr "Ισπανικά" msgid "Speaker Volume:" msgstr "Ένταση ηχείου:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" -"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.\n" -"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less " -"issues. Generally speaking, the lower the internal resolution is, the better " -"your performance will be.\n" +"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.\n" +"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n" "\n" "If unsure, select 640x528." msgstr "" -"ΟÏίζει την ανάλυση που θα χÏησιμοποιηθεί κατά την απεικόνιση. Μια υψηλή " -"ανάλυση θα βελτιώσει την οπτική ποιότητα αÏκετά αλλά επίσης θα έχει βαÏÏ " -"αντίκτυπο στις επιδόσεις και μποÏεί να Ï€Ïοκαλέσει ελαττώματα σε οÏισμένα " -"παιχνίδια.\n" -"Το \"Πολλαπλάσιο του 640x528\" είναι λίγο πιο αÏγό από το \"Μέγεθος ΠαÏαθÏÏου" -"\" αλλά αποδίδει λιγότεÏα Ï€Ïοβλήματα. Γενικά, όσο χαμηλότεÏη είναι η " -"εσωτεÏική ανάλυση, θα είναι και καλÏτεÏες οι επιδόσεις.\n" +"ΟÏίζει την ανάλυση που θα χÏησιμοποιηθεί κατά την απεικόνιση. Μια υψηλή ανάλυση θα βελτιώσει την οπτική ποιότητα αÏκετά αλλά επίσης θα έχει βαÏÏ Î±Î½Ï„Î¯ÎºÏ„Ï…Ï€Î¿ στις επιδόσεις και μποÏεί να Ï€Ïοκαλέσει ελαττώματα σε οÏισμένα παιχνίδια.\n" +"Το \"Πολλαπλάσιο του 640x528\" είναι λίγο πιο αÏγό από το \"Μέγεθος ΠαÏαθÏÏου\" αλλά αποδίδει λιγότεÏα Ï€Ïοβλήματα. Γενικά, όσο χαμηλότεÏη είναι η εσωτεÏική ανάλυση, θα είναι και καλÏτεÏες οι επιδόσεις.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 640x528." @@ -5349,6 +5460,7 @@ msgstr "ΤετÏάγωνο Stick" msgid "Standard Controller" msgstr "Τυπικός Controller" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 @@ -5357,9 +5469,11 @@ msgstr "Τυπικός Controller" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Εκκίνηση" @@ -5389,6 +5503,7 @@ msgstr "Σημεία Αποθήκευσης" msgid "Stick" msgstr "Stick" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD <<<<<<< HEAD @@ -5399,10 +5514,16 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Διακοπή" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" @@ -5425,6 +5546,21 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +msgid "" +"Store EFB copies in GPU texture objects.\n" +"This is not so accurate, but it works well enough for most games and gives a great speedup over EFB to RAM.\n" +"\n" +"If unsure, leave this checked." +msgstr "" +"Αποθήκευση των EFB αντιγÏάφων σε GPU αντικείμενα υφών.\n" +"Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" +"\n" +"Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Stretch to Window" msgstr "ΠÏοσαÏμογή στο ΠαÏάθυÏο" @@ -5458,8 +5594,8 @@ msgstr "Γλώσσα Συστήματος:" msgid "TAIWAN" msgstr "ΤΑΪΒΑÎ" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Είσοδος" @@ -5479,10 +5615,10 @@ msgstr "ΑÏιστεÏÏŒ Table" msgid "Table Right" msgstr "Δεξί Table" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 @@ -5490,6 +5626,9 @@ msgstr "Δεξί Table" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Take Screenshot" msgstr "ΔημιουÏγία Στιγμιότυπου" @@ -5501,15 +5640,20 @@ msgstr "" msgid "Test" msgstr "Τέστ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 <<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Texture" msgstr "Υφή" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" msgstr "Cache Υφών" +<<<<<<< HEAD ======= #, fuzzy msgid "Texture" @@ -5525,6 +5669,10 @@ msgstr "ΚαθαÏισμός Cache" ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 >>>>>>> Update Greek and Czech translations +======= + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" @@ -5557,19 +5705,15 @@ msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:51 #, c-format -msgid "" -"The file %s could not be opened for writing. Please check if it's already " -"opened by another program." -msgstr "" -"Αδυναμία ανοίγματος του αÏχείου %s για εγγÏαφή. ΠαÏακαλώ ελέγξτε αν είναι " -"ήδη ανοιχτό από άλλο Ï€ÏόγÏαμμα." +msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." +msgstr "Αδυναμία ανοίγματος του αÏχείου %s για εγγÏαφή. ΠαÏακαλώ ελέγξτε αν είναι ήδη ανοιχτό από άλλο Ï€ÏόγÏαμμα." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format msgid "The file %s was already open, the file header will not be written." msgstr "Το αÏχείο %s ήταν ήδη ανοιχτό, η κεφαλίδα του αÏχείου δε θα γÏαφεί." -#: Source/Core/Core/Src/Boot/Boot.cpp:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Το αÏχείο που επιλέξατε (%s) δεν υπάÏχει" @@ -5584,8 +5728,17 @@ msgstr "Το όνομα δεν μποÏεί να πεÏιέχει τον Ï‡Î±Ï #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:141 msgid "The resulting decrypted AR code doesn't contain any lines." +msgstr "Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." msgstr "" -"Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." +"Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να χάσει ανανεώσεις των υφών από την RAM.\n" +"\n" +"Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από δεξιά." <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 @@ -5607,16 +5760,11 @@ msgstr "" >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" -msgstr "" -"Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" +msgstr "Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" -#: Source/Core/DolphinWX/Src/Main.cpp:363 -msgid "" -"The selected language is not supported by your system. Falling back to " -"system default." -msgstr "" -"Η επιλεγμένη γλώσσα δεν υποστηÏίζεται από το σÏστημά σας. ΕπαναφοÏά στην " -"Ï€Ïοεπιλογή συστήματος." +#: Source/Core/DolphinWX/Src/Main.cpp:353 +msgid "The selected language is not supported by your system. Falling back to system default." +msgstr "Η επιλεγμένη γλώσσα δεν υποστηÏίζεται από το σÏστημά σας. ΕπαναφοÏά στην Ï€Ïοεπιλογή συστήματος." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5652,12 +5800,8 @@ msgid "Theme selection went wrong" msgstr "Η επιλογή θέματος απέτυχε" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 -msgid "" -"There must be a ticket for 00000001/00000002. Your NAND dump is probably " -"incomplete." -msgstr "" -"ΠÏέπει να υπάÏχει εισητήÏιο για 00000001/00000002. Το NAND dump σας είναι " -"πιθανότατα ημιτελές." +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:304 msgid "" @@ -5665,40 +5809,25 @@ msgid "" "Undetermined means the game uses Dolphin's setting." msgstr "" "Αυτές οι Ïυθμίσεις υπεÏισχÏουν των γενικών Ïυθμίσεων του Dolphin.\n" -"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις " -"του Dolphin. " +"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις του Dolphin. " #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "" -"This action replay simulator does not support codes that modify Action " -"Replay itself." -msgstr "" -"Αυτός ο Ï€Ïοσομοιωτής action replay δεν υποστηÏίζει κωδικοÏÏ‚ που αλλάζουν το " -"ίδιο το Action Replay." +msgid "This action replay simulator does not support codes that modify Action Replay itself." +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 και σε μεÏικά " -"παιχνίδια." +msgstr "Αυτό μποÏεί να Ï€Ïοκαλέσει καθυστεÏήσεις στο ÎœÎµÎ½Î¿Ï Wii και σε μεÏικά παιχνίδια." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " -"Hold SHIFT and press one of the WASD keys to move the camera by a certain " -"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " -"SHIFT+R to reset the camera.\n" +"Hold the right mouse button and move the mouse to pan the camera around. Hold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Αυτό το χαÏακτηÏιστικό σας επιτÏέπει να πειÏάξετε την κάμεÏα του " -"παιχνιδιοÏ.\n" -"ΚÏατώντας πατημένο το δεξί πλήκτÏο του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î¼ÎµÏ„Î±ÎºÎ¹Î½Î®ÏƒÏ„Îµ το ποντίκι για " -"να μετακινήσετε Ï„ÏιγÏÏω την κάμεÏα. ΚÏατώντας πατημένο το SHIFT πιέστε ένα " -"από τα WASD πλήκτÏα για να μετακινήσετε την κάμεÏα κατά μία καθοÏισμένη " -"απόσταση (SHIFT+0 για να κινηθεί γÏηγοÏότεÏα και SHIFT+9 για να κινηθεί πιο " -"αÏγά). Πατήστε SHIFT+R για να επαναφέÏετε την κάμεÏα στην αÏχική της θέση.\n" +"Αυτό το χαÏακτηÏιστικό σας επιτÏέπει να πειÏάξετε την κάμεÏα του παιχνιδιοÏ.\n" +"ΚÏατώντας πατημένο το δεξί πλήκτÏο του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î¼ÎµÏ„Î±ÎºÎ¹Î½Î®ÏƒÏ„Îµ το ποντίκι για να μετακινήσετε Ï„ÏιγÏÏω την κάμεÏα. ΚÏατώντας πατημένο το SHIFT πιέστε ένα από τα WASD πλήκτÏα για να μετακινήσετε την κάμεÏα κατά μία καθοÏισμένη απόσταση (SHIFT+0 για να κινηθεί γÏηγοÏότεÏα και SHIFT+9 για να κινηθεί πιο αÏγά). Πατήστε SHIFT+R για να επαναφέÏετε την κάμεÏα στην αÏχική της θέση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5710,14 +5839,11 @@ msgid "" "\n" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" -"ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle " -"ήχου.\n" -"ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€.χ. " -"Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" +"ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle ήχου.\n" +"ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€.χ. Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" "Όμως οÏισμένες φοÏές η ενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μόνιμο θόÏυβο.\n" "\n" -"Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί " -"η λειτουÏγία Throttle." +"Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί η λειτουÏγία Throttle." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." @@ -5725,20 +5851,16 @@ msgstr "ΧÏησιμοποιείται για την αναπαÏαγωγή μο #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" -"This splits the Video and CPU threads, so they can be run on separate " -"cores.\n" -"Causes major speed improvements on PCs with more than one core, but can also " -"cause occasional crashes/glitches." +"This splits the Video and CPU threads, so they can be run on separate cores.\n" +"Causes major speed improvements on PCs with more than one core, but can also cause occasional crashes/glitches." msgstr "" -"ΧωÏίζει τα νήματα του Βίντεο και της CPU, ώστε να Ï„Ïέχουν σε ξεχωÏιστοÏÏ‚ " -"πυÏήνες.\n" +"ΧωÏίζει τα νήματα του Βίντεο και της CPU, ώστε να Ï„Ïέχουν σε ξεχωÏιστοÏÏ‚ πυÏήνες.\n" "ΠÏοκαλεί μεγάλη επιτάχυνση σε PC με πεÏισσότεÏους από έναν πυÏήνες,\n" "αλλά μποÏεί να Ï€Ïοκαλέσει κÏασαÏίσματα ή άλλα Ï€Ïοβλήματα. " #: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 msgid "This will let you Manually Edit the INI config file" -msgstr "" -"Αυτό σας επιτÏέπει την χειÏοκίνητη επεξεÏγασία του αÏχείου Ïυθμίσεων INI" +msgstr "Αυτό σας επιτÏέπει την χειÏοκίνητη επεξεÏγασία του αÏχείου Ïυθμίσεων INI" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:249 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:254 @@ -5763,6 +5885,7 @@ msgstr "Εώς" msgid "Toggle All Log Types" msgstr "Εναλλαγή Όλων ΤÏπων ΚαταγÏαφής " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD <<<<<<< HEAD @@ -5779,13 +5902,19 @@ msgstr "Εναλλαγή ΠλήÏους Οθόνης" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. ======= +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Εναλλαγή ΠλήÏους Οθόνης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Top" msgstr "ΚοÏυφή" @@ -5793,7 +5922,7 @@ msgstr "ΚοÏυφή" msgid "Traditional Chinese" msgstr "Κινέζικα ΠαÏαδοσιακά " -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπου αÏχείο." @@ -5801,7 +5930,8 @@ msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπο msgid "Triggers" msgstr "Σκανδάλες" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 +#: Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "ΠÏοσπάθεια ανάγνωσης από ένα μη έγκυÏο SYSCONF" @@ -5829,8 +5959,8 @@ msgstr "ΤÏπος" msgid "UDP Port:" msgstr "ΠόÏτα UDP:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5853,13 +5983,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format msgid "" -"Unable to parse line %lu of the entered AR code as a valid encrypted or " -"decrypted code. Make sure you typed it correctly.\n" +"Unable to parse line %lu of the entered AR code as a valid encrypted or decrypted code. Make sure you typed it correctly.\n" "Would you like to ignore this line and continue parsing?" msgstr "" -"Δεν μποÏεί να γίνει parse της γÏαμμής %lu από τον εισαγώμενο κωδικό AR ως " -"ένας έγκυÏος κωδικοποιημένος ή αποκωδικοποιημένος κωδικός. ΣιγουÏευτείτε ότι " -"τον πληκτÏολογήσατε σωστά.\n" +"Δεν μποÏεί να γίνει parse της γÏαμμής %lu από τον εισαγώμενο κωδικό AR ως ένας έγκυÏος κωδικοποιημένος ή αποκωδικοποιημένος κωδικός. ΣιγουÏευτείτε ότι τον πληκτÏολογήσατε σωστά.\n" "Θα θέλατε να αγνοήσετε αυτήν την γÏαμμή και να συνεχίσετε με το parsing;" #: Source/Core/DolphinWX/Src/FrameTools.cpp:404 @@ -5906,13 +6033,17 @@ msgstr "" "Άγνωστος δείκτης %#08x\n" "Συνέχεια;" +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 ======= >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Πάνω" @@ -5929,7 +6060,7 @@ msgstr "Κάθετη Θέση Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "ΧÏήση ΛειτουÏγίας EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "ΧÏήση ΠλήÏους Οθόνης" @@ -5941,7 +6072,7 @@ msgstr "ΧÏήση Hex" msgid "Use Panic Handlers" msgstr "ΧÏήση Οθονών ΠανικοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5949,31 +6080,27 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "ΧÏησιμοποίηση πολλαπλών νημάτων για την αποκωδικοποίηση υφών.\n" -"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο " -"πυÏήνες).\n" +"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο πυÏήνες).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" -"However, one may skip the popups to allow interruption free gameplay by " -"checking this option.\n" +"However, one may skip the popups to allow interruption free gameplay by checking this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Συνήθως άμα αποτÏχει η μεταγλώττιση ενός shader, θα εμφανιστεί ένα μÏνημα " -"σφάλματος.\n" -"ΠαÏόλα αυτά μποÏείτε να παÏαλείψετε το αναδυόμενο μÏνημα ώστε να έχετε " -"gameplay χωÏίς παÏεμβάσεις επιλέγοντας αυτήν την ÏÏθμιση.\n" +"Συνήθως άμα αποτÏχει η μεταγλώττιση ενός shader, θα εμφανιστεί ένα μÏνημα σφάλματος.\n" +"ΠαÏόλα αυτά μποÏείτε να παÏαλείψετε το αναδυόμενο μÏνημα ώστε να έχετε gameplay χωÏίς παÏεμβάσεις επιλέγοντας αυτήν την ÏÏθμιση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "ΕÏγαλεία" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "Κάθετος ΣυγχÏονισμός" @@ -5997,8 +6124,7 @@ msgstr "Αναλυτικότητα" msgid "Video" msgstr "Βίντεο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Εικονικό" @@ -6020,27 +6146,26 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της " -"εικόνας.\n" +"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της εικόνας.\n" "Μειώνει τις επιδόσεις αν η ταχÏτητα εξομοίωσης είναι μικÏότεÏη από 100%.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "ΠÏοειδοποίηση" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση DOL σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ELF σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ISO σε λάθος λειτουÏγία κονσόλας!" @@ -6051,8 +6176,7 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων " -"στον φάκελο:\n" +"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων στον φάκελο:\n" "%s\n" "Θέλετε να συνεχίσετε;" @@ -6064,8 +6188,7 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης " -"που υπάÏχουν στον φάκελο:\n" +"ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης που υπάÏχουν στον φάκελο:\n" "%s\n" "και έχουν το ίδιο όνομα με αÏχεία στη memcard\n" "Συνέχεια;" @@ -6114,7 +6237,7 @@ msgstr "WaveFileWriter - το αÏχείο δεν είναι ανοιχτό." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Hack ΕυÏείας Οθόνης" @@ -6138,6 +6261,7 @@ msgstr "Wii NAND Ρίζα:" msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6147,6 +6271,9 @@ msgstr "Εισαγωγή Αποθήκευσης Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -6154,8 +6281,8 @@ msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Αδυναμία ανάγνωσης από αÏχείο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -6177,6 +6304,7 @@ msgstr "" "ή πιθανόν να οφείλεται σε χÏόνο αδÏάνειας ή κάποιον άλλο λόγο.\n" "Θέλετε να γίνει άμεση επανασÏνδεση;" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 @@ -6186,6 +6314,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/Main.cpp:609 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -6217,6 +6348,7 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6227,6 +6359,9 @@ msgstr "Αναδίπλωση Λέξεων" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. @@ -6294,8 +6429,7 @@ msgstr "ΠÏέπει να εισάγετε ένα έγκυÏο όνομα Ï€Ïο #: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." -msgstr "" -"ΠÏέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή." +msgstr "ΠÏέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή." #: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" @@ -6334,7 +6468,7 @@ msgstr "Άγνωστος Zero code: %08x" msgid "[ waiting ]" msgstr "[ σε αναμονή ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -6350,26 +6484,21 @@ msgstr "" msgid "[Custom]" msgstr "[ΠÏοσαÏμοζόμενο]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" -"Aims to speed up emulation by offloading texture decoding to the GPU using " -"the OpenCL framework.\n" -"However, right now it's known to cause texture defects in various games. " -"Also it's slower than regular CPU texture decoding in most cases.\n" +"Aims to speed up emulation by offloading texture decoding to the GPU using the OpenCL framework.\n" +"However, right now it's known to cause texture defects in various games. Also it's slower than regular CPU texture decoding in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" "[ΠΕΙΡΑΜΑΤΙΚΟ]\n" -"ΣτοχεÏει στην επιτάχυνση της εξομοίωσης φοÏτώνοντας την αποκωδικοποίηση των " -"υφών στην GPU χÏησιμοποιώντας το OpenCL framework.\n" -"ΠαÏ'όλα αυτά, Ï€Ïος το παÏόν είναι γνωστό ότι Ï€Ïοκαλεί Ï€Ïοβλήματα στις υφές " -"σε διάφοÏα παιχνίδια. Επίσης είναι πιο αÏγή από την τυπική αποκωδικοποίηση " -"υφών από την CPU στις πεÏισσότεÏες πεÏιπτώσεις.\n" +"ΣτοχεÏει στην επιτάχυνση της εξομοίωσης φοÏτώνοντας την αποκωδικοποίηση των υφών στην GPU χÏησιμοποιώντας το OpenCL framework.\n" +"ΠαÏ'όλα αυτά, Ï€Ïος το παÏόν είναι γνωστό ότι Ï€Ïοκαλεί Ï€Ïοβλήματα στις υφές σε διάφοÏα παιχνίδια. Επίσης είναι πιο αÏγή από την τυπική αποκωδικοποίηση υφών από την CPU στις πεÏισσότεÏες πεÏιπτώσεις.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -6412,9 +6541,7 @@ msgstr "iCacheJIT: Ανάγνωση Opcode από %x. ΠαÏακαλώ να το #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "" -"δεν είναι σημείο αποθήκευσης wii ή αποτυχία ανάγνωσης κεφαλίδας αÏχείου " -"μεγέθους %x" +msgstr "δεν είναι σημείο αποθήκευσης wii ή αποτυχία ανάγνωσης κεφαλίδας αÏχείου μεγέθους %x" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:461 msgid "s" @@ -6441,6 +6568,7 @@ msgstr "zNear ΔιόÏθωση: " msgid "| OR" msgstr "| OR" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." @@ -6538,3 +6666,5 @@ msgstr "| OR" #~ "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από " #~ "δεξιά." >>>>>>> Update Greek and Czech translations +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit From 6fef0b9a8ff56dec390307a243eb549a9411d667 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 15 Oct 2011 17:01:51 -0500 Subject: [PATCH 038/185] Updated Spanish translation --- Languages/po/es.po | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Languages/po/es.po b/Languages/po/es.po index 10b8c05209..b16d557823 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -12,8 +12,12 @@ msgstr "" "PO-Revision-Date: 2011-12-09 00:28+0100\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-08-11 15:30+0100\n" >>>>>>> Update translation files for recent changes in the code. +======= +"PO-Revision-Date: 2011-10-15 23:23+0100\n" +>>>>>>> Updated Spanish translation "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" "Language: Spanish\n" @@ -437,9 +441,12 @@ msgstr "Emulación de VBeam Precisa" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Updated Spanish translation msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -681,6 +688,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Sincronización alternativa del Wiimote" ======= @@ -688,6 +696,10 @@ msgstr "Sincronización alternativa del Wiimote" msgid "Alternate Wiimote Timing" msgstr "Wiimote emulado" >>>>>>> Update translation files for recent changes in the code. +======= +msgid "Alternate Wiimote Timing" +msgstr "Sincronización alternativa del Wiimote" +>>>>>>> Updated Spanish translation #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -2867,9 +2879,12 @@ msgstr "Mayor que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Updated Spanish translation msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2887,9 +2902,14 @@ msgstr "" ======= "Aumenta bastante la calidad de las texturas generadas utilizando los efectos " "de renderización para la textura.\n" +<<<<<<< HEAD "Aumentar la resolución interna va a mejorar el efecto de esta definición.\n" "Diminuye ligeramente el desempenño y probablemente provoca fallos (aunque es " >>>>>>> Update translation files for recent changes in the code. +======= +"Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" +"Diminuye ligeramente el desempeño y probablemente provoca fallos (aunque es " +>>>>>>> Updated Spanish translation "improbable).\n" "\n" "Si está inseguro, déjelo marcado." From 510450999d74218ad8052387888ca7c39d3957d0 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 17 Oct 2011 16:36:56 -0500 Subject: [PATCH 039/185] Update Arabic and Japanese translations. --- Languages/po/ar.po | 89 ++++++++++++++++++++++++++++++++++++++++++++-- Languages/po/ja.po | 19 ++++++++-- 2 files changed, 104 insertions(+), 4 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 322a2c504f..59bf9c9782 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -13,9 +13,14 @@ msgstr "" "Last-Translator: mansoor\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-07-20 13:33+0300\n" "Last-Translator: \n" >>>>>>> Update translation files for recent changes in the code. +======= +"PO-Revision-Date: 2011-10-16 11:25-0500\n" +"Last-Translator: mansoor\n" +>>>>>>> Update Arabic and Japanese translations. "Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" @@ -425,9 +430,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -637,6 +645,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "بديل ويموت" ======= @@ -644,6 +653,10 @@ msgstr "بديل ويموت" msgid "Alternate Wiimote Timing" msgstr "محاكاة ويموت" >>>>>>> Update translation files for recent changes in the code. +======= +msgid "Alternate Wiimote Timing" +msgstr "بديل ويموت" +>>>>>>> Update Arabic and Japanese translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -947,11 +960,22 @@ msgstr "إلغاء" msgid "Cannot open %s" msgstr "لا يمكن Ùتح %s" +<<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 +msgid "Cannot record movies in read-only mode." +msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." + +>>>>>>> Update Arabic and Japanese translations. #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +>>>>>>> Update Arabic and Japanese translations. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -2752,9 +2776,12 @@ msgstr "أكبر من" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -4373,11 +4400,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" <<<<<<< HEAD +<<<<<<< HEAD msgstr "EFB Copia a escala" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= msgstr "" +======= +msgstr "EFB Copia a escala" +>>>>>>> Update Arabic and Japanese translations. #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. @@ -5042,6 +5073,7 @@ msgstr "اختبار" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 <<<<<<< HEAD +<<<<<<< HEAD msgid "Texture" msgstr "" @@ -5050,14 +5082,19 @@ msgid "Texture Cache" msgstr "" ======= #, fuzzy +======= +>>>>>>> Update Arabic and Japanese translations. msgid "Texture" -msgstr "Texturesتعطيل " +msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 -#, fuzzy msgid "Texture Cache" +<<<<<<< HEAD msgstr "إزالة التخزين المؤقت" >>>>>>> Update translation files for recent changes in the code. +======= +msgstr "" +>>>>>>> Update Arabic and Japanese translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" @@ -5556,6 +5593,7 @@ msgstr "" "%s\n" "ولها Ù†Ùس اسم المل٠على بطاقة ذاكرة الخاصة بك\n" "تستمر?" +<<<<<<< HEAD #: Source/Core/Core/Src/Movie.cpp:629 #, c-format @@ -5591,6 +5629,8 @@ 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 "" +======= +>>>>>>> Update Arabic and Japanese translations. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5936,12 +5976,18 @@ msgstr "أو" #~ msgstr "< الوضع الاÙتراضي >" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "AOSound" #~ msgstr "&الصوت" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Accurate Texture Cache" #~ msgstr "دقة المظهر السطحي المؤقت" @@ -5980,6 +6026,9 @@ msgstr "أو" #~ "ومن الأÙضل Ù„ تعيين نسبة العرض إلى الارتÙاع لتمتد عند استخدامه." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Bad gameini filename" #~ msgstr "Nombre de archivo gameini incorrecto" @@ -6007,15 +6056,21 @@ msgstr "أو" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "No se puede abrir %s, no tiene una función" +<<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." +======= +>>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "Config..." #~ msgstr "إعدادات" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Configuration profile" #~ msgstr "التكوين الشخصي" @@ -6117,6 +6172,9 @@ msgstr "أو" #~ msgstr "CPU Access تمكين" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Enable Copy to EFB" #~ msgstr "Habilitar Copiado al EFB" @@ -6132,8 +6190,11 @@ msgstr "أو" #~ msgid "Enable JIT Dynarec" #~ msgstr "تمكين صÙحات" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Enable OpenCL" #~ msgstr "OpenCL تمكين " @@ -6141,6 +6202,9 @@ msgstr "أو" #~ msgstr "تمكين شاشة التوقÙ" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" @@ -6214,8 +6278,11 @@ msgstr "أو" #~ msgid "Force Bi/Trilinear Filtering" #~ msgstr "Forzar Filtro Bi/Tri-linear" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Fractional" #~ msgstr "جزئي" @@ -6359,6 +6426,9 @@ msgstr "أو" #~ msgstr "اللازمة لاستعمال الخط القرص اليابانية." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "Run" #~ msgstr "Enter" @@ -6366,8 +6436,11 @@ msgstr "أو" #~ msgid "Running script...\n" #~ msgstr "Ejecutando script...\n" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Scale:" #~ msgstr "النطاق :" @@ -6426,6 +6499,9 @@ msgstr "أو" #~ "وهذا Ù…Ùيد Ùقط لأغراض التصحيح." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" @@ -6465,8 +6541,11 @@ msgstr "أو" #~ msgid "Specify an audio plugin" #~ msgstr "حدد الخلÙية مل٠Ùيديو" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Start Renderer in Fullscreen" #~ msgstr "بدء ÙÙŠ كمال ملء الشاشة" @@ -6474,6 +6553,9 @@ msgstr "أو" #~ msgstr "بدء التقديم ÙÙŠ إطار وضع ملء الشاشة." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "The file " #~ msgstr "El archivo " @@ -6487,6 +6569,7 @@ msgstr "أو" #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "Configuración de tipo %d no soportado en el plugin %s" +<<<<<<< HEAD #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6496,6 +6579,8 @@ msgstr "أو" ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Use FPS For Limiting" #~ msgstr "لحد عدد الاطارات" diff --git a/Languages/po/ja.po b/Languages/po/ja.po index dc9751b1b1..1392815cb3 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -12,8 +12,12 @@ msgstr "" "PO-Revision-Date: 2011-10-12 20:45+0900\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-08-19 08:37-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"PO-Revision-Date: 2011-10-12 20:45+0900\n" +>>>>>>> Update Arabic and Japanese translations. "Last-Translator: DanbSky\n" "Language-Team: \n" "Language: Japanese\n" @@ -432,9 +436,12 @@ msgstr "Accurate VBeam emulation" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -669,6 +676,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" ======= @@ -676,6 +684,10 @@ msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" msgid "Alternate Wiimote Timing" msgstr "Wii リモコンをエミュレート" >>>>>>> Update translation files for recent changes in the code. +======= +msgid "Alternate Wiimote Timing" +msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" +>>>>>>> Update Arabic and Japanese translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -2834,9 +2846,12 @@ msgstr "より大ãã„" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -5520,8 +5535,8 @@ msgid "" "Unknown pointer %#08x\n" "Continue?" msgstr "" -"ä¸æ˜Žãªãƒã‚¤ãƒ³ã‚¿ %#08x\n" -"続ã‘ã¾ã™ã‹ï¼Ÿ" +"Unknown pointer %#08x\n" +"Continue?" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 From 3e8ca14e967578e15105f712a5bad1cb77b0adc2 Mon Sep 17 00:00:00 2001 From: Pascal Jouy Date: Fri, 28 Oct 2011 23:42:40 +0200 Subject: [PATCH 040/185] Update french translation. --- Languages/po/fr.po | 669 +++++++++++++++++---------------------------- 1 file changed, 247 insertions(+), 422 deletions(-) diff --git a/Languages/po/fr.po b/Languages/po/fr.po index 56cb368da8..891787bfb0 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -12,8 +12,12 @@ msgstr "" "PO-Revision-Date: 2011-10-28 23:40+0100\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-08-10 17:42+0100\n" >>>>>>> Update translation files for recent changes in the code. +======= +"PO-Revision-Date: 2011-10-28 23:40+0100\n" +>>>>>>> Update french translation. "Last-Translator: Pascal\n" "Language-Team: \n" "Language: French\n" @@ -47,8 +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\" n'est pas un fichier GCM/ISO valide, ou n'est pas une ISO GC/Wii." +msgstr "\"%s\" n'est pas un fichier GCM/ISO valide, ou n'est pas une ISO GC/Wii." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:193 #, c-format @@ -103,8 +106,7 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s n'a pas pu être chargé en tant que carte mémoire.\n" -"Le fichier n'est pas assez grand pour être un fichier de carte mémoire " -"valide (0x%x octets)" +"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:367 #, c-format @@ -376,13 +378,11 @@ msgstr "" msgid "" "ALERT:\n" "\n" -"NetPlay will currently only work properly when using the following " -"settings:\n" +"NetPlay will currently only work properly when using the following settings:\n" " - Dual Core [OFF]\n" " - Audio Throttle [OFF]\n" " - DSP-HLE with \"Null Audio\" or DSP-LLE\n" -" - Manually set the exact number of controllers that will be used to " -"[Standard Controller]\n" +" - Manually set the exact number of controllers that will be used to [Standard Controller]\n" "\n" "All players should try to use the same Dolphin version and settings.\n" "Disable all memory cards or send them to all players before starting.\n" @@ -396,13 +396,10 @@ msgstr "" " - 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" +" - Spécifier manuellement le nombre de contôleurs qui seront utilisés dans [Contrôleur standard]\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" +"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" "\n" "Vous devez indiquer le port TCP à l'hôte !!" @@ -435,19 +432,20 @@ msgstr "Emulation fidèle VBeam" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update french translation. msgid "" "Accurately emulate EFB copies.\n" -"Some games depend on this for certain graphical effects or gameplay " -"functionality.\n" +"Some games depend on this for certain graphical effects or gameplay functionality.\n" "\n" "If unsure, check EFB to Texture instead." msgstr "" "Emule fidèlement les copies d'EFB.\n" -"Certains jeux requièrent ceci pour certains effets graphiques ou " -"fonctionnalités dans le jeu.\n" +"Certains jeux requièrent ceci pour certains effets graphiques ou fonctionnalités dans le jeu.\n" "\n" "Dans le doute, cochez plutôt EFB vers texture." @@ -473,51 +471,33 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "" -"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le " -"code Ajout (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le code Ajout (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:756 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " -"(%s)" -msgstr "" -"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le " -"code Remplir et déplacer (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" +msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le code Remplir et déplacer (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:549 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " -"Fill (%s)" -msgstr "" -"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans " -"l'écriture de la RAM et Remplir (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" +msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans l'écriture de la RAM et Remplir (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:609 #, c-format -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 " -"vers Pointeur (%s)" +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 vers Pointeur (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" -msgstr "" -"Erreur Action Replay : Valeur non valide (%08x) dans la Copie de mémoire (%s)" +msgstr "Erreur Action Replay : Valeur non valide (%08x) dans la Copie de mémoire (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "" -"Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" +msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -585,16 +565,14 @@ msgstr "Adresse :" msgid "" "Adds the specified value to zFar Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " -"the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" "Ajoute la valeur spécifiée au paramètre zFar.\n" "Il y a 2 façons d'indiquer les valeurs en virgule flottante.\n" -"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, " -"la valeur retenue sera \"0.0002\".\n" +"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, la valeur retenue sera \"0.0002\".\n" "Valeurs : (0->+/- Integer) ou (0->+/-FP[précision à 6 chiffres])\n" "\n" "NOTE: Consultez LogWindow/Console pour les valeurs acquises." @@ -603,24 +581,21 @@ msgstr "" msgid "" "Adds the specified value to zNear Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " -"the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" "Ajoute la valeur spécifiée au paramètre zNear.\n" "Il y a 2 façons d'indiquer les valeurs en virgule flottante.\n" -"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, " -"la valeur retenue sera \"0.0002\".\n" +"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, la valeur retenue sera \"0.0002\".\n" "Valeurs : (0->+/- Integer) ou (0->+/-FP[précision à 6 chiffres])\n" "\n" "NOTE: Consultez LogWindow/Console pour les valeurs acquises." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "" -"Ajuste le contrôle analogique de pression requise pour activer les boutons." +msgstr "Ajuste le contrôle analogique de pression requise pour activer les boutons." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" @@ -666,18 +641,17 @@ msgstr "Tous les fichiers (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Permet d'activer certaines options via les raccourcis clavier 3, 4, 5, 6 et " -"7 dans la fenêtre d'émulation.\n" +"Permet d'activer certaines options via les raccourcis clavier 3, 4, 5, 6 et 7 dans la fenêtre d'émulation.\n" "\n" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Délai alternatif de communication avec la Wiimote" ======= @@ -685,6 +659,10 @@ msgstr "Délai alternatif de communication avec la Wiimote" msgid "Alternate Wiimote Timing" msgstr "Wiimote émulée" >>>>>>> Update translation files for recent changes in the code. +======= +msgid "Alternate Wiimote Timing" +msgstr "Délai alternatif de communication avec la Wiimote" +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -716,8 +694,7 @@ msgid "" "\n" "If unsure, select (off)." msgstr "" -"Appliquer un effet de post-processing après avoir fini le rendu d'une " -"image.\n" +"Appliquer un effet de post-processing après avoir fini le rendu d'une image.\n" "\n" "Dans le doute, sélectionnez (aucun)." @@ -740,9 +717,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 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 !" +msgstr "Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé définitivement !" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -807,10 +782,8 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Génère automatiquement des mipmaps plutôt que de les décoder depuis la " -"mémoire.\n" -"Améliore un peu les performances mais peut provoquer des défauts mineurs de " -"texture.\n" +"Génère automatiquement des mipmaps plutôt que de les décoder depuis la mémoire.\n" +"Améliore un peu les performances mais peut provoquer des défauts mineurs de texture.\n" "\n" "Dans le doute, cochez cette case." @@ -871,9 +844,7 @@ msgstr "Basse" #: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" -msgstr "" -"Echec de la vérification de la somme de contrôle de la Table d'Allocation de " -"Blocs" +msgstr "Echec de la vérification de la somme de contrôle de la Table d'Allocation de Blocs" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Blocks" @@ -958,17 +929,12 @@ msgstr "Cache des listes d'affichage" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" +"In contrast to pixel lighting (which is merely an enhancement), per-pixel depth calculations are necessary to properly emulate a small number of games.\n" "\n" "If unsure, leave this checked." msgstr "" -"Calcule la profondeur par pixel des valeurs des graphiques 3D plutôt que par " -"vertex.\n" -"Contrairement à l'éclairage par pixel (qui est une bonne amélioration), les " -"calculs de profondeur par pixel sont nécessaires pour émuler correctement un " -"petit nombre de jeux.\n" +"Calcule la profondeur par pixel des valeurs des graphiques 3D plutôt que par vertex.\n" +"Contrairement à l'éclairage par pixel (qui est une bonne amélioration), les calculs de profondeur par pixel sont nécessaires pour émuler correctement un petit nombre de jeux.\n" "\n" "Dans le doute, cochez cette case." @@ -981,10 +947,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Calcule la lumière des graphiques 3D par pixel et non par vertex.\n" -"Diminue la vitesse d'émulation de quelques pourcents (en fonction de votre " -"GPU).\n" -"Cette amélioration est plutôt sûre, mais peut parfois provoquer quelques " -"pépins.\n" +"Diminue la vitesse d'émulation de quelques pourcents (en fonction de votre GPU).\n" +"Cette amélioration est plutôt sûre, mais peut parfois provoquer quelques pépins.\n" "\n" "Dans le doute, décochez cette case." @@ -1002,8 +966,7 @@ msgstr "Impossible d'ouvrir %s" #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" -msgstr "" -"Impossible de désenregistrer des évènements alors qu'il y en a en attente." +msgstr "Impossible de désenregistrer des évènements alors qu'il y en a en attente." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format @@ -1027,8 +990,7 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -msgstr "" -"Impossible de trouver la Wiimote par bd : %02x:%02x:%02x:%02x:%02x:%02x" +msgstr "Impossible de trouver la Wiimote par bd : %02x:%02x:%02x:%02x:%02x:%02x" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872 #, c-format @@ -1040,8 +1002,7 @@ msgstr "Impossible de trouver la Wiimote par le gestionnaire de connexion %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" -msgstr "" -"Impossible de lire à partir de DVD_Plugin - DVD-Interface : Erreur fatale" +msgstr "Impossible de lire à partir de DVD_Plugin - DVD-Interface : Erreur fatale" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:49 msgid "Caps Lock" @@ -1145,6 +1106,7 @@ msgstr "Choisir une carte mémoire :" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " @@ -1152,6 +1114,10 @@ msgid "" msgstr "" "Choisir un fichier comme apploader : (uniquement pour les disques créés à " "partir de dossiers)" +======= +msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" +msgstr "Choisir un fichier comme apploader : (uniquement pour les disques créés à partir de dossiers)" +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 @@ -1178,12 +1144,8 @@ msgid "Clear failed." msgstr "Echec de l'éffacement" #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "" -"Client disconnect while game is running!! NetPlay is disabled. You must " -"manually stop the game." -msgstr "" -"Le client s'est déconnecté alors que le jeu est en cours !! NetPlay est " -"désactivé. Vous devez arrêter le jeu manuellement." +msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." +msgstr "Le client s'est déconnecté alors que le jeu est en cours !! NetPlay est désactivé. Vous devez arrêter le jeu manuellement." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 @@ -1345,15 +1307,8 @@ msgstr "Impossible d'initialiser le moteur %s." #: 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 " -"backup. Please note that original Gamecube and Wii discs cannot be read by " -"most PC DVD drives." -msgstr "" -"Impossible de lire \"%s\". Il n'y a pas de disque dans le lecteur, ou ce " -"n'est pas un backup GC/Wii. Veuillez noter que les disques originaux de " -"GameCube et Wii ne peuvent pas être plus par la plupart des lecteurs DVD sur " -"PC." +msgid "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii backup. Please note that original Gamecube and Wii discs cannot be read by most PC DVD drives." +msgstr "Impossible de lire \"%s\". Il n'y a pas de disque dans le lecteur, ou ce n'est pas un backup GC/Wii. Veuillez noter que les disques originaux de GameCube et Wii ne peuvent pas être plus par la plupart des lecteurs DVD sur PC." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format @@ -1370,23 +1325,19 @@ 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)" +"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 "" "Could not write memory card file %s.\n" "\n" -"Are you running Dolphin from a CD/DVD, or is the save file maybe write " -"protected?" +"Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?" msgstr "" "Impossible d'écrire le fichier de carte mémoire %s.\n" "\n" -"Exécutez-vous Dolpin à partir d'un CD/DVD, ou le fichier de sauvegarde est " -"peut-être protégé contré l'écriture ?" +"Exécutez-vous Dolpin à partir d'un CD/DVD, ou le fichier de sauvegarde est peut-être protégé contré l'écriture ?" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" @@ -1427,11 +1378,16 @@ msgstr "Créé par KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +======= +msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +msgstr "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" @@ -1611,12 +1567,8 @@ msgstr "Détecter" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -msgid "" -"Detected attempt to read more data from the DVD than fit inside the out " -"buffer. Clamp." -msgstr "" -"Détecté que le DVD a essayé de lire plus de données que ce que peut contenir " -"le buffer de sortie." +msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." +msgstr "Détecté que le DVD a essayé de lire plus de données que ce que peut contenir le buffer de sortie." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 @@ -1672,30 +1624,24 @@ msgstr "Désactiver les textures" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" -"Speeds up emulation a lot but causes heavy glitches in many games which rely " -"on them (especially homebrew applications).\n" +"Speeds up emulation a lot but causes heavy glitches in many games which rely on them (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Désactive l'émulation des XFB.\n" -"Accélère beaucoup l'émulation mais provoque de gros pépins dans les nombreux " -"jeux s'appuyant dessus (particulièrement les applications homebrew).\n" +"Accélère beaucoup l'émulation mais provoque de gros pépins dans les nombreux jeux s'appuyant dessus (particulièrement les applications homebrew).\n" "\n" "Dans le doute, cochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" -"These are often used for post-processing or render-to-texture effects, so " -"while checking this setting gives a great speedup it almost always also " -"causes issues.\n" +"These are often used for post-processing or render-to-texture effects, so while checking this setting gives a great speedup it almost always also causes issues.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Désactive l'émulation de copies d'EFB.\n" -"Elles sont souvent utilisées pour du post-processing ou des effets de rendu " -"sur texture, donc cocher cette case va beaucoup accélérer l'émulation mais " -"aussi provoquer des pépins.\n" +"Elles sont souvent utilisées pour du post-processing ou des effets de rendu sur texture, donc cocher cette case va beaucoup accélérer l'émulation mais aussi provoquer des pépins.\n" "\n" "Dans le doute, décochez cette case." @@ -1799,6 +1745,7 @@ msgstr "Dolphin dans &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " @@ -1806,11 +1753,16 @@ msgid "" msgstr "" "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des " "fichiers..." +======= +msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." +msgstr "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des fichiers..." +>>>>>>> Update french translation. <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " @@ -1818,6 +1770,10 @@ msgid "" msgstr "" "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour " "afficher tous les jeux..." +======= +msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." +msgstr "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour afficher tous les jeux..." +>>>>>>> Update french translation. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -1863,8 +1819,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Copier toutes les images rendues (calculées) dans un fichier AVI dans User/" -"Dump/Frames/\n" +"Copier toutes les images rendues (calculées) dans un fichier AVI dans User/Dump/Frames/\n" "\n" "Dans le doute, décochez cette case." @@ -1910,16 +1865,8 @@ msgstr "Copies de l'EFB" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, c-format -msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " -"version %d.%d -- If you recently upgraded your Dolphin distribution, a " -"reboot is probably required at this point to get Windows to see the new " -"driver." -msgstr "" -"ERREUR : cette version de Dolphin requiert un pilote TAP-Win32 qui ait au " -"moins la version %d.%d -- Si vous avez récemment mis à niveau votre " -"distribution de Dolphin, un redémarrage est probablement nécessaire pour que " -"Windows charge le nouveau pilote." +msgid "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least version %d.%d -- If you recently upgraded your Dolphin distribution, a reboot is probably required at this point to get Windows to see the new driver." +msgstr "ERREUR : cette version de Dolphin requiert un pilote TAP-Win32 qui ait au moins la version %d.%d -- Si vous avez récemment mis à niveau votre distribution de Dolphin, un redémarrage est probablement nécessaire pour que Windows charge le nouveau pilote." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -1969,31 +1916,24 @@ msgstr "Thread d'émulation déjà en cours d'exécution" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" -"Slows down emulation a lot and prohibits high-resolution rendering but is " -"necessary to emulate a number of games properly.\n" +"Slows down emulation a lot and prohibits high-resolution rendering but is necessary to emulate a number of games properly.\n" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" "Emule 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" +"Ralentit beaucoup l'émulation et empêche le rendu en haute résolution, mais est nécessaire pour émuler certains jeux correctement.\n" "\n" "Dans le doute, sélectionnez plutôt Virtuel." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" -"Fixes many games which don't work without XFB emulation while not being as " -"slow as real XFB emulation. However, it may still fail for a lot of other " -"games (especially homebrew applications).\n" +"Fixes many games which don't work without XFB emulation while not being as slow as real XFB emulation. However, it may still fail for a lot of other games (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Emule 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" +"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" "Dans le doute, sélectionnez cette case." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 @@ -2010,15 +1950,13 @@ msgstr "Activer" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" -"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " -"supported by your GPU.\n" +"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\n" "Possibly causes issues.\n" "Requires fullscreen to work.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Active les effets 3D via la stéréoscopie en utilisant la technologie nVidia " -"3D Vision, si elle est prise en charge par votre GPU.\n" +"Active les effets 3D via la stéréoscopie en utilisant la technologie nVidia 3D Vision, si elle est prise en charge par votre GPU.\n" "Peut provoquer des pépins.\n" "Ne fonctionne qu'en plein écran.\n" "\n" @@ -2113,19 +2051,14 @@ msgid "" "If unsure, select 1x." msgstr "" "Active le filtrage anisotropique.\n" -"Améliore la qualité visuelle des textures qui ont des angles de vue " -"obliques.\n" +"Améliore la qualité visuelle des textures qui ont des angles de vue obliques.\n" "Peut provoquer des soucis pour un petit nombre de jeux.\n" "\n" "Dans le doute, sélectionnez 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "" -"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " -"Compatible)" -msgstr "" -"Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, " -"ARRÊT = Compatible)" +msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" +msgstr "Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, ARRÊT = Compatible)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Enable pages" @@ -2138,21 +2071,18 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Sélectionnez ceci si vous souhaitez que le rendu se fasse sur l'intégralité " -"de l'écran.\n" +"Sélectionnez ceci si vous souhaitez que le rendu se fasse sur l'intégralité de l'écran.\n" "Si cette case est décochée, une fenêtre de rendu sera créée.\n" "\n" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" -"Enable this if you want to use the main Dolphin window for rendering rather " -"than a separate render window.\n" +"Enable this if you want to use the main Dolphin window for rendering rather than a separate render window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Cochez cette case si vous souhaitez que la fenêtre principale de Dolphin " -"soit utilisée pour le rendu, plutôt qu'une fenêtre séparée.\n" +"Cochez cette case si vous souhaitez que la fenêtre principale de Dolphin soit utilisée pour le rendu, plutôt qu'une fenêtre séparée.\n" "\n" "Dans le doute, décochez cette case." @@ -2160,6 +2090,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " @@ -2167,16 +2098,14 @@ msgid "" msgstr "" "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. " "Désactiver pour TOUS les autres jeux." +======= +msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." +msgstr "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. Désactiver pour TOUS les autres jeux." +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Activer la traduction de bloc d'adresse (BAT), une fonctionnalité de l'unité " -"de gesiton de mémoire. Fidèle au matériel de la console, mais lent à émuler. " -"(ON = Compatible, OFF = Rapide)" +msgid "Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)" +msgstr "Activer la traduction de bloc d'adresse (BAT), une fonctionnalité de l'unité de gesiton de mémoire. Fidèle au matériel de la console, mais lent à émuler. (ON = Compatible, OFF = Rapide)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" @@ -2195,12 +2124,8 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "" -"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " -"OFF = Fast)" -msgstr "" -"Activer le Memory Management Unit (unité de gestion de la mémoire), requis " -"pour certains jeux. (ON = Compatible, OFF = Vitesse)" +msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" +msgstr "Activer le Memory Management Unit (unité de gestion de la mémoire), requis pour certains jeux. (ON = Compatible, OFF = Vitesse)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" @@ -2273,9 +2198,7 @@ msgstr "Erreur" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 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 " -"défaut du système." +msgstr "Erreur lors du chargement de la langue sélectionnée. Retour à la langue par défaut du système." #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format @@ -2287,6 +2210,7 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format +<<<<<<< HEAD msgid "" ======= >>>>>>> Update translation files for recent changes in the code. @@ -2295,6 +2219,10 @@ msgid "" msgstr "" "Erreur : essai d'accès aux polices %s mais elles ne sont pas chargées. Les " "jeux peuvent ne pas afficher les polices correctement, ou planter." +======= +msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." +msgstr "Erreur : essai d'accès aux polices %s mais elles ne sont pas chargées. Les jeux peuvent ne pas afficher les polices correctement, ou planter." +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2307,8 +2235,7 @@ msgstr "Euphorie" #: Source/Core/Core/Src/MemTools.cpp:214 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" -msgstr "" -"Erreur d'exception : accès à un espace en-dessous de la mémoire. %08llx%08llx" +msgstr "Erreur d'exception : accès à un espace en-dessous de la mémoire. %08llx%08llx" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Execute" @@ -2463,8 +2390,7 @@ msgstr "" "Il n'est pas fourni avec Dolphin pour des raisons de copyright.\n" "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" +"Vous pouvez utiliser le moteur DSP HLE à la place, celui-ci ne requiert pas d'extration de ROM.\n" "(Sélectionnez-le depuis l'onglet \"Audio\" dans la fenêtre de configuration.)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:99 @@ -2486,8 +2412,7 @@ msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -"Impossible de lire correctement la sauvegarde de la table d'allocation des " -"blocs\n" +"Impossible de lire correctement la sauvegarde de la table d'allocation des blocs\n" "(0x8000-0x9FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:144 @@ -2657,8 +2582,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Force le filtrage de texture, même si le jeu l'a explicitement désactivé.\n" -"Améliore légèrement la qualité des textures, mais peut provoquer des pépins " -"dans certains jeux.\n" +"Améliore légèrement la qualité des textures, mais peut provoquer des pépins dans certains jeux.\n" "\n" "Dans le doute, décochez cette case." @@ -2669,8 +2593,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Force le jeu à sortir des graphiques pour les écrans larges (16/9è, " -"16/10è).\n" +"Force le jeu à sortir des graphiques pour les écrans larges (16/9è, 16/10è).\n" "Provoque des pépins graphiques dans certains jeux.\n" "\n" "Dans le doute, décochez cette case." @@ -2678,12 +2601,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" -"Left unchecked, dolphin defaults to NTSC-U and automatically enables this " -"setting when playing Japanese games." +"Left unchecked, dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games." msgstr "" "Force le mode NTSC-J pour utiliser la police de la ROM japonaise.\n" -"Si cette case est décochée, Dolphin sera par défaut en NTSC-U et activera " -"automatiquement cette option lorsque des jeux japonais seront lancés." +"Si cette case est décochée, Dolphin sera par défaut en NTSC-U et activera automatiquement cette option lorsque des jeux japonais seront lancés." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -2866,8 +2787,7 @@ msgstr "Allemand" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, c-format 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" +msgstr "GetARCode : l'index est plus grand que la taille de la liste de codes %lu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Graphics" @@ -2883,18 +2803,20 @@ msgstr "Plus grand que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update french translation. msgid "" -"Greatly increases quality of textures generated using render to texture " -"effects.\n" +"Greatly increases quality of textures generated using render to texture effects.\n" "Raising the internal resolution will improve the effect of this setting.\n" -"Slightly decreases performance and possibly causes issues (although " -"unlikely).\n" +"Slightly decreases performance and possibly causes issues (although unlikely).\n" "\n" "If unsure, leave this checked." msgstr "" +<<<<<<< HEAD "Améliore significativement la qualité des textures générées en utilisant les " "effets de rendu vers texture.\n" "Le fait d'augmenter la résolution interne améliore l'impact de cette " @@ -2904,6 +2826,11 @@ msgstr "" "peu probable).\n" ======= >>>>>>> Update translation files for recent changes in the code. +======= +"Améliore significativement la qualité des textures générées en utilisant les effets de rendu vers texture.\n" +"Le fait d'augmenter la résolution interne améliore l'impact de cette option.\n" +"Baisse légèrement les performances et peut provoquer quelques pépins (mais peu probable).\n" +>>>>>>> Update french translation. "\n" "Dans le doute, cochez cette case." @@ -2962,10 +2889,8 @@ msgid "" msgstr "" "Bonjour,\n" "\n" -"Dolphin requiert que votre processeur prenne en charge les instructions " -"SSE2.\n" -"Malheureusement, votre processeur ne les a pas, et donc Dolphin ne " -"s'exécutera pas.\n" +"Dolphin requiert que votre processeur prenne en charge les instructions SSE2.\n" +"Malheureusement, votre processeur ne les a pas, et donc Dolphin ne s'exécutera pas.\n" "\n" "Sayonara !\n" @@ -2983,8 +2908,7 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Masquer le curseur de la souris s'il est au-dessus de la fenêtre " -"d'émulation.\n" +"Masquer le curseur de la souris s'il est au-dessus de la fenêtre d'émulation.\n" "\n" "Dans le doute, cochez cette case." @@ -3022,20 +2946,16 @@ msgstr "Wiimote hybride" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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" +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:795 #, c-format msgid "" -"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " -"in your nand dump\n" +"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available in your nand dump\n" "TitleID %016llx.\n" " Dolphin will likely hang now" msgstr "" -"IOCTL_ES_LAUNCH : Le jeu a essayé de recharger ios ou un titre qui n'est pas " -"disponible dans votre copie de la NAND\n" +"IOCTL_ES_LAUNCH : Le jeu a essayé de recharger ios ou un titre qui n'est pas disponible dans votre copie de la NAND\n" "ID du titre : %016llx.\n" " Dolphin va probablement figer maintenant" @@ -3082,16 +3002,14 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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 "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)" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " @@ -3100,6 +3018,10 @@ 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), vous devez aussi désactiver " "le contrôle audio dans le DSP pour que cela fonctionne." +======= +msgid "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you also have to disable Audio Throttle in DSP to make it effective." +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), vous devez aussi désactiver le contrôle audio dans le DSP pour que cela fonctionne." +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3108,28 +3030,24 @@ msgstr "Ignorer les changements de formats" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" -"Improves performance in many games without any negative effect. Causes " -"graphical defects in a small number of other games though.\n" +"Improves performance in many games without any negative effect. Causes graphical defects in a small number of other games though.\n" "\n" "If unsure, leave this checked." msgstr "" "Ignore tous les changements du format d'EFB.\n" -"Améliore les performances dans la plupart des jeux sans effet négatif. " -"Provoque des défauts graphiques dans un petit nombre de jeux.\n" +"Améliore les performances dans la plupart des jeux sans effet négatif. Provoque des défauts graphiques dans un petit nombre de jeux.\n" "\n" "Dans le doute, cochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" -"Improves performance in some games, but might disable some gameplay-related " -"features or graphical effects.\n" +"Improves performance in some games, but might disable some gameplay-related features or graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Ignore les requêtes de lecture ou d'écriture vers l'EFB du CPU.\n" -"Améliore les performances dans certains jeux, mais peut désactiver certaines " -"fonctionnalités de gameplay ou effets graphiques.\n" +"Améliore les performances dans certains jeux, mais peut désactiver certaines fonctionnalités de gameplay ou effets graphiques.\n" "\n" "Dans le doute, décochez cette case." @@ -3163,13 +3081,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" -"Improves performance but causes glitches in most games which rely on proper " -"fog emulation.\n" +"Improves performance but causes glitches in most games which rely on proper fog emulation.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Améliore les performances mais peut causer de petits pépins dans les jeux " -"s'appuyant sur une émulation de brouillard/fumée correcte.\n" +"Améliore les performances mais peut causer de petits pépins dans les jeux s'appuyant sur une émulation de brouillard/fumée correcte.\n" "\n" "Dans le doute, décochez cette case." @@ -3179,8 +3095,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Améliore les performances, mais peut faire disparaître l'éclairage dans la " -"plupart des jeux.\n" +"Améliore les performances, mais peut faire disparaître l'éclairage dans la plupart des jeux.\n" "\n" "Dans le doute, décochez cette case." @@ -3230,11 +3145,8 @@ msgid "Install to Wii Menu" msgstr "Installer dans le menu Wii" #: Source/Core/Core/Src/MemTools.cpp:248 -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." +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." <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3517,9 +3429,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:49 msgid "Load preset values from hack patterns available." -msgstr "" -"Charger les valeurs de pré-réglage à partir de la palette de hack " -"disponibles." +msgstr "Charger les valeurs de pré-réglage à partir de la palette de hack disponibles." #: Source/Core/DolphinWX/Src/Main.cpp:134 msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" @@ -3628,12 +3538,8 @@ msgid "Memory Card" msgstr "Carte mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "" -"Memory Card Manager WARNING-Make backups before using, should be fixed but " -"could mangle stuff!" -msgstr "" -"Gestionnaire de cartes mémoires | ATTENTION : Faites des sauvegardes avant " -"utilisation, devrait être OK mais corruption possible de données !" +msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" +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:369 #, c-format @@ -3654,9 +3560,7 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "" -"La taille du fichier de la carte mémoire ne correspond pas à la taille de " -"l'entête." +msgstr "La taille du fichier de la carte mémoire ne correspond pas à la taille de l'entête." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" @@ -3686,14 +3590,11 @@ msgstr "Modif." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" -"Modify textures to show the format they're encoded in. Needs an emulation " -"reset in most cases.\n" +"Modify textures to show the format they're encoded in. Needs an emulation reset in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Modifie les textures pour afficher le format dans lequel elles sont " -"encodées. Il faudra redémarrer l'émulation dans la plupart des cas pour que " -"cela prenne effet.\n" +"Modifie les textures pour afficher le format dans lequel elles sont encodées. Il faudra redémarrer l'émulation dans la plupart des cas pour que cela prenne effet.\n" "\n" "Dans le doute, décochez cette case." @@ -3733,12 +3634,8 @@ msgid "Multiply" msgstr "Multiplier" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "" -"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " -"effect on emulated wiimotes." -msgstr "" -"Supprime le son du haut-parleur de la Wiimote. Corrige les déconnexions " -"aléatoires sur les Wiimotes physiques. N'affecte pas les Wiimotes émulées." +msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." +msgstr "Supprime le son du haut-parleur de la Wiimote. Corrige les déconnexions aléatoires sur les Wiimotes physiques. N'affecte pas les Wiimotes émulées." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Add" @@ -4044,8 +3941,7 @@ msgid "" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -"L'ordre des fichiers dans le Dossier de fichiers ne correspond pas à l'ordre " -"des blocs\n" +"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" @@ -4055,12 +3951,8 @@ msgid "Other" msgstr "Autres" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "" -"Other client disconnected while game is running!! NetPlay is disabled. You " -"manually stop the game." -msgstr "" -"Autre client déconnecté pendant que le jeu est en cours d'exécution !! " -"NetPlay est désactivé. Vous devez arrêter le jeu manuellement." +msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." +msgstr "Autre client déconnecté pendant que le jeu est en cours d'exécution !! NetPlay est désactivé. Vous devez arrêter le jeu manuellement." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4369,8 +4261,7 @@ msgid "" msgstr "" "Réduit la quantité d'aliasing causée par des graphiques 3D rasterisés.\n" "Ceci permet d'avoir une image moins carrée, avec moins d'effets d'escalier.\n" -"Impacte négativement les performances de l'émulation et peut provoquer des " -"pépins.\n" +"Impacte négativement les performances de l'émulation et peut provoquer des pépins.\n" "\n" "Dans le doute, sélectionnez Aucune." @@ -4546,9 +4437,7 @@ msgstr "Sauvegarder le fichier GCM/ISO décompressé" #: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "" -"Le film de sauvegarde d'état %s est corrompu, arrêt de l'enregistrement du " -"film..." +msgstr "Le film de sauvegarde d'état %s est corrompu, arrêt de l'enregistrement du film..." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" @@ -4583,8 +4472,10 @@ msgstr "Fitre de recherche" msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 +#: Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 +#: Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "La section %s n'a pas été trouvée dans SYSCONF" @@ -4671,8 +4562,7 @@ msgstr "" "Sélectionner le format d'écran lors du rendu :\n" "Auto : Utiliser le format d'écran natif\n" "Forcer 16/9è : Dimensionner l'image pour un format d'écran 16/9è.\n" -"Forcer 4/3 : Dimensionner l'image pour un format d'écran de " -"4/3.\n" +"Forcer 4/3 : Dimensionner l'image pour un format d'écran de 4/3.\n" "Etirer à la fenêtre : Adapter l'image à la fenêtre.\n" "\n" "Dans le doute, choisissez Auto." @@ -4684,32 +4574,27 @@ msgstr "Police sélectionnée" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Selects the display resolution used in fullscreen mode.\n" -"This should always be bigger than or equal to the internal resolution. " -"Performance impact is negligible.\n" +"This should always be bigger than or equal to the internal resolution. Performance impact is negligible.\n" "\n" "If unsure, use your desktop resolution.\n" "If still unsure, use the highest resolution which works for you." msgstr "" "Sélectionne la résolution d'affichage utilisée en mode Plein écran.\n" -"Elle devrait toujours être supérieure ou égale à la résolution interne. " -"L'impact sur les performances est négligeable.\n" +"Elle devrait toujours être supérieure ou égale à la résolution interne. L'impact sur les performances est négligeable.\n" "\n" "Dans le doute, utilisez la résolution de votre Bureau.\n" -"Si vous ne savez toujours pas, sélectionnez la plus haute résolution " -"affichée." +"Si vous ne savez toujours pas, sélectionnez la plus haute résolution affichée." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects what graphics API to use internally.\n" -"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " -"Direct3D 11 is somewhere between the two.\n" +"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. Direct3D 11 is somewhere between the two.\n" "Note that the Direct3D backends are only available on Windows.\n" "\n" "If unsure, use Direct3D 9." msgstr "" "Sélectionne l'API graphique à utiliser.\n" -"Direct3D 9 est généralement le plus rapide. OpenGL est cependant le plus " -"précis. Direct3D 11 est quelque part entre les deux.\n" +"Direct3D 9 est généralement le plus rapide. OpenGL est cependant le plus précis. Direct3D 11 est quelque part entre les deux.\n" "Les moteurs Direct3D ne sont disponibles que pour Windows.\n" "\n" "Dans le doute, sélectionnez Direct3D 9." @@ -4734,12 +4619,17 @@ msgstr "Serbe" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Port série 1 - C'est le port que les périphériques tels que l'adaptateur " "ethernet utilisent" +======= +msgid "Serial Port 1 - This is the port which devices such as the net adapter use" +msgstr "Port série 1 - C'est le port que les périphériques tels que l'adaptateur ethernet utilisent" +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -4757,9 +4647,7 @@ msgstr "Définir comme carte mémoire par défaut : %c" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" -msgstr "" -"SetARCode_IsActive : L'index est plus grand que la taille de la liste des " -"codes AR %lu" +msgstr "SetARCode_IsActive : L'index est plus grand que la taille de la liste des codes AR %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." @@ -4880,13 +4768,10 @@ msgstr "Demande confirmation avant d'arrêter le jeu." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "Show a message box when a potentially serious error has occured.\n" -"Disabling this may avoid annoying and non-fatal messages, but it may also " -"mean that Dolphin suddenly crashes without any explanation at all." +"Disabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all." msgstr "" "Affiche un message lorsqu'une erreur sérieuse potentielle est arrivée.\n" -"Le désactiver évitera les messages embêtants et les messages non-fatals, " -"mais cela peut aussi signifier que Dolphin plante soudainement sans aucune " -"explication." +"Le désactiver évitera les messages embêtants et les messages non-fatals, mais cela peut aussi signifier que Dolphin plante soudainement sans aucune explication." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Show first block" @@ -4910,13 +4795,11 @@ msgstr "Afficher le titre de sauvegarde" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" -"Show the number of frames rendered per second as a measure of emulation " -"speed.\n" +"Show the number of frames rendered per second as a measure of emulation speed.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Affiche le nombre d'images rendues par seconde, afin de mesurer la vitesse " -"d'émulation.\n" +"Affiche le nombre d'images rendues par seconde, afin de mesurer la vitesse d'émulation.\n" "\n" "Dans le doute, décochez cette case." @@ -4986,13 +4869,11 @@ msgid "" msgstr "" ======= msgid "" -"Skip the destination alpha pass used in many games for various graphical " -"effects.\n" +"Skip the destination alpha pass 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" +"Saute la passe alpha de destination, utilisée dans beaucoup de jeux pour divers effets graphiques.\n" "\n" "Dans le doute, décochez cette case." @@ -5000,17 +4881,19 @@ msgstr "" msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" -"If you're experiencing any issues, try raising texture cache accuracy or " -"disable this option.\n" +"If you're experiencing any issues, try raising texture cache accuracy or disable this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. "Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision " "de l'émulation.\n" +======= +"Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision de l'émulation.\n" +>>>>>>> Update french translation. "Améliore parfois la qualité visuelle.\n" -"Si vous rencontrez des problèmes, essayez d'augmenter la précision du cache " -"ou désactivez cette option.\n" +"Si vous rencontrez des problèmes, essayez d'augmenter la précision du cache ou désactivez cette option.\n" "\n" "Dans le doute, décochez cette case." @@ -5038,16 +4921,13 @@ msgstr "Rendu logiciel" #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:83 msgid "" -"Software rendering is an order of magnitude slower than using the other " -"backends.\n" +"Software rendering is an order of magnitude slower than using the other backends.\n" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -"Le rendu logiciel est le plus lent de tous les moteurs, et n'utilise pas " -"l'accélération de votre carte graphique.\n" +"Le rendu logiciel est le plus lent de tous les moteurs, et n'utilise pas l'accélération de votre carte graphique.\n" "Il n'est utile qu'à des fins de débogage.\n" -"Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez " -"'Non'." +"Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez 'Non'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" @@ -5085,21 +4965,13 @@ msgstr "Volume du haut-parleur :" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" -"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.\n" -"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less " -"issues. Generally speaking, the lower the internal resolution is, the better " -"your performance will be.\n" +"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.\n" +"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n" "\n" "If unsure, select 640x528." msgstr "" -"Spécifie la résolution de rendu. Une haute résolution améliore beaucoup la " -"qualité visuelle mais impacte beaucoup les performances et peut provoquer " -"quelques pépins dans certains jeux.\n" -"\"Multiple de 640x528\" est un peu plus lent que \"Taille de la fenêtre\" " -"mais provoque moins de problèmes. En général, plus la résolution interne est " -"petite, meilleures seront les performances.\n" +"Spécifie la résolution de rendu. Une haute résolution améliore beaucoup la qualité visuelle mais impacte beaucoup les performances et peut provoquer quelques pépins dans certains jeux.\n" +"\"Multiple de 640x528\" est un peu plus lent que \"Taille de la fenêtre\" mais provoque moins de problèmes. En général, plus la résolution interne est petite, meilleures seront les performances.\n" "\n" "Dans le doute, sélectionnez 640x528." @@ -5169,14 +5041,12 @@ msgstr "Arrêter" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Store EFB copies in GPU texture objects.\n" -"This is not so accurate, but it works well enough for most games and gives a " -"great speedup over EFB to RAM.\n" +"This is not so accurate, but it works well enough for most games and gives a great speedup over EFB to RAM.\n" "\n" "If unsure, leave this checked." msgstr "" "Enregistre les copies d'EFB dans les objets de texture du GPU.\n" -"Ce n'est pas précis, mais fonctionne suffisamment bien pour la plupart des " -"jeux et améliore sensiblement la vitesse comparé à l'EFB vers la RAM.\n" +"Ce n'est pas précis, mais fonctionne suffisamment bien pour la plupart des jeux et améliore sensiblement la vitesse comparé à l'EFB vers la RAM.\n" "\n" "Dans le doute, sélectionnez cette case." @@ -5294,12 +5164,8 @@ msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:51 #, c-format -msgid "" -"The file %s could not be opened for writing. Please check if it's already " -"opened by another program." -msgstr "" -"Le fichier %s n'a pas pu être ouvert pour l'écriture. Vérifiez qu'il n'a pas " -"été ouvert par un autre programme." +msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." +msgstr "Le fichier %s n'a pas pu être ouvert pour l'écriture. Vérifiez qu'il n'a pas été ouvert par un autre programme." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format @@ -5325,28 +5191,21 @@ msgstr "Le code AR décrypté ne contient aucune ligne." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" -"The safer you adjust this, the less likely the emulator will be missing any " -"texture updates from RAM.\n" +"The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n" "\n" "If unsure, use the second-fastest value from the right." msgstr "" -"Plus vous allez vers Sûr, moins l'émulateur manquera les mises à jour de " -"texture depuis la RAM.\n" +"Plus vous allez vers Sûr, moins l'émulateur manquera les mises à jour de texture depuis la RAM.\n" "\n" "Dans le doute, utilisez la deuxième position depuis la droite." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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" +msgstr "La sauvegarde que vous essayez de copier a une taille de fichier non valide" #: Source/Core/DolphinWX/Src/Main.cpp:353 -msgid "" -"The selected language is not supported by your system. Falling back to " -"system default." -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." +msgid "The selected language is not supported by your system. Falling back to system default." +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:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5382,12 +5241,8 @@ msgid "Theme selection went wrong" msgstr "La sélection du thème a rencontré un problème" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 -msgid "" -"There must be a ticket for 00000001/00000002. Your NAND dump is probably " -"incomplete." -msgstr "" -"Il doit y avoir un ticket pour 00000001/00000002. Votre copie de la NAND est " -"probablement incomplète." +msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." +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:304 msgid "" @@ -5398,12 +5253,8 @@ msgstr "" "Indéterminé signifie que les paramètres de Dolphin sont appliqués." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "" -"This action replay simulator does not support codes that modify Action " -"Replay itself." -msgstr "" -"Ce simulateur d'Action Replay ne prend pas en charge les codes qui modifient " -"l'Action Replay lui-même." +msgid "This action replay simulator does not support codes that modify Action Replay itself." +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:513 msgid "This could cause slow down in Wii Menu and some games." @@ -5412,19 +5263,12 @@ msgstr "Ceci peut ralentir le Menu Wii et quelques jeux." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " -"Hold SHIFT and press one of the WASD keys to move the camera by a certain " -"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " -"SHIFT+R to reset the camera.\n" +"Hold the right mouse button and move the mouse to pan the camera around. Hold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Cette fonctionnalité vous permet de vous amuser avec la caméra du jeu.\n" -"Faites un clic droit et déplacez la souris pour changer l'orientation de la " -"caméra. Appuyez sur SHIFT et sur W, A, S ou D pour modifier pas à pas la " -"distance de la caméra (SHIFT et 0 déplace la caméra plus vite, SHIFT et 9 " -"la déplace plus lentement). Appuyez sur SHIFT et R pour réinitiliser la " -"position de la caméra.\n" +"Faites un clic droit et déplacez la souris pour changer l'orientation de la caméra. Appuyez sur SHIFT et sur W, A, S ou D pour modifier pas à pas la distance de la caméra (SHIFT et 0 déplace la caméra plus vite, SHIFT et 9 la déplace plus lentement). Appuyez sur SHIFT et R pour réinitiliser la position de la caméra.\n" "\n" "Dans le doute, décochez cette case." @@ -5437,12 +5281,10 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" "Ceci est utiliser pour contrôler la vitesse du jeu par la constance du son.\n" -"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple " -"trop rapide.\n" +"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple trop rapide.\n" "Mais il se peut parfois qu'activer cette option produise un bruit constant.\n" "\n" -"Raccourci clavier : Appuyer pour instantanément désactiver cette " -"option." +"Raccourci clavier : Appuyer pour instantanément désactiver cette option." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." @@ -5450,21 +5292,15 @@ msgstr "Ceci est utilisé pour lire les pistes de musique, comme les BGM." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" -"This splits the Video and CPU threads, so they can be run on separate " -"cores.\n" -"Causes major speed improvements on PCs with more than one core, but can also " -"cause occasional crashes/glitches." +"This splits the Video and CPU threads, so they can be run on separate cores.\n" +"Causes major speed improvements on PCs with more than one core, but can also cause occasional crashes/glitches." msgstr "" -"Ceci sépare les threads du processeur et de l'affichage, pour qu'ils " -"puissent être exécutés sur des coeurs séparés.\n" -"Cela a pour conséquence d'accélérer considérablement l'émulation sur les PC " -"qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou " -"des plantages." +"Ceci sépare les threads du processeur et de l'affichage, pour qu'ils puissent être exécutés sur des coeurs séparés.\n" +"Cela a pour conséquence d'accélérer considérablement l'émulation sur les PC qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou des plantages." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 msgid "This will let you Manually Edit the INI config file" -msgstr "" -"Ceci vous permettra de modifier manuellement le fichier de configuration INI" +msgstr "Ceci vous permettra de modifier manuellement le fichier de configuration INI" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:249 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:254 @@ -5519,7 +5355,8 @@ msgstr "Echec de chargement d'un type de fichier inconnu." msgid "Triggers" msgstr "Déclencheurs" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 +#: Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "Essai de lecture d'un fichier SYSCONF non valide" @@ -5571,12 +5408,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format msgid "" -"Unable to parse line %lu of the entered AR code as a valid encrypted or " -"decrypted code. Make sure you typed it correctly.\n" +"Unable to parse line %lu of the entered AR code as a valid encrypted or decrypted code. Make sure you typed it correctly.\n" "Would you like to ignore this line and continue parsing?" msgstr "" -"Impossible d'analyser la ligne %lu du code AR entré comme un code crypté ou " -"décrypté valide. Veuillez vérifier que vous l'avez correctement tapé.\n" +"Impossible d'analyser la ligne %lu du code AR entré comme un code crypté ou 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:404 @@ -5611,9 +5446,13 @@ msgstr "Reception d'un message inconnu avec l'ID : %d" #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" <<<<<<< HEAD +<<<<<<< HEAD ======= msgstr "" "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" +======= +msgstr "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" +>>>>>>> Update french translation. #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format @@ -5662,23 +5501,19 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Utilise plusieurs threads pour décoder les textures.\n" -"Peut accélérer l'émulation, particulièrement avec des processeurs qui ont " -"plus de 2 coeurs.\n" +"Peut accélérer l'émulation, particulièrement avec des processeurs qui ont plus de 2 coeurs.\n" "\n" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" -"However, one may skip the popups to allow interruption free gameplay by " -"checking this option.\n" +"However, one may skip the popups to allow interruption free gameplay by checking this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"En cas d'échec de compilation de shader, un message est habituellement " -"affiché.\n" -"Cependant, certains préfèrent ne pas afficher ce message pour ne pas " -"interrompre le jeu en cochant cette case.\n" +"En cas d'échec de compilation de shader, un message est habituellement affiché.\n" +"Cependant, certains préfèrent ne pas afficher ce message pour ne pas interrompre le jeu en cochant cette case.\n" "\n" "Dans le doute, décochez cette case." @@ -5762,8 +5597,7 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"Attention ! Il est conseillé de sauvegarder tous les fichiers dans le " -"dossier :\n" +"Attention ! Il est conseillé de sauvegarder tous les fichiers dans le dossier :\n" "%s\n" "Voulez-vous continuer ?" @@ -5775,8 +5609,7 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"Attention : ceci va écraser toutes les sauvegardes existantes dans ce " -"dossier :\n" +"Attention : ceci va écraser toutes les sauvegardes existantes dans ce dossier :\n" "%s\n" "et vont avoir le même nom que le fichier sur votre carte mémoire\n" "Continuer ?" @@ -5969,8 +5802,7 @@ msgid "" "Only Zelda ucode games will work correctly with them.\n" msgstr "" "Vous utilisez des ROM de DSP gratuits créés par l'équipe de Dolphin.\n" -"Seuls les jeux basés sur les ucodes de Zelda fonctionneront correctement " -"avec ces ROM.\n" +"Seuls les jeux basés sur les ucodes de Zelda fonctionneront correctement avec ces ROM.\n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:72 msgid "You can't close panes that have pages in them." @@ -6052,19 +5884,14 @@ msgstr "[Personnalisé]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" -"Aims to speed up emulation by offloading texture decoding to the GPU using " -"the OpenCL framework.\n" -"However, right now it's known to cause texture defects in various games. " -"Also it's slower than regular CPU texture decoding in most cases.\n" +"Aims to speed up emulation by offloading texture decoding to the GPU using the OpenCL framework.\n" +"However, right now it's known to cause texture defects in various games. Also it's slower than regular CPU texture decoding in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" "[EXPERIMENTAL]\n" -"Tente d'accélérer l'émulation en déportant le décodage de texture vers le " -"GPU en utilisant le framework OpenCL.\n" -"Cependant, il est actuellement connu pour provoquer des défauts de textures " -"dans divers jeux. De plus, il est généralement plus lent qu'un classique " -"décodage par le CPU.\n" +"Tente d'accélérer l'émulation en déportant le décodage de texture vers le GPU en utilisant le framework OpenCL.\n" +"Cependant, il est actuellement connu pour provoquer des défauts de textures dans divers jeux. De plus, il est généralement plus lent qu'un classique décodage par le CPU.\n" "\n" "Dans le doute, décochez cette case." @@ -6111,9 +5938,7 @@ msgstr "iCacheJIT : Lecture de l'Opcode depuis %x. Merci de nous le signaler." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "" -"Ceci n'est pas une sauvegarde Wii, ou erreur de lecture de la taille de " -"l'entête du fichier %x" +msgstr "Ceci n'est pas une sauvegarde Wii, ou erreur de lecture de la taille de l'entête du fichier %x" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:461 msgid "s" From 1880eb8e9f31771dc1f5465ae0ee47fe510de4e8 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 19 Dec 2011 09:10:17 -0600 Subject: [PATCH 041/185] Update Czeck translation. --- Languages/po/cs.po | 583 ++++++++++++++------------------------------- 1 file changed, 184 insertions(+), 399 deletions(-) diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 00f3a3c290..728e2493b1 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -11,6 +11,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-10-15 14:50+0100\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -23,6 +24,9 @@ msgstr "" >>>>>>> The actual update of the Greek and Czech translations. The last commit "PO-Revision-Date: 2011-10-15 14:50+0100\n" >>>>>>> Update Greek and Czech translations +======= +"PO-Revision-Date: 2011-12-19 07:39+0100\n" +>>>>>>> Update Czeck translation. "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" "Language: Czech\n" @@ -111,8 +115,7 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s nelze naÄíst jako paměťovou kartu\n" -"soubor není dostateÄnÄ› velký, aby byl platným souborem paměťové karty (0x%x " -"bajtů)" +"soubor není dostateÄnÄ› velký, aby byl platným souborem paměťové karty (0x%x bajtů)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -384,13 +387,11 @@ msgstr "" msgid "" "ALERT:\n" "\n" -"NetPlay will currently only work properly when using the following " -"settings:\n" +"NetPlay will currently only work properly when using the following settings:\n" " - Dual Core [OFF]\n" " - Audio Throttle [OFF]\n" " - DSP-HLE with \"Null Audio\" or DSP-LLE\n" -" - Manually set the exact number of controllers that will be used to " -"[Standard Controller]\n" +" - Manually set the exact number of controllers that will be used to [Standard Controller]\n" "\n" "All players should try to use the same Dolphin version and settings.\n" "Disable all memory cards or send them to all players before starting.\n" @@ -400,13 +401,11 @@ 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 v souÄasnosti 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" +" - RuÄnÄ› nastavit pÅ™esné Äíslo ovladaÄů, které budou použity na [Standardní OvladaÄ]\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" @@ -455,8 +454,7 @@ msgstr "Precizní emulace VBeam" >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" "Accurately emulate EFB copies.\n" -"Some games depend on this for certain graphical effects or gameplay " -"functionality.\n" +"Some games depend on this for certain graphical effects or gameplay functionality.\n" "\n" "If unsure, check EFB to Texture instead." msgstr "" @@ -487,38 +485,23 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "" -"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Kódu PÅ™idat " -"(%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Kódu PÅ™idat (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:756 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " -"(%s)" -msgstr "" -"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Naplnit a " -"Sesunout (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" +msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Naplnit a Sesunout (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:549 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " -"Fill (%s)" -msgstr "" -"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Ram Zápisu A " -"NaplnÄ›ní (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" +msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Ram Zápisu A NaplnÄ›ní (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:609 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " -"Pointer (%s)" -msgstr "" -"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Zápisu Do " -"Ukazatele (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" +msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Zápisu Do Ukazatele (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -527,10 +510,8 @@ msgstr "Chyba Action Replay: Neplatná hodnota (%08x) v Kopii PamÄ›ti (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "" -"Chyba Action Replay: Hlavní Kód a Zápis do CCXXXXXX nejsou zavedeny (%s)" +msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "Chyba Action Replay: Hlavní Kód a Zápis do CCXXXXXX nejsou zavedeny (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -610,16 +591,14 @@ msgstr "Adresa :" msgid "" "Adds the specified value to zFar Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " -"the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" "PÅ™idá zadanou hodnotu do Parametru ZFar.\n" "Dva způsoby jak vyjádÅ™it hodnoty v plovoucí desetinné Äárce.\n" -"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný úÄinek, získaná " -"hodnota bude \"0.0002\".\n" +"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný úÄinek, získaná hodnota bude \"0.0002\".\n" "Hodnoty: (0->+/-Celé Äíslo) nebo (0->+/-PDÄŒ[6 desetinných míst])\n" "\n" "Poznámka: Zkontrolujte Konzoli/Okno protokolu pro získané hodnoty" @@ -628,16 +607,14 @@ msgstr "" msgid "" "Adds the specified value to zNear Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " -"the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" "PÅ™idá zadanou hodnotu do Parametru zNear.\n" "Dva způsoby jak vyjádÅ™it hodnoty v plovoucí desetinné Äárce.\n" -"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný úÄinek, získaná " -"hodnota bude \"0.0002\".\n" +"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný úÄinek, získaná hodnota bude \"0.0002\".\n" "Hodnoty: (0->+/-Celé Äíslo) nebo (0->+/-PDÄŒ[6 desetinných míst])\n" "\n" "Poznámka: Zkontrolujte Konzoli/Okno protokolu pro získané hodnoty\"" @@ -700,13 +677,11 @@ msgstr "VÅ¡echny soubory (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Umožní pÅ™epínání jistých možností pomocí horkých kláves 3, 4, 5, 6 a 7 " -"uvnitÅ™ okna emulace.\n" +"Umožní pÅ™epínání jistých možností pomocí horkých kláves 3, 4, 5, 6 a 7 uvnitÅ™ okna emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -1033,15 +1008,12 @@ msgstr "Ukládat pÅ™edvyt. obj. do vyr. pam." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" +"In contrast to pixel lighting (which is merely an enhancement), per-pixel depth calculations are necessary to properly emulate a small number of games.\n" "\n" "If unsure, leave this checked." msgstr "" "VypoÄítat hodnoty hloubky 3D grafiky podle pixelu, radÄ›ji než podle bodu.\n" -"Na rozdíl od osvÄ›tlení pixelu (což je pouze vylepÅ¡en), výpoÄty hloubky podle " -"pixelu jsou potÅ™ebné ke správné emulaci malého poÄtu her.\n" +"Na rozdíl od osvÄ›tlení pixelu (což je pouze vylepÅ¡en), výpoÄty hloubky podle pixelu jsou potÅ™ebné ke správné emulaci malého poÄtu her.\n" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." @@ -1054,8 +1026,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "VypoÄítat osvÄ›tlení 3D grafiky podle pixelu, radÄ›ji než podle bodu.\n" -"Sníží rychlost emulace o nÄ›jaké procento (záleží na VaÅ¡em grafikém " -"procesoru).\n" +"Sníží rychlost emulace o nÄ›jaké procento (záleží na VaÅ¡em grafikém procesoru).\n" "Toto je vÄ›tÅ¡inou bezpeÄné vylepÅ¡ení, ale může nÄ›kdy způsobit problémy.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -1211,12 +1182,8 @@ msgid "Choose a memory card:" msgstr "Zvolte paměťovou kartu:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -msgid "" -"Choose file to use as apploader: (applies to discs constructed from " -"directories only)" -msgstr "" -"Zvolte soubor, který má být použit jako zavadÄ›Ä aplikace: (platí pouze pro " -"disky sestavené z adresářů)" +msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" +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:768 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 @@ -1243,11 +1210,8 @@ msgid "Clear failed." msgstr "VyÄiÅ¡tÄ›ní selhalo" #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "" -"Client disconnect while game is running!! NetPlay is disabled. You must " -"manually stop the game." -msgstr "" -"Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit ruÄnÄ›." +msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." +msgstr "Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit ruÄnÄ›." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 @@ -1425,14 +1389,8 @@ msgstr "Nezle spustit backend %s." #: 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 " -"backup. Please note that original Gamecube and Wii discs cannot be read by " -"most PC DVD drives." -msgstr "" -"\"%s\" nelze Äíst. BuÄ není v mechanice žádný disk, nebo toto není záloha GC/" -"Wii. Nezapomeňte, že původní disky GameCube a Wii nepÅ™eÄte vÄ›tÅ¡ina PC DVD " -"mechanik." +msgid "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii backup. Please note that original Gamecube and Wii discs cannot be read by most PC DVD drives." +msgstr "\"%s\" nelze Äíst. BuÄ není v mechanice žádný disk, nebo toto není záloha GC/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:294 #, c-format @@ -1457,13 +1415,11 @@ msgstr "" msgid "" "Could not write memory card file %s.\n" "\n" -"Are you running Dolphin from a CD/DVD, or is the save file maybe write " -"protected?" +"Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?" msgstr "" "Nelze zapsat soubor paměťové karty %s.\n" "\n" -"SpouÅ¡títe Dolphina z CD/DVD, nebo je snad soubor s uložením chránÄ›ný proti " -"zápisu?" +"SpouÅ¡títe Dolphina z CD/DVD, nebo je snad soubor s uložením chránÄ›ný proti zápisu?" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" @@ -1501,10 +1457,8 @@ msgid "Created by KDE-Look.org" msgstr "VytvoÅ™il KDE-look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"VytvoÅ™il Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +msgstr "VytvoÅ™il Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" @@ -1694,12 +1648,8 @@ msgstr "Zjistit" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -msgid "" -"Detected attempt to read more data from the DVD than fit inside the out " -"buffer. Clamp." -msgstr "" -"ZjiÅ¡tÄ›n pokus o pÅ™eÄtení více dat z DVD, než se vejde do výstupní pamÄ›ti. " -"Zásek." +msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." +msgstr "ZjiÅ¡tÄ›n pokus o pÅ™eÄtení více dat z DVD, než se vejde do výstupní pamÄ›ti. Zásek." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 @@ -1755,30 +1705,24 @@ msgstr "Zakázat Textury" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" -"Speeds up emulation a lot but causes heavy glitches in many games which rely " -"on them (especially homebrew applications).\n" +"Speeds up emulation a lot but causes heavy glitches in many games which rely on them (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Zakázat jakoukoli emulaci XFB.\n" -"Velmi zrychluje emulaci, ale způsobuje hodnÄ› chyb v mnoha hrách, které na " -"nich závisejí (zvláštÄ› po domácku vyrobené aplikace).\n" +"Velmi zrychluje emulaci, ale způsobuje hodnÄ› chyb v mnoha hrách, které na nich závisejí (zvláštÄ› po domácku vyrobené aplikace).\n" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" -"These are often used for post-processing or render-to-texture effects, so " -"while checking this setting gives a great speedup it almost always also " -"causes issues.\n" +"These are often used for post-processing or render-to-texture effects, so while checking this setting gives a great speedup it almost always also causes issues.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Zakázat emulaci EFB kopií.\n" -"Tyto jsou Äasto používány pro efekty následného zpracování nebo vykreslení " -"do textur, takže když toto zaÅ¡krtnete, dostanete velké zrychlení, ale toto " -"také skoro vždy způsobuje problémy.\n" +"Tyto jsou Äasto používány pro efekty následného zpracování nebo vykreslení do textur, takže když toto zaÅ¡krtnete, dostanete velké zrychlení, ale toto také skoro vždy způsobuje problémy.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -1903,20 +1847,12 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -msgid "" -"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " -"files..." -msgstr "" -"Dolphin nemohl nalézt žádná GX/Wii ISO. KliknÄ›te zde dvakrát k prohledání " -"souborů..." +msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." +msgstr "Dolphin nemohl nalézt žádná GX/Wii ISO. KliknÄ›te zde dvakrát k prohledání souborů..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -msgid "" -"Dolphin is currently set to hide all games. Doubleclick here to show all " -"games..." -msgstr "" -"Dolphin je v souÄasnosti nastaven na skrytí vÅ¡ech her. KliknÄ›te zde dvakrát " -"pro zobrazení vÅ¡ech her..." +msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." +msgstr "Dolphin je v souÄasnosti nastaven na skrytí vÅ¡ech her. KliknÄ›te zde dvakrát pro zobrazení vÅ¡ech her..." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -2020,15 +1956,8 @@ msgstr "EFB Kopie" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, c-format -msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " -"version %d.%d -- If you recently upgraded your Dolphin distribution, a " -"reboot is probably required at this point to get Windows to see the new " -"driver." -msgstr "" -"CHYBA: Tato verze Dolphinu vyžaduje ovladaÄ TAP-Win32 verze alespoň %d.%d -- " -"Pokud jste nedávno VaÅ¡i instalaci Dolphin aktualizovali, je zapotÅ™ebí v " -"tomto bodÄ› restartovat, aby Windows uvidÄ›l nový ovladaÄ." +msgid "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least version %d.%d -- If you recently upgraded your Dolphin distribution, a reboot is probably required at this point to get Windows to see the new driver." +msgstr "CHYBA: Tato verze Dolphinu vyžaduje ovladaÄ TAP-Win32 verze alespoň %d.%d -- Pokud jste nedávno VaÅ¡i instalaci Dolphin aktualizovali, je zapotÅ™ebí v tomto bodÄ› restartovat, aby Windows uvidÄ›l nový ovladaÄ." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -2078,30 +2007,24 @@ msgstr "Vlákno Emulace již běží" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" -"Slows down emulation a lot and prohibits high-resolution rendering but is " -"necessary to emulate a number of games properly.\n" +"Slows down emulation a lot and prohibits high-resolution rendering but is necessary to emulate a number of games properly.\n" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" "PÅ™esnÄ› Emulovat XFB.\n" -"Velmi zpomaluje emulaci a brání vykreslování ve vysokém rozliÅ¡ení, ale je " -"nutná k řádné emulaci jistého poÄtu her.\n" +"Velmi zpomaluje emulaci a brání vykreslování ve vysokém rozliÅ¡ení, ale je nutná k řádné emulaci jistého poÄtu her.\n" "\n" "Pokud si nejste jisti, zaÅ¡krtnÄ›te místo tohoto virtuální emulaci XFB." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" -"Fixes many games which don't work without XFB emulation while not being as " -"slow as real XFB emulation. However, it may still fail for a lot of other " -"games (especially homebrew applications).\n" +"Fixes many games which don't work without XFB emulation while not being as slow as real XFB emulation. However, it may still fail for a lot of other games (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Emulovat XFB pomocí objektů textury grafického procesoru.\n" -"Spraví mnoho her, které nefungují bez emulace EFB, aniž by byla tak pomalá " -"jako opravdová emulace EFB. NicménÄ› stále může selhat v mnoha jiných hrách " -"(zvláštÄ› po domácku vyrobené aplikace).\n" +"Spraví mnoho her, které nefungují bez emulace EFB, aniž by byla tak pomalá jako opravdová emulace EFB. NicménÄ› stále může selhat v mnoha jiných hrách (zvláštÄ› po domácku vyrobené aplikace).\n" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." @@ -2119,15 +2042,13 @@ msgstr "Povolit" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" -"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " -"supported by your GPU.\n" +"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\n" "Possibly causes issues.\n" "Requires fullscreen to work.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Zapnout 3D efekty pomocí stereoskopie použitím technologie Nvidia 3D Vision, " -"pokud je podporována Vaším grafickým procesorem.\n" +"Zapnout 3D efekty pomocí stereoskopie použitím technologie Nvidia 3D Vision, pokud je podporována Vaším grafickým procesorem.\n" "Může způsobovat problémy.\n" "Pro fungování vyžaduje režim celé obrazovky.\n" "\n" @@ -2154,7 +2075,7 @@ msgstr "Zapnout SluÄování Bloků" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" -msgstr "" +msgstr "Povolit výpoÄet ohraniÄujícího rámeÄku" ======= >>>>>>> Update translation files for recent changes in the code. @@ -2237,12 +2158,8 @@ msgstr "" "Pokud si nejste jisti, zvolte 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "" -"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " -"Compatible)" -msgstr "" -"Zapnout rychlý přístup k disku. NÄ›které hry to potÅ™ebují. (ZAPNUTO = rychlé, " -"VYPNUTO = Kompatibilní)" +msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" +msgstr "Zapnout rychlý přístup k disku. NÄ›které hry to potÅ™ebují. (ZAPNUTO = rychlé, VYPNUTO = Kompatibilní)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Enable pages" @@ -2255,41 +2172,28 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Toto povolte, pokud chcete, aby celá obrazovka byla použita pro " -"vykreslování.\n" +"Toto povolte, pokud chcete, aby celá obrazovka byla použita pro vykreslování.\n" "Pokud je toto zakázáno, bude místo toho vytvoÅ™eno vykreslovací okno.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" -"Enable this if you want to use the main Dolphin window for rendering rather " -"than a separate render window.\n" +"Enable this if you want to use the main Dolphin window for rendering rather than a separate render window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Toto zapnÄ›te, pokud chcete použít hlavní okno Dolphin pro vykreslování " -"radÄ›ji, než oddÄ›lené vykreslovací okno.\n" +"Toto zapnÄ›te, pokud chcete použít hlavní okno Dolphin pro vykreslování radÄ›ji, než oddÄ›lené vykreslovací okno.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -msgid "" -"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " -"ANY other game." -msgstr "" -"Povolte toto pro zrychlení The Legend of Zelda: Twilight Princess. Zakažte " -"pro VÅ ECHNY ostatní hry." +msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." +msgstr "Povolte toto pro zrychlení The Legend of Zelda: Twilight Princess. Zakažte pro VÅ ECHNY ostatní hry." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Povolit PÅ™eklad Adres Bloků (BAT); funkce Jednotky Správy PamÄ›ti. PÅ™esnÄ› " -"napodobuje hardware, ale je emulován pomalu. (ZAPNUTO = Kompatibilní, " -"VYPNUTO = Rychlé)" +msgid "Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)" +msgstr "Povolit PÅ™eklad Adres Bloků (BAT); funkce Jednotky Správy PamÄ›ti. PÅ™esnÄ› napodobuje hardware, ale je emulován pomalu. (ZAPNUTO = Kompatibilní, VYPNUTO = Rychlé)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" @@ -2308,12 +2212,8 @@ msgstr "" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "" -"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " -"OFF = Fast)" -msgstr "" -"Povolí Jednotku Správy PamÄ›ti, potÅ™ebnou v nÄ›jakých hrách. (ZAPNUTO = " -"Kompatibilní, VYPNUTO = Rychlé)" +msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" +msgstr "Povolí Jednotku Správy PamÄ›ti, potÅ™ebnou v nÄ›jakých hrách. (ZAPNUTO = Kompatibilní, VYPNUTO = Rychlé)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" @@ -2391,6 +2291,8 @@ msgid "" "Error in PlayWiimote. %u != %u, byte %d.\n" "Sorry, Wii recording is temporarily broken." msgstr "" +"Chyba v PlayWiimote. %u != %u, bajt %d.\n" +"Je nám líto, nahrávání Wii je doÄasnÄ› nefunkÄní." ======= ======= @@ -2416,24 +2318,17 @@ msgstr "Chyba" #: Source/Core/DolphinWX/Src/Main.cpp:346 >>>>>>> The actual update of the Greek and Czech translations. The last commit 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." +msgstr "Chyba pÅ™i nahrávání zvoleného jazyka. Vracím se na výchozí jazyk systému." #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format -msgid "" -"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -"Aborting savestate load..." -msgstr "" +msgid "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load..." +msgstr "Chyba: Po \"%s\", nalezeno %d (0x%X) místo znaÄky uložení %d (0x%X). UkonÄuji naÄtení uloženého stavu..." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format -msgid "" -"Error: Trying to access %s fonts but they are not loaded. Games may not show " -"fonts correctly, or crash." -msgstr "" -"Chyba: Pokus o přístup k písmům %s, ale ty nejsou naÄtena. Hry nemusí " -"zobrazit písma správnÄ›, nebo se můžou zhroutit" +msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." +msgstr "Chyba: Pokus o přístup k písmům %s, ale ty nejsou naÄtena. Hry nemusí zobrazit písma správnÄ›, nebo se můžou zhroutit" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2598,8 +2493,7 @@ msgstr "" "Nelze naÄíst ROM DSP:\t%s\n" "\n" "Tento soubor je vyžadován pÅ™i použití DSP LLE.\n" -"Není distribuován s Dolphinem, protože obsahuje data chránÄ›ná autorským " -"právem.\n" +"Není distribuován s Dolphinem, protože obsahuje data chránÄ›ná autorským právem.\n" "Použijte DSPSpy k výpisu soubor z Vaší skuteÄné konzole.\n" "\n" "Můžete použít jádro DSP HLE, které nevyžaduje výpisy ROM.\n" @@ -2813,12 +2707,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" -"Left unchecked, dolphin defaults to NTSC-U and automatically enables this " -"setting when playing Japanese games." +"Left unchecked, dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games." msgstr "" "Donutí použít režim NTSC-J pro použití Japonského písma ROMu.\n" -"Pokud není zaÅ¡krtnuto, Dolphin standardnÄ› pÅ™ejde na NTSC-U a automaticky " -"zapne toto nastavení pÅ™i hraní Japonských her." +"Pokud není zaÅ¡krtnuto, Dolphin standardnÄ› pÅ™ejde na NTSC-U a automaticky zapne toto nastavení pÅ™i hraní Japonských her." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -2916,9 +2808,8 @@ msgid "GCI File(*.gci)" msgstr "Soubor GCI(*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 -#, fuzzy msgid "GCMic Configuration" -msgstr "Nastavení Záznamu" +msgstr "Nastavení GCMic" #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -3075,16 +2966,13 @@ msgstr "VÄ›tší než" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" -"Greatly increases quality of textures generated using render to texture " -"effects.\n" +"Greatly increases quality of textures generated using render to texture effects.\n" "Raising the internal resolution will improve the effect of this setting.\n" -"Slightly decreases performance and possibly causes issues (although " -"unlikely).\n" +"Slightly decreases performance and possibly causes issues (although unlikely).\n" "\n" "If unsure, leave this checked." msgstr "" -"Velmi zvýší kvalitu vytvářených textur použitím efektů vykreslení do " -"textury.\n" +"Velmi zvýší kvalitu vytvářených textur použitím efektů vykreslení do textury.\n" "Zvýšení vnitÅ™ního rozliÅ¡ení zlepší úÄinnek tohoto nastavení.\n" "TroÅ¡ku sníží výkon a možná způsobí problémy (i když to je nepravdÄ›podobné).\n" "\n" @@ -3217,13 +3105,11 @@ msgstr "IOCTL_ES_GETVIEWS: Pokus o získání dat z neznámého lístku: %08x/%0 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 #, c-format msgid "" -"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " -"in your nand dump\n" +"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available in your nand dump\n" "TitleID %016llx.\n" " Dolphin will likely hang now" msgstr "" -"IOCTL_ES_LAUNCH: Hra se pokusila znovu naÄíst ios nebo název, který není " -"dostupný ve VaÅ¡em nand výpisu\n" +"IOCTL_ES_LAUNCH: Hra se pokusila znovu naÄíst ios nebo název, který není dostupný ve VaÅ¡em nand výpisu\n" "IDNázvu %016llx.\n" "Dolphin se teÄ pravdÄ›podobnÄ› zasekne" @@ -3264,25 +3150,16 @@ msgid "Icon" msgstr "Ikona" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -msgid "" -"If checked, the bounding box registers will be updated. Used by the Paper " -"Mario games." -msgstr "" +msgid "If checked, the bounding box registers will be updated. Used by the Paper Mario games." +msgstr "Pokud je zaÅ¡krtnuto, registry ohraniÄujícího rámeÄku budou aktualizovány. Používáno v hrách Paper Mario." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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 "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é)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." -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, aby to bylo úÄinné." +msgid "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you also have to disable Audio Throttle in DSP to make it effective." +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, aby to bylo úÄinné." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3291,28 +3168,24 @@ msgstr "Ignorovat ZmÄ›ny Formátu" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" -"Improves performance in many games without any negative effect. Causes " -"graphical defects in a small number of other games though.\n" +"Improves performance in many games without any negative effect. Causes graphical defects in a small number of other games though.\n" "\n" "If unsure, leave this checked." msgstr "" "Ignorovat vÅ¡echny zmÄ›ny formátu EFB.\n" -"Zlepší výkon v mnoha hrách, bez žádného negativního efektu. PÅ™esto způsobuje " -"grafické chyby v malém poÄtu jiných her.\n" +"Zlepší výkon v mnoha hrách, bez žádného negativního efektu. PÅ™esto způsobuje grafické chyby v malém poÄtu jiných her.\n" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" -"Improves performance in some games, but might disable some gameplay-related " -"features or graphical effects.\n" +"Improves performance in some games, but might disable some gameplay-related features or graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Ignorovat vÅ¡echny požadavky procesoru pro Ätení a zápis do EFB.\n" -"Zvýší výkon v nÄ›kterých hrách, ale může vypnout nÄ›které funkce související s " -"hraním a grafické efekty.\n" +"Zvýší výkon v nÄ›kterých hrách, ale může vypnout nÄ›které funkce související s hraním a grafické efekty.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -3346,13 +3219,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" -"Improves performance but causes glitches in most games which rely on proper " -"fog emulation.\n" +"Improves performance but causes glitches in most games which rely on proper fog emulation.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Zlepší výkon, ale způsobuje chyby ve vÄ›tÅ¡inÄ› her, které závisejí na správné " -"emulaci mlhy.\n" +"Zlepší výkon, ale způsobuje chyby ve vÄ›tÅ¡inÄ› her, které závisejí na správné emulaci mlhy.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -3412,11 +3283,8 @@ msgid "Install to Wii Menu" msgstr "Instalovat do Wii Menu" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "" -"InstallExceptionHandler called, but this platform does not yet support it." -msgstr "" -"Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " -"nepodporuje." +msgid "InstallExceptionHandler called, but this platform does not yet support it." +msgstr "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› nepodporuje." <<<<<<< HEAD <<<<<<< HEAD @@ -3862,12 +3730,8 @@ msgid "Memory Card" msgstr "Paměťová karta" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "" -"Memory Card Manager WARNING-Make backups before using, should be fixed but " -"could mangle stuff!" -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!" +msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" +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:369 #, c-format @@ -3918,13 +3782,11 @@ msgstr "Modifikátor" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" -"Modify textures to show the format they're encoded in. Needs an emulation " -"reset in most cases.\n" +"Modify textures to show the format they're encoded in. Needs an emulation reset in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ZmÄ›nit textury, aby zobrazovali formát, v kterém jsou zakódovány. Ve vÄ›tÅ¡inÄ› " -"případů vyžaduje resetovaní emulace.\n" +"ZmÄ›nit textury, aby zobrazovali formát, v kterém jsou zakódovány. Ve vÄ›tÅ¡inÄ› případů vyžaduje resetovaní emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -3964,12 +3826,8 @@ msgid "Multiply" msgstr "Násobit" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "" -"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " -"effect on emulated wiimotes." -msgstr "" -"Ztlumí reproduktor Wiimote. Spravuje náhodná odpojování u opravdových " -"Wiimote. Žádný efekt na emulovaná Wiimote." +msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." +msgstr "Ztlumí reproduktor Wiimote. Spravuje náhodná odpojování u opravdových Wiimote. Žádný efekt na emulovaná Wiimote." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Add" @@ -4308,11 +4166,8 @@ msgid "Other" msgstr "Jiné" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "" -"Other client disconnected while game is running!! NetPlay is disabled. You " -"manually stop the game." -msgstr "" -"Jiný klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru ukonÄete ruÄnÄ›." +msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." +msgstr "Jiný klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru ukonÄete ruÄnÄ›." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4509,17 +4364,17 @@ msgstr "Efekt Následného Zpracování:" #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" -msgstr "" +msgstr "PÅ™edÄasný konec filmu v PlayController. %u + 8 > %u" #: Source/Core/Core/Src/Movie.cpp:829 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" -msgstr "" +msgstr "PÅ™edÄasný konec filmu v PlayWiimote. %u + %d > %u" #: Source/Core/Core/Src/Movie.cpp:806 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" -msgstr "" +msgstr "PÅ™edÄasný konec filmu v PlayWiimote. %u > %u" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4904,8 +4759,10 @@ msgstr "Hledat Filtr" msgid "Search Subfolders" msgstr "Hledat Podadresáře" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 +#: Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 +#: Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Sekce %s nebyla v SYSCONF nalezena" @@ -5026,32 +4883,27 @@ msgstr "Vybraný typ písma" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Selects the display resolution used in fullscreen mode.\n" -"This should always be bigger than or equal to the internal resolution. " -"Performance impact is negligible.\n" +"This should always be bigger than or equal to the internal resolution. Performance impact is negligible.\n" "\n" "If unsure, use your desktop resolution.\n" "If still unsure, use the highest resolution which works for you." msgstr "" "Vybere rozliÅ¡ení obrazovky použité v režimu celé obrazovky.\n" -"To by mÄ›lo být vždycky vÄ›tší než nebo rovno vnitÅ™nímu rozliÅ¡ení. Dopad na " -"výkon je zanedbatelný.\n" +"To by mÄ›lo být vždycky vÄ›tší než nebo rovno vnitÅ™nímu rozliÅ¡ení. Dopad na výkon je zanedbatelný.\n" "\n" "Pokud si nejste jisti, použijte VaÅ¡e rozliÅ¡ení obrazovky.\n" -"Pokud si stále nejste jisti, použijte takové nejvyšší rozliÅ¡ení, které Vám " -"funguje." +"Pokud si stále nejste jisti, použijte takové nejvyšší rozliÅ¡ení, které Vám funguje." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects what graphics API to use internally.\n" -"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " -"Direct3D 11 is somewhere between the two.\n" +"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. Direct3D 11 is somewhere between the two.\n" "Note that the Direct3D backends are only available on Windows.\n" "\n" "If unsure, use Direct3D 9." msgstr "" "Zvolí jaké bude vnitÅ™nÄ› grafické API použito.\n" -"Direct3D 9 je vÄ›tÅ¡inou nejrychlejší. OpenGL je ale nejpÅ™esnÄ›jší. Direct3D 11 " -"je nÄ›kde mezi nimi.\n" +"Direct3D 9 je vÄ›tÅ¡inou nejrychlejší. OpenGL je ale nejpÅ™esnÄ›jší. Direct3D 11 je nÄ›kde mezi nimi.\n" "Nezapomeňte, že backendy Direct3D jsou dostupné pouze ve Windows.\n" "\n" "Pokud si nejste jisti, použijte Direct3D 9" @@ -5073,11 +4925,8 @@ msgid "Serbian" msgstr "SrbÅ¡tina" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -msgid "" -"Serial Port 1 - This is the port which devices such as the net adapter use" -msgstr "" -"Sériový port 1 - Tito je port, který používají zařízení jako internetový " -"adaptér" +msgid "Serial Port 1 - This is the port which devices such as the net adapter use" +msgstr "Sériový port 1 - Tito je port, který používají zařízení jako internetový adaptér" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -5216,12 +5065,10 @@ msgstr "Zobrazí rámeÄek s potvrzením pÅ™ed zastavením hry." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "Show a message box when a potentially serious error has occured.\n" -"Disabling this may avoid annoying and non-fatal messages, but it may also " -"mean that Dolphin suddenly crashes without any explanation at all." +"Disabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all." msgstr "" "Zobrazit rámeÄek se zprávou, pÅ™i zjiÅ¡tÄ›ní potenciálnÄ› závažné chyby.\n" -"Vypnutím tohoto se můžete vyhnout otravným a nezávažným zprávám, ale Dolphin " -"může také být náhle ukonÄen bez jakéhokoliv vysvÄ›tlení." +"Vypnutím tohoto se můžete vyhnout otravným a nezávažným zprávám, ale Dolphin může také být náhle ukonÄen bez jakéhokoliv vysvÄ›tlení." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Show first block" @@ -5245,13 +5092,11 @@ msgstr "Zobrazit název uložení" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" -"Show the number of frames rendered per second as a measure of emulation " -"speed.\n" +"Show the number of frames rendered per second as a measure of emulation speed.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Zobrazí poÄet snímků vykreslených za sekundu jako měřítko rychlosti " -"emulace.\n" +"Zobrazí poÄet snímků vykreslených za sekundu jako měřítko rychlosti emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -5299,13 +5144,11 @@ msgstr "PÅ™eskoÄit EFB Přístup z Procesoru" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" -"Skip the destination alpha pass used in many games for various graphical " -"effects.\n" +"Skip the destination alpha pass 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" +"PÅ™eskoÄit průchod cílové průhlednosti používaný ve vÄ›tÅ¡inÄ› her pro různé grafické efekty.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -5313,15 +5156,13 @@ msgstr "" msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" -"If you're experiencing any issues, try raising texture cache accuracy or " -"disable this option.\n" +"If you're experiencing any issues, try raising texture cache accuracy or disable this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Lehce zrychlí kopie EFB do RAM obÄ›továním pÅ™esnosti emulace.\n" "NÄ›kdy také zvýší kvalitu obrazu.\n" -"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost textury, " -"nebo tuto možnost vypnout.\n" +"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost textury, nebo tuto možnost vypnout.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -5349,16 +5190,13 @@ msgstr "Softwarový VykreslovaÄ" #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:83 msgid "" -"Software rendering is an order of magnitude slower than using the other " -"backends.\n" +"Software rendering is an order of magnitude slower than using the other backends.\n" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -"Softwarové vykreslování je řádovÄ› pomalejší, než pÅ™i použití ostatních " -"backendů.\n" +"Softwarové vykreslování je řádovÄ› pomalejší, než pÅ™i použití ostatních backendů.\n" "Je užiteÄné pouze pro úÄely ladÄ›ní.\n" -"Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, " -"zvolte 'Ne'." +"Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, zvolte 'Ne'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" @@ -5408,21 +5246,13 @@ msgstr "Hlasitost Reproduktoru:" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" -"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.\n" -"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less " -"issues. Generally speaking, the lower the internal resolution is, the better " -"your performance will be.\n" +"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.\n" +"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n" "\n" "If unsure, select 640x528." msgstr "" -"UrÄuje rozliÅ¡ení, v kterém bude vykresleno. Vysoké rozliÅ¡ení vlemi zvýší " -"kvalitu obrazu, ale je také o dost nároÄnÄ›jší na výkon a může způsobovat v " -"nÄ›kterých hrách chyby.\n" -"\"Násobek 640x528\" je o trochu pomalejší než \"Velikost Okna\", ale také " -"nezpůsobuje tolik problémů. ObecnÄ› Å™eÄeno, Äím nižší je vnitÅ™ní rozliÅ¡ení, " -"tím lepší výkon bude.\n" +"UrÄuje rozliÅ¡ení, v kterém bude vykresleno. Vysoké rozliÅ¡ení vlemi zvýší kvalitu obrazu, ale je také o dost nároÄnÄ›jší na výkon a může způsobovat v nÄ›kterých hrách chyby.\n" +"\"Násobek 640x528\" je o trochu pomalejší než \"Velikost Okna\", ale také nezpůsobuje tolik problémů. ObecnÄ› Å™eÄeno, Äím nižší je vnitÅ™ní rozliÅ¡ení, tím lepší výkon bude.\n" "\n" "Pokud si nejste jisti, zvolte 640x528." @@ -5508,14 +5338,12 @@ msgstr "Zastavit" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Store EFB copies in GPU texture objects.\n" -"This is not so accurate, but it works well enough for most games and gives a " -"great speedup over EFB to RAM.\n" +"This is not so accurate, but it works well enough for most games and gives a great speedup over EFB to RAM.\n" "\n" "If unsure, leave this checked." msgstr "" "Ukládat EFB kopie do objektů textury grafického procesoru.\n" -"Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává vÄ›tší " -"zrychlení než EFB do RAM.\n" +"Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává vÄ›tší zrychlení než EFB do RAM.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -5593,7 +5421,7 @@ msgstr "VytvoÅ™it Snímek Obrazovky" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "TaruKonga (Bongos)" -msgstr "" +msgstr "TaruKonga (Bonga)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5640,12 +5468,8 @@ msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:51 #, c-format -msgid "" -"The file %s could not be opened for writing. Please check if it's already " -"opened by another program." -msgstr "" -"Soubor %s nemohl být otevÅ™en pro zápis. Zkontrolujte, prosím, je-li už " -"otevÅ™en jiným programem." +msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." +msgstr "Soubor %s nemohl být otevÅ™en pro zápis. Zkontrolujte, prosím, je-li už otevÅ™en jiným programem." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format @@ -5671,13 +5495,11 @@ msgstr "Výsledný rozÅ¡ifrovaný kód AR neobsahuje žádné řádky." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" -"The safer you adjust this, the less likely the emulator will be missing any " -"texture updates from RAM.\n" +"The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n" "\n" "If unsure, use the second-fastest value from the right." msgstr "" -"Čím bezpeÄnÄ›jší toto bude, tím bude ménÄ› pravdÄ›podobné, že emulátoru budou " -"chybÄ›t jakékoliv aktualizace textur z RAM.\n" +"Čím bezpeÄnÄ›jší toto bude, tím bude ménÄ› pravdÄ›podobné, že emulátoru budou chybÄ›t jakékoliv aktualizace textur z RAM.\n" "\n" "Pokud si nejste jisti, použijte druhou nejrychlejší hodnotu zprava." @@ -5686,12 +5508,8 @@ 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:353 -msgid "" -"The selected language is not supported by your system. Falling back to " -"system default." -msgstr "" -"Zvolený jazyk není VaÅ¡im systémem podporován. Vracím se na výchozí jazyk " -"systému." +msgid "The selected language is not supported by your system. Falling back to system default." +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:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5727,12 +5545,8 @@ msgid "Theme selection went wrong" msgstr "VýbÄ›r vzhledu se zvrtl" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 -msgid "" -"There must be a ticket for 00000001/00000002. Your NAND dump is probably " -"incomplete." -msgstr "" -"Musí existovat lístek pro 00000001/00000002. VaÅ¡e NAND vypsání je " -"pravdÄ›podobnÄ› neúplné" +msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." +msgstr "Musí existovat lístek pro 00000001/00000002. VaÅ¡e NAND vypsání je pravdÄ›podobnÄ› neúplné" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "" @@ -5743,12 +5557,8 @@ msgstr "" "NeurÄený znamená, že hra použije nastavení Dolphin." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "" -"This action replay simulator does not support codes that modify Action " -"Replay itself." -msgstr "" -"Tento simulátor action replay nepodporuje kód, který mÄ›ní samotný Action " -"Replay." +msgid "This action replay simulator does not support codes that modify Action Replay itself." +msgstr "Tento simulátor action replay nepodporuje kód, který mÄ›ní samotný Action Replay." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." @@ -5757,18 +5567,12 @@ msgstr "Toto může způsobit zpomalení ve Wii Menu a v nÄ›kterých hrách." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " -"Hold SHIFT and press one of the WASD keys to move the camera by a certain " -"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " -"SHIFT+R to reset the camera.\n" +"Hold the right mouse button and move the mouse to pan the camera around. Hold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Tato funkce Vám umožňuje si pohrát s herní kamerou.\n" -"Podržte pravé tlaÄítko myÅ¡i a pohybujte s ní pro zmÄ›nu pohledu kamery. " -"Podržte SHIFT a zmáÄknÄ›te jednu z kláves WASD, abyste kamerou pohnuli v " -"urÄité vzdálenosti kroku (SHIFT+0 pro rychlejší pohyb a SHIFT+9 pro " -"pomalejší). StisknÄ›te SHIFT+R k resetu kamery.\n" +"Podržte pravé tlaÄítko myÅ¡i a pohybujte s ní pro zmÄ›nu pohledu kamery. Podržte SHIFT a zmáÄknÄ›te jednu z kláves WASD, abyste kamerou pohnuli v urÄité vzdálenosti kroku (SHIFT+0 pro rychlejší pohyb a SHIFT+9 pro pomalejší). StisknÄ›te SHIFT+R k resetu kamery.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -5788,19 +5592,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." -msgstr "" -"Toto se používá pro pÅ™ehrávání hudebních stop, jako napÅ™. hudba v pozadí." +msgstr "Toto se používá pro pÅ™ehrávání hudebních stop, jako napÅ™. hudba v pozadí." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" -"This splits the Video and CPU threads, so they can be run on separate " -"cores.\n" -"Causes major speed improvements on PCs with more than one core, but can also " -"cause occasional crashes/glitches." +"This splits the Video and CPU threads, so they can be run on separate cores.\n" +"Causes major speed improvements on PCs with more than one core, but can also cause occasional crashes/glitches." msgstr "" "Toto rozdÄ›lí vlákna Obrazu a Procesoru, takže běží na oddÄ›lených jádrech.\n" -"Způsobí výrazné zvýšení rychlosti na PC s více než jedním jádrem, ale také " -"může způsobovat obÄasné chyby/pády." +"Způsobí výrazné zvýšení rychlosti na PC s více než jedním jádrem, ale také může způsobovat obÄasné chyby/pády." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 msgid "This will let you Manually Edit the INI config file" @@ -5874,7 +5674,8 @@ msgstr "Pokus o naÄtení souboru neznámého typu." msgid "Triggers" msgstr "SpínaÄe" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 +#: Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "Pokus o Ätení z neplatného SYSCONF" @@ -5926,12 +5727,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format msgid "" -"Unable to parse line %lu of the entered AR code as a valid encrypted or " -"decrypted code. Make sure you typed it correctly.\n" +"Unable to parse line %lu of the entered AR code as a valid encrypted or decrypted code. Make sure you typed it correctly.\n" "Would you like to ignore this line and continue parsing?" msgstr "" -"Nelze analyzovat řádek %lu zadaného kódu AR jako platný zaÅ¡ifrovaný nebo " -"rozÅ¡ifrovaný kód. UjistÄ›te se, že jste ho správnÄ› zadali.\n" +"Nelze analyzovat řádek %lu zadaného kódu AR jako platný zaÅ¡ifrovaný nebo 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:404 @@ -6025,22 +5824,19 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Použít více vláken k dekódování textur.\n" -"Může vést ke zrychlení (zvláštÄ› u procesorů, která mají více než dvÄ› " -"jádra).\n" +"Může vést ke zrychlení (zvláštÄ› u procesorů, která mají více než dvÄ› jádra).\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" -"However, one may skip the popups to allow interruption free gameplay by " -"checking this option.\n" +"However, one may skip the popups to allow interruption free gameplay by checking this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" "NormálnÄ› pokud kompilace shadera selže, je zobrazena chybová zpráva.\n" -"NicménÄ›, zaÅ¡krtnutím této možnosti tyto vyskakovací okna pÅ™eskoÄíte, což Vám " -"umožní nepÅ™eruÅ¡ované hraní.\n" +"NicménÄ›, zaÅ¡krtnutím této možnosti tyto vyskakovací okna pÅ™eskoÄíte, což Vám umožní nepÅ™eruÅ¡ované hraní.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -6143,38 +5939,35 @@ msgstr "" #: Source/Core/Core/Src/Movie.cpp:629 #, c-format -msgid "" -"Warning: You loaded a save that's after the end of the current movie. (byte " -"%u > %u) (frame %u > %u). You should load another save before continuing, or " -"load this state with read-only mode off." -msgstr "" +msgid "Warning: You loaded a save that's after the end of the current movie. (byte %u > %u) (frame %u > %u). You should load another save before continuing, or load this state with read-only mode off." +msgstr "Varování: NaÄetli jste uloženou pozici, která je umístÄ›na po skonÄení souÄasného filmu. (bajt %u > %u) (snímek %u > %u). PÅ™ed pokraÄováním byste 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:646 #, c-format -msgid "" -"Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " -"should load another save before continuing, or load this state with read-" -"only mode off. Otherwise you'll probably get a desync." -msgstr "" +msgid "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync." +msgstr "Varování: NaÄetli jste uloženou pozici, jejíž film má neshodu v bajtu %d (0x%X). PÅ™ed pokraÄováním byste mÄ›li naÄíst jinou pozici, nebo tento stav naÄíst bez zapnutého režimu pouze pro Ätení. Jinak pravdÄ›podobnÄ› dojde k desynchronizaci." #: Source/Core/Core/Src/Movie.cpp:655 #, c-format msgid "" -"Warning: You loaded a save whose movie mismatches on frame %d. You should " -"load another save before continuing, or load this state with read-only mode " -"off. Otherwise you'll probably get a desync.\n" +"Warning: You loaded a save whose movie mismatches on frame %d. You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync.\n" "\n" -"More information: The current movie is %d frames long and the savestate's " -"movie is %d frames long.\n" +"More information: The current movie is %d frames long and the savestate's movie is %d frames long.\n" "\n" "On frame %d, the current movie presses:\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" +"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" "On frame %d, the savestate's movie presses:\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" +"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 "" +"Varování: NaÄetli jste uloženou pozici, jejíž film má neshodu ve snímku %d. PÅ™ed pokraÄováním byste mÄ›li naÄíst jinou pozici, nebo tento stav naÄíst bez zapnutého režimu pouze pro Ätení. Jinak pravdÄ›podobnÄ› dojde k desynchronizaci.\n" +"\n" +"Další informace: SouÄasný film je dlouhý %d snímků a uložený stav filmu je dlouhý %d snímků.\n" +"\n" +"Ve snímku %d souÄasný film stiskává:\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" +"Na snímku %d, film uloženého stavu stiskává:\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:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -6369,9 +6162,7 @@ msgstr "Musíte zadat jméno!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 msgid "You must enter a valid decimal, hexadecimal or octal value." -msgstr "" -"Musíte zadat platnou hodnotu v desítkové, Å¡estnáctkové nebo osmiÄkové " -"soustavÄ›." +msgstr "Musíte zadat platnou hodnotu v desítkové, Å¡estnáctkové nebo osmiÄkové soustavÄ›." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 msgid "You must enter a valid profile name." @@ -6437,19 +6228,14 @@ msgstr "[Vlastní]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" -"Aims to speed up emulation by offloading texture decoding to the GPU using " -"the OpenCL framework.\n" -"However, right now it's known to cause texture defects in various games. " -"Also it's slower than regular CPU texture decoding in most cases.\n" +"Aims to speed up emulation by offloading texture decoding to the GPU using the OpenCL framework.\n" +"However, right now it's known to cause texture defects in various games. Also it's slower than regular CPU texture decoding in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" "[EXPERIMENTÃLNÃ]\n" -"Usiluje o zrychlení emulace tím, že dekódování textury pÅ™enechá grafickému " -"procesoru použitím struktury OpenCL.\n" -"NicménÄ› v tuto dobu je známo, že způsobuje vady textur v různých hrách. Také " -"je ve vÄ›tÅ¡inÄ› případů pomalejší, než normální dekódování textur pÅ™es " -"procesor.\n" +"Usiluje o zrychlení emulace tím, že dekódování textury pÅ™enechá grafickému procesoru použitím struktury OpenCL.\n" +"NicménÄ› v tuto dobu je známo, že způsobuje vady textur v různých hrách. Také je ve vÄ›tÅ¡inÄ› případů pomalejší, než normální dekódování textur pÅ™es procesor.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -6462,8 +6248,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "[EXPERIMENTÃLNÃ]\n" -"Trochu zrychlí emulaci ukládáním pÅ™edvytvoÅ™ených objektů do vyrovnávací " -"pamÄ›ti\n" +"Trochu zrychlí emulaci ukládáním pÅ™edvytvoÅ™ených objektů do vyrovnávací pamÄ›ti\n" "Může ale také způsobovat problémy\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." From 6961c2e553c863bc82ae8111884cd771fae6bc51 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 20 Dec 2011 17:26:22 -0600 Subject: [PATCH 042/185] Update Hungarian and Turkish translations. --- Languages/po/fr.po | 1524 +++++++++++++++++++++++++++++++------------- Languages/po/hu.po | 130 ++++ Languages/po/tr.po | 507 +++++++++------ 3 files changed, 1530 insertions(+), 631 deletions(-) diff --git a/Languages/po/fr.po b/Languages/po/fr.po index 891787bfb0..5af84de44e 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -8,6 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-28 23:40+0100\n" ======= @@ -18,6 +19,10 @@ msgstr "" ======= "PO-Revision-Date: 2011-10-28 23:40+0100\n" >>>>>>> Update french translation. +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-12-20 18:42+0100\n" +>>>>>>> Update Hungarian and Turkish translations. "Last-Translator: Pascal\n" "Language-Team: \n" "Language: French\n" @@ -51,16 +56,17 @@ 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\" n'est pas un fichier GCM/ISO valide, ou n'est pas une ISO GC/Wii." +msgstr "" +"\"%s\" n'est pas un fichier GCM/ISO valide, ou n'est pas une ISO GC/Wii." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:193 #, c-format msgid "%1$sCopy%1$s" msgstr "%1$sCopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -106,7 +112,8 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s n'a pas pu être chargé en tant que carte mémoire.\n" -"Le fichier n'est pas assez grand pour être un fichier de carte mémoire valide (0x%x octets)" +"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:367 #, c-format @@ -187,11 +194,11 @@ msgstr "Gestionnaire de &cheats" msgid "&DSP Settings" msgstr "Paramètres &DSP (audio)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 msgid "&Delete ISO..." msgstr "&Supprimer l'ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 msgid "&Delete selected ISOs..." msgstr "&Supprimer les ISO sélectionnés" @@ -255,7 +262,7 @@ msgstr "&Pause" msgid "&Play" msgstr "&Démarrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 msgid "&Properties" msgstr "&Propriétés" @@ -299,7 +306,7 @@ msgstr "&Affichage" msgid "&Wiimote Settings" msgstr "Paramètres de la &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 msgid "&Wiki" msgstr "&Wiki" @@ -348,11 +355,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "" msgstr "" @@ -378,11 +384,13 @@ msgstr "" msgid "" "ALERT:\n" "\n" -"NetPlay will currently only work properly when using the following settings:\n" +"NetPlay will currently only work properly when using the following " +"settings:\n" " - Dual Core [OFF]\n" " - Audio Throttle [OFF]\n" " - DSP-HLE with \"Null Audio\" or DSP-LLE\n" -" - Manually set the exact number of controllers that will be used to [Standard Controller]\n" +" - Manually set the exact number of controllers that will be used to " +"[Standard Controller]\n" "\n" "All players should try to use the same Dolphin version and settings.\n" "Disable all memory cards or send them to all players before starting.\n" @@ -396,16 +404,19 @@ msgstr "" " - 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" +" - Spécifier manuellement le nombre de contôleurs qui seront utilisés dans " +"[Contrôleur standard]\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" +"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" "\n" "Vous devez indiquer le port TCP à l'hôte !!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "AM-Baseboard" msgstr "AM-Baseboard" @@ -440,17 +451,18 @@ msgstr "Emulation fidèle VBeam" >>>>>>> Update french translation. msgid "" "Accurately emulate EFB copies.\n" -"Some games depend on this for certain graphical effects or gameplay functionality.\n" +"Some games depend on this for certain graphical effects or gameplay " +"functionality.\n" "\n" "If unsure, check EFB to Texture instead." msgstr "" "Emule fidèlement les copies d'EFB.\n" -"Certains jeux requièrent ceci pour certains effets graphiques ou fonctionnalités dans le jeu.\n" +"Certains jeux requièrent ceci pour certains effets graphiques ou " +"fonctionnalités dans le jeu.\n" "\n" "Dans le doute, cochez plutôt EFB vers texture." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "Action" @@ -471,33 +483,51 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le code Ajout (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "" +"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le " +"code Ajout (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:756 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" -msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le code Remplir et déplacer (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " +"(%s)" +msgstr "" +"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le " +"code Remplir et déplacer (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:549 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" -msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans l'écriture de la RAM et Remplir (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " +"Fill (%s)" +msgstr "" +"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans " +"l'écriture de la RAM et Remplir (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:609 #, c-format -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 vers Pointeur (%s)" +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 " +"vers Pointeur (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" -msgstr "Erreur Action Replay : Valeur non valide (%08x) dans la Copie de mémoire (%s)" +msgstr "" +"Erreur Action Replay : Valeur non valide (%08x) dans la Copie de mémoire (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" +msgid "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "" +"Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -533,11 +563,11 @@ msgstr "Carte :" msgid "Add" msgstr "Ajouter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 msgid "Add ActionReplay Code" msgstr "Ajouter un code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 msgid "Add Patch" msgstr "Ajouter un patch" @@ -545,6 +575,7 @@ msgstr "Ajouter un patch" msgid "Add new pane" msgstr "Ajouter un nouveau panneau" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -554,6 +585,11 @@ msgstr "Ajouter un nouveau panneau" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update Hungarian and Turkish translations. msgid "Add..." msgstr "Ajouter..." @@ -565,14 +601,16 @@ msgstr "Adresse :" msgid "" "Adds the specified value to zFar Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " +"the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" "Ajoute la valeur spécifiée au paramètre zFar.\n" "Il y a 2 façons d'indiquer les valeurs en virgule flottante.\n" -"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, la valeur retenue sera \"0.0002\".\n" +"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, " +"la valeur retenue sera \"0.0002\".\n" "Valeurs : (0->+/- Integer) ou (0->+/-FP[précision à 6 chiffres])\n" "\n" "NOTE: Consultez LogWindow/Console pour les valeurs acquises." @@ -581,27 +619,30 @@ msgstr "" msgid "" "Adds the specified value to zNear Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " +"the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" "Ajoute la valeur spécifiée au paramètre zNear.\n" "Il y a 2 façons d'indiquer les valeurs en virgule flottante.\n" -"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, la valeur retenue sera \"0.0002\".\n" +"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, " +"la valeur retenue sera \"0.0002\".\n" "Valeurs : (0->+/- Integer) ou (0->+/-FP[précision à 6 chiffres])\n" "\n" "NOTE: Consultez LogWindow/Console pour les valeurs acquises." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "Ajuste le contrôle analogique de pression requise pour activer les boutons." +msgstr "" +"Ajuste le contrôle analogique de pression requise pour activer les boutons." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Avancé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 msgid "Advanced Settings" msgstr "Paramètres avancés" @@ -609,14 +650,15 @@ msgstr "Paramètres avancés" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tous les fichiers GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Toutes les images GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -624,28 +666,34 @@ msgstr "Tous les fichiers GameCube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update Hungarian and Turkish translations. msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 msgid "All Wii ISO files (iso)" msgstr "Tous les fichiers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "All files (*.*)|*.*" msgstr "Tous les fichiers (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Permet d'activer certaines options via les raccourcis clavier 3, 4, 5, 6 et 7 dans la fenêtre d'émulation.\n" +"Permet d'activer certaines options via les raccourcis clavier 3, 4, 5, 6 et " +"7 dans la fenêtre d'émulation.\n" "\n" "Dans le doute, décochez cette case." @@ -680,7 +728,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "Apploader:" msgstr "Apploader :" @@ -694,11 +742,12 @@ msgid "" "\n" "If unsure, select (off)." msgstr "" -"Appliquer un effet de post-processing après avoir fini le rendu d'une image.\n" +"Appliquer un effet de post-processing après avoir fini le rendu d'une " +"image.\n" "\n" "Dans le doute, sélectionnez (aucun)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "Arabic" msgstr "Arabe" @@ -707,7 +756,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -715,15 +764,21 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ces fichiers ?\n" "Ils seront définitivement supprimés !" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 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 !" +msgstr "" +"Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé " +"définitivement !" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -732,11 +787,11 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Audio Backend:" msgstr "Moteur audio :" @@ -744,11 +799,15 @@ msgstr "Moteur audio :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -782,8 +841,10 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Génère automatiquement des mipmaps plutôt que de les décoder depuis la mémoire.\n" -"Améliore un peu les performances mais peut provoquer des défauts mineurs de texture.\n" +"Génère automatiquement des mipmaps plutôt que de les décoder depuis la " +"mémoire.\n" +"Améliore un peu les performances mais peut provoquer des défauts mineurs de " +"texture.\n" "\n" "Dans le doute, cochez cette case." @@ -791,7 +852,7 @@ msgstr "" msgid "Back" msgstr "Retour" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Backend Settings" msgstr "Paramètres de l'interface audio" @@ -801,7 +862,7 @@ msgid "Backend:" msgstr "Moteur :" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 msgid "Background Input" msgstr "Entrée en arrière-plan" @@ -814,15 +875,15 @@ msgid "Bad File Header" msgstr "Mauvaise entête de fichier" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 msgid "Banner" msgstr "Bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 msgid "Banner Details" msgstr "Détails de la bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Banner:" msgstr "Bannière :" @@ -834,7 +895,7 @@ msgstr "Barre" msgid "Basic" msgstr "Paramètres de base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Basic Settings" msgstr "Paramètres de base" @@ -844,7 +905,9 @@ msgstr "Basse" #: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" -msgstr "Echec de la vérification de la somme de contrôle de la Table d'Allocation de Blocs" +msgstr "" +"Echec de la vérification de la somme de contrôle de la Table d'Allocation de " +"Blocs" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Blocks" @@ -864,10 +927,14 @@ msgstr "Bleu Droite" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update Hungarian and Turkish translations. msgid "Bottom" msgstr "Bas" @@ -876,7 +943,7 @@ msgstr "Bas" msgid "Bound Controls: %lu" msgstr "Contrôles liés : %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "Broken" msgstr "Corrompu" @@ -884,7 +951,7 @@ msgstr "Corrompu" msgid "Browse" msgstr "Parcourir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 msgid "Browse for a directory to add" msgstr "Choisir un dossier à ajouter" @@ -892,7 +959,7 @@ msgstr "Choisir un dossier à ajouter" msgid "Browse for an ISO directory..." msgstr "Rechercher un dossier contenant des ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 msgid "Browse for output directory" msgstr "Parcourir un dossier de destination" @@ -900,11 +967,15 @@ msgstr "Parcourir un dossier de destination" msgid "Buffer:" msgstr "Buffer :" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -914,11 +985,11 @@ msgstr "Boutons" msgid "C Stick" msgstr "Stick-C" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 msgid "C-Stick" msgstr "Stick-C" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "CPU Emulator Engine" msgstr "Moteur d'émulation du CPU" @@ -929,12 +1000,17 @@ msgstr "Cache des listes d'affichage" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel depth calculations are necessary to properly emulate a small number of games.\n" +"In contrast to pixel lighting (which is merely an enhancement), per-pixel " +"depth calculations are necessary to properly emulate a small number of " +"games.\n" "\n" "If unsure, leave this checked." msgstr "" -"Calcule la profondeur par pixel des valeurs des graphiques 3D plutôt que par vertex.\n" -"Contrairement à l'éclairage par pixel (qui est une bonne amélioration), les calculs de profondeur par pixel sont nécessaires pour émuler correctement un petit nombre de jeux.\n" +"Calcule la profondeur par pixel des valeurs des graphiques 3D plutôt que par " +"vertex.\n" +"Contrairement à l'éclairage par pixel (qui est une bonne amélioration), les " +"calculs de profondeur par pixel sont nécessaires pour émuler correctement un " +"petit nombre de jeux.\n" "\n" "Dans le doute, cochez cette case." @@ -947,8 +1023,10 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Calcule la lumière des graphiques 3D par pixel et non par vertex.\n" -"Diminue la vitesse d'émulation de quelques pourcents (en fonction de votre GPU).\n" -"Cette amélioration est plutôt sûre, mais peut parfois provoquer quelques pépins.\n" +"Diminue la vitesse d'émulation de quelques pourcents (en fonction de votre " +"GPU).\n" +"Cette amélioration est plutôt sûre, mais peut parfois provoquer quelques " +"pépins.\n" "\n" "Dans le doute, décochez cette case." @@ -964,11 +1042,16 @@ msgstr "Annuler" msgid "Cannot open %s" msgstr "Impossible d'ouvrir %s" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 +msgid "Cannot record movies in read-only mode." +msgstr "Impossible d'enregistrer des films en mode Lecture seule." + #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" -msgstr "Impossible de désenregistrer des évènements alors qu'il y en a en attente." +msgstr "" +"Impossible de désenregistrer des évènements alors qu'il y en a en attente." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -979,7 +1062,7 @@ msgstr "" "%s\n" "n'est pas un fichier de carte mémoire GameCube valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -990,7 +1073,8 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -msgstr "Impossible de trouver la Wiimote par bd : %02x:%02x:%02x:%02x:%02x:%02x" +msgstr "" +"Impossible de trouver la Wiimote par bd : %02x:%02x:%02x:%02x:%02x:%02x" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872 #, c-format @@ -1002,13 +1086,14 @@ msgstr "Impossible de trouver la Wiimote par le gestionnaire de connexion %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" -msgstr "Impossible de lire à partir de DVD_Plugin - DVD-Interface : Erreur fatale" +msgstr "" +"Impossible de lire à partir de DVD_Plugin - DVD-Interface : Erreur fatale" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:49 msgid "Caps Lock" msgstr "Verr Maj" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Catalan" msgstr "Catalan" @@ -1025,7 +1110,6 @@ msgid "Change &Disc..." msgstr "&Changer de disque..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "Changer de disque" @@ -1033,7 +1117,7 @@ msgstr "Changer de disque" msgid "Change Game" msgstr "Changer de Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1049,8 +1133,8 @@ 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 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Changing this will have no effect while the emulator is running!" msgstr "Changer ceci n'aura aucun effet durant l'émulation !" @@ -1070,31 +1154,31 @@ msgstr "Rechercher un cheat" msgid "Cheats Manager" msgstr "Gestionnaire de Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Chinese (Simplified)" msgstr "Chinois (simplifié)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Traditional)" msgstr "Chinois (traditionnel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "Choose a DVD root directory:" msgstr "Choisir un dossier racine pour le DVD :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a NAND root directory:" msgstr "Choisir un dossier racine pour la NAND :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Choose a default ISO:" msgstr "Choisir un ISO par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 msgid "Choose a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 msgid "Choose a file to open" msgstr "Choisir un fichier à ouvrir" @@ -1102,25 +1186,32 @@ msgstr "Choisir un fichier à ouvrir" msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "Choisir un fichier comme apploader : (uniquement pour les disques créés à " "partir de dossiers)" +<<<<<<< HEAD ======= msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" msgstr "Choisir un fichier comme apploader : (uniquement pour les disques créés à partir de dossiers)" >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 msgid "Choose the folder to extract to" msgstr "Choisir le dossier de destination de l'extraction" @@ -1139,21 +1230,29 @@ msgstr "Classique" msgid "Clear" msgstr "Effacer" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:173 msgid "Clear failed." msgstr "Echec de l'éffacement" #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." -msgstr "Le client s'est déconnecté alors que le jeu est en cours !! NetPlay est désactivé. Vous devez arrêter le jeu manuellement." +msgid "" +"Client disconnect while game is running!! NetPlay is disabled. You must " +"manually stop the game." +msgstr "" +"Le client s'est déconnecté alors que le jeu est en cours !! NetPlay est " +"désactivé. Vous devez arrêter le jeu manuellement." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fermer" @@ -1178,20 +1277,20 @@ msgstr "Commande" msgid "Comment" msgstr "Commentaire" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Comment:" msgstr "Commentaire :" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 msgid "Compress ISO..." msgstr "Compresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 msgid "Compress selected ISOs..." msgstr "Compresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 msgid "Compressing ISO" msgstr "Compression de l'ISO" @@ -1218,13 +1317,13 @@ msgstr "Configurer les manettes" msgid "Configure..." msgstr "Configurer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 msgid "Confirm File Overwrite" msgstr "Confirmer l'écrasement du fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 msgid "Confirm on Stop" msgstr "Confirmer l'arrêt de l'émulation" @@ -1233,7 +1332,7 @@ msgstr "Confirmer l'arrêt de l'émulation" msgid "Connect" msgstr "Connecter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Connect USB Keyboard" msgstr "Connecter le clavier USB" @@ -1243,30 +1342,30 @@ msgid "Connect Wiimote %i" msgstr "Connecter la Wiimote %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "Connecter la 1ère Wiimote" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "Connecter la 2è Wiimote" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "Connecter la 3è Wiimote" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "Connecter la 4è Wiimote" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update Hungarian and Turkish translations. msgid "Connecting..." msgstr "Connexion..." @@ -1291,7 +1390,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:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Core" msgstr "Core" @@ -1307,15 +1406,22 @@ msgstr "Impossible d'initialiser le moteur %s." #: 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 backup. Please note that original Gamecube and Wii discs cannot be read by most PC DVD drives." -msgstr "Impossible de lire \"%s\". Il n'y a pas de disque dans le lecteur, ou ce n'est pas un backup GC/Wii. Veuillez noter que les disques originaux de GameCube et Wii ne peuvent pas être plus par la plupart des lecteurs DVD sur PC." +msgid "" +"Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " +"backup. Please note that original Gamecube and Wii discs cannot be read by " +"most PC DVD drives." +msgstr "" +"Impossible de lire \"%s\". Il n'y a pas de disque dans le lecteur, ou ce " +"n'est pas un backup GC/Wii. Veuillez noter que les disques originaux de " +"GameCube et Wii ne peuvent pas être plus par la plupart des lecteurs DVD sur " +"PC." #: 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:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 #, c-format msgid "Could not save %s" msgstr "Impossible de sauvegarder %s" @@ -1325,21 +1431,25 @@ 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)" +"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 "" "Could not write memory card file %s.\n" "\n" -"Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?" +"Are you running Dolphin from a CD/DVD, or is the save file maybe write " +"protected?" msgstr "" "Impossible d'écrire le fichier de carte mémoire %s.\n" "\n" -"Exécutez-vous Dolpin à partir d'un CD/DVD, ou le fichier de sauvegarde est peut-être protégé contré l'écriture ?" +"Exécutez-vous Dolpin à partir d'un CD/DVD, ou le fichier de sauvegarde est " +"peut-être protégé contré l'écriture ?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossible de trouver la commande d'ouverture pour l'extension 'ini' !" @@ -1356,7 +1466,7 @@ msgstr "" msgid "Count:" msgstr "Nombre :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Country:" msgstr "Pays :" @@ -1370,30 +1480,37 @@ msgstr "Créer un code AR" msgid "Create new perspective" msgstr "Créer une nouvelle perspective" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "Created by KDE-Look.org" msgstr "Créé par KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +<<<<<<< HEAD ======= msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "Created by VistaIcons.com" msgstr "Créé par VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Créé par black_rider et publié sur ForumW.org > Web Developments" @@ -1428,7 +1545,7 @@ msgstr "Crossfade" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Le dossier actuel a été changé de %s en %s après wxFileSelector !" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "Custom Projection Hack" msgstr "Hack de projection personnalisé" @@ -1436,15 +1553,15 @@ msgstr "Hack de projection personnalisé" msgid "Custom Projection Hack Settings" msgstr "Paramètres du hack de projection personnalisé" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Customize some Orthographic Projection parameters." msgstr "Personnalise certains paramètres de projection orthographique." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Czech" msgstr "Tchèque" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "D-Pad" msgstr "Pad numérique" @@ -1452,28 +1569,32 @@ msgstr "Pad numérique" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update Hungarian and Turkish translations. msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE interpreter (slow)" msgstr "Interpréteur du DSP en LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP LLE on Thread" msgstr "DSP LLE sur thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP LLE recompiler" msgstr "Recompilateur du DSP en LLE" @@ -1481,7 +1602,7 @@ msgstr "Recompilateur du DSP en LLE" msgid "DSP settings" msgstr "Paramètres DSP (audio)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 msgid "DVD Root:" msgstr "Racine du DVD :" @@ -1489,7 +1610,7 @@ msgstr "Racine du DVD :" msgid "Data Size" msgstr "Taille des données" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Date:" msgstr "Date :" @@ -1518,16 +1639,16 @@ msgstr "Débug" msgid "Decimal" msgstr "Décimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 msgid "Decompress ISO..." msgstr "Décompresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "Decompress selected ISOs..." msgstr "Décompresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 msgid "Decompressing ISO" msgstr "Décompression de l'ISO" @@ -1535,7 +1656,7 @@ msgstr "Décompression de l'ISO" msgid "Default" msgstr "Par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 msgid "Default ISO:" msgstr "ISO par défaut :" @@ -1567,16 +1688,20 @@ msgstr "Détecter" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." -msgstr "Détecté que le DVD a essayé de lire plus de données que ce que peut contenir le buffer de sortie." +msgid "" +"Detected attempt to read more data from the DVD than fit inside the out " +"buffer. Clamp." +msgstr "" +"Détecté que le DVD a essayé de lire plus de données que ce que peut contenir " +"le buffer de sortie." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 msgid "Device" msgstr "Appareil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 msgid "Device Settings" msgstr "Paramètres de la console virtuelle" @@ -1624,24 +1749,30 @@ msgstr "Désactiver les textures" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" -"Speeds up emulation a lot but causes heavy glitches in many games which rely on them (especially homebrew applications).\n" +"Speeds up emulation a lot but causes heavy glitches in many games which rely " +"on them (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Désactive l'émulation des XFB.\n" -"Accélère beaucoup l'émulation mais provoque de gros pépins dans les nombreux jeux s'appuyant dessus (particulièrement les applications homebrew).\n" +"Accélère beaucoup l'émulation mais provoque de gros pépins dans les nombreux " +"jeux s'appuyant dessus (particulièrement les applications homebrew).\n" "\n" "Dans le doute, cochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" -"These are often used for post-processing or render-to-texture effects, so while checking this setting gives a great speedup it almost always also causes issues.\n" +"These are often used for post-processing or render-to-texture effects, so " +"while checking this setting gives a great speedup it almost always also " +"causes issues.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Désactive l'émulation de copies d'EFB.\n" -"Elles sont souvent utilisées pour du post-processing ou des effets de rendu sur texture, donc cocher cette case va beaucoup accélérer l'émulation mais aussi provoquer des pépins.\n" +"Elles sont souvent utilisées pour du post-processing ou des effets de rendu " +"sur texture, donc cocher cette case va beaucoup accélérer l'émulation mais " +"aussi provoquer des pépins.\n" "\n" "Dans le doute, décochez cette case." @@ -1655,7 +1786,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Disc" msgstr "Disque" @@ -1682,15 +1813,19 @@ msgstr "" msgid "Divide" msgstr "Diviser" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update Hungarian and Turkish translations. msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 msgid "Dolphin" msgstr "Dolphin" @@ -1715,6 +1850,7 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1730,6 +1866,14 @@ msgstr "Configuration de la manette GC pour Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Configuration de la manette GC pour Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update Hungarian and Turkish translations. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -1741,18 +1885,23 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des " "fichiers..." +<<<<<<< HEAD ======= msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." msgstr "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des fichiers..." @@ -1764,16 +1913,23 @@ msgstr "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher d #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour " "afficher tous les jeux..." +<<<<<<< HEAD ======= msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." msgstr "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour afficher tous les jeux..." >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -1797,7 +1953,7 @@ msgstr "Percussions" msgid "Dummy" msgstr "Factice" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Dump Audio" msgstr "Enregistrer le son" @@ -1819,7 +1975,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Copier toutes les images rendues (calculées) dans un fichier AVI dans User/Dump/Frames/\n" +"Copier toutes les images rendues (calculées) dans un fichier AVI dans User/" +"Dump/Frames/\n" "\n" "Dans le doute, décochez cette case." @@ -1843,6 +2000,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1852,6 +2010,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update Hungarian and Turkish translations. msgid "Dutch" msgstr "Néerlandais" @@ -1865,8 +2028,16 @@ msgstr "Copies de l'EFB" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, c-format -msgid "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least version %d.%d -- If you recently upgraded your Dolphin distribution, a reboot is probably required at this point to get Windows to see the new driver." -msgstr "ERREUR : cette version de Dolphin requiert un pilote TAP-Win32 qui ait au moins la version %d.%d -- Si vous avez récemment mis à niveau votre distribution de Dolphin, un redémarrage est probablement nécessaire pour que Windows charge le nouveau pilote." +msgid "" +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"version %d.%d -- If you recently upgraded your Dolphin distribution, a " +"reboot is probably required at this point to get Windows to see the new " +"driver." +msgstr "" +"ERREUR : cette version de Dolphin requiert un pilote TAP-Win32 qui ait au " +"moins la version %d.%d -- Si vous avez récemment mis à niveau votre " +"distribution de Dolphin, un redémarrage est probablement nécessaire pour que " +"Windows charge le nouveau pilote." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -1896,8 +2067,8 @@ msgstr "Editer le patch" msgid "Edit current perspective" msgstr "Modifier la perspective actuelle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 msgid "Edit..." msgstr "Editer..." @@ -1909,38 +2080,45 @@ msgstr "Effets" msgid "Embedded Frame Buffer" msgstr "Buffer d'image embarqué" -#: Source/Core/Core/Src/Core.cpp:174 +#: Source/Core/Core/Src/Core.cpp:173 msgid "Emu Thread already running" msgstr "Thread d'émulation déjà en cours d'exécution" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" -"Slows down emulation a lot and prohibits high-resolution rendering but is necessary to emulate a number of games properly.\n" +"Slows down emulation a lot and prohibits high-resolution rendering but is " +"necessary to emulate a number of games properly.\n" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" "Emule 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" +"Ralentit beaucoup l'émulation et empêche le rendu en haute résolution, mais " +"est nécessaire pour émuler certains jeux correctement.\n" "\n" "Dans le doute, sélectionnez plutôt Virtuel." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" -"Fixes many games which don't work without XFB emulation while not being as slow as real XFB emulation. However, it may still fail for a lot of other games (especially homebrew applications).\n" +"Fixes many games which don't work without XFB emulation while not being as " +"slow as real XFB emulation. However, it may still fail for a lot of other " +"games (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Emule 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" +"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" "Dans le doute, sélectionnez cette case." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 msgid "Emulated Wiimote" msgstr "Wiimote émulée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "Emulation State: " msgstr "Etat de l'émulation :" @@ -1950,13 +2128,15 @@ msgstr "Activer" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" -"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\n" +"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " +"supported by your GPU.\n" "Possibly causes issues.\n" "Requires fullscreen to work.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Active les effets 3D via la stéréoscopie en utilisant la technologie nVidia 3D Vision, si elle est prise en charge par votre GPU.\n" +"Active les effets 3D via la stéréoscopie en utilisant la technologie nVidia " +"3D Vision, si elle est prise en charge par votre GPU.\n" "Peut provoquer des pépins.\n" "Ne fonctionne qu'en plein écran.\n" "\n" @@ -1966,7 +2146,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activer la journalisation AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "Enable Audio Throttle" msgstr "Activer le contrôle audio" @@ -1978,6 +2158,7 @@ msgstr "Activer BAT" msgid "Enable Block Merging" msgstr "Activer l'assemblage de blocs" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -1985,19 +2166,25 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activer le cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update Hungarian and Turkish translations. msgid "Enable Cheats" msgstr "Activer les Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 msgid "Enable DTK Music" msgstr "Activer la musique DTK" @@ -2005,7 +2192,7 @@ msgstr "Activer la musique DTK" msgid "Enable Dual Core" msgstr "Activer le Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Enable Dual Core (speedup)" msgstr "Activer le Dual Core (plus rapide)" @@ -2017,7 +2204,7 @@ msgstr "Activer les touches de raccourci" msgid "Enable Idle Skipping" msgstr "Activer le saut d'inactivité" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Enable Idle Skipping (speedup)" msgstr "Activer le saut d'inactivité (plus rapide)" @@ -2030,7 +2217,7 @@ msgstr "Activer le MMU" msgid "Enable Progressive Scan" msgstr "Activer le Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 msgid "Enable Screen Saver" msgstr "Activer l'économiseur d'écran" @@ -2051,14 +2238,19 @@ msgid "" "If unsure, select 1x." msgstr "" "Active le filtrage anisotropique.\n" -"Améliore la qualité visuelle des textures qui ont des angles de vue obliques.\n" +"Améliore la qualité visuelle des textures qui ont des angles de vue " +"obliques.\n" "Peut provoquer des soucis pour un petit nombre de jeux.\n" "\n" "Dans le doute, sélectionnez 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" -msgstr "Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, ARRÊT = Compatible)" +msgid "" +"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " +"Compatible)" +msgstr "" +"Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, " +"ARRÊT = Compatible)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Enable pages" @@ -2071,43 +2263,59 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Sélectionnez ceci si vous souhaitez que le rendu se fasse sur l'intégralité de l'écran.\n" +"Sélectionnez ceci si vous souhaitez que le rendu se fasse sur l'intégralité " +"de l'écran.\n" "Si cette case est décochée, une fenêtre de rendu sera créée.\n" "\n" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" -"Enable this if you want to use the main Dolphin window for rendering rather than a separate render window.\n" +"Enable this if you want to use the main Dolphin window for rendering rather " +"than a separate render window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Cochez cette case si vous souhaitez que la fenêtre principale de Dolphin soit utilisée pour le rendu, plutôt qu'une fenêtre séparée.\n" +"Cochez cette case si vous souhaitez que la fenêtre principale de Dolphin " +"soit utilisée pour le rendu, plutôt qu'une fenêtre séparée.\n" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. " "Désactiver pour TOUS les autres jeux." +<<<<<<< HEAD ======= msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." msgstr "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. Désactiver pour TOUS les autres jeux." >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 -msgid "Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)" -msgstr "Activer la traduction de bloc d'adresse (BAT), une fonctionnalité de l'unité de gesiton de mémoire. Fidèle au matériel de la console, mais lent à émuler. (ON = Compatible, OFF = Rapide)" +msgid "" +"Enables Block Address Translation (BAT); a function of the Memory Management " +"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " +"Fast)" +msgstr "" +"Activer la traduction de bloc d'adresse (BAT), une fonctionnalité de l'unité " +"de gesiton de mémoire. Fidèle au matériel de la console, mais lent à émuler. " +"(ON = Compatible, OFF = Rapide)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 msgid "Enables Custom Projection Hack" msgstr "Active un hack de projection personnalisé" @@ -2124,8 +2332,12 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" -msgstr "Activer le Memory Management Unit (unité de gestion de la mémoire), requis pour certains jeux. (ON = Compatible, OFF = Vitesse)" +msgid "" +"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " +"OFF = Fast)" +msgstr "" +"Activer le Memory Management Unit (unité de gestion de la mémoire), requis " +"pour certains jeux. (ON = Compatible, OFF = Vitesse)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" @@ -2141,6 +2353,7 @@ msgstr "" msgid "End" msgstr "Fin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2150,6 +2363,11 @@ msgstr "Fin" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update Hungarian and Turkish translations. msgid "English" msgstr "Anglais" @@ -2179,6 +2397,7 @@ msgstr "Egal" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erreur" @@ -2207,22 +2426,40 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Erreur" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/DolphinWX/Src/Main.cpp:346 +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 " +"défaut du système." +>>>>>>> Update Hungarian and Turkish translations. + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 #, c-format <<<<<<< HEAD +<<<<<<< HEAD msgid "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +msgid "" +>>>>>>> Update Hungarian and Turkish translations. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" "Erreur : essai d'accès aux polices %s mais elles ne sont pas chargées. Les " "jeux peuvent ne pas afficher les polices correctement, ou planter." +<<<<<<< HEAD ======= msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." msgstr "Erreur : essai d'accès aux polices %s mais elles ne sont pas chargées. Les jeux peuvent ne pas afficher les polices correctement, ou planter." >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2235,7 +2472,8 @@ msgstr "Euphorie" #: Source/Core/Core/Src/MemTools.cpp:214 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" -msgstr "Erreur d'exception : accès à un espace en-dessous de la mémoire. %08llx%08llx" +msgstr "" +"Erreur d'exception : accès à un espace en-dessous de la mémoire. %08llx%08llx" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Execute" @@ -2249,12 +2487,11 @@ msgstr "Quitter Dolphin avec l'émulateur" msgid "Export Failed" msgstr "Echec de l'exportation" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 msgid "Export File" msgstr "Exporter un fichier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Exporter l'enregistrement..." @@ -2266,7 +2503,7 @@ msgstr "Exporter l'enregistrement..." msgid "Export Save" msgstr "Exporter une sauvegarde" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 msgid "Export Wii save (Experimental)" msgstr "Exporter une sauvegarde Wii (expérimental)" @@ -2298,44 +2535,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract All Files..." msgstr "Extraire tous les fichiers..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract Apploader..." msgstr "Extraire l'Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 msgid "Extract DOL..." msgstr "Extraire le DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Directory..." msgstr "Extraire un dossier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract File..." msgstr "Extraire un fichier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 msgid "Extract Partition..." msgstr "Extraire une partition..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 #, c-format msgid "Extracting %s" msgstr "Extraction de %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 msgid "Extracting All Files" msgstr "Extraction de tous les fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 msgid "Extracting Directory" msgstr "Extraction du dossier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 msgid "Extracting..." msgstr "Extraction..." @@ -2351,7 +2588,7 @@ msgstr "Lecteur FIFO" msgid "FRANCE" msgstr "France" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "FST Size:" msgstr "Taille FST :" @@ -2367,7 +2604,7 @@ msgstr "Ecoute impossible !" msgid "Failed to download codes." msgstr "Impossible de télécharger les codes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 #, c-format msgid "Failed to extract to %s!" msgstr "Impossible d'extraire vers %s !" @@ -2390,7 +2627,8 @@ msgstr "" "Il n'est pas fourni avec Dolphin pour des raisons de copyright.\n" "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" +"Vous pouvez utiliser le moteur DSP HLE à la place, celui-ci ne requiert pas " +"d'extration de ROM.\n" "(Sélectionnez-le depuis l'onglet \"Audio\" dans la fenêtre de configuration.)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:99 @@ -2412,7 +2650,8 @@ msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -"Impossible de lire correctement la sauvegarde de la table d'allocation des blocs\n" +"Impossible de lire correctement la sauvegarde de la table d'allocation des " +"blocs\n" "(0x8000-0x9FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:144 @@ -2542,11 +2781,11 @@ msgstr "Fichier non compressé" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO : mode d'ouverture inconnu : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Filesystem" msgstr "Système de fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !" @@ -2566,7 +2805,7 @@ msgstr "Forcer 16/9è" msgid "Force 4:3" msgstr "Forcer 4/3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Force Console as NTSC-J" msgstr "Forcer la console comme NTSC-J" @@ -2582,7 +2821,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Force le filtrage de texture, même si le jeu l'a explicitement désactivé.\n" -"Améliore légèrement la qualité des textures, mais peut provoquer des pépins dans certains jeux.\n" +"Améliore légèrement la qualité des textures, mais peut provoquer des pépins " +"dans certains jeux.\n" "\n" "Dans le doute, décochez cette case." @@ -2593,18 +2833,21 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Force le jeu à sortir des graphiques pour les écrans larges (16/9è, 16/10è).\n" +"Force le jeu à sortir des graphiques pour les écrans larges (16/9è, " +"16/10è).\n" "Provoque des pépins graphiques dans certains jeux.\n" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" -"Left unchecked, dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games." +"Left unchecked, dolphin defaults to NTSC-U and automatically enables this " +"setting when playing Japanese games." msgstr "" "Force le mode NTSC-J pour utiliser la police de la ROM japonaise.\n" -"Si cette case est décochée, Dolphin sera par défaut en NTSC-U et activera automatiquement cette option lorsque des jeux japonais seront lancés." +"Si cette case est décochée, Dolphin sera par défaut en NTSC-U et activera " +"automatiquement cette option lorsque des jeux japonais seront lancés." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -2628,7 +2871,6 @@ msgid "Frame " msgstr "Image " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Avancement d'image" @@ -2644,7 +2886,7 @@ msgstr "Plage d'images :" msgid "Frame S&kipping" msgstr "Saut d'&image :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Framelimit:" msgstr "Image/s max :" @@ -2656,6 +2898,7 @@ msgstr "Images à enregistrer :" msgid "Free Look" msgstr "Vue libre" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2665,6 +2908,11 @@ msgstr "Vue libre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update Hungarian and Turkish translations. msgid "French" msgstr "Français" @@ -2689,16 +2937,19 @@ msgstr "Résolution en Plein écran :" msgid "GCI File(*.gci)" msgstr "Fichier GCI (*.gci)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 #, fuzzy msgid "GCMic Configuration" msgstr "Configuration de la journalisation" +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "Manette GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 msgid "Game ID:" msgstr "ID du jeu :" @@ -2714,7 +2965,7 @@ msgstr "Le jeu n'est pas en cours d'émulation !" msgid "Game not found!!" msgstr "Jeu non trouvé !!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 msgid "Game-Specific Settings" msgstr "Paramètres spécifiques au jeu" @@ -2722,7 +2973,7 @@ msgstr "Paramètres spécifiques au jeu" msgid "GameConfig" msgstr "Config du Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 msgid "Gamecube" msgstr "GameCube" @@ -2732,10 +2983,14 @@ msgstr "Paramètres de la &manette GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update Hungarian and Turkish translations. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" @@ -2759,11 +3014,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Général" @@ -2772,6 +3031,7 @@ msgstr "Général" msgid "General Settings" msgstr "Paramètres généraux" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2781,13 +3041,19 @@ msgstr "Paramètres généraux" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update Hungarian and Turkish translations. msgid "German" msgstr "Allemand" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, c-format 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" +msgstr "" +"GetARCode : l'index est plus grand que la taille de la liste de codes %lu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Graphics" @@ -2810,18 +3076,24 @@ msgstr "Plus grand que" ======= >>>>>>> Update french translation. msgid "" -"Greatly increases quality of textures generated using render to texture effects.\n" +"Greatly increases quality of textures generated using render to texture " +"effects.\n" "Raising the internal resolution will improve the effect of this setting.\n" -"Slightly decreases performance and possibly causes issues (although unlikely).\n" +"Slightly decreases performance and possibly causes issues (although " +"unlikely).\n" "\n" "If unsure, leave this checked." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Hungarian and Turkish translations. "Améliore significativement la qualité des textures générées en utilisant les " "effets de rendu vers texture.\n" "Le fait d'augmenter la résolution interne améliore l'impact de cette " "option.\n" <<<<<<< HEAD +<<<<<<< HEAD "Baisse légèrement les performances et peut provoquer quelques pépins (mais " "peu probable).\n" ======= @@ -2831,10 +3103,14 @@ msgstr "" "Le fait d'augmenter la résolution interne améliore l'impact de cette option.\n" "Baisse légèrement les performances et peut provoquer quelques pépins (mais peu probable).\n" >>>>>>> Update french translation. +======= +"Baisse légèrement les performances et peut provoquer quelques pépins (mais " +"peu probable).\n" +>>>>>>> Update Hungarian and Turkish translations. "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Greek" msgstr "Grèque" @@ -2866,7 +3142,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:299 msgid "Hebrew" msgstr "Hébreu" @@ -2889,8 +3165,10 @@ msgid "" msgstr "" "Bonjour,\n" "\n" -"Dolphin requiert que votre processeur prenne en charge les instructions SSE2.\n" -"Malheureusement, votre processeur ne les a pas, et donc Dolphin ne s'exécutera pas.\n" +"Dolphin requiert que votre processeur prenne en charge les instructions " +"SSE2.\n" +"Malheureusement, votre processeur ne les a pas, et donc Dolphin ne " +"s'exécutera pas.\n" "\n" "Sayonara !\n" @@ -2908,7 +3186,8 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Masquer le curseur de la souris s'il est au-dessus de la fenêtre d'émulation.\n" +"Masquer le curseur de la souris s'il est au-dessus de la fenêtre " +"d'émulation.\n" "\n" "Dans le doute, cochez cette case." @@ -2927,15 +3206,19 @@ msgstr "Configuration des raccourcis clavier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update Hungarian and Turkish translations. msgid "Hotkeys" msgstr "Raccourcis clavier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hungarian" msgstr "Hongrois" @@ -2946,16 +3229,20 @@ msgstr "Wiimote hybride" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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" +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:795 #, c-format msgid "" -"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available in your nand dump\n" +"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " +"in your nand dump\n" "TitleID %016llx.\n" " Dolphin will likely hang now" msgstr "" -"IOCTL_ES_LAUNCH : Le jeu a essayé de recharger ios ou un titre qui n'est pas disponible dans votre copie de la NAND\n" +"IOCTL_ES_LAUNCH : Le jeu a essayé de recharger ios ou un titre qui n'est pas " +"disponible dans votre copie de la NAND\n" "ID du titre : %016llx.\n" " Dolphin va probablement figer maintenant" @@ -2963,7 +3250,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - mauvaise destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 msgid "IPL Settings" msgstr "Paramètres IPL" @@ -2979,11 +3266,11 @@ msgstr "Pointeur IR" msgid "IR Sensitivity:" msgstr "Sensibilité de l'IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 msgid "ISO Details" msgstr "Détails de l'ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "ISO Directories" msgstr "Dossiers des ISO" @@ -2995,22 +3282,32 @@ msgstr "Italie" msgid "Icon" msgstr "Icône" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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 "" +"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)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +>>>>>>> Update Hungarian and Turkish translations. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." @@ -3018,10 +3315,13 @@ 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), vous devez aussi désactiver " "le contrôle audio dans le DSP pour que cela fonctionne." +<<<<<<< HEAD ======= msgid "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you also have to disable Audio Throttle in DSP to make it effective." 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), vous devez aussi désactiver le contrôle audio dans le DSP pour que cela fonctionne." >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3030,24 +3330,28 @@ msgstr "Ignorer les changements de formats" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" -"Improves performance in many games without any negative effect. Causes graphical defects in a small number of other games though.\n" +"Improves performance in many games without any negative effect. Causes " +"graphical defects in a small number of other games though.\n" "\n" "If unsure, leave this checked." msgstr "" "Ignore tous les changements du format d'EFB.\n" -"Améliore les performances dans la plupart des jeux sans effet négatif. Provoque des défauts graphiques dans un petit nombre de jeux.\n" +"Améliore les performances dans la plupart des jeux sans effet négatif. " +"Provoque des défauts graphiques dans un petit nombre de jeux.\n" "\n" "Dans le doute, cochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" -"Improves performance in some games, but might disable some gameplay-related features or graphical effects.\n" +"Improves performance in some games, but might disable some gameplay-related " +"features or graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Ignore les requêtes de lecture ou d'écriture vers l'EFB du CPU.\n" -"Améliore les performances dans certains jeux, mais peut désactiver certaines fonctionnalités de gameplay ou effets graphiques.\n" +"Améliore les performances dans certains jeux, mais peut désactiver certaines " +"fonctionnalités de gameplay ou effets graphiques.\n" "\n" "Dans le doute, décochez cette case." @@ -3081,11 +3385,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" -"Improves performance but causes glitches in most games which rely on proper fog emulation.\n" +"Improves performance but causes glitches in most games which rely on proper " +"fog emulation.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Améliore les performances mais peut causer de petits pépins dans les jeux s'appuyant sur une émulation de brouillard/fumée correcte.\n" +"Améliore les performances mais peut causer de petits pépins dans les jeux " +"s'appuyant sur une émulation de brouillard/fumée correcte.\n" "\n" "Dans le doute, décochez cette case." @@ -3095,11 +3401,12 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Améliore les performances, mais peut faire disparaître l'éclairage dans la plupart des jeux.\n" +"Améliore les performances, mais peut faire disparaître l'éclairage dans la " +"plupart des jeux.\n" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "In Game" msgstr "Dans le jeu" @@ -3128,7 +3435,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:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Insert SD Card" msgstr "Insérer une carte SD" @@ -3140,35 +3447,42 @@ msgstr "Indiquer un nom ici..." msgid "Install WAD" msgstr "Installer un WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 msgid "Install to Wii Menu" msgstr "Installer dans le menu Wii" #: Source/Core/Core/Src/MemTools.cpp:248 -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." +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." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update Hungarian and Turkish translations. msgid "Installing WAD..." msgstr "Installation du WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Interface Settings" msgstr "Paramètres de l'interface" -#: Source/Core/Core/Src/State.cpp:242 +#: Source/Core/Core/Src/State.cpp:192 msgid "Internal LZO Error - compression failed" msgstr "Erreur interne LZO - échec de la compression" -#: Source/Core/Core/Src/State.cpp:338 +#: Source/Core/Core/Src/State.cpp:292 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3177,7 +3491,7 @@ msgstr "" "Erreur interne LZO - échec de la décompression (%d) (%li, %li) \n" "Essayez de charger à nouveau l'état" -#: Source/Core/Core/Src/State.cpp:461 +#: Source/Core/Core/Src/State.cpp:390 msgid "Internal LZO Error - lzo_init() failed" msgstr "Erreur interne LZO - échec de lzo_init()" @@ -3185,11 +3499,11 @@ msgstr "Erreur interne LZO - échec de lzo_init()" msgid "Internal Resolution:" msgstr "Résolution interne :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 msgid "Interpreter (VERY slow)" msgstr "Interpréteur (TRES lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Intro" msgstr "Intro" @@ -3206,7 +3520,7 @@ msgstr "Valeur non valide !" msgid "Invalid bat.map or dir entry" msgstr "bar.map ou entrée dir non valide" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:534 #, c-format msgid "Invalid event type %i" msgstr "Type d'évènement non valide : %i" @@ -3226,14 +3540,15 @@ msgstr "" "%s\n" "Vous devriez copier à nouveau ce jeu." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:374 msgid "Invalid recording file" msgstr "Fichier d'enregitrement non valide" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:488 msgid "Invalid state" msgstr "Etat non valide" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3243,6 +3558,11 @@ msgstr "Etat non valide" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update Hungarian and Turkish translations. msgid "Italian" msgstr "Italien" @@ -3250,16 +3570,16 @@ msgstr "Italien" msgid "JAPAN" msgstr "Japon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "JIT Recompiler (recommended)" msgstr "Recompilateur JIT (recommandé) " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JITIL experimental recompiler" msgstr "Recompilateur expérimental JIT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Japanese" msgstr "Japonais" @@ -3268,17 +3588,16 @@ msgid "KOREA" msgstr "Corée" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "Touche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Korean" msgstr "Coréen" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 msgid "L" msgstr "L" @@ -3287,11 +3606,11 @@ msgid "L Button" msgstr "Bouton L" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "L-Analog" msgstr "L Analog." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Language:" msgstr "Langue :" @@ -3314,7 +3633,6 @@ msgid "Left Stick" msgstr "Stick Gauche" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3344,7 +3662,7 @@ msgstr "" msgid "Less Than" msgstr "Plus petit que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Limit by FPS" msgstr "Nb de FPS comme limite" @@ -3357,42 +3675,34 @@ msgid "Load Custom Textures" msgstr "Charger textures personnalisées" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" msgstr "Charger l'état du Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" msgstr "Charger l'état du Slot 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" msgstr "Charger l'état du Slot 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 4" msgstr "Charger l'état du Slot 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 msgid "Load State Slot 5" msgstr "Charger l'état du Slot 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Load State Slot 6" msgstr "Charger l'état du Slot 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Load State Slot 7" msgstr "Charger l'état du Slot 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "Charger l'état du Slot 8" @@ -3400,6 +3710,7 @@ msgstr "Charger l'état du Slot 8" msgid "Load State..." msgstr "Charger un état..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3413,6 +3724,13 @@ msgstr "Charger le Menu Système Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Charger le Menu Système Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update Hungarian and Turkish translations. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" @@ -3429,7 +3747,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:49 msgid "Load preset values from hack patterns available." -msgstr "Charger les valeurs de pré-réglage à partir de la palette de hack disponibles." +msgstr "" +"Charger les valeurs de pré-réglage à partir de la palette de hack " +"disponibles." #: Source/Core/DolphinWX/Src/Main.cpp:134 msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" @@ -3439,7 +3759,7 @@ msgstr "Charge le fichier spécifié (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Lock Threads to Cores" msgstr "Verrouiller les threads aux coeurs" @@ -3494,20 +3814,24 @@ msgstr "Hack de vitesse pour le MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Fichiers MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Maker ID:" msgstr "ID concepteur :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Maker:" msgstr "Concepteur :" @@ -3530,16 +3854,24 @@ msgstr "Octet mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update Hungarian and Turkish translations. msgid "Memory Card" msgstr "Carte mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" -msgstr "Gestionnaire de cartes mémoires | ATTENTION : Faites des sauvegardes avant utilisation, devrait être OK mais corruption possible de données !" +msgid "" +"Memory Card Manager WARNING-Make backups before using, should be fixed but " +"could mangle stuff!" +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:369 #, c-format @@ -3560,13 +3892,15 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "La taille du fichier de la carte mémoire ne correspond pas à la taille de l'entête." +msgstr "" +"La taille du fichier de la carte mémoire ne correspond pas à la taille de " +"l'entête." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Mic" msgstr "Micro" @@ -3579,7 +3913,7 @@ msgstr "Min" msgid "Misc" msgstr "Divers" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 msgid "Misc Settings" msgstr "Paramètres divers" @@ -3590,11 +3924,14 @@ msgstr "Modif." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" -"Modify textures to show the format they're encoded in. Needs an emulation reset in most cases.\n" +"Modify textures to show the format they're encoded in. Needs an emulation " +"reset in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Modifie les textures pour afficher le format dans lequel elles sont encodées. Il faudra redémarrer l'émulation dans la plupart des cas pour que cela prenne effet.\n" +"Modifie les textures pour afficher le format dans lequel elles sont " +"encodées. Il faudra redémarrer l'émulation dans la plupart des cas pour que " +"cela prenne effet.\n" "\n" "Dans le doute, décochez cette case." @@ -3607,7 +3944,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 msgid "Motor" msgstr "Vibreur" @@ -3634,8 +3971,12 @@ msgid "Multiply" msgstr "Multiplier" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." -msgstr "Supprime le son du haut-parleur de la Wiimote. Corrige les déconnexions aléatoires sur les Wiimotes physiques. N'affecte pas les Wiimotes émulées." +msgid "" +"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " +"effect on emulated wiimotes." +msgstr "" +"Supprime le son du haut-parleur de la Wiimote. Corrige les déconnexions " +"aléatoires sur les Wiimotes physiques. N'affecte pas les Wiimotes émulées." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Add" @@ -3721,11 +4062,15 @@ msgstr "NP Tabulation" msgid "NP Up" msgstr "NP Haut" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3764,7 +4109,7 @@ msgstr "Pseudo :" msgid "No Country (SDK)" msgstr "Pas de pays (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 msgid "No ISOs or WADS found" msgstr "Aucun ISO ou WAD trouvé" @@ -3799,7 +4144,7 @@ msgstr "Aucun dossier de sauvegarde trouvé pour le titre %s" msgid "None" msgstr "Aucune" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Norwegian Bokmaal" msgstr "Norvégien BokmÃ¥l" @@ -3807,20 +4152,24 @@ msgstr "Norvégien BokmÃ¥l" msgid "Not Equal" msgstr "Différent" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 msgid "Not Set" msgstr "Non défini" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update Hungarian and Turkish translations. msgid "Not connected" msgstr "Non connectée" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 msgid "Notes" msgstr "Notes" @@ -3862,7 +4211,7 @@ msgstr "Objet" msgid "Object Range" msgstr "Plage d'objets :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 msgid "Off" msgstr "Arrêt" @@ -3878,17 +4227,20 @@ msgstr "%d blocs disponibles seulement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. msgid "Open" msgstr "Ouvrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 msgid "Open &containing folder" msgstr "Ouvrir l'emplacement du fichier" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 msgid "Open Wii &save folder" msgstr "Ouvrir le dossier de &sauvegarde Wii" @@ -3927,7 +4279,7 @@ msgid "Opens the logger" msgstr "Ouvrir le journaliseur" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 msgid "Options" msgstr "Options" @@ -3941,7 +4293,8 @@ msgid "" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -"L'ordre des fichiers dans le Dossier de fichiers ne correspond pas à l'ordre des blocs\n" +"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" @@ -3951,8 +4304,12 @@ msgid "Other" msgstr "Autres" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." -msgstr "Autre client déconnecté pendant que le jeu est en cours d'exécution !! NetPlay est désactivé. Vous devez arrêter le jeu manuellement." +msgid "" +"Other client disconnected while game is running!! NetPlay is disabled. You " +"manually stop the game." +msgstr "" +"Autre client déconnecté pendant que le jeu est en cours d'exécution !! " +"NetPlay est désactivé. Vous devez arrêter le jeu manuellement." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4003,10 +4360,11 @@ msgstr "Partition %i" msgid "Patches" msgstr "Patchs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Paths" msgstr "Chemins" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4014,6 +4372,10 @@ msgstr "Chemins" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4022,7 +4384,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Eclairage par pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Perfect" msgstr "Parfait" @@ -4034,26 +4396,29 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update Hungarian and Turkish translations. msgid "Play" msgstr "Démarrer" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "Jouer l'enregistrement..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "Démarrer/Arrêter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Playable" msgstr "Jouable" @@ -4065,11 +4430,15 @@ msgstr "Options de lecture" msgid "Players" msgstr "Joueurs" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update Hungarian and Turkish translations. msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4081,23 +4450,23 @@ 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:305 msgid "Polish" msgstr "Polonais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 4" msgstr "Port 4" @@ -4106,11 +4475,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Portuguese" msgstr "Portugais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese (Brazilian)" msgstr "Portugais (brésilien)" @@ -4118,6 +4487,7 @@ msgstr "Portugais (brésilien)" msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" +<<<<<<< HEAD #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" @@ -4133,6 +4503,8 @@ msgstr "" msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "Pré-réglages :" @@ -4175,7 +4547,7 @@ msgid "Quit" msgstr "Quitter" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "R" msgstr "R" @@ -4184,7 +4556,7 @@ msgid "R Button" msgstr "Bouton R" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "R-Analog" msgstr "R Analog." @@ -4201,7 +4573,6 @@ msgid "Range" msgstr "Etendue" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Mode Lecture seule" @@ -4261,7 +4632,8 @@ msgid "" msgstr "" "Réduit la quantité d'aliasing causée par des graphiques 3D rasterisés.\n" "Ceci permet d'avoir une image moins carrée, avec moins d'effets d'escalier.\n" -"Impacte négativement les performances de l'émulation et peut provoquer des pépins.\n" +"Impacte négativement les performances de l'émulation et peut provoquer des " +"pépins.\n" "\n" "Dans le doute, sélectionnez Aucune." @@ -4272,7 +4644,6 @@ msgid "Refresh" msgstr "Rafraîchir" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "Rafraîchir la liste" @@ -4280,6 +4651,7 @@ msgstr "Rafraîchir la liste" msgid "Refresh game list" msgstr "Rafraîchir la liste des jeux" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4291,6 +4663,12 @@ msgstr "Rafraîchir la liste des jeux" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update Hungarian and Turkish translations. msgid "Remove" msgstr "Retirer" @@ -4310,9 +4688,12 @@ msgstr "Rendu dans la fenêtre principale" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4335,15 +4716,15 @@ msgid "Right Stick" msgstr "Stick Droit" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Exécuter DSP LLE sur un thread dédié (non recommandé)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Russian" msgstr "Russe" @@ -4355,11 +4736,15 @@ msgstr "Sau&vegarder l'état" msgid "Safe" msgstr "Sûr " +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update Hungarian and Turkish translations. msgid "Sample Rate:" msgstr "Echantillonnage :" @@ -4374,42 +4759,34 @@ msgid "Save GCI as..." msgstr "Enregistrer GCI sous..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "Sauvegarder l'état vers le Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "Sauvegarder l'état vers le Slot 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" msgstr "Sauvegarder l'état vers le Slot 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" msgstr "Sauvegarder l'état vers le Slot 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 msgid "Save State Slot 5" msgstr "Sauvegarder l'état vers le Slot 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" msgstr "Sauvegarder l'état vers le Slot 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 msgid "Save State Slot 7" msgstr "Sauvegarder l'état vers le Slot 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "Sauvegarder l'état vers le Slot 8" @@ -4417,12 +4794,12 @@ msgstr "Sauvegarder l'état vers le Slot 8" msgid "Save State..." msgstr "Enregistrer l'état" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 msgid "Save as..." msgstr "Enregistrer sous..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 msgid "Save compressed GCM/ISO" msgstr "Sauver le fichier compressé GCM/ISO" @@ -4430,29 +4807,31 @@ msgstr "Sauver le fichier compressé GCM/ISO" msgid "Save current perspective" msgstr "Sauvegarder la perspective actuelle" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 msgid "Save decompressed GCM/ISO" msgstr "Sauvegarder le fichier GCM/ISO décompressé" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:428 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "Le film de sauvegarde d'état %s est corrompu, arrêt de l'enregistrement du film..." +msgstr "" +"Le film de sauvegarde d'état %s est corrompu, arrêt de l'enregistrement du " +"film..." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" msgstr "Copie à l'échelle de l'EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" msgstr "Analyse de %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 msgid "Scanning for ISOs" msgstr "Recherche d'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 msgid "Scanning..." msgstr "Recherche..." @@ -4468,14 +4847,12 @@ msgstr "Arrêt défil." msgid "Search Filter" msgstr "Fitre de recherche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" -#: Source/Core/Common/Src/SysConf.h:104 -#: Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 -#: Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "La section %s n'a pas été trouvée dans SYSCONF" @@ -4485,6 +4862,7 @@ msgstr "La section %s n'a pas été trouvée dans SYSCONF" msgid "Select" msgstr "Select" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4500,6 +4878,14 @@ msgstr "Sélectionner le fichier d'enregistrement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Sélectionner le fichier d'enregistrement" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update Hungarian and Turkish translations. msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -4525,15 +4911,20 @@ msgstr "Sélectionner les fenêtres flottantes" msgid "Select the file to load" msgstr "Sélectionner le fichier à charger" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +>>>>>>> Update Hungarian and Turkish translations. msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Sélectionner l'état à charger" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4546,6 +4937,9 @@ msgstr "Sélectionner l'état à charger" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update Hungarian and Turkish translations. msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -4562,7 +4956,8 @@ msgstr "" "Sélectionner le format d'écran lors du rendu :\n" "Auto : Utiliser le format d'écran natif\n" "Forcer 16/9è : Dimensionner l'image pour un format d'écran 16/9è.\n" -"Forcer 4/3 : Dimensionner l'image pour un format d'écran de 4/3.\n" +"Forcer 4/3 : Dimensionner l'image pour un format d'écran de " +"4/3.\n" "Etirer à la fenêtre : Adapter l'image à la fenêtre.\n" "\n" "Dans le doute, choisissez Auto." @@ -4574,27 +4969,32 @@ msgstr "Police sélectionnée" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Selects the display resolution used in fullscreen mode.\n" -"This should always be bigger than or equal to the internal resolution. Performance impact is negligible.\n" +"This should always be bigger than or equal to the internal resolution. " +"Performance impact is negligible.\n" "\n" "If unsure, use your desktop resolution.\n" "If still unsure, use the highest resolution which works for you." msgstr "" "Sélectionne la résolution d'affichage utilisée en mode Plein écran.\n" -"Elle devrait toujours être supérieure ou égale à la résolution interne. L'impact sur les performances est négligeable.\n" +"Elle devrait toujours être supérieure ou égale à la résolution interne. " +"L'impact sur les performances est négligeable.\n" "\n" "Dans le doute, utilisez la résolution de votre Bureau.\n" -"Si vous ne savez toujours pas, sélectionnez la plus haute résolution affichée." +"Si vous ne savez toujours pas, sélectionnez la plus haute résolution " +"affichée." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects what graphics API to use internally.\n" -"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. Direct3D 11 is somewhere between the two.\n" +"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " +"Direct3D 11 is somewhere between the two.\n" "Note that the Direct3D backends are only available on Windows.\n" "\n" "If unsure, use Direct3D 9." msgstr "" "Sélectionne l'API graphique à utiliser.\n" -"Direct3D 9 est généralement le plus rapide. OpenGL est cependant le plus précis. Direct3D 11 est quelque part entre les deux.\n" +"Direct3D 9 est généralement le plus rapide. OpenGL est cependant le plus " +"précis. Direct3D 11 est quelque part entre les deux.\n" "Les moteurs Direct3D ne sont disponibles que pour Windows.\n" "\n" "Dans le doute, sélectionnez Direct3D 9." @@ -4611,31 +5011,38 @@ msgstr "Position de la Sensor Bar :" msgid "Separator" msgstr "Séparateur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Serbian" msgstr "Serbe" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Port série 1 - C'est le port que les périphériques tels que l'adaptateur " "ethernet utilisent" +<<<<<<< HEAD ======= msgid "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "Port série 1 - C'est le port que les périphériques tels que l'adaptateur ethernet utilisent" >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" msgstr "Paramétrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 msgid "Set as &default ISO" msgstr "Définir comme l'ISO par &défaut" @@ -4647,13 +5054,15 @@ msgstr "Définir comme carte mémoire par défaut : %c" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" -msgstr "SetARCode_IsActive : L'index est plus grand que la taille de la liste des codes AR %lu" +msgstr "" +"SetARCode_IsActive : L'index est plus grand que la taille de la liste des " +"codes AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Settings..." msgstr "Configurer..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" @@ -4661,7 +5070,7 @@ msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" msgid "Shake" msgstr "Secouement" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Short Name:" msgstr "Nom court :" @@ -4721,7 +5130,7 @@ msgstr "Afficher Japon" msgid "Show Korea" msgstr "Afficher Corée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Show Language:" msgstr "Afficher la langue :" @@ -4761,17 +5170,20 @@ msgstr "Afficher WAD" msgid "Show Wii" msgstr "Afficher Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "Show a confirmation box before stopping a game." msgstr "Demande confirmation avant d'arrêter le jeu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Show a message box when a potentially serious error has occured.\n" -"Disabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all." +"Disabling this may avoid annoying and non-fatal messages, but it may also " +"mean that Dolphin suddenly crashes without any explanation at all." msgstr "" "Affiche un message lorsqu'une erreur sérieuse potentielle est arrivée.\n" -"Le désactiver évitera les messages embêtants et les messages non-fatals, mais cela peut aussi signifier que Dolphin plante soudainement sans aucune explication." +"Le désactiver évitera les messages embêtants et les messages non-fatals, " +"mais cela peut aussi signifier que Dolphin plante soudainement sans aucune " +"explication." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Show first block" @@ -4795,11 +5207,13 @@ msgstr "Afficher le titre de sauvegarde" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" -"Show the number of frames rendered per second as a measure of emulation speed.\n" +"Show the number of frames rendered per second as a measure of emulation " +"speed.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Affiche le nombre d'images rendues par seconde, afin de mesurer la vitesse d'émulation.\n" +"Affiche le nombre d'images rendues par seconde, afin de mesurer la vitesse " +"d'émulation.\n" "\n" "Dans le doute, décochez cette case." @@ -4825,15 +5239,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote à l'horizontale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 msgid "Simplified Chinese" msgstr "Chinois simplifié" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 msgid "Size" msgstr "Taille" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 msgid "Skip BIOS" msgstr "Ne pas exécuter le BIOS" @@ -4869,11 +5283,13 @@ msgid "" msgstr "" ======= msgid "" -"Skip the destination alpha pass used in many games for various graphical effects.\n" +"Skip the destination alpha pass 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" +"Saute la passe alpha de destination, utilisée dans beaucoup de jeux pour " +"divers effets graphiques.\n" "\n" "Dans le doute, décochez cette case." @@ -4881,19 +5297,26 @@ msgstr "" msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" -"If you're experiencing any issues, try raising texture cache accuracy or disable this option.\n" +"If you're experiencing any issues, try raising texture cache accuracy or " +"disable this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. "Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision " "de l'émulation.\n" ======= "Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision de l'émulation.\n" >>>>>>> Update french translation. +======= +"Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision " +"de l'émulation.\n" +>>>>>>> Update Hungarian and Turkish translations. "Améliore parfois la qualité visuelle.\n" -"Si vous rencontrez des problèmes, essayez d'augmenter la précision du cache ou désactivez cette option.\n" +"Si vous rencontrez des problèmes, essayez d'augmenter la précision du cache " +"ou désactivez cette option.\n" "\n" "Dans le doute, décochez cette case." @@ -4903,11 +5326,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 msgid "Slot B" msgstr "Slot B" @@ -4921,15 +5344,18 @@ msgstr "Rendu logiciel" #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:83 msgid "" -"Software rendering is an order of magnitude slower than using the other backends.\n" +"Software rendering is an order of magnitude slower than using the other " +"backends.\n" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -"Le rendu logiciel est le plus lent de tous les moteurs, et n'utilise pas l'accélération de votre carte graphique.\n" +"Le rendu logiciel est le plus lent de tous les moteurs, et n'utilise pas " +"l'accélération de votre carte graphique.\n" "Il n'est utile qu'à des fins de débogage.\n" -"Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez 'Non'." +"Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez " +"'Non'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 msgid "Sound Settings" msgstr "Paramètres audio" @@ -4947,6 +5373,7 @@ msgstr "Echec de la création du buffer audio : %s" msgid "Space" msgstr "Espace" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4956,6 +5383,11 @@ msgstr "Espace" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update Hungarian and Turkish translations. msgid "Spanish" msgstr "Espagnol" @@ -4965,13 +5397,21 @@ msgstr "Volume du haut-parleur :" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" -"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.\n" -"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n" +"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.\n" +"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less " +"issues. Generally speaking, the lower the internal resolution is, the better " +"your performance will be.\n" "\n" "If unsure, select 640x528." msgstr "" -"Spécifie la résolution de rendu. Une haute résolution améliore beaucoup la qualité visuelle mais impacte beaucoup les performances et peut provoquer quelques pépins dans certains jeux.\n" -"\"Multiple de 640x528\" est un peu plus lent que \"Taille de la fenêtre\" mais provoque moins de problèmes. En général, plus la résolution interne est petite, meilleures seront les performances.\n" +"Spécifie la résolution de rendu. Une haute résolution améliore beaucoup la " +"qualité visuelle mais impacte beaucoup les performances et peut provoquer " +"quelques pépins dans certains jeux.\n" +"\"Multiple de 640x528\" est un peu plus lent que \"Taille de la fenêtre\" " +"mais provoque moins de problèmes. En général, plus la résolution interne est " +"petite, meilleures seront les performances.\n" "\n" "Dans le doute, sélectionnez 640x528." @@ -4991,11 +5431,15 @@ msgstr "Stick carré" msgid "Standard Controller" msgstr "Contrôleur standard" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5010,16 +5454,14 @@ msgid "Start Re&cording" msgstr "Commencer l'enregistrement" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "Commencer l'enregistrement" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 msgid "State" msgstr "Etat" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Etats" @@ -5031,9 +5473,12 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arrêter" @@ -5041,12 +5486,14 @@ msgstr "Arrêter" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Store EFB copies in GPU texture objects.\n" -"This is not so accurate, but it works well enough for most games and gives a great speedup over EFB to RAM.\n" +"This is not so accurate, but it works well enough for most games and gives a " +"great speedup over EFB to RAM.\n" "\n" "If unsure, leave this checked." msgstr "" "Enregistre les copies d'EFB dans les objets de texture du GPU.\n" -"Ce n'est pas précis, mais fonctionne suffisamment bien pour la plupart des jeux et améliore sensiblement la vitesse comparé à l'EFB vers la RAM.\n" +"Ce n'est pas précis, mais fonctionne suffisamment bien pour la plupart des " +"jeux et améliore sensiblement la vitesse comparé à l'EFB vers la RAM.\n" "\n" "Dans le doute, sélectionnez cette case." @@ -5075,8 +5522,8 @@ msgstr "Fichiers de sauvegarde importés avec succès" msgid "Swing" msgstr "Balancement" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 msgid "System Language:" msgstr "Langue du système :" @@ -5109,6 +5556,7 @@ msgstr "Table Droite" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. @@ -5119,6 +5567,11 @@ msgstr "Capture d'écran" msgid "TaruKonga (Bongos)" msgstr "" +======= +msgid "Take Screenshot" +msgstr "Capture d'écran" + +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Test" @@ -5147,13 +5600,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 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:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 #, c-format msgid "" "The file %s already exists.\n" @@ -5164,8 +5617,12 @@ msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:51 #, c-format -msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." -msgstr "Le fichier %s n'a pas pu être ouvert pour l'écriture. Vérifiez qu'il n'a pas été ouvert par un autre programme." +msgid "" +"The file %s could not be opened for writing. Please check if it's already " +"opened by another program." +msgstr "" +"Le fichier %s n'a pas pu être ouvert pour l'écriture. Vérifiez qu'il n'a pas " +"été ouvert par un autre programme." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format @@ -5191,21 +5648,28 @@ msgstr "Le code AR décrypté ne contient aucune ligne." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" -"The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" "\n" "If unsure, use the second-fastest value from the right." msgstr "" -"Plus vous allez vers Sûr, moins l'émulateur manquera les mises à jour de texture depuis la RAM.\n" +"Plus vous allez vers Sûr, moins l'émulateur manquera les mises à jour de " +"texture depuis la RAM.\n" "\n" "Dans le doute, utilisez la deuxième position depuis la droite." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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" +msgstr "" +"La sauvegarde que vous essayez de copier a une taille de fichier non valide" #: Source/Core/DolphinWX/Src/Main.cpp:353 -msgid "The selected language is not supported by your system. Falling back to system default." -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." +msgid "" +"The selected language is not supported by your system. Falling back to " +"system default." +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:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5232,7 +5696,7 @@ 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:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 msgid "Theme" msgstr "Thème" @@ -5241,8 +5705,12 @@ msgid "Theme selection went wrong" msgstr "La sélection du thème a rencontré un problème" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 -msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." -msgstr "Il doit y avoir un ticket pour 00000001/00000002. Votre copie de la NAND est probablement incomplète." +msgid "" +"There must be a ticket for 00000001/00000002. Your NAND dump is probably " +"incomplete." +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:304 msgid "" @@ -5253,26 +5721,37 @@ msgstr "" "Indéterminé signifie que les paramètres de Dolphin sont appliqués." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "This action replay simulator does not support codes that modify Action Replay itself." -msgstr "Ce simulateur d'Action Replay ne prend pas en charge les codes qui modifient l'Action Replay lui-même." +msgid "" +"This action replay simulator does not support codes that modify Action " +"Replay itself." +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:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 msgid "This could cause slow down in Wii Menu and some games." msgstr "Ceci peut ralentir le Menu Wii et quelques jeux." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. Hold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n" +"Hold the right mouse button and move the mouse to pan the camera around. " +"Hold SHIFT and press one of the WASD keys to move the camera by a certain " +"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " +"SHIFT+R to reset the camera.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Cette fonctionnalité vous permet de vous amuser avec la caméra du jeu.\n" -"Faites un clic droit et déplacez la souris pour changer l'orientation de la caméra. Appuyez sur SHIFT et sur W, A, S ou D pour modifier pas à pas la distance de la caméra (SHIFT et 0 déplace la caméra plus vite, SHIFT et 9 la déplace plus lentement). Appuyez sur SHIFT et R pour réinitiliser la position de la caméra.\n" +"Faites un clic droit et déplacez la souris pour changer l'orientation de la " +"caméra. Appuyez sur SHIFT et sur W, A, S ou D pour modifier pas à pas la " +"distance de la caméra (SHIFT et 0 déplace la caméra plus vite, SHIFT et 9 " +"la déplace plus lentement). Appuyez sur SHIFT et R pour réinitiliser la " +"position de la caméra.\n" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -5281,26 +5760,34 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" "Ceci est utiliser pour contrôler la vitesse du jeu par la constance du son.\n" -"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple trop rapide.\n" +"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple " +"trop rapide.\n" "Mais il se peut parfois qu'activer cette option produise un bruit constant.\n" "\n" -"Raccourci clavier : Appuyer pour instantanément désactiver cette option." +"Raccourci clavier : Appuyer pour instantanément désactiver cette " +"option." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "This is used to play music tracks, like BGM." msgstr "Ceci est utilisé pour lire les pistes de musique, comme les BGM." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 msgid "" -"This splits the Video and CPU threads, so they can be run on separate cores.\n" -"Causes major speed improvements on PCs with more than one core, but can also cause occasional crashes/glitches." +"This splits the Video and CPU threads, so they can be run on separate " +"cores.\n" +"Causes major speed improvements on PCs with more than one core, but can also " +"cause occasional crashes/glitches." msgstr "" -"Ceci sépare les threads du processeur et de l'affichage, pour qu'ils puissent être exécutés sur des coeurs séparés.\n" -"Cela a pour conséquence d'accélérer considérablement l'émulation sur les PC qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou des plantages." +"Ceci sépare les threads du processeur et de l'affichage, pour qu'ils " +"puissent être exécutés sur des coeurs séparés.\n" +"Cela a pour conséquence d'accélérer considérablement l'émulation sur les PC " +"qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou " +"des plantages." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 msgid "This will let you Manually Edit the INI config file" -msgstr "Ceci vous permettra de modifier manuellement le fichier de configuration INI" +msgstr "" +"Ceci vous permettra de modifier manuellement le fichier de configuration INI" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:249 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:254 @@ -5312,7 +5799,7 @@ msgid "Tilt" msgstr "Tilt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 msgid "Title" msgstr "Titre" @@ -5328,22 +5815,29 @@ msgstr "Activer tous les types de journaux" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. msgid "Toggle Fullscreen" msgstr "Activer le plein écran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update Hungarian and Turkish translations. msgid "Top" msgstr "Haut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Traditional Chinese" msgstr "Chinois traditionnel" @@ -5351,12 +5845,11 @@ msgstr "Chinois traditionnel" msgid "Tried to load an unknown file type." msgstr "Echec de chargement d'un type de fichier inconnu." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "Triggers" msgstr "Déclencheurs" -#: Source/Core/Common/Src/SysConf.h:92 -#: Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "Essai de lecture d'un fichier SYSCONF non valide" @@ -5368,7 +5861,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:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Turkish" msgstr "Turque" @@ -5408,10 +5901,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format msgid "" -"Unable to parse line %lu of the entered AR code as a valid encrypted or decrypted code. Make sure you typed it correctly.\n" +"Unable to parse line %lu of the entered AR code as a valid encrypted or " +"decrypted code. Make sure you typed it correctly.\n" "Would you like to ignore this line and continue parsing?" msgstr "" -"Impossible d'analyser la ligne %lu du code AR entré comme un code crypté ou décrypté valide. Veuillez vérifier que vous l'avez correctement tapé.\n" +"Impossible d'analyser la ligne %lu du code AR entré comme un code crypté ou " +"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:404 @@ -5447,21 +5942,32 @@ msgstr "Reception d'un message inconnu avec l'ID : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= msgstr "" "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" ======= msgstr "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" >>>>>>> Update french translation. +======= +msgstr "" +"Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format msgid "" "Unknown pointer %#08x\n" "Continue?" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgstr "" "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" +======= +msgstr "" +"Pointeur inconnu %#08x\n" +"Continuer ?" +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 @@ -5477,7 +5983,7 @@ msgstr "Mettre à jour" msgid "Upright Wiimote" msgstr "Wiimote debout" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utiliser le mode EuRGB60 (PAL60)" @@ -5489,7 +5995,7 @@ msgstr "&Plein écran" msgid "Use Hex" msgstr "Utiliser Hexa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Use Panic Handlers" msgstr "Utiliser les gestionnaires de panique" @@ -5501,19 +6007,23 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Utilise plusieurs threads pour décoder les textures.\n" -"Peut accélérer l'émulation, particulièrement avec des processeurs qui ont plus de 2 coeurs.\n" +"Peut accélérer l'émulation, particulièrement avec des processeurs qui ont " +"plus de 2 coeurs.\n" "\n" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" -"However, one may skip the popups to allow interruption free gameplay by checking this option.\n" +"However, one may skip the popups to allow interruption free gameplay by " +"checking this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"En cas d'échec de compilation de shader, un message est habituellement affiché.\n" -"Cependant, certains préfèrent ne pas afficher ce message pour ne pas interrompre le jeu en cochant cette case.\n" +"En cas d'échec de compilation de shader, un message est habituellement " +"affiché.\n" +"Cependant, certains préfèrent ne pas afficher ce message pour ne pas " +"interrompre le jeu en cochant cette case.\n" "\n" "Dans le doute, décochez cette case." @@ -5541,7 +6051,7 @@ msgstr "Valeur" msgid "Verbosity" msgstr "Verbosité" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 msgid "Video" msgstr "Vidéo" @@ -5549,7 +6059,7 @@ msgstr "Vidéo" msgid "Virtual" msgstr "Virtuel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 msgid "Volume" msgstr "Volume" @@ -5597,7 +6107,8 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"Attention ! Il est conseillé de sauvegarder tous les fichiers dans le dossier :\n" +"Attention ! Il est conseillé de sauvegarder tous les fichiers dans le " +"dossier :\n" "%s\n" "Voulez-vous continuer ?" @@ -5609,11 +6120,13 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"Attention : ceci va écraser toutes les sauvegardes existantes dans ce dossier :\n" +"Attention : ceci va écraser toutes les sauvegardes existantes dans ce " +"dossier :\n" "%s\n" "et vont avoir le même nom que le fichier sur votre carte mémoire\n" "Continuer ?" +<<<<<<< HEAD #: Source/Core/Core/Src/Movie.cpp:629 #, c-format msgid "" @@ -5649,6 +6162,8 @@ msgid "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" msgstr "" +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5666,15 +6181,15 @@ msgstr "Hack écran large (16/9è)" msgid "Width" msgstr "Largeur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Wii NAND Root:" msgstr "Racine de la NAND (Wii) :" @@ -5682,11 +6197,15 @@ msgstr "Racine de la NAND (Wii) :" msgid "Wii Save Import" msgstr "Importer une sauvegarde Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update Hungarian and Turkish translations. msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -5717,11 +6236,15 @@ msgstr "" "ou bien c'est dû à un temps d'attente trop long, ou encore autre chose.\n" "Voulez-vous la reconnecter tout de suite ?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update Hungarian and Turkish translations. msgid "Wiimote Connected" msgstr "Wiimote connectée" @@ -5753,6 +6276,7 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5762,6 +6286,11 @@ msgstr "Casse" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update Hungarian and Turkish translations. msgid "Working..." msgstr "Travail..." @@ -5802,7 +6331,8 @@ msgid "" "Only Zelda ucode games will work correctly with them.\n" msgstr "" "Vous utilisez des ROM de DSP gratuits créés par l'équipe de Dolphin.\n" -"Seuls les jeux basés sur les ucodes de Zelda fonctionneront correctement avec ces ROM.\n" +"Seuls les jeux basés sur les ucodes de Zelda fonctionneront correctement " +"avec ces ROM.\n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:72 msgid "You can't close panes that have pages in them." @@ -5824,7 +6354,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 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." @@ -5847,7 +6377,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:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "ZTP hack" msgstr "ZTP hack" @@ -5884,14 +6414,19 @@ msgstr "[Personnalisé]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" -"Aims to speed up emulation by offloading texture decoding to the GPU using the OpenCL framework.\n" -"However, right now it's known to cause texture defects in various games. Also it's slower than regular CPU texture decoding in most cases.\n" +"Aims to speed up emulation by offloading texture decoding to the GPU using " +"the OpenCL framework.\n" +"However, right now it's known to cause texture defects in various games. " +"Also it's slower than regular CPU texture decoding in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" "[EXPERIMENTAL]\n" -"Tente d'accélérer l'émulation en déportant le décodage de texture vers le GPU en utilisant le framework OpenCL.\n" -"Cependant, il est actuellement connu pour provoquer des défauts de textures dans divers jeux. De plus, il est généralement plus lent qu'un classique décodage par le CPU.\n" +"Tente d'accélérer l'émulation en déportant le décodage de texture vers le " +"GPU en utilisant le framework OpenCL.\n" +"Cependant, il est actuellement connu pour provoquer des défauts de textures " +"dans divers jeux. De plus, il est généralement plus lent qu'un classique " +"décodage par le CPU.\n" "\n" "Dans le doute, décochez cette case." @@ -5913,7 +6448,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5930,7 +6465,7 @@ msgstr "Impossible de lire les données du fichier %s" msgid "failed to read header" msgstr "Impossible de lire l'entête" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:447 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT : Lecture de l'Opcode depuis %x. Merci de nous le signaler." @@ -5938,7 +6473,9 @@ msgstr "iCacheJIT : Lecture de l'Opcode depuis %x. Merci de nous le signaler." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "Ceci n'est pas une sauvegarde Wii, ou erreur de lecture de la taille de l'entête du fichier %x" +msgstr "" +"Ceci n'est pas une sauvegarde Wii, ou erreur de lecture de la taille de " +"l'entête du fichier %x" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:461 msgid "s" @@ -5949,7 +6486,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Commande inconnue 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute a retourné -1 sur l'exécution de l'application !" @@ -6061,9 +6598,6 @@ msgstr "| OR" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "Impossible d'ouvrir %s, une fonction manque" -#~ msgid "Cannot record movies in read-only mode." -#~ msgstr "Impossible d'enregistrer des films en mode Lecture seule." - #~ msgid "Config..." #~ msgstr "Configurer..." @@ -6163,6 +6697,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Paramètres graphiques de l'émulateur" +#~ msgid "Enable Bounding Box Calculation" +#~ msgstr "Activer le calcul de la boît de saut" + #~ msgid "Enable CPU Access" #~ msgstr "Activer l'accès CPU" @@ -6221,6 +6758,13 @@ msgstr "| OR" #~ msgid "Error allocating buffer" #~ msgstr "Erreur d'allocation du buffer" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "Erreur dans PlayWiimote. %u != %u, octet %d.\n" +#~ "Désolé, l'enregistrement Wii est temporairement instable." + #~ msgid "Error loading %s: can't read info" #~ msgstr "Erreur lors du chargement de %s : inpossible de lire l'info" @@ -6233,6 +6777,13 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "Erreur d'ouverture du fichier %s pour l'enregistrement" +#~ msgid "" +#~ "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +#~ "Aborting savestate load..." +#~ msgstr "" +#~ "Erreur : Apres \"%s\", %d (0x%X) a été trouvé au lieu du marqueur de " +#~ "sauvegarde %d (0x%X). Abandon du chargement de la sauvegarde d'état..." + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6271,6 +6822,9 @@ msgstr "| OR" #~ "en ont besoin pour fonctionneer correctement, mais peut être aussi très " #~ "lent." +#~ msgid "GCMic Configuration" +#~ msgstr "Configuration du micro de la GC" + #~ msgid "GFX Config" #~ msgstr "Configurer..." @@ -6294,6 +6848,13 @@ msgstr "| OR" #~ "Si un jeu bloque, fonctionne seulement avec l'Interpreteur ou que Dolphin " #~ "plante, cette option peut corriger le jeu." +#~ msgid "" +#~ "If checked, the bounding box registers will be updated. Used by the Paper " +#~ "Mario games." +#~ msgstr "" +#~ "Si coché, les registres de la boîte de saut seront mis à jour. Utilisé " +#~ "par les jeux Paper Mario." + #~ msgid "Input Source" #~ msgstr "Source d'entrée" @@ -6382,6 +6943,15 @@ msgstr "| OR" #~ " Exécutez-vous Dolphin à partir d'un média en lecture seule ou d'un " #~ "dossier d'où Dolphin n'est pas situé ?" +#~ msgid "Premature movie end in PlayController. %u + 8 > %u" +#~ msgstr "Fin prématurée du film dans PlayController. %u + 8 > %u" + +#~ msgid "Premature movie end in PlayWiimote. %u + %d > %u" +#~ msgstr "Fin prématurée du film dans PlayWiimote. %u + %d > %u" + +#~ msgid "Premature movie end in PlayWiimote. %u > %u" +#~ msgstr "Fin prématurée du film dans PlayWiimote. %u > %u" + #~ msgid "Projection Stats" #~ msgstr "Stats de projection" @@ -6507,6 +7077,9 @@ msgstr "| OR" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Démarrer la fenêtre de rendu en plein écran." +#~ msgid "TaruKonga (Bongos)" +#~ msgstr "TaruKonga (Bongos)" + #~ msgid "The file " #~ msgstr "Le fichier " @@ -6521,13 +7094,6 @@ msgstr "| OR" #~ msgstr "" #~ "Le type de configuration %d n'est pas pris en charge dans le plug-in %s" -#~ msgid "" -#~ "Unknown pointer %#08x\n" -#~ "Continue?" -#~ msgstr "" -#~ "Pointeur inconnu %#08x\n" -#~ "Continuer ?" - #~ msgid "Use FPS For Limiting" #~ msgstr "Utiliser les FPS pour limiter" @@ -6558,6 +7124,60 @@ msgstr "| OR" #~ "Attendre les blancs verticaux (ou synchro verticale).\n" #~ "Réduit les sauts mais peut aussi baisser les performances" +#~ msgid "" +#~ "Warning: You loaded a save that's after the end of the current movie. " +#~ "(byte %u > %u) (frame %u > %u). You should load another save before " +#~ "continuing, or load this state with read-only mode off." +#~ msgstr "" +#~ "Attention : vous avez chargé une sauvegarde qui se situe après la fin du " +#~ "film actuel. (octet %u > %u) (image %u > %u). Vous devriez charger une " +#~ "autre sauvegarde avant de continuer, ou charger cette sauvegarde en " +#~ "désactivant le mode Lecture seule." + +#~ msgid "" +#~ "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " +#~ "should load another save before continuing, or load this state with read-" +#~ "only mode off. Otherwise you'll probably get a desync." +#~ msgstr "" +#~ "Attention : vous avez chargé une sauvegarde dont le film ne correspond " +#~ "pas à l'octet %d (0x%X). Vous devriez charger une autre sauvegarde avant " +#~ "de continuer, ou charger cet état en désactivant le mode Lecture seule. " +#~ "Autrement, vous aurez probablement une désynchronisation." + +#~ msgid "" +#~ "Warning: You loaded a save whose movie mismatches on frame %d. You should " +#~ "load another save before continuing, or load this state with read-only " +#~ "mode off. Otherwise you'll probably get a desync.\n" +#~ "\n" +#~ "More information: The current movie is %d frames long and the savestate's " +#~ "movie is %d frames long.\n" +#~ "\n" +#~ "On frame %d, the current movie presses:\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" +#~ "On frame %d, the savestate's movie presses:\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" +#~ msgstr "" +#~ "Attention : vous avez chargé une sauvegarde dont le film ne correspond " +#~ "pas à l'image %d. Vous devriez charger une autre sauvegarde avant de " +#~ "continuer, ou charger cet état en désactivant le mode Lecture seule. " +#~ "Autrement, vous aurez probablement une désynchronisation.\n" +#~ "\n" +#~ "Infos complémentaires : Le film actuel fait %d images et alors que le " +#~ "film de la sauvegarde d'état fait %d images.\n" +#~ "\n" +#~ "A l'image %d, le film actuel appuie sur :\n" +#~ "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DHaut=%d, DBas=%d, DGauche=%d, " +#~ "DDroit=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=" +#~ "%d\n" +#~ "\n" +#~ "A l'image %d, le film de la sauvegarde d'état appuie sur :\n" +#~ "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DHaut=%d, DBas=%d, DGauche=%d, " +#~ "DDroit=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" + #~ msgid "" #~ "When using EFB to RAM we very often need to decode RAM data to a VRAM " #~ "texture, which is a very time-consuming task.\n" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index 2a61a06212..4e43ee3092 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -12,8 +12,12 @@ msgstr "" "PO-Revision-Date: 2011-12-18 13:41-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-06-04 14:29+0100\n" >>>>>>> Update translation files for recent changes in the code. +======= +"PO-Revision-Date: 2011-12-20 17:22-0600\n" +>>>>>>> Update Hungarian and Turkish translations. "Last-Translator: Delirious \n" "Language-Team: Delirious \n" "Language: Hungarian\n" @@ -80,10 +84,14 @@ msgstr "%s tisztítása sikertelen. Valószínűleg a képfájl sérült." #: Source/Core/Core/Src/HW/GCMemcard.cpp:97 <<<<<<< HEAD +<<<<<<< HEAD #, c-format ======= #, fuzzy, c-format >>>>>>> Update translation files for recent changes in the code. +======= +#, c-format +>>>>>>> Update Hungarian and Turkish translations. msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" @@ -93,10 +101,14 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:112 <<<<<<< HEAD +<<<<<<< HEAD #, c-format ======= #, fuzzy, c-format >>>>>>> Update translation files for recent changes in the code. +======= +#, c-format +>>>>>>> Update Hungarian and Turkish translations. msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" @@ -443,9 +455,12 @@ msgstr "Pontos VBeam emuláció" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -685,6 +700,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Változtatható Wiimote idÅ‘zítés" ======= @@ -692,6 +708,10 @@ msgstr "Változtatható Wiimote idÅ‘zítés" msgid "Alternate Wiimote Timing" msgstr "Emulált Wiimote" >>>>>>> Update translation files for recent changes in the code. +======= +msgid "Alternate Wiimote Timing" +msgstr "Változtatható Wiimote idÅ‘zítés" +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -1002,11 +1022,22 @@ msgstr "Mégsem" msgid "Cannot open %s" msgstr "%s nem nyitható meg" +<<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 +msgid "Cannot record movies in read-only mode." +msgstr "A mozgások rögzítése nem lehetséges írásvédett módban." + +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "Nem lehet események bejegyzéseket törölni függÅ‘ben lévÅ‘ eseményekkel" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +>>>>>>> Update Hungarian and Turkish translations. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -2854,9 +2885,12 @@ msgstr "Nagyobb mint" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -5143,9 +5177,12 @@ msgstr "TAJVAN" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. msgid "TAS Input" msgstr "TAS bemenet" @@ -6261,6 +6298,9 @@ msgstr "| VAGY" #~ msgid "Emulator Display Settings" #~ msgstr "Emulátor kijelzÅ‘ beállítások" +#~ msgid "Enable Bounding Box Calculation" +#~ msgstr "Bounding Box kalkuláció használata" + #~ msgid "Enable CPU Access" #~ msgstr "Processzor hozzáférés engedélyezése" @@ -6318,6 +6358,13 @@ msgstr "| VAGY" #~ msgid "Error allocating buffer" #~ msgstr "Puffer kiosztási hiba" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "PlayWiimote hiba. %u != %u, bájt %d.\n" +#~ "Sajnos a Wii videó rögzítés egyenlÅ‘re nem működik." + #~ msgid "Error loading %s: can't read info" #~ msgstr "Hiba a(z) %s betöltése közben: az infó nem olvasható" @@ -6330,6 +6377,13 @@ msgstr "| VAGY" #~ msgid "Error opening file %s for recording" #~ msgstr "Hiba a(z) %s fájl rögzítéshez történÅ‘ megnyitása közben" +#~ msgid "" +#~ "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +#~ "Aborting savestate load..." +#~ msgstr "" +#~ "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x" +#~ "%X). Mentés betöltésének leállítása..." + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6367,6 +6421,9 @@ msgstr "| VAGY" #~ "Ez sokkal pontosabb mint az EFB másolás textúrába, és néhány játékhoz " #~ "szükséges a megfelelÅ‘ működéshez, ugyanakkor nagyon lassú is lehet." +#~ msgid "GCMic Configuration" +#~ msgstr "GCMic beállítások" + #~ msgid "GFX Config" #~ msgstr "GFX beállítások" @@ -6390,6 +6447,13 @@ msgstr "| VAGY" #~ "Ha a játék leáll, csak Interpreter módban működik vagy ha a Dolphin " #~ "kifagy, akkor ez a beállítás javíthat a játékon." +#~ msgid "" +#~ "If checked, the bounding box registers will be updated. Used by the Paper " +#~ "Mario games." +#~ msgstr "" +#~ "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper " +#~ "Mario játékok használják." + #~ msgid "Input Source" #~ msgstr "Bemeneti forrás" @@ -6479,6 +6543,15 @@ msgstr "| VAGY" #~ " A Dolphin emulátort csak olvasható eszközrÅ‘l futtatod vagy egy olyan " #~ "könyvtárból amely nem tartalmazza az emulátort?" +#~ msgid "Premature movie end in PlayController. %u + 8 > %u" +#~ msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u" + +#~ msgid "Premature movie end in PlayWiimote. %u + %d > %u" +#~ msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u" + +#~ msgid "Premature movie end in PlayWiimote. %u > %u" +#~ msgstr "Túl korai PlayWiimote videó befejezés. %u > %u" + #~ msgid "Projection Stats" #~ msgstr "Kivetítési statisztikák" @@ -6598,6 +6671,9 @@ msgstr "| VAGY" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "A megjelenítési ablak teljes képernyÅ‘s módban indul." +#~ msgid "TaruKonga (Bongos)" +#~ msgstr "TaruKonga (Bongos)" + #~ msgid "The file " #~ msgstr "A fájl" @@ -6647,6 +6723,60 @@ msgstr "| VAGY" #~ "Várakozás a függÅ‘leges képkioltásra.\n" #~ "Csökkenti a képszakadást de egyben a teljesítményt is." +#~ msgid "" +#~ "Warning: You loaded a save that's after the end of the current movie. " +#~ "(byte %u > %u) (frame %u > %u). You should load another save before " +#~ "continuing, or load this state with read-only mode off." +#~ msgstr "" +#~ "Figyelem: Olyan mentést töltöttél be, ami a választott videó befejezése " +#~ "utáni. (%u > %u bájt) (%u > %u képkocka). Folytatás elÅ‘tt betölthetsz egy " +#~ "másik mentést, vagy betöltheted ezt a mentést az írásvédett mód " +#~ "kikapcsolása után." + +#~ msgid "" +#~ "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " +#~ "should load another save before continuing, or load this state with read-" +#~ "only mode off. Otherwise you'll probably get a desync." +#~ msgstr "" +#~ "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d (0x%X) bájt " +#~ "eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy " +#~ "betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " +#~ "esetben szinkronizációs hibák jelentkezhetnek." + +#~ msgid "" +#~ "Warning: You loaded a save whose movie mismatches on frame %d. You should " +#~ "load another save before continuing, or load this state with read-only " +#~ "mode off. Otherwise you'll probably get a desync.\n" +#~ "\n" +#~ "More information: The current movie is %d frames long and the savestate's " +#~ "movie is %d frames long.\n" +#~ "\n" +#~ "On frame %d, the current movie presses:\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" +#~ "On frame %d, the savestate's movie presses:\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" +#~ msgstr "" +#~ "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka " +#~ "eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy " +#~ "betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " +#~ "esetben szinkronizációs hibák jelentkezhetnek.\n" +#~ "\n" +#~ "BÅ‘vebb információk: A választott videó %d képkocka hosszú, a mentett " +#~ "állás videója pedig %d képkocka hosszú.\n" +#~ "\n" +#~ "%d képkockánál a videó tömörítve lesz:\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 képkockánál a mentett állás videója tömörítve lesz:\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" + #~ msgid "" #~ "When using EFB to RAM we very often need to decode RAM data to a VRAM " #~ "texture, which is a very time-consuming task.\n" diff --git a/Languages/po/tr.po b/Languages/po/tr.po index fe7e7a4688..fe4f784856 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -11,8 +11,12 @@ msgstr "" "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-08-19 08:38-0500\n" +======= +"PO-Revision-Date: 2011-12-20 19:22+0200\n" +>>>>>>> Update Hungarian and Turkish translations. "Last-Translator: nlgzrgn \n" "Language-Team: nlgzrgn \n" "Language: Turkish\n" @@ -363,7 +367,7 @@ msgstr "Bir NetPlay penceresi zaten açık!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 msgid "A game is not currently running." -msgstr "Bir oyun ÅŸu anda çalışmıyor." +msgstr "Bir oyun ÅŸu anda düzgün çalışmıyor." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 msgid "" @@ -410,7 +414,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" -msgstr "AM-Süpürgelik" +msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 @@ -434,7 +438,6 @@ msgid "Accurate VBeam emulation" msgstr "DoÄŸru VBeam Emülasyonu" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -442,11 +445,10 @@ msgid "" "\n" "If unsure, check EFB to Texture instead." msgstr "" -"EFB kopyalarını doÄŸru bir ÅŸekilde emüle eder. \n" -"Bazı oyunlar iÅŸlevsellik veya belirli görsel efektler için buna ihtiyaç " -"duyar. \n" +"EFB kopya emülasyonunun gerçekçiliÄŸini artırır. \n" +"Bazı oyunlarda belirli görsel efektler için bu ayarın açık olması gerekir. \n" "\n" -"Emin deÄŸilseniz, iÅŸaretli bırakın." +"Emin deÄŸilseniz, bunun yerine EFB'den Doku'ya seçeneÄŸini iÅŸaretleyin." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 @@ -666,15 +668,14 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"3, 4, 5, 6 ve 7 tuÅŸlarıyla emülasyon penceresinde belirli seçeneklere geçiÅŸ " +"3, 4, 5, 6 ve 7 tuÅŸlarıyla emülasyon penceresinde belirli seçeneklere geçiÅŸi " "saÄŸlar. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -#, fuzzy msgid "Alternate Wiimote Timing" -msgstr "Taklit Wiimote" +msgstr "Alternatif Wiimote Zamanlaması" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -686,7 +687,7 @@ msgstr "KeskinleÅŸtirme:" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:317 msgid "Apploader is the wrong size...is it really an apploader?" -msgstr "Apploader boyutu yanlış...bu gerçekten bir apploader mı?" +msgstr "Apploader boyutu yanlış. Bu gerçekten bir apploader mı?" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:311 msgid "Apploader unable to load from file" @@ -706,7 +707,7 @@ msgid "" "\n" "If unsure, select (off)." msgstr "" -"Bir kare bitiÅŸinde sonradan iÅŸleme etkisi uygula. \n" +"Çerçevelerden sonra geç iÅŸleme etkisi uygula. \n" "\n" "Emin deÄŸilseniz, kapalı seçin." @@ -725,12 +726,13 @@ msgid "" "They will be gone forever!" msgstr "" "Bu dosyaları gerçekten silmek istiyor musunuz?\n" -"Ama geri döndürülemeyecekler!" +"Silindikten sonra bu dosyaları geri döndüremezsiniz!" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -"Bu dosyayı gerçekten silmek istiyor musunuz? Ama geri döndürülemeyecektir!" +"Bu dosyayı gerçekten silmek istiyor musunuz? Silindikten sonra bu dosyaları " +"geri döndüremezsiniz!" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -743,7 +745,7 @@ msgstr "En-boy Oranı:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:69 msgid "At least one pane must remain open." -msgstr "En azından bir bölme açık kalmalıdır." +msgstr "En az bir bölme açık kalmalıdır." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" @@ -751,7 +753,7 @@ msgstr "Ses" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" -msgstr "Ses Arka Ucu:" +msgstr "Ses Çözücüsü:" #: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 msgid "AudioCommon: Error opening AO device.\n" @@ -795,8 +797,8 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Mipmapleri hafızadan dekode etmek yerine otomatik olarak yarat. \n" -"Performansı artırır ama bazı küçük doku hatalarına neden olabilir. \n" +"MipMap'leri hafızadan çözmek yerine otomatik olarak oluÅŸtur. \n" +"Performansı artırır ancak küçük doku bozukluklarına neden olur. \n" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." @@ -806,12 +808,12 @@ msgstr "Geri" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" -msgstr "Arka Uç Ayarları" +msgstr "Çözücü Ayarları" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" -msgstr "Arka Uç:" +msgstr "Çözücü:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 @@ -820,7 +822,7 @@ msgstr "Arkaplanda GiriÅŸ" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:279 msgid "Backward" -msgstr "Geriye doÄŸru" +msgstr "Geri" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264 msgid "Bad File Header" @@ -903,7 +905,7 @@ msgstr "Eklemek için bir klasöre gözat" #: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Browse for an ISO directory..." -msgstr "Bir kalıp konumu için gözat" +msgstr "Bir kalıp konumu için gözat..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" @@ -948,7 +950,7 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"3 Boyutlu görüntülerin derinlik deÄŸerlerini vertex yerine piksel başına " +"3 Boyutlu görüntülerin derinlik deÄŸerlerini vertex yerine piksel olarak " "hesapla. \n" "Piksel aydınlatmanın tersine (sadece bir donanım olan), oyunların çok azında " "piksel başına derinlik hesaplaması gereklidir.\n" @@ -963,10 +965,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"3 Boyutlu görüntülerin aydınlatılmasını vertex yerine piksel başına " +"3 Boyutlu görüntülerin aydınlatılmasını vertex yerine piksel olarak " "hesaplar. \n" -"Emülasyon hızını (iÅŸlemciye baÄŸlı olarak) biraz düşürür. \n" -"Bu genelde güvenli bir donanımdır, ama bazen sorunlara neden olabilir. \n" +"Emülasyon hızını (GPU'ya baÄŸlı olarak) biraz düşürebilir. \n" +"Bu genelde güvenlidir, ama bazen sorunlara neden olabilir. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -980,7 +982,7 @@ msgstr "Ä°ptal" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240 #, c-format msgid "Cannot open %s" -msgstr "%s 'yi açmayı iptal et" +msgstr "%s açılamadı." #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" @@ -1020,7 +1022,7 @@ msgstr "Sap baÄŸlantısı ile Wiimote bulunamadı: %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" -msgstr "DVD Eklentisinden okunamıyor - DVD-Arabirimi : Ölümcül Hata" +msgstr "DVD Eklentisinden okunamıyor - DVD-Arabirimi : Önemli Hata" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:49 msgid "Caps Lock" @@ -1061,16 +1063,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:59 msgid "Changes sign to zFar Parameter (after correction)" -msgstr "zFar Parametresine iÅŸaret deÄŸiÅŸtirir (düzeltme sonrası)" +msgstr "zFar Parametresinin iÅŸaretini deÄŸiÅŸtirir (düzeltme sonrası)" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:54 msgid "Changes sign to zNear Parameter (after correction)" -msgstr "zNear Parametresine iÅŸaret deÄŸiÅŸtirir (düzeltme sonrası)" +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 etki etmeyecektir!" +msgstr "" +"Emülatör çalışırken deÄŸiÅŸtirirseniz herhangi bir etkisini göremezsiniz!" #: Source/Core/DolphinWX/Src/NetWindow.cpp:282 msgid "Chat" @@ -1316,7 +1319,7 @@ msgstr "%s oluÅŸturulamadı." #: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 #, c-format msgid "Could not initialize backend %s." -msgstr "Arkauç %s baÅŸlatılamadı." +msgstr "Çözücü %s baÅŸlatılamadı." #: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format @@ -1357,8 +1360,7 @@ msgid "" msgstr "" "Hafıza kartı dosyası %s yazılamadı. \n" "\n" -"Dolphin'i bir CD veya DVD'den çalıştırıyor olabilir misiniz veya kayıt " -"dosyası yazma korumalı olabilir mi?" +"Dolphin'i bir CD/DVD'den çalıştırıyorsunuz veya kayıt dosyası yazma korumalı." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" @@ -1446,11 +1448,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" -msgstr "Özel Projeksiyon Hilesi" +msgstr "Özel Görüntüleme Hilesi" #: Source/Core/DolphinWX/Src/PHackSettings.h:30 msgid "Custom Projection Hack Settings" -msgstr "Özel Projeksiyon Hilesi Ayarları" +msgstr "Özel Görüntüleme Hilesi Ayarları" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." @@ -1587,8 +1589,7 @@ msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." msgstr "" -"Dışarı tampon DVD içine sığacak veriden daha fazla veri almak için giriÅŸimde " -"algılandı. Kelepçe." +"DVD'nin alabileceÄŸi veriden daha fazlasını sığdırma giriÅŸimi algılandı." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 @@ -1618,7 +1619,7 @@ msgid "" " and Directory backup checksum failed" msgstr "" "Konum doÄŸrulama baÅŸarısız \n" -"ve Konum yedeÄŸi doÄŸrulama da baÅŸarısız" +"ve konum yedeÄŸi doÄŸrulama da baÅŸarısız." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 @@ -1649,9 +1650,9 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Herhangi bir XFB emülasyonunu iptal et. \n" -"Emülasyonu bayağı hızlandırır ama onlara dayanıklı oyunlarda (özellikle " -"homebrew uygulamalarında) ağır hatalara neden olabilir.\n" +"XFB emülasyonunu iptal et. \n" +"Emülasyonu çok hızlandırır ama onlara dayanıklı oyunlarda (özellikle " +"homebrew uygulamalarında) önemli hatalara neden olabilir.\n" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." @@ -1665,9 +1666,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "EFB kopyalarının emülasyonunu iptal et. \n" -"Bunlar genelde yorumlamadan dokuya olan efektlerin sonradan iÅŸlenmesinde " -"kullanılır, bunun için de bu ayarı açmak çoÄŸu zaman hataya neden olan büyük " -"bir hızlanma saÄŸlar. \n" +"Bunlar genelde render-to-texture efektlerinin geç iÅŸlenmesinde kullanılır, " +"bu ayarı açmak büyük bir hızlanma saÄŸlar ama çoÄŸu zaman önemli hatalara " +"neden olabilir. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -1772,7 +1773,7 @@ msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -"Dolphin herhangi bir GC veya Wii kalıbı bulamadı. Buraya çift tıklatarak " +"Dolphin herhangi bir GC veya Wii kalıbı bulamadı. Buraya çift tıklatarak " "dosyalara göz atabilirsiniz..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 @@ -1781,7 +1782,7 @@ msgid "" "games..." msgstr "" "Dolphin ÅŸu anda oyunları gizlemeye ayarlıdır. Buraya çift tıklatarak tüm " -"oyunları görebilirsiniz..." +"oyunları görebilirsiniz." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -1790,7 +1791,7 @@ msgstr "AÅŸağı" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 msgid "Download Codes (WiiRD Database)" -msgstr "WiiRD Veritabanından Kod Ä°ndir" +msgstr "Kodları Ä°ndir (WiiRD Veritabanı)" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 #, c-format @@ -1827,8 +1828,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Tüm yorumlanan kareleri User/Dump/Frames içerisine bir AVI dosyası olarak " -"dök \n" +"Yorumlanan çerçeveleri User/Dump/Frames içerisine bir AVI dosyası olarak " +"kaydet. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -1838,7 +1839,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Çözülen oyun dokularını User/Dump/Textures// konumuna dök. \n" +"Çözülen oyun dokularını User/Dump/Textures// konumuna kaydet. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -1848,7 +1849,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"EFB kopyalarının içeriÄŸini User/Dump/Textures içine dök \n" +"EFB kopyalarının içeriÄŸini User/Dump/Textures içine kaydet. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -1881,9 +1882,8 @@ msgid "" "driver." msgstr "" "HATA: Dolphin'in bu sürümü bir TAP-Win32 sürücüsü gerektirir ve bu sürücü en " -"azından %d. %d sürümü olmalıdır. --- EÄŸer Dolphin'i sürekli " -"güncelliyorsanız, Windows'un sürücüyü görmesi için yeniden baÅŸlatma " -"gerekebilir." +"azından %d.%d sürümü olmalıdır. --- EÄŸer Dolphin'i sürekli güncelliyorsanız, " +"Windows'un sürücüyü görmesi için yeniden baÅŸlatma gerekebilir." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -1924,7 +1924,7 @@ msgstr "Etki" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" -msgstr "Gömülü Kare Tamponu" +msgstr "Gömülü Çerçeve Tamponu" #: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" @@ -1938,9 +1938,9 @@ msgid "" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" -"XFB'lerin doÄŸruluÄŸunu emüle et. \n" -"Hızı bayağı düşürür ve yüksek çözünürlükte yorumlamayı engeller ama bazı " -"oyunları düzgün çalıştırabilmek için gereklidir. \n" +"XFB'leri daha gerçekçi bir ÅŸekilde emüle et. \n" +"Hızı çok düşürür, yüksek çözünürlükte yorumlamayı engeller, ama bazı " +"oyunların düzgün çalışması için gereklidir. \n" "\n" "Emin deÄŸilseniz, bunun yerine sanal XFB emülasyonunu seçin." @@ -1954,9 +1954,9 @@ msgid "" "If unsure, leave this checked." msgstr "" "XFB'leri GPU doku nesneleriyle emüle et. \n" -"XFB emülasyonu olmadan çalışmayan oyunların gerçek XFB emülasyonu kadar " -"kasmadan çalıştırır. Ancak, yine de diÄŸer birçok oyunda (özellikle homebrew " -"uygulamalarında) baÅŸarısız olabilir. \n" +"XFB emülasyonu olmadan çalışmayan oyunları, gerçek XFB emülasyonu gibi " +"yavaÅŸlamadan çalıştırır. Ancak, yine de diÄŸer birçok oyunda (özellikle " +"homebrew uygulamalarında) baÅŸarısız olabilir. \n" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." @@ -2013,7 +2013,7 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" -msgstr "ÖnbelleÄŸe izin ver" +msgstr "Ön BelleÄŸe Ä°zin Ver" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2078,7 +2078,7 @@ msgid "" msgstr "" "Filtrelemeyi etkinleÅŸtirir. \n" "Özellikle eÄŸik açılı dokuların görsel kalitesini artırır. \n" -"Çok az oyunda bazı hatalara neden olabilir. \n" +"Oyunların çok azında bazı hatalara neden olabilir. \n" "\n" "Emin deÄŸilseniz, 1x seçin." @@ -2134,12 +2134,13 @@ msgid "" "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" msgstr "" -"Blok Adresi Çevirisine izin verir. Bu bir Hafıza Yönetim Ãœnitesi iÅŸlevidir. " -"DoÄŸruluÄŸu artırır ama performansı düşürür. (Açık = Uyumlu, Kapalı = Hızlı)" +"Blok Adresi Çevirisi'ne (BAT) izin verir. Bu bir Hafıza Yönetim Ãœnitesi " +"iÅŸlevidir. GerçekçiliÄŸi artırır ama performansı düşürür. (Açık = Uyumlu, " +"Kapalı = Hızlı)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" -msgstr "Özel Projeksiyon Hilesini EtkinleÅŸtirir" +msgstr "Özel Gösterim Hilesini EtkinleÅŸtirir" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" @@ -2148,7 +2149,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"EÄŸer emüle edilen yazılım destekliyorsa, progresif taramayı etkinleÅŸtirir.\n" +"EÄŸer yazılım desteÄŸi varsa, progresif taramayı etkinleÅŸtirir.\n" "Oyunların çoÄŸu bunu umursamaz.\n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -2247,8 +2248,8 @@ msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" -"Hata: %s yazı tiplerine ulaÅŸmayı denedik,ama yüklenemediler. Oyunlar yazı " -"tiplerini düzgün göstermeyecek veya çakılacaklar." +"Hata: %s yazı tipleri düzgün yüklenemedi. Oyunlardaki yazılar düzgün " +"görüntülenemeyebilir, veya oyunlar çakılabilir." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2294,7 +2295,7 @@ msgstr "Kaydı Ver" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" -msgstr "Wii Kayıtlı Oyununu Ver (Deneysel)" +msgstr "Wii Kayıtlı Oyununu Ver (Deneme Amaçlı)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 msgid "Export all saves" @@ -2314,7 +2315,7 @@ msgstr "Uzantı" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" -msgstr "Harici Kare Tamponu" +msgstr "Harici Çerçeve Tamponu" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:60 msgid "Extra Parameter" @@ -2367,7 +2368,7 @@ msgstr "GeniÅŸletiliyor..." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 msgid "FIFO Byte" -msgstr "FIFO Baytı" +msgstr "FIFO Bayt'ı" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:38 msgid "FIFO Player" @@ -2490,7 +2491,7 @@ msgstr "" #: Source/Core/DiscIO/Src/VolumeGC.cpp:61 msgid "Failed to read unique ID from disc image" -msgstr "Disk kalıbından eÅŸsiz ID okunamadı." +msgstr "Disk kalıbının Unique ID'si okunamadı." #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:83 msgid "Failed to write BT.DINF to SYSCONF" @@ -2516,7 +2517,7 @@ msgstr "Hızlı" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Fast Mipmaps" -msgstr "Hızlı Mipmap'lar" +msgstr "Hızlı MipMap'ler" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." @@ -2594,7 +2595,7 @@ msgstr "4:3 'e zorla" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" -msgstr "Konsolu NTSC-J Olarak Zorla" +msgstr "Konsolu NTSC-J Olmaya Zorla" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" @@ -2608,7 +2609,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Oyun kabul etmese de doku filtresini açar. \n" -"Doku kalitesini artırır ama bazı oyunlarda hatalara neden olabilir. \n" +"Doku kalitesini artırır ama bazı oyunlarda hatalara neden olur. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -2620,7 +2621,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Oyunun görüntüsünü geniÅŸ ekrana uydurur. \n" -"Bazı oyunlarda görüntü hatalarına neden olabilir. \n" +"Bazı oyunlarda görüntü hatalarına neden olur. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -2649,36 +2650,36 @@ msgstr "Ä°leri" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Frame" -msgstr "Kare" +msgstr "Çerçeve" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Frame " -msgstr "Kare" +msgstr "Çerçeve" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" -msgstr "GeliÅŸmiÅŸ Kareleme" +msgstr "GeliÅŸmiÅŸ Çerçeveleme" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" -msgstr "Kare dökümünde FFV1 kullan" +msgstr "Çerçeve dökümünde FFV1 kullan" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105 msgid "Frame Range" -msgstr "Kare Aralığı" +msgstr "Çerçeve Aralığı" #: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Frame S&kipping" -msgstr "&Kare Atlama" +msgstr "Çerçeve Atlama(&K)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" -msgstr "Kare Sınırı:" +msgstr "Çerçeve Sınırı:" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189 msgid "Frames To Record" -msgstr "Çekilecek Kareler" +msgstr "Çekilecek Çerçeveler" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" @@ -2830,7 +2831,6 @@ msgid "Greater Than" msgstr "Daha Büyük" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -#, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2840,8 +2840,9 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Dokuya yorumlama efektlerinde kullanılan doku kalitesini bayağı artırır. \n" +"Render-to-texture efektlerinde kullanılan doku kalitesini bayağı artırır. \n" "İç çözünürlüğü yükseltmek bu ayarın etkisini artırır. \n" +"Performansı düşürüp, hatalara neden olabilir. \n" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." @@ -3018,15 +3019,15 @@ msgstr "" msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -"Saniyedeki kare sayısı düzensizse, bu seçenek size yardım edebilir. (Açık = " -"Uyumlu, Kapalı = Hızlı)" +"Saniyedeki çerçeve sayısı düzensizse, bu seçenek size yardım edebilir. (Açık " +"= Uyumlu, Kapalı = Hızlı)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." msgstr "" -"EÄŸer kare sınırını oyun hızından yüksek seçerseniz (NTSC:60, PAL:50), ses " +"EÄŸer çerçeve sınırını oyun hızından yüksek seçerseniz (NTSC:60, PAL:50), ses " "ayarlarında Ses hızlandırmasını da iptal ederek bunu daha etkili " "kılabilirsiniz." @@ -3828,7 +3829,7 @@ msgstr "Hiçbiri" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" -msgstr "Norveççe" +msgstr "Norveççe (Bokmaal Lehçesi)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Not Equal" @@ -4147,7 +4148,7 @@ msgstr "Portekizce (Brezilya)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" -msgstr "Sonradan Ä°ÅŸleme Etkisi:" +msgstr "Geç Ä°ÅŸleme Etkisi:" #: Source/Core/Core/Src/Movie.cpp:735 #, c-format @@ -4291,8 +4292,8 @@ msgid "" "If unsure, select None." msgstr "" "3D Görüntü yüzünden oluÅŸan bozulmayı azaltır. \n" -"Görüntünün daha az bloklu görünmesini saÄŸlar ama performansı çok düşürür.\n" -"Emülasyon hızını çok kötü düşürür ve bazen hatalara neden olur. \n" +"Görüntünün daha kaliteli olmasını saÄŸlar ama performansı çok düşürür.\n" +"Emülasyon hızını çok düşürür ve bazen hatalara neden olur. \n" "\n" "Emin deÄŸilseniz, hiçbiri seçin." @@ -4542,7 +4543,7 @@ msgid "" "\n" "If unsure, use the first one." msgstr "" -"Kullanmak için bir donanım adaptörü seçin. \n" +"Kullanmak için bir çevirici seçin. \n" "\n" "Emin deÄŸilseniz, ilkini kullanın." @@ -4593,7 +4594,7 @@ msgid "" "If unsure, select Auto." msgstr "" "Yorumlarken kullanılacak en-boy oranını seçin:\n" -"Otomatik: DoÄŸal en-boy oranını kullanır (4:3)\n" +"Otomatik: DoÄŸal en-boy oranını kullanır\n" "16:9'a Zorla: En-boy oranını 16:9 yapar. \n" "4:3'e Zorla: En-boy oranını 4:3 yapar. \n" "Pencereye göre: Görüntüyü pencereye göre yorumlar. \n" @@ -4630,8 +4631,8 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" "Hangi görüntü API'sinin kullanılacağını seçer.\n" -"DirectX 9 genelde en hızlı olanlarıdır. OpenGL doÄŸruluÄŸa önem verir. DirectX " -"11 ikisinin arasıdır.\n" +"DirectX 9 genelde en hızlı olanlarıdır. OpenGL gerçekçiliÄŸe önem verir. " +"DirectX 10/11 ikisinin arasıdır.\n" "Åžunu unutmayın, DirectX 9 sadece Windows'da kullanılabilir.\n" "\n" "Emin deÄŸilseniz, DirectX 9 seçin." @@ -4829,7 +4830,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Emülasyon hızını ölçmek için 1 saniye içerisinde yorumlanan kare sayısını " +"Emülasyon hızını ölçmek için 1 saniye içerisinde yorumlanan çerçeve sayısını " "göster. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -4874,7 +4875,7 @@ msgstr "Hedef Alpha GeçiÅŸini Atla" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" -msgstr "CPU'dan EFB eriÅŸimini atla" +msgstr "CPU'dan EFB'ye eriÅŸimi atla" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" @@ -4883,7 +4884,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ÇoÄŸu oyunda çeÅŸitli görsel efektler için hedef alfa geçiÅŸini atla. \n" +"ÇoÄŸu oyunda çeÅŸitli görsel efektler için hedef alpha geçiÅŸini atla. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -4896,11 +4897,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"DoÄŸruluktan fedakarlık edip EFB'den RAM'a kopyalamayı biraz hızlandırır. \n" -"Bazen görsel kaliteyi de artırır. \n" -"EÄŸer herhangi bir sorun yaşıyorsanız, doku önbelleÄŸi doÄŸruluÄŸunu artırmayı " -"veya bu seçeneÄŸi iptal etmeyi deneyin. \n" -"\n" +"DoÄŸruluktan ödün vererek EFB'den RAM'e kopyalayı biraz hızlandırır. \n" +"Bazen bu görüntü kalitesini de artırır. \n" +"Herhangi bir sorun yaÅŸarsanız, bu seçeneÄŸi iptal etmeyi veya doku ön belleÄŸi " +"doÄŸruluÄŸunu artırmayı deneyin.\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 @@ -4932,7 +4932,7 @@ msgid "" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -"Yazılım yorumlaması, diÄŸer arka uçlardan daha yavaÅŸtır.\n" +"Yazılım yorumlaması, diÄŸer çözücülerden daha yavaÅŸtır.\n" "Sadece hata ayıklamada kullanışlıdır.\n" "Yazılım yorumlamasını açmayı gerçekten istiyor musunuz? Emin deÄŸilseniz, " "'Hayır' seçin." @@ -5062,9 +5062,9 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"EFB kopyalarını GPU doku nesnelerinde sakla. \n" -"Pek doÄŸru deÄŸildir, ama çoÄŸu oyun için iyi çalışır ve EFB'den RAM'e " -"seçeneÄŸinden daha fazla hız verir. \n" +"EFB kopyalarını GPU doku nesnelerinde saklayın.\n" +"Bu pek doÄŸru deÄŸildir, ancak EFB'den RAM'e seçiliyken yeteri kadar iyi " +"çalışarak çoÄŸu oyunu hızlandırır.\n" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." @@ -5091,7 +5091,7 @@ msgstr "Kayıt dosyaları baÅŸarıyla alındı" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 msgid "Swing" -msgstr "Sapma" +msgstr "Hareket" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 @@ -5147,7 +5147,7 @@ msgstr "Doku" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" -msgstr "Doku ÖnbelleÄŸi" +msgstr "Doku Ön BelleÄŸi" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" @@ -5218,8 +5218,8 @@ msgid "" "\n" "If unsure, use the second-fastest value from the right." msgstr "" -"Bunu ayarlamak daha güvenlidir, emülatörün RAM'den daha az doku güncellemesi " -"kaçırmasını saÄŸlar. \n" +"Bunu güvenli bir ÅŸekilde ayarlamanız, emülatörün RAM'den doku güncellemesi " +"kaybetme oranını azaltacaktır. \n" "\n" "Emin deÄŸilseniz, saÄŸdaki 2. en hızlı deÄŸeri kullanın." @@ -5322,8 +5322,9 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" "Bu seçenek oyun hızının sesle denetlenmesini saÄŸlar. \n" -"Ä°ptal ederseniz oyun hızında anormallik olabilir,mesela çok hızlı. \n" -"Ama bazen bunu iÅŸaretlemek sürekli gürültüye neden olabilir. \n" +"Ä°ptal ederseniz oyun hızında anormallik olabilir,mesela oyun çok hızlı " +"çalışabilir. \n" +"Ama bazen bunu iÅŸaretlemek gürültüye neden olabilir. \n" "\n" "Klavye Kısayolu : Hızlandırmayı anında iptal etmek için basılı tutun." @@ -5394,7 +5395,7 @@ msgstr "Geleneksel Çince" #: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." -msgstr "Bilinmeyen bir dosya türünü yüklemeye denedik." +msgstr "Bilinmeyen bir dosya türünü yüklemeyi denedi." #: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" @@ -5476,7 +5477,7 @@ msgstr "Bilinmeyen" #: Source/Core/Core/Src/HW/DVDInterface.cpp:894 #, c-format msgid "Unknown DVD command %08x - fatal error" -msgstr "Bilinmeyen DVD komutu %08x - ölümcül hata" +msgstr "Bilinmeyen DVD komutu %08x - önemli hata" #: Source/Core/Common/Src/SysConf.cpp:145 #, c-format @@ -5543,7 +5544,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Dokuları emüle etmek için birden fazla iÅŸlem birimi kullanın. \n" -"(Özellikle iki veya daha fazla çekirdeÄŸi olan iÅŸlemcilerde) hızı artırır. \n" +"Özellikle iki veya daha fazla çekirdeÄŸi olan iÅŸlemcilerde hızı artırır. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -5567,7 +5568,7 @@ msgstr "Gereçler" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" -msgstr "Dikey Sync" +msgstr "Dikey EÅŸitleme" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 msgid "Value" @@ -5653,7 +5654,7 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"Uyarı: Bu,aÅŸağıdaki klasördeki herhangi bit kayıtlı oyunun üzerine " +"Uyarı: Bu,aÅŸağıdaki klasördeki herhangi bir kayıtlı oyunun üzerine " "yazılacak:\n" "%s\n" "ve hafıza kartınızdaki dosyayla aynı adda olacak.\n" @@ -5918,7 +5919,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "[BOZUK] \n" -"EFB'lerin kopyalandığı bölgeleri iÅŸaretle.\n" +"EFB'lerin kopyalandığı bölgeleri belirt.\n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -5936,8 +5937,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"[DENEYSEL]\n" -"OpenCL kullanarak doku yorumlamasındaki yüklenmeyi azaltarak emülasyonu " +"[DENEME AMAÇLI]\n" +"OpenCL kullanarak doku yorumlamasındaki yüklenmeyi azaltır ve emülasyonu " "hızlandırır. \n" "Ancak, çeÅŸitli oyunlarda doku bozulmalarına neden olabilmektedir. Ayrıca " "çoÄŸu zaman CPU doku çözmesinden daha yavaÅŸtır. \n" @@ -5952,7 +5953,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"[DENEYSEL]\n" +"[DENEME AMAÇLI]\n" "Görüntü listelerini önbelleÄŸe alarak emülasyonu biraz hızlandırır. \n" "Bazı hatalara neden olabilir. \n" "\n" @@ -6017,11 +6018,13 @@ msgstr "| VEYA" #~ msgid "%d %%" #~ msgstr "%d %%" +#, fuzzy #~ msgid "&Frame Stepping" -#~ msgstr "&Kare Adımlama" +#~ msgstr "Çerçeve Atlama(&K)" +#, fuzzy #~ msgid "(Default)" -#~ msgstr "(Varsayılan)" +#~ msgstr "Varsayılan" #~ msgid "32,000 Hz" #~ msgstr "32,000 Hz" @@ -6041,14 +6044,17 @@ msgstr "| VEYA" #~ msgid "ALSA" #~ msgstr "ALSA" +#, fuzzy #~ msgid "AOSound" -#~ msgstr "AOSes" +#~ msgstr "&Ses" +#, fuzzy #~ msgid "Accurate Texture Cache" -#~ msgstr "DoÄŸru Doku ÖnbelleÄŸi" +#~ msgstr "Doku Ön BelleÄŸi" +#, fuzzy #~ msgid "Adjust window size" -#~ msgstr "Pencere boyutunu ayarlayın" +#~ msgstr "Pencere Boyutunu Otomatik Ayarla" #~ msgid "" #~ "Allows the CPU to read or write to the EFB (render buffer).\n" @@ -6106,44 +6112,57 @@ msgstr "| VEYA" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "%s açılamıyor, kayıp bir iÅŸleve sahip." +<<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "Salt-okunur modda film çekilemez." +======= +#, fuzzy +>>>>>>> Update Hungarian and Turkish translations. #~ msgid "Config..." #~ msgstr "Yapılandır..." +#, fuzzy #~ msgid "Configuration profile" -#~ msgstr "Yapılandırma Profili" +#~ msgstr "GeçmiÅŸ Yapılandırması" +#, fuzzy #~ msgid "Configuration profile:" -#~ msgstr "Yapılandırma Profili:" +#~ msgstr "GeçmiÅŸ Yapılandırması" +#, fuzzy #~ msgid "Connected" -#~ msgstr "BaÄŸlanıldı." +#~ msgstr "BaÄŸlan" +#, fuzzy #~ msgid "Connected to %i Wiimotes" -#~ msgstr "%i adet Wiimote'a baÄŸlanıldı." +#~ msgstr "Wiimote 1'i BaÄŸla" #~ msgid "Copy" #~ msgstr "Kopyala" +#, fuzzy #~ msgid "CoreAudio" -#~ msgstr "Ses ÇekirdeÄŸi" +#~ msgstr "Ses" +#, fuzzy #~ msgid "Could not copy %s to %s" -#~ msgstr "%s , %s 'e kopyalanamadı." +#~ msgstr "%s oluÅŸturulamadı." +#, fuzzy #~ msgid "Could not get info about plugin %s" -#~ msgstr "%s eklentisi hakkında bilgi alınamadı." +#~ msgstr "%s oluÅŸturulamadı." #~ msgid "DList Cache" #~ msgstr "D Listesi ÖnbelleÄŸi" +#, fuzzy #~ msgid "DSound" -#~ msgstr "DSound" +#~ msgstr "&Ses" +#, fuzzy #~ msgid "Danish" -#~ msgstr "Danca" +#~ msgstr "Ä°spanyolca" #~ msgid "Disable Wiimote Speaker" #~ msgstr "WiiMote Hoparlörünü Ä°ptal Et" @@ -6162,8 +6181,9 @@ msgstr "| VEYA" #~ "Alpha-ayar geçiÅŸini iptal eder. \n" #~ "Bazı etkiler iptal olur ama performansı artırabilir." +#, fuzzy #~ msgid "Distance Alpha Pass" -#~ msgstr "Uzaklık Alpha GeçiÅŸi" +#~ msgstr "Hedef Alpha GeçiÅŸini Atla" #~ msgid "Dolphin DSP-HLE Plugin" #~ msgstr "Dolphin DSP-HLE Eklentisi" @@ -6177,14 +6197,17 @@ msgstr "| VEYA" #~ msgid "Dolphin DSP-LLE Plugin Settings" #~ msgstr "Dolphin DSP-LLE Eklenti Ayarları" +#, fuzzy #~ msgid "Dolphin Direct3D11" -#~ msgstr "Dolphin DirectX 10/11" +#~ msgstr "DirectX 10/11" +#, fuzzy #~ msgid "Dolphin Direct3D9" -#~ msgstr "Dolphin DirectX 9" +#~ msgstr "DirectX 9" +#, fuzzy #~ msgid "Dolphin OpenGL" -#~ msgstr "Dolphin OpenGL" +#~ msgstr "Dolphin FIFO" #~ msgid "" #~ "Dolphin has not been configured with an install location,\n" @@ -6207,33 +6230,42 @@ msgstr "| VEYA" #~ msgid "Emulator Display Settings" #~ msgstr "Emülatör Görüntü Ayarları" +#~ msgid "Enable Bounding Box Calculation" +#~ msgstr "Sınırlayıcı Kutu Hesaplama'yı EtkinleÅŸtir" + +#, fuzzy #~ msgid "Enable CPU Access" -#~ msgstr "CPU EriÅŸimine Ä°zin Ver" +#~ msgstr "Ön BelleÄŸe Ä°zin Ver" #~ msgid "Enable Copy to EFB" #~ msgstr "EFB'ye Kopyalamaya Ä°zin Ver" +#, fuzzy #~ msgid "Enable EFB To Texture" -#~ msgstr "EFB'den Dokuya Ä°zin Ver" +#~ msgstr "Dokuları Ä°ptal Et" +#, fuzzy #~ msgid "Enable HLE Audio" -#~ msgstr "HLE Sesine Ä°zin Ver" +#~ msgstr "Ses Hızlandırmasına Ä°zin Ver" +#, fuzzy #~ msgid "Enable JIT Dynarec" -#~ msgstr "JIT Dynarec'e Ä°zin Ver" +#~ msgstr "Çift ÇekirdeÄŸe Ä°zin Ver" +#, fuzzy #~ msgid "Enable OpenCL" -#~ msgstr "OpenCL'ye Ä°zin Ver" +#~ msgstr "Sayfalara izin ver" +#, fuzzy #~ msgid "Enable Screen Saver (burn-in reduction)" -#~ msgstr "Ekran Koruyucuya Ä°zin Ver (Yanma redüksiyonu)" +#~ msgstr "Ekran Koruyucusuna Ä°zin Ver" +#, fuzzy #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" #~ msgstr "" -#~ "Ses kodunun dinamik yeniden derlenmesine izin verir. \n" -#~ "Emülatör çalışırken deÄŸiÅŸtirirseniz etki etmeyecektir!" +#~ "Emülatör çalışırken deÄŸiÅŸtirirseniz herhangi bir etkisini göremezsiniz!" #~ msgid "" #~ "Enables emulation of Embedded Frame Buffer copies, if the game uses " @@ -6264,6 +6296,13 @@ msgstr "| VEYA" #~ msgid "Error allocating buffer" #~ msgstr "Tampon ayırma hatası" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "PlayWiimote'da hata. %u != %u, byte %d.\n" +#~ "Ãœzgünüz, Wii kaydında geçici hasar var." + #~ msgid "Error loading %s: can't read info" #~ msgstr "%s yüklenirken hata: Bilgi okunamıyor." @@ -6276,6 +6315,13 @@ msgstr "| VEYA" #~ msgid "Error opening file %s for recording" #~ msgstr "Kayıt için %s dosyasını açarken hata." +#~ msgid "" +#~ "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +#~ "Aborting savestate load..." +#~ msgstr "" +#~ "Hata: \"%s\" 'dan sonra, %d (0x%X) bulundu ( %d (0x%X) yerine). Durum " +#~ "kaydı yüklemesinden vazgeçiliyor..." + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6285,8 +6331,9 @@ msgstr "| VEYA" #~ "%s\n" #~ "DSP LLE Kullanabilmek için bu dosya gereklidir." +#, fuzzy #~ msgid "Failed to load DSP ROM: %s" -#~ msgstr "DSP ROM'u %s yükleme baÅŸarısız." +#~ msgstr "Kod indirme baÅŸarısız." #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " @@ -6296,11 +6343,13 @@ msgstr "| VEYA" #~ "Hızlı varyantlar daha az piksele bakar ve hata potansiyeli yüksektir. \n" #~ "YavaÅŸ varyantlar daha çok piksele bakar ve daha güvenlidir." +#, fuzzy #~ msgid "Force Bi/Trilinear Filtering" -#~ msgstr "Ä°ki/Üç Çizgili Filtreye Zorla" +#~ msgstr "Doku Filtrelemesine Zorla" +#, fuzzy #~ msgid "Fractional" -#~ msgstr "Kesirli" +#~ msgstr "Eylem" #~ msgid "" #~ "Fully emulate embedded frame buffer copies.\n" @@ -6311,14 +6360,20 @@ msgstr "| VEYA" #~ "Dokuya EFB Kopyalamaktan daha doÄŸrudur, ve bazı oyunlar düzgün çalışmak " #~ "için buna ihtiyaç duyar, ama çok yavaÅŸ olabilir." +#~ msgid "GCMic Configuration" +#~ msgstr "GCMic Yapılandırması" + +#, fuzzy #~ msgid "GFX Config" -#~ msgstr "Grafik Yapılandırması" +#~ msgstr "Yapılandırma" +#, fuzzy #~ msgid "Graphics Plugin" -#~ msgstr "Görüntü Eklentisi" +#~ msgstr "Görüntü" +#, fuzzy #~ msgid "Hide Shader Errors" -#~ msgstr "Gölgelendirici Hatalarını Gizle" +#~ msgstr "Disk Okuma Hatası" #~ msgid "" #~ "Hide the cursor when it is over the rendering window and the rendering " @@ -6333,24 +6388,34 @@ msgstr "| VEYA" #~ "EÄŸer bir oyun çakılırsa, sadece Interpreter'da çalışıyorsa veya Dolphin " #~ "çökerse, bu seçenek oyunu düzeltebilir." +#~ msgid "" +#~ "If checked, the bounding box registers will be updated. Used by the Paper " +#~ "Mario games." +#~ msgstr "" +#~ "EÄŸer iÅŸaretlenmiÅŸse, sınırlayıcı kutu kayıtları güncellenecektir. Paper " +#~ "Mario oyunları tarafından kullanılır." + #~ msgid "Input Source" #~ msgstr "GiriÅŸ Kaynağı" #~ msgid "Install directory could not be saved" #~ msgstr "Kurulum konumu kaydedilemedi." +#, fuzzy #~ msgid "Installing WAD to Wii Menu..." -#~ msgstr "WAD dosyası Wii Menüsüne kuruluyor..." +#~ msgstr "Wii Menüsüne kur" +#, fuzzy #~ msgid "Integral [recommended]" -#~ msgstr "Ä°ntegral [önerilen]" +#~ msgstr "JIT Yeniden Derleyici (önerilen)" +#, fuzzy #~ msgid "" #~ "Internal LZO Error - decompression failed (%d) (%ld, %ld) \n" #~ "Try verifying the state again" #~ msgstr "" -#~ "İç LZO Hatası - GeniÅŸletme baÅŸarısız (%d) (%ld, %ld) \n" -#~ "Durumu doÄŸrulamayı tekrar deneyin." +#~ "İç LZO Hatası - GeniÅŸletme baÅŸarısız (%d) (%li, %li) \n" +#~ "Durumu tekrar yüklemeyi deneyin." #~ msgid "" #~ "Keeps track of textures based on looking at the actual pixels in the " @@ -6362,8 +6427,9 @@ msgstr "| VEYA" #~ "YavaÅŸlamaya neden olabilir, ama bazı oyunlar düzgün çalışmak için buna " #~ "ihtiyaç duyar." +#, fuzzy #~ msgid "Load Script..." -#~ msgstr "Script Yükle..." +#~ msgstr "Durumu Yükle..." #~ msgid "" #~ "Loads native mipmaps instead of generating them.\n" @@ -6373,8 +6439,9 @@ msgstr "| VEYA" #~ "Mipmap'leri oluÅŸturmak yerine doÄŸal olanlarını yükler. \n" #~ "DoÄŸruluÄŸu artırır ama performansı düşürebilir." +#, fuzzy #~ msgid "Lua Script Console" -#~ msgstr "Lua Script Konsolu" +#~ msgstr "Konsola Yaz" #~ msgid "Metroid Other M" #~ msgstr "Metroid Other M" @@ -6389,8 +6456,9 @@ msgstr "| VEYA" #~ "Dokuların kullandığı biçimi görmek için onları deÄŸiÅŸtir. \n" #~ "Sadece hata ayıklama için kullanışlıdır." +#, fuzzy #~ msgid "New &Lua Console" -#~ msgstr "Yeni &Lua Konsolu" +#~ msgstr "Konsolu Göster (&C)" #~ msgid "No audio output" #~ msgstr "Ses çıkışı yok" @@ -6401,11 +6469,13 @@ msgstr "| VEYA" #~ msgid "OK" #~ msgstr "Tamam" +#, fuzzy #~ msgid "OpenAL" -#~ msgstr "OpenAL" +#~ msgstr "Aç" +#, fuzzy #~ msgid "OpenGL" -#~ msgstr "OpenGL" +#~ msgstr "Aç" #~ msgid "Plugins" #~ msgstr "Eklentiler" @@ -6419,8 +6489,18 @@ msgstr "| VEYA" #~ "Dolphin'i salt okunur bir konumdan veya kurulmadığı yerden mi " #~ "çalıştırıyorsunuz?" +#~ msgid "Premature movie end in PlayController. %u + 8 > %u" +#~ msgstr "PlayController'da erken kayıt bitiÅŸi. %u + 8 > %u" + +#~ msgid "Premature movie end in PlayWiimote. %u + %d > %u" +#~ msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u + %d > %u" + +#~ msgid "Premature movie end in PlayWiimote. %u > %u" +#~ msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u > %u" + +#, fuzzy #~ msgid "Projection Stats" -#~ msgstr "Projeksiyon Durumu" +#~ msgstr "Özel Görüntüleme Hilesi Ayarları" #~ msgid "Pulse" #~ msgstr "VuruÅŸ" @@ -6428,8 +6508,9 @@ msgstr "| VEYA" #~ msgid "Relaunch Dolphin from the install directory and save from there" #~ msgstr "Dolphin'i kurulum konumundan tekrar baÅŸlat ve buradan kaydet" +#, fuzzy #~ msgid "Render to main window." -#~ msgstr "Oyunu ana pencerede çalıştırır." +#~ msgstr "Ana pencerede yorumla" #~ msgid "Rendering" #~ msgstr "Yorumlama" @@ -6437,8 +6518,9 @@ msgstr "| VEYA" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Japon ROM'lardaki yazıyı kullanmak için gereklidir." +#, fuzzy #~ msgid "Run" -#~ msgstr "Çalıştır" +#~ msgstr "Enter" #~ msgid "Running script...\n" #~ msgstr "Script çalıştırılıyor... \n" @@ -6455,8 +6537,9 @@ msgstr "| VEYA" #~ "Bir diskin güncelleme bölüntüsünden geniÅŸletilen Sistem Menüsü WAD'ını " #~ "seçin." +#, fuzzy #~ msgid "Select the script to load" -#~ msgstr "Yüklemek için Script seçin" +#~ msgstr "Yüklemek için durum seçin" #~ msgid "" #~ "Selects which game should be affected by the configuration changes done " @@ -6484,8 +6567,9 @@ msgstr "| VEYA" #~ "Projeksiyon durumunu göster. \n" #~ "Sadece hata ayıklamada kullanışlıdır." +#, fuzzy #~ msgid "Show save banner" -#~ msgstr "Kayıt afiÅŸini göster" +#~ msgstr "Kayıt simgesini göster" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Saniyede kaç karenin görüntülendiÄŸini göster." @@ -6500,8 +6584,9 @@ msgstr "| VEYA" #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" +#, fuzzy #~ msgid "Slot" -#~ msgstr "Slot" +#~ msgstr "Slot A" #~ msgid "Sonic and the Black Knight" #~ msgstr "Sonic and the Black Knight + NFS Nitro" @@ -6529,8 +6614,9 @@ msgstr "| VEYA" #~ "DiÄŸer seçenekler görüntü boyutundan bağımsız olarak seçilen düzeltilmiÅŸ " #~ "çözünürlüklerdir." +#, fuzzy #~ msgid "Specify an audio plugin" -#~ msgstr "Bir ses eklentisi belirtin" +#~ msgstr "Bir görüntü arka ucu belirtin" #~ msgid "Start Renderer in Fullscreen" #~ msgstr "Görüntüyü Tam Ekran baÅŸlat" @@ -6538,14 +6624,18 @@ msgstr "| VEYA" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Oyununuz tam ekran görüntüyle baÅŸlar." +#~ msgid "TaruKonga (Bongos)" +#~ msgstr "TaruKonga (Bongos)" + #~ msgid "The file " #~ msgstr "Dosya" #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Ses efektlerini oynatmak için kullanılır." +#, fuzzy #~ msgid "Trying to load unsupported type %d" -#~ msgstr "Desteklenmeyen tür %d 'yi yüklemeyi deniyor" +#~ msgstr "Bilinmeyen bir dosya türünü yüklemeyi denedi." #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "%d türü yapılandırma %s eklentisinde desteklenmiyor" @@ -6577,8 +6667,9 @@ msgstr "| VEYA" #~ "EFB kopyası kullanan oyunların görsel kalitesini artırır ama bazı " #~ "oyunlarda hatalara neden olur." +#, fuzzy #~ msgid "Video Backend:" -#~ msgstr "Görüntü Arka Ucu :" +#~ msgstr "Ses Çözücüsü:" #~ msgid "" #~ "Wait for vertical blanks.\n" @@ -6587,6 +6678,61 @@ msgstr "| VEYA" #~ "Dikey boÅŸlukları bekle. \n" #~ "Yırtılmayı azaltır ama performansı da azaltır." +#~ msgid "" +#~ "Warning: You loaded a save that's after the end of the current movie. " +#~ "(byte %u > %u) (frame %u > %u). You should load another save before " +#~ "continuing, or load this state with read-only mode off." +#~ msgstr "" +#~ "Dikkat: Åžu anki kaydın bitiÅŸinden sonra yer alan bir kayıt yüklediniz. " +#~ "(Bayt %u > %u) (Çerçeve %u > %u). Devam etmeden önce baÅŸka bir kayıt " +#~ "yüklemeniz, 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." + +#~ msgid "" +#~ "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " +#~ "should load another save before continuing, or load this state with read-" +#~ "only mode off. Otherwise you'll probably get a desync." +#~ msgstr "" +#~ "Dikkat: Bayt %d (0x%X) ile eÅŸleÅŸmeyen bir kayıt yüklediniz. Devam etmeden " +#~ "önce baÅŸka bir kayıt yüklemeniz, 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." + +#~ msgid "" +#~ "Warning: You loaded a save whose movie mismatches on frame %d. You should " +#~ "load another save before continuing, or load this state with read-only " +#~ "mode off. Otherwise you'll probably get a desync.\n" +#~ "\n" +#~ "More information: The current movie is %d frames long and the savestate's " +#~ "movie is %d frames long.\n" +#~ "\n" +#~ "On frame %d, the current movie presses:\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" +#~ "On frame %d, the savestate's movie presses:\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" +#~ msgstr "" +#~ "Dikkat: Çerçeve %d ile eÅŸleÅŸmeyen bir kayıt yüklediniz. Devam etmeden " +#~ "önce baÅŸka bir kayıt yüklemeniz, 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.\n" +#~ "\n" +#~ "Daha fazla bilgi: Åžu anki kayıt %d çerçeve uzunluÄŸunda, ama durum kaydı " +#~ "%d çerçeve uzunluÄŸunda.\n" +#~ "\n" +#~ "Çerçeve %d 'de, ÅŸu anki kayıt bunları basıyor:\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" +#~ "Çerçeve %d 'de, durum kaydı bunları basıyor:\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" + #~ msgid "" #~ "When using EFB to RAM we very often need to decode RAM data to a VRAM " #~ "texture, which is a very time-consuming task.\n" @@ -6607,17 +6753,20 @@ msgstr "| VEYA" #~ "(NOT: Güvenli doku önbelleklemesi hız artışını azaltır; doÄŸru doku " #~ "önbelleklenmesi \"safe\" 'ye ayarlıysa daha yavaÅŸ olabilir!)" +#, fuzzy #~ msgid "Wiimote %i %s" -#~ msgstr "Wiimote %i %s" +#~ msgstr "Wiimote %i" +#, fuzzy #~ msgid "Wiimote Settings" -#~ msgstr "Wiimote Ayarları" +#~ msgstr "&Wiimote Ayarları" #~ msgid "Will enable progressive scan option if supported by software." #~ msgstr "EÄŸer yazılım desteÄŸi varsa progresif taramayı etkinleÅŸtirir." +#, fuzzy #~ msgid "Window Size:" -#~ msgstr "Pencere Boyutu:" +#~ msgstr "Otomatik (Pencere Boyutu)" #~ msgid "Window height for windowed mode" #~ msgstr "Pencere modu için yükseklik" From 7306257c0f4df9f00719e537e41c616d1550f278 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 27 Dec 2011 08:36:16 -0600 Subject: [PATCH 043/185] Update from master branch. Update Arabic, Hungarian, and Spanish translations. --- Languages/po/ar.po | 434 ++++++++++++++--- Languages/po/ca.po | 257 +++++++++- Languages/po/cs.po | 250 +++++++++- Languages/po/de.po | 251 +++++++++- Languages/po/dolphin-emu.pot | 251 +++++++++- Languages/po/el.po | 921 ++++++++++++++++++++++++++++------- Languages/po/en.po | 251 +++++++++- Languages/po/es.po | 447 +++++++++++++++-- Languages/po/fr.po | 913 +++++++++++++++++++++------------- Languages/po/he.po | 251 +++++++++- Languages/po/hu.po | 418 ++++++++++++---- Languages/po/it.po | 251 +++++++++- Languages/po/ja.po | 258 +++++++++- Languages/po/ko.po | 251 +++++++++- Languages/po/nb.po | 251 +++++++++- Languages/po/nl.po | 251 +++++++++- Languages/po/pl.po | 282 ++++++++++- Languages/po/pt.po | 257 +++++++++- Languages/po/pt_BR.po | 290 ++++++++++- Languages/po/ru.po | 251 +++++++++- Languages/po/sr.po | 251 +++++++++- Languages/po/zh_CN.po | 251 +++++++++- Languages/po/zh_TW.po | 251 +++++++++- 23 files changed, 7012 insertions(+), 727 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 59bf9c9782..10b8d4bb51 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -8,6 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-16 11:25-0500\n" "Last-Translator: mansoor\n" @@ -19,6 +20,10 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= "PO-Revision-Date: 2011-10-16 11:25-0500\n" +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-27 08:27-0600\n" +>>>>>>> Update from master branch. "Last-Translator: mansoor\n" >>>>>>> Update Arabic and Japanese translations. "Language-Team: \n" @@ -103,6 +108,8 @@ 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 bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -221,7 +228,7 @@ msgstr "&إعدادات الاختصارات" #: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&JIT" -msgstr "" +msgstr "&JIT" #: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "&Load State" @@ -301,11 +308,11 @@ msgstr "&معلومات عن اللعبة" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:58 msgid "(-)+zFar" -msgstr "" +msgstr "(-)+zFar" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:53 msgid "(-)+zNear" -msgstr "" +msgstr "(-)+zNear" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:98 msgid "(UNKNOWN)" @@ -405,7 +412,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" -msgstr "" +msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 @@ -426,7 +433,7 @@ msgstr "ضبط:" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" -msgstr "" +msgstr "Accurate VBeam emulation" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD @@ -547,6 +554,7 @@ msgstr "أض٠باتش" msgid "Add new pane" msgstr "إضاÙØ© جزء جديد" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -556,6 +564,11 @@ msgstr "إضاÙØ© جزء جديد" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "أضÙ" @@ -599,16 +612,17 @@ msgstr "إعدادات متقدمة" #: Source/Core/DolphinWX/Src/FrameTools.cpp:666 msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" -msgstr "" +msgstr "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" -msgstr "" +msgstr "All GC/Wii images (gcm, iso, ciso, gcz)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملÙات الجيم كيوب (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -616,6 +630,10 @@ msgstr "جميع ملÙات الجيم كيوب (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Ø­Ùظ جميع الحالات (sav, s##)" @@ -676,7 +694,7 @@ msgstr "Apploader غير قادر على تحميل مل٠من" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" -msgstr "" +msgstr "Apploader:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 msgid "Apply" @@ -711,11 +729,15 @@ msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙØŸ " msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙات؟" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -736,11 +758,15 @@ msgstr "صوت الخلÙية :" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "تلقائي" @@ -856,10 +882,14 @@ msgstr "اليمين أزرق" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "أسÙÙ„" @@ -870,7 +900,7 @@ msgstr "يلزم التحكم: %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" -msgstr "معطل" +msgstr "معطلة" #: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Browse" @@ -892,11 +922,15 @@ msgstr "لاستعراض الدليل الإخراج" msgid "Buffer:" msgstr "العازلة :" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -960,6 +994,7 @@ msgstr "إلغاء" msgid "Cannot open %s" msgstr "لا يمكن Ùتح %s" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:721 @@ -967,15 +1002,21 @@ msgid "Cannot record movies in read-only mode." msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." >>>>>>> Update Arabic and Japanese translations. +======= +>>>>>>> Update from master branch. #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 >>>>>>> Update Arabic and Japanese translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +>>>>>>> Update from master branch. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1013,7 +1054,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:49 msgid "Caps Lock" -msgstr "" +msgstr "Caps Lock" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" @@ -1091,7 +1132,7 @@ msgstr "DVD اختيار الدليل أصل :" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" -msgstr "" +msgstr "Choose a NAND root directory:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" @@ -1114,6 +1155,7 @@ msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" +"اختيار مل٠لاستخدام راÙعة التطبيقات: (ينطبق على الأقراص مصنوعة من الادله Ùقط)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 @@ -1122,7 +1164,7 @@ msgstr "اختيار مجلد لاستخراج" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:297 msgid "Circle Stick" -msgstr "" +msgstr "دائرة العصا" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52 msgid "Classic" @@ -1150,10 +1192,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "إغلاق" @@ -1262,11 +1308,15 @@ msgstr "توصيل ويموت 3" msgid "Connect Wiimote 4" msgstr "توصيل ويموت 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "توصيل" @@ -1460,10 +1510,14 @@ msgstr "محرك محاكي الصوت" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulation (سريع)" @@ -1473,11 +1527,11 @@ msgstr "DSP LLE interpreter (بطيء)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" -msgstr "" +msgstr "DSP LLE on Thread" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" -msgstr "" +msgstr "DSP LLE recompiler" #: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "DSP settings" @@ -1485,7 +1539,7 @@ msgstr "إعدادات الصوت" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" -msgstr "" +msgstr "DVD Root:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" @@ -1506,7 +1560,7 @@ msgstr "" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:281 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:296 msgid "Dead Zone" -msgstr "" +msgstr "المنطقة الميتة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Debug" @@ -1590,11 +1644,11 @@ msgstr "الاتصال الهاتÙÙŠ" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" -msgstr "" +msgstr "Direct3D11" #: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" -msgstr "" +msgstr "Direct3D9" #: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" @@ -1692,11 +1746,15 @@ msgstr "" msgid "Divide" msgstr "انقسام" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" @@ -1725,6 +1783,7 @@ msgstr "إعدادات تحكم الوي" msgid "Dolphin FIFO" msgstr "دولÙين" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1740,6 +1799,14 @@ msgstr "إعدادات تحكم الجيم كيوب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "إعدادات تحكم الجيم كيوب" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1789,11 +1856,11 @@ msgstr "وهمي " #: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" -msgstr "" +msgstr "Dump Audio" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" -msgstr "" +msgstr "Dump EFB Target" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" @@ -1801,7 +1868,7 @@ msgstr "تÙريغ الإطارات" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" -msgstr "" +msgstr "Dump Textures" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" @@ -1833,6 +1900,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1842,6 +1910,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Dutch" @@ -1851,7 +1924,7 @@ msgstr "خروج" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" -msgstr "" +msgstr "EFB Copies" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, c-format @@ -1977,6 +2050,7 @@ msgstr "BAT تمكين" msgid "Enable Block Merging" msgstr "تمكين منع الدمج" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -1984,25 +2058,35 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "تمكين تنظيم حساب الإطار" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "تمكين التخزين المؤقت" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "تمكين الاسرار " #: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" -msgstr "" +msgstr "Enable DTK Music" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Enable Dual Core" -msgstr "" +msgstr "Enable Dual Core" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" @@ -2014,7 +2098,7 @@ msgstr "تمكين الاختصارات" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Enable Idle Skipping" -msgstr "" +msgstr "Enable Idle Skipping" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" @@ -2140,6 +2224,7 @@ msgstr "" msgid "End" msgstr "نهاية" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2149,6 +2234,11 @@ msgstr "نهاية" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "English" @@ -2178,6 +2268,7 @@ msgstr "المساواة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "خطأ" @@ -2195,6 +2286,19 @@ msgid "Error" msgstr "خطأ" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "خطأ" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "خطأ ÙÙŠ تحميل اللغة المختارة. يتراجع إلى النظام الاÙتراضية." @@ -2607,7 +2711,7 @@ msgstr "الإطار المسبق" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" -msgstr "" +msgstr "Frame Dumps use FFV1" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105 msgid "Frame Range" @@ -2629,6 +2733,7 @@ msgstr "إطارات لتسجيل" msgid "Free Look" msgstr "تحكم بكاميرا اللعبة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2638,6 +2743,11 @@ msgstr "تحكم بكاميرا اللعبة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "French" @@ -2660,7 +2770,11 @@ msgstr "دقة العرض :" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:533 msgid "GCI File(*.gci)" -msgstr "" +msgstr "GCI File(*.gci)" + +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +msgid "GCMic Configuration" +msgstr "GCMic اعدادات" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 #, fuzzy @@ -2705,10 +2819,14 @@ msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " @@ -2732,11 +2850,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "عام" @@ -2745,6 +2868,7 @@ msgstr "عام" msgid "General Settings" msgstr "الإعدادات العامة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2754,6 +2878,11 @@ msgstr "الإعدادات العامة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "German" @@ -2891,11 +3020,16 @@ msgstr "إعدادات الاختصارات" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "الاختصارات" @@ -2931,7 +3065,7 @@ msgstr "IPL إعدادات" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 msgid "IR" -msgstr "" +msgstr "IR" #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "IR Pointer" @@ -2962,6 +3096,11 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +<<<<<<< HEAD +======= +"إذا كانت محددة، سيتم تحديث سجلات المربع المحيط. المستخدمة من قبل لعبه بابير " +"ماريو" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" @@ -3056,7 +3195,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" -msgstr "ÙÙŠ اللعبة" +msgstr "تتعطل ÙÙŠ اللعبة" #: Source/Core/DolphinWX/Src/NetWindow.cpp:592 msgid "In-Game" @@ -3104,11 +3243,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "wad تثبيت" @@ -3147,7 +3290,7 @@ msgstr "Interpreter (بطيئة جدا)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" -msgstr "مقدمة" +msgstr "تتعطل ÙÙŠ المقدمة" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194 #, c-format @@ -3187,6 +3330,7 @@ msgstr "تسجيل المل٠غير صالح" msgid "Invalid state" msgstr "غير صالح حالة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3196,6 +3340,11 @@ msgstr "غير صالح حالة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italian" @@ -3233,16 +3382,16 @@ msgstr "Korean" #. i18n: Left #: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" -msgstr "" +msgstr "L" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:39 msgid "L Button" -msgstr "" +msgstr "L Button" #. i18n: Left-Analog #: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" -msgstr "" +msgstr "L-Analog" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" @@ -3348,6 +3497,7 @@ msgstr "8 تحميل حالة" msgid "Load State..." msgstr "تحميل حالة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3361,6 +3511,13 @@ msgstr "تحميل قائمة نظام الوي" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "تحميل قائمة نظام الوي" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "تحميل قائمة نظام الوي %d%c" @@ -3389,7 +3546,7 @@ msgstr "المحلية" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" -msgstr "" +msgstr "Lock Threads to Cores" #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" @@ -3422,7 +3579,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" -msgstr "" +msgstr "M Button" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119 #, c-format @@ -3440,11 +3597,15 @@ msgstr "MMU سرعة هاك" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "العصا الأيسر" @@ -3476,10 +3637,14 @@ msgstr "ذاكرة بايت" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "بطاقة الذاكرة" @@ -3675,11 +3840,15 @@ msgstr "التبويب" msgid "NP Up" msgstr "Ùوق" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3695,7 +3864,7 @@ msgstr "الاسم :" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 msgid "Native GCI files(*.gci)" -msgstr "" +msgstr "Native GCI files(*.gci)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 msgid "New Scan" @@ -3766,11 +3935,15 @@ msgstr "لا يساوي" msgid "Not Set" msgstr "غير مجموعة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "غير متصل" @@ -3832,9 +4005,13 @@ msgstr "Ùقط %d كتل متاحة" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Ùتح" @@ -3965,6 +4142,7 @@ msgstr "باتش" msgid "Paths" msgstr "مسارات" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3972,6 +4150,10 @@ msgstr "مسارات" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "وقÙØ©" @@ -3982,7 +4164,7 @@ msgstr "لكل بكسل إضاءة" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" -msgstr "مثالي" +msgstr "مثالية" #: Source/Core/DolphinWX/Src/FrameAui.cpp:608 #, c-format @@ -3992,12 +4174,17 @@ msgstr "مشهد %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "بدأ اللعبه" @@ -4013,7 +4200,7 @@ msgstr "بدأ/ايقاÙ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" -msgstr "القابلة للتشغيل" +msgstr "قابلة للتشغيل" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "Playback Options" @@ -4023,11 +4210,15 @@ msgstr "خيارات التشغيل" msgid "Players" msgstr "لاعبين" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -4135,20 +4326,20 @@ msgstr "خروج" #. i18n: Right #: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" -msgstr "" +msgstr "R" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:40 msgid "R Button" -msgstr "" +msgstr "R Button" #. i18n: Right-Analog #: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" -msgstr "" +msgstr "R-Analog" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" -msgstr "" +msgstr "RAM" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 msgid "RUSSIA" @@ -4238,6 +4429,7 @@ msgstr "تحديث قائمة" msgid "Refresh game list" msgstr "تحديث القائمة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4249,6 +4441,12 @@ msgstr "تحديث القائمة" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "إزالة" @@ -4268,9 +4466,13 @@ msgstr "تقدم إلى الشاشة الرئيسية" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "إعادة ضبط" @@ -4313,11 +4515,15 @@ msgstr "Ø­Ùظ الحالة" msgid "Safe" msgstr "آمنة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "معدل العينة :" @@ -4404,6 +4610,7 @@ msgid "Scaled EFB Copy" msgstr "EFB Copia a escala" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +<<<<<<< HEAD ======= msgstr "" ======= @@ -4412,6 +4619,8 @@ msgstr "EFB Copia a escala" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Ùحص %s" @@ -4451,6 +4660,7 @@ msgstr "" msgid "Select" msgstr "حدد" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4466,6 +4676,14 @@ msgstr "اختر مل٠تسجيل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "اختر مل٠تسجيل" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملÙ" @@ -4491,6 +4709,7 @@ msgstr "اختر النواÙØ° العائمة" msgid "Select the file to load" msgstr "حدد المل٠لتحميل" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4503,15 +4722,22 @@ msgstr "حدد حالة التحميل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "حدد Ø­Ùظ الملÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "حدد حالة التحميل" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "حدد حالة الحÙظ" @@ -4618,7 +4844,7 @@ msgstr "SetupWiiMem: الإعداد غير قادر على إيجاد ملÙ" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 msgid "Shake" -msgstr "" +msgstr "هزة" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" @@ -4854,7 +5080,7 @@ msgstr "لقطة" #: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:52 msgid "Software Renderer" -msgstr "" +msgstr "Software Renderer" #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:83 msgid "" @@ -4885,6 +5111,7 @@ msgstr "Ùشل إنشاء المخزن المؤقت الصوت : %s" msgid "Space" msgstr "مجال" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4894,6 +5121,11 @@ msgstr "مجال" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spanish" @@ -4927,21 +5159,25 @@ msgstr "حدد الخلÙية مل٠Ùيديو" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Speed up Disc Transfer Rate" -msgstr "" +msgstr "تسريع معدل نقل القرص" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:243 msgid "Square Stick" -msgstr "" +msgstr "مربع العصا" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 msgid "Standard Controller" msgstr "وحدة تحكم القياسية" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4977,9 +5213,13 @@ msgstr "عصا" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "اغلق اللعبه" @@ -5057,15 +5297,23 @@ msgstr "الجدول الأيمن" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "اخذ لقطه من الشاشه" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "TaruKonga (Bongos)" +<<<<<<< HEAD msgstr "" +======= +msgstr "TaruKonga (Bongos)" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5079,6 +5327,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" +<<<<<<< HEAD msgstr "" ======= #, fuzzy @@ -5095,6 +5344,9 @@ msgstr "إزالة التخزين المؤقت" ======= msgstr "" >>>>>>> Update Arabic and Japanese translations. +======= +msgstr "Texture Cache" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" @@ -5310,18 +5562,26 @@ msgstr "تبديل جميع أنواع السجل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "اللعب بالشاشة كاملة" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "أعلى" @@ -5366,7 +5626,7 @@ msgstr "UDP منÙØ° :" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" -msgstr "" +msgstr "UDP Wiimote" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "UNKNOWN" @@ -5428,6 +5688,7 @@ msgstr "تلقى رسالة مجهولة مع معر٠: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5440,6 +5701,8 @@ msgstr "" "مواصلة?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5632,6 +5895,41 @@ msgstr "" ======= >>>>>>> Update Arabic and Japanese translations. +#: Source/Core/Core/Src/Movie.cpp:629 +#, c-format +msgid "" +"Warning: You loaded a save that's after the end of the current movie. (byte " +"%u > %u) (frame %u > %u). You should load another save before continuing, or " +"load this state with read-only mode off." +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, c-format +msgid "" +"Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " +"should load another save before continuing, or load this state with read-" +"only mode off. Otherwise you'll probably get a desync." +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, c-format +msgid "" +"Warning: You loaded a save whose movie mismatches on frame %d. You should " +"load another save before continuing, or load this state with read-only mode " +"off. Otherwise you'll probably get a desync.\n" +"\n" +"More information: The current movie is %d frames long and the savestate's " +"movie is %d frames long.\n" +"\n" +"On frame %d, the current movie presses:\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" +"On frame %d, the savestate's movie presses:\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5659,17 +5957,21 @@ msgstr "جهاز الوي" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" -msgstr "" +msgstr "Wii NAND Root:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "Wii Save Import" msgstr "استيراد Ø­Ùظ الوي" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "ملÙات Ø­Ùظ الوي (*.bin)|*.bin" @@ -5700,11 +6002,15 @@ msgstr "" "أو ربما هو بسبب الخمول وقت مستقطع أو لسبب آخر.\n" "هل تريد إعادة الاتصال على الÙور?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "ويموت متصل" @@ -5736,6 +6042,7 @@ msgstr "نواÙØ° اليمين" msgid "Word Wrap" msgstr "كلمة ختامية" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5745,6 +6052,11 @@ msgstr "كلمة ختامية" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "العمل" @@ -5898,7 +6210,7 @@ msgstr "^أض٠" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" -msgstr "" +msgstr "apploader (.img)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185 msgid "failed to read bk header" @@ -5916,7 +6228,7 @@ msgstr "Ùشل ÙÙŠ قراءة عنوان" #: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." -msgstr "" +msgstr "iCacheJIT: قراءة Ø´Ùرة تشغيل من %x. الرجاء التقرير." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format @@ -5925,7 +6237,7 @@ msgstr "ليس Ø­Ùظ الوي أو قراءة Ùشلة لحجم عنوان ا #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:461 msgid "s" -msgstr "" +msgstr "s" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 #, c-format @@ -5934,15 +6246,15 @@ msgstr "أمر غير معرو٠0x%08x" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" -msgstr "" +msgstr "wxExecute returned -1 on application run!" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:55 msgid "zFar Correction: " -msgstr "" +msgstr "zFar تصحيح: " #: Source/Core/DolphinWX/Src/PHackSettings.cpp:50 msgid "zNear Correction: " -msgstr "" +msgstr "zNear تصحيح: " #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 msgid "| OR" @@ -6056,12 +6368,18 @@ msgstr "أو" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "No se puede abrir %s, no tiene una función" +<<<<<<< HEAD <<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." ======= >>>>>>> Update Arabic and Japanese translations. +======= +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." + +>>>>>>> Update from master branch. #, fuzzy #~ msgid "Config..." #~ msgstr "إعدادات" @@ -6570,6 +6888,9 @@ msgstr "أو" #~ msgstr "Configuración de tipo %d no soportado en el plugin %s" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6577,10 +6898,13 @@ msgstr "أو" #~ "مؤشر غير معرو٠%#08x\n" #~ "مواصلة?" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Arabic and Japanese translations. +======= +>>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "لحد عدد الاطارات" diff --git a/Languages/po/ca.po b/Languages/po/ca.po index bb6dd4f690..e7664edac1 100644 --- a/Languages/po/ca.po +++ b/Languages/po/ca.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-08-19 08:36-0500\n" "Last-Translator: Jordi Coma \n" "Language-Team: Catalan \n" @@ -568,6 +572,7 @@ msgstr "Afegeix Pegat" msgid "Add new pane" msgstr "Afegeix un nou panell" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -577,6 +582,11 @@ msgstr "Afegeix un nou panell" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Afegir ..." @@ -644,6 +654,7 @@ msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tots els fitxers GameCube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -651,6 +662,10 @@ msgstr "Tots els fitxers GameCube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Tots els Estats (savi, s##\")" @@ -739,11 +754,15 @@ 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à irrecuperable!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -764,11 +783,15 @@ msgstr "Suport d'àudio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error en obrir el dispositiu AO \n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -885,10 +908,14 @@ msgstr "Blau dret" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Abaix" @@ -921,11 +948,15 @@ msgstr "Examineu el directori de sortida" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1183,10 +1214,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Tancar" @@ -1295,11 +1330,15 @@ msgstr "Connectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Connectar Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Connectant ..." @@ -1491,10 +1530,14 @@ msgstr "Motor d'emulació DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "Emulació DSP HLE (ràpid)" @@ -1725,11 +1768,15 @@ msgstr "" msgid "Divide" msgstr "Divideix" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" @@ -1758,6 +1805,7 @@ msgstr "Configuració de Wiimote emulat" msgid "Dolphin FIFO" msgstr "FIFO Dolphin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1773,6 +1821,14 @@ msgstr "Configuració del control GC Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Configuració del control GC Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" @@ -1869,6 +1925,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1878,6 +1935,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holandès" @@ -2023,21 +2085,31 @@ msgid "Enable Block Merging" msgstr "Habilitar fusió de Bloc" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Habilitar memòria cau" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Activar Trucs" @@ -2190,6 +2262,7 @@ msgstr "" msgid "End" msgstr "Fi" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2199,6 +2272,11 @@ msgstr "Fi" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Anglès" @@ -2228,6 +2306,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2245,6 +2324,19 @@ msgid "Error" msgstr "Error" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Error" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2703,6 +2795,7 @@ msgstr "Imatges a Enregistrar" msgid "Free Look" msgstr "Visió lliure" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2712,6 +2805,11 @@ msgstr "Visió lliure" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francès" @@ -2779,10 +2877,14 @@ msgstr "Configuració control «&Gamecube»" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" @@ -2806,11 +2908,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2819,6 +2926,7 @@ msgstr "General" msgid "General Settings" msgstr "Configuració General" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2828,6 +2936,11 @@ msgstr "Configuració General" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Alemany" @@ -2962,11 +3075,16 @@ msgstr "Tecla d'accés de configuració" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Tecles d'accés" @@ -3191,11 +3309,15 @@ msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Instal·lant WAD ..." @@ -3277,6 +3399,7 @@ msgstr "Enregistrament de fitxer invàlid" msgid "Invalid state" msgstr "Estat invàlid" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3286,6 +3409,11 @@ msgstr "Estat invàlid" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italià" @@ -3443,6 +3571,7 @@ msgstr "Carregar ranura d'estat 8" msgid "Load State..." msgstr "Carregar Estat..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3456,6 +3585,13 @@ msgstr "Carregar el menú del sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Carregar el menú del sistema Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar menú del sistema Wii %d%c" @@ -3537,11 +3673,15 @@ msgstr "Modificació de velocitat MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arxius MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Palanca principal" @@ -3573,10 +3713,14 @@ msgstr "Byte de memòria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Targeta de memòria" @@ -3776,11 +3920,15 @@ msgstr "NP Tabulador" msgid "NP Up" msgstr "NP Amunt" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3867,11 +4015,15 @@ msgstr "No igual" msgid "Not Set" msgstr "Sense establir" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "No està connectat" @@ -3933,9 +4085,13 @@ msgstr "Només queden %d blocs disponibles" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Obrir" @@ -4066,6 +4222,7 @@ msgstr "Pegats" msgid "Paths" msgstr "Camins" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4073,6 +4230,10 @@ msgstr "Camins" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4093,12 +4254,17 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Executar" @@ -4124,11 +4290,15 @@ msgstr "Opcions de reproducció" msgid "Players" msgstr "Jugadors" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Confirmeu ..." @@ -4340,6 +4510,7 @@ msgstr "Actualitzar llista" msgid "Refresh game list" msgstr "Actualitza la llista de jocs" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4351,6 +4522,12 @@ msgstr "Actualitza la llista de jocs" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Treure" @@ -4370,9 +4547,13 @@ msgstr "Renderitzar a la finestra principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4415,11 +4596,15 @@ msgstr "&Desa l'estat" msgid "Safe" msgstr "Segur" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Freqüència de mostreig:" @@ -4503,11 +4688,15 @@ msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." msgid "Scaled EFB Copy" msgstr "Copia EFB escalada" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Escanejant %s" @@ -4547,6 +4736,7 @@ msgstr "La secció %s no trobada a SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4562,6 +4752,14 @@ msgstr "Seleccionar el fitxer de gravació" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Seleccionar el fitxer de gravació" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Seleccionar un fitxer WAD de Wii per instal·lar" @@ -4586,6 +4784,7 @@ msgstr "Seleccioneu finestres flotants" msgid "Select the file to load" msgstr "Seleccioneu el fitxer a carregar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4598,15 +4797,22 @@ msgstr "Seleccioneu l'estat a carregar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Seleccioneu el fitxer de partida desada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Seleccioneu l'estat a carregar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Seleccioneu l'estat a desar" @@ -4989,6 +5195,7 @@ msgstr "Ha fallat la creació del buffer de so: %s" msgid "Space" msgstr "Espai" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4998,6 +5205,11 @@ msgstr "Espai" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Espanyol" @@ -5042,11 +5254,15 @@ msgstr "Palanca quadrada" msgid "Standard Controller" msgstr "Control estàndard" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5082,9 +5298,13 @@ msgstr "Palanca" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Aturar" @@ -5162,9 +5382,13 @@ msgstr "Taula dreta" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Capturar pantalla" @@ -5411,18 +5635,26 @@ msgstr "Activar tots els tipus de registre de Log" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Activar pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Dalt" @@ -5532,6 +5764,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Missatge desconegut amb id: %d rebut des del jugador: Expulsant jugador %d!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5544,6 +5777,8 @@ msgstr "" "Voleu continuar?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5769,11 +6004,15 @@ msgstr "Arrel de la NAND:" msgid "Wii Save Import" msgstr "Importar partida guardada Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -5804,11 +6043,15 @@ msgstr "" "o potser és perquè l'esteu fent servir fora de temps o una altra raó. \n" "Vols tornar a connectar-lo immediatament?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote connectat" @@ -5840,6 +6083,7 @@ msgstr "Finestra dreta" msgid "Word Wrap" msgstr "Envoltant de paraula" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5849,6 +6093,11 @@ msgstr "Envoltant de paraula" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Treballant ..." @@ -6421,6 +6670,9 @@ msgstr "| O" #~ msgstr "Iniciar la finestra de renderitzat a pantalla completa." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6428,8 +6680,11 @@ msgstr "| O" #~ "Punter desconegud %#08x\n" #~ "Voleu continuar?" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "Limitar imatges/s (FPS)" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 728e2493b1..b561011572 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -10,6 +10,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" <<<<<<< HEAD "PO-Revision-Date: 2011-10-15 14:50+0100\n" @@ -27,6 +28,10 @@ msgstr "" ======= "PO-Revision-Date: 2011-12-19 07:39+0100\n" >>>>>>> Update Czeck translation. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-19 07:39+0100\n" +>>>>>>> Update from master branch. "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" "Language: Czech\n" @@ -562,6 +567,7 @@ msgstr "PÅ™idat nový panel" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 @@ -580,6 +586,11 @@ msgstr "PÅ™idat nový panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "PÅ™idat..." @@ -646,6 +657,7 @@ msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ======= @@ -660,6 +672,10 @@ msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" @@ -762,6 +778,7 @@ msgstr "" 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!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= @@ -774,6 +791,9 @@ msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" @@ -795,6 +815,7 @@ msgstr "Backend Zvuku:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Chyba pÅ™i otevírání zařízení zvukového výstupu.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= @@ -807,6 +828,9 @@ msgstr "AudioCommon: Chyba pÅ™i otevírání zařízení zvukového výstupu.\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" @@ -925,6 +949,7 @@ msgstr "Modrá vpravo" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -937,6 +962,9 @@ msgstr "Modrá vpravo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Dole" @@ -972,6 +1000,7 @@ msgstr "Vyrovnávací paměť:" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 @@ -984,6 +1013,9 @@ msgstr "Vyrovnávací paměť:" ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1216,6 +1248,7 @@ msgstr "Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1227,6 +1260,9 @@ msgstr "Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Close" @@ -1339,6 +1375,7 @@ msgstr "PÅ™ipojit Wiimote 4" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 @@ -1349,6 +1386,9 @@ msgstr "PÅ™ipojit Wiimote 4" ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "PÅ™ipojuji..." @@ -1541,8 +1581,12 @@ msgstr "Jádro Emulátoru DSP" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" @@ -1766,6 +1810,7 @@ msgstr "RozdÄ›lit" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 @@ -1776,6 +1821,9 @@ msgstr "RozdÄ›lit" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" @@ -1807,6 +1855,7 @@ msgstr "Dolphin FIFO" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" @@ -1835,6 +1884,14 @@ msgstr "Dolphin GCPad Nastavení" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Nastavení" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1925,6 +1982,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 @@ -1943,6 +2001,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "NizozemÅ¡tina" @@ -2073,18 +2136,25 @@ msgstr "Zapnout SluÄování Bloků" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "Povolit výpoÄet ohraniÄujícího rámeÄku" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Povolit vyrovnávací paměť" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2095,6 +2165,9 @@ msgstr "Povolit vyrovnávací paměť" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Povolit Cheaty" @@ -2232,6 +2305,7 @@ msgstr "End" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 @@ -2250,6 +2324,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "AngliÄtina" @@ -2303,13 +2382,25 @@ msgstr "" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Chyba" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" +"Chyba v PlayWiimote. %u != %u, bajt %d.\n" +"Je nám líto, nahrávání Wii je doÄasnÄ› nefunkÄní." + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 ======= #: Source/Core/DolphinWX/Src/Main.cpp:356 @@ -2765,6 +2856,7 @@ msgstr "Rozhlížení pomocí myÅ¡i" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 @@ -2783,6 +2875,11 @@ msgstr "Rozhlížení pomocí myÅ¡i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "FrancouzÅ¡tina" @@ -2861,8 +2958,12 @@ msgstr "Nastavení Gamecube &Pad" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2901,7 +3002,8 @@ msgstr "" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "General" @@ -2914,6 +3016,7 @@ msgstr "Obecná Nastavení" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 @@ -2932,6 +3035,11 @@ msgstr "Obecná Nastavení" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "NÄ›mÄina" @@ -3073,6 +3181,7 @@ msgstr "Nastavení klávesových zkratek" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= @@ -3086,6 +3195,10 @@ msgstr "Nastavení klávesových zkratek" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Klávesové zkratky" @@ -3289,6 +3402,7 @@ msgstr "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› ne <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 @@ -3299,6 +3413,9 @@ msgstr "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› ne ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3383,6 +3500,7 @@ msgstr "Neplatný stav" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 @@ -3401,6 +3519,11 @@ msgstr "Neplatný stav" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "ItalÅ¡tina" @@ -3561,6 +3684,7 @@ msgstr "Nahrát Stav..." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" @@ -3587,6 +3711,13 @@ msgstr "Nahrát Systémové Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Nahrát Systémové Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" @@ -3671,6 +3802,7 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 @@ -3681,6 +3813,9 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)" ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hlavní Stick" @@ -3714,6 +3849,7 @@ msgstr "Bajt PamÄ›ti" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3726,6 +3862,9 @@ msgstr "Bajt PamÄ›ti" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Paměťová karta" @@ -3916,6 +4055,7 @@ msgstr "NK Nahoru" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 @@ -3925,6 +4065,9 @@ msgstr "NK Nahoru" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4014,6 +4157,7 @@ msgstr "Nenastaven" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 @@ -4024,6 +4168,9 @@ msgstr "Nenastaven" ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "NepÅ™ipojen" @@ -4095,7 +4242,11 @@ msgstr "Pouze bloky %d jsou dostupné" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Otevřít" @@ -4225,6 +4376,7 @@ msgstr "Cesty" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ======= @@ -4237,6 +4389,10 @@ msgstr "Cesty" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pozastavit" @@ -4272,9 +4428,14 @@ msgstr "Perspektiva %d" ======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Spustit" @@ -4303,6 +4464,7 @@ msgstr "HráÄi" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 @@ -4313,6 +4475,9 @@ msgstr "HráÄi" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -4526,6 +4691,7 @@ msgstr "Obnovit seznam her" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 @@ -4548,6 +4714,12 @@ msgstr "Obnovit seznam her" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Odstranit" @@ -4578,6 +4750,7 @@ msgstr "Vykreslit do Hlavního okna" ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetovat" @@ -4624,6 +4797,7 @@ msgstr "Uložit Sta&v" msgid "Safe" msgstr "BezpeÄná" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4634,6 +4808,9 @@ msgstr "BezpeÄná" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" @@ -4721,6 +4898,7 @@ msgstr "Uložený stav filmu %s je poÅ¡kozen, nahrávání filmu je zastaveno... msgid "Scaled EFB Copy" msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4731,6 +4909,9 @@ msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Skenuji %s" @@ -4772,6 +4953,7 @@ msgstr "Sekce %s nebyla v SYSCONF nalezena" msgid "Select" msgstr "Vybrat" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4795,6 +4977,14 @@ msgstr "Vyberte Soubor s Nahrávkou" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Vyberte Soubor s Nahrávkou" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -4823,6 +5013,7 @@ msgstr "Vyberte soubor k nahrání" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" @@ -4840,13 +5031,17 @@ msgstr "Vyberte stav k nahrání" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 @@ -4857,6 +5052,9 @@ msgstr "Vyberte stav k nahrání" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -5219,6 +5417,7 @@ msgstr "Mezerník" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 @@ -5237,6 +5436,11 @@ msgstr "Mezerník" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" @@ -5275,6 +5479,7 @@ msgstr "Standardní OvladaÄ" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 @@ -5284,6 +5489,9 @@ msgstr "Standardní OvladaÄ" ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5330,7 +5538,11 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Zastavit" @@ -5415,7 +5627,11 @@ msgstr "Deska vpravo" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "VytvoÅ™it Snímek Obrazovky" @@ -5650,15 +5866,20 @@ msgstr "PÅ™epnout na Celou Obrazovku" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "PÅ™epnout na Celou Obrazovku" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "NahoÅ™e" @@ -5766,6 +5987,7 @@ msgstr "PÅ™ijata neznámá zpráva s id : %d" 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!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5786,6 +6008,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6005,6 +6229,7 @@ msgstr "Import uložených pozic Wii" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 @@ -6015,6 +6240,9 @@ msgstr "Import uložených pozic Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -6048,6 +6276,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 @@ -6058,6 +6287,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote PÅ™ipojen" @@ -6092,6 +6324,7 @@ msgstr "Zalamování textu" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 @@ -6106,6 +6339,11 @@ msgstr "Zalamování textu" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Pracuji..." @@ -6714,6 +6952,9 @@ msgstr "| NEBO" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6721,6 +6962,7 @@ msgstr "| NEBO" #~ "Neznámý ukazatel %#08x\n" #~ "PokraÄovat?" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. ======= @@ -6757,6 +6999,8 @@ msgstr "| NEBO" >>>>>>> Update Greek and Czech translations ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "Použít SzS pro Omezení" diff --git a/Languages/po/de.po b/Languages/po/de.po index 8772af3d05..52e4251e01 100644 --- a/Languages/po/de.po +++ b/Languages/po/de.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-02-17 01:23+0100\n" "Last-Translator: LucasX \n" "Language-Team: \n" @@ -555,6 +559,7 @@ msgstr "Patch hinzufügen" msgid "Add new pane" msgstr "Neue Palette hinzufügen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -564,6 +569,11 @@ msgstr "Neue Palette hinzufügen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Hinzufügen..." @@ -632,6 +642,7 @@ msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM Dateien (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -639,6 +650,10 @@ msgstr "Alle Gamecube GCM Dateien (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" @@ -721,11 +736,15 @@ 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." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -746,11 +765,15 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisch" @@ -865,10 +888,14 @@ msgstr "Blau rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Unten" @@ -901,11 +928,15 @@ msgstr "Ausgabeverzeichnis auswählen" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1145,10 +1176,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Schließen" @@ -1258,11 +1293,15 @@ msgstr "Wiimote 3 verbinden" msgid "Connect Wiimote 4" msgstr "Wiimote 4 verbinden" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Verbinden..." @@ -1455,10 +1494,14 @@ msgstr "DSP Emulator Engine" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emulation (schnell)" @@ -1675,11 +1718,15 @@ msgstr "" msgid "Divide" msgstr "Dividieren" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" @@ -1709,6 +1756,7 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1724,6 +1772,14 @@ msgstr "Dolphin GCPad Konfiguration" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Konfiguration" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" @@ -1811,6 +1867,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1820,6 +1877,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holländisch" @@ -1948,22 +2010,32 @@ msgid "Enable Block Merging" msgstr "Blockvereinigung aktivieren" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Cache verwenden" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Cheats aktivieren" @@ -2102,6 +2174,7 @@ msgstr "" msgid "End" msgstr "Ende" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2111,6 +2184,11 @@ msgstr "Ende" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Englisch" @@ -2140,6 +2218,7 @@ msgstr "Gleich" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Fehler" @@ -2157,6 +2236,19 @@ msgid "Error" msgstr "Fehler" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Fehler" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2617,6 +2709,7 @@ msgstr "" msgid "Free Look" msgstr "Frei Umsehen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2626,6 +2719,11 @@ msgstr "Frei Umsehen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Französisch" @@ -2695,10 +2793,14 @@ msgstr "Gamecube-&Pad Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Cards (*.raw,*.gcp)" @@ -2723,11 +2825,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Allgemein" @@ -2737,6 +2844,7 @@ msgstr "Allgemein" msgid "General Settings" msgstr "Interface Einstellungen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2746,6 +2854,11 @@ msgstr "Interface Einstellungen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Deutsch" @@ -2871,11 +2984,16 @@ msgstr "Tastenkürzel Einstellungen" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Tastenkürzel" @@ -3090,11 +3208,15 @@ msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. #, fuzzy msgid "Installing WAD..." msgstr "WAD ins Wii-Menü installieren..." @@ -3180,6 +3302,7 @@ msgstr "Ungültige Aufnahmedatei" msgid "Invalid state" msgstr "Ungültiger Status" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3189,6 +3312,11 @@ msgstr "Ungültiger Status" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italienisch" @@ -3347,20 +3475,28 @@ msgstr "Status aus Slot 8 laden" msgid "Load State..." msgstr "Status laden..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "Wii-Menü laden (%d %c)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii-Menü laden (%d %c)" @@ -3445,11 +3581,15 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark Dateien(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Main Stick" @@ -3482,10 +3622,14 @@ msgstr "Speicher" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Memory Card" @@ -3672,11 +3816,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Hoch" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3764,11 +3912,15 @@ msgstr "Ungleich" msgid "Not Set" msgstr "Nicht Festgelegt" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Nicht Verbunden" @@ -3830,9 +3982,13 @@ msgstr "Nur %d Blöcke verfügbar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Öffnen" @@ -3964,6 +4120,7 @@ msgstr "Patches" msgid "Paths" msgstr "Pfade" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3971,6 +4128,10 @@ msgstr "Pfade" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3992,12 +4153,17 @@ msgstr "Perspektive %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Start" @@ -4024,11 +4190,15 @@ msgstr "Optionen" msgid "Players" msgstr "Spieler" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -4244,6 +4414,7 @@ msgstr "Liste aktualisieren" msgid "Refresh game list" msgstr "Spieleliste aktualisieren" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4255,6 +4426,12 @@ msgstr "Spieleliste aktualisieren" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Entfernen" @@ -4274,9 +4451,13 @@ msgstr "Im Hauptfenster Rendern" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Zurücksetzen" @@ -4319,11 +4500,15 @@ msgstr "S&tatus speichern" msgid "Safe" msgstr "Sicher" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Abtastrate:" @@ -4408,11 +4593,15 @@ msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." msgid "Scaled EFB Copy" msgstr "EFB Scaled Copy" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Scanning %s" msgstr "Suche..." @@ -4452,6 +4641,7 @@ msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" msgid "Select" msgstr "Auswählen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4467,6 +4657,14 @@ msgstr "Aufnahmedatei auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Aufnahmedatei auswählen" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Speicherdatei zum Importieren auswählen" @@ -4493,6 +4691,7 @@ msgstr "Wähle unverankerte Fenster" msgid "Select the file to load" msgstr "Datei zum Laden auswählen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4505,15 +4704,22 @@ msgstr "Status zum Laden auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Wii-Spielstand auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Status zum Laden auswählen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Status zum Speichern auswählen" @@ -4869,6 +5075,7 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s" msgid "Space" msgstr "Leertaste" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4878,6 +5085,11 @@ msgstr "Leertaste" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spanisch" @@ -4913,11 +5125,15 @@ msgstr "" msgid "Standard Controller" msgstr "Standard-Controller" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4953,9 +5169,13 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" @@ -5029,9 +5249,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Screenshot erstellen" @@ -5278,18 +5502,26 @@ msgstr "Alle umschalten" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Vollbildmodus wechseln" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Oben" @@ -5394,6 +5626,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Unbekannte Meldung mit ID %d erhalten von Spieler %d, Spieler herausgeworfen!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5406,6 +5639,8 @@ msgstr "" "Fortfahren?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5616,11 +5851,15 @@ msgstr "DVD Laufwerk:" msgid "Wii Save Import" msgstr "Wii Spielstand importieren" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii Speicherdateien (*.bin)|*.bin" @@ -5651,11 +5890,15 @@ msgstr "" "oder die Wiimote war zulange inaktiv oder andere Ursachen.\n" "Soll die Wiimote jetzt wieder verbunden werden?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Verbunden" @@ -5688,6 +5931,7 @@ msgstr "Windows Rechts" msgid "Word Wrap" msgstr "Zeilenumbruch" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5697,6 +5941,11 @@ msgstr "Zeilenumbruch" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Arbeite..." diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index dd44453140..271f6d526b 100644 --- a/Languages/po/dolphin-emu.pot +++ b/Languages/po/dolphin-emu.pot @@ -9,10 +9,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -510,6 +514,7 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -519,6 +524,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "" @@ -572,6 +582,7 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -579,6 +590,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "" @@ -656,11 +671,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -681,11 +700,15 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -794,10 +817,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "" @@ -830,11 +857,15 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1057,10 +1088,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1169,11 +1204,15 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "" @@ -1349,10 +1388,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1562,11 +1605,15 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1595,6 +1642,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1610,6 +1658,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1692,6 +1748,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1701,6 +1758,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "" @@ -1824,21 +1886,31 @@ msgid "Enable Block Merging" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "" @@ -1964,6 +2036,7 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -1973,6 +2046,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "" @@ -2002,6 +2080,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -2019,6 +2098,19 @@ msgid "Error" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2433,6 +2525,7 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2442,6 +2535,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "" @@ -2508,10 +2606,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2533,11 +2635,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2546,6 +2653,7 @@ msgstr "" msgid "General Settings" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2555,6 +2663,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "" @@ -2670,11 +2783,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "" @@ -2864,11 +2982,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "" @@ -2945,6 +3067,7 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -2954,6 +3077,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "" @@ -3104,6 +3232,7 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3117,6 +3246,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3193,11 +3329,15 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3229,10 +3369,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "" @@ -3409,11 +3553,15 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3500,11 +3648,15 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3566,9 +3718,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "" @@ -3694,6 +3850,7 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3701,6 +3858,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3721,12 +3882,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "" @@ -3752,11 +3918,15 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "" @@ -3962,6 +4132,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -3973,6 +4144,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "" @@ -3989,9 +4166,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -4034,11 +4215,15 @@ msgstr "" msgid "Safe" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "" @@ -4122,11 +4307,15 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "" @@ -4166,6 +4355,7 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4181,6 +4371,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "" @@ -4203,6 +4401,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4215,15 +4414,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "" @@ -4557,6 +4763,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4566,6 +4773,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "" @@ -4601,11 +4813,15 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4641,9 +4857,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4716,9 +4936,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -4931,18 +5155,26 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "" @@ -5044,6 +5276,7 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5054,6 +5287,8 @@ msgid "" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5255,11 +5490,15 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5286,11 +5525,15 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5322,6 +5565,7 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5331,6 +5575,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "" diff --git a/Languages/po/el.po b/Languages/po/el.po index 7a97de70b5..f5da4c8403 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -10,6 +10,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:39-0600\n" ======= @@ -23,6 +24,10 @@ msgstr "" >>>>>>> The actual update of the Greek and Czech translations. The last commit "PO-Revision-Date: 2011-10-15 11:16+0200\n" >>>>>>> Update Greek and Czech translations +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" "Language: Greek\n" @@ -58,7 +63,8 @@ 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\" είναι ένα μη έγκυÏο αÏχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." +msgstr "" +"Το \"%s\" είναι ένα μη έγκυÏο αÏχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:193 #, c-format @@ -86,7 +92,8 @@ msgstr "%s υπάÏχει ήδη, θέλετε αντικατάσταση;" #: Source/Core/DiscIO/Src/CompressedBlob.cpp:167 #, c-format msgid "%s failed to be scrubbed. Probably the image is corrupt." -msgstr "%s απέτυχε να γίνει scrubbed. Πιθανότατα το αÏχείο εικόνας είναι φθαÏμένο." +msgstr "" +"%s απέτυχε να γίνει scrubbed. Πιθανότατα το αÏχείο εικόνας είναι φθαÏμένο." #: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format @@ -113,7 +120,8 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης \n" -"το αÏχείο δεν είναι αÏκετά μεγάλο ώστε να αποτελεί έγκυÏο αÏχείο κάÏτας μνήμης (0x%x bytes)" +"το αÏχείο δεν είναι αÏκετά μεγάλο ώστε να αποτελεί έγκυÏο αÏχείο κάÏτας " +"μνήμης (0x%x bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -144,7 +152,9 @@ msgstr "Το %s είναι ήδη συμπιεσμένο! Δε γίνεται ν #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345 #, 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:199 #, c-format @@ -385,11 +395,13 @@ msgstr "" msgid "" "ALERT:\n" "\n" -"NetPlay will currently only work properly when using the following settings:\n" +"NetPlay will currently only work properly when using the following " +"settings:\n" " - Dual Core [OFF]\n" " - Audio Throttle [OFF]\n" " - DSP-HLE with \"Null Audio\" or DSP-LLE\n" -" - Manually set the exact number of controllers that will be used to [Standard Controller]\n" +" - Manually set the exact number of controllers that will be used to " +"[Standard Controller]\n" "\n" "All players should try to use the same Dolphin version and settings.\n" "Disable all memory cards or send them to all players before starting.\n" @@ -403,10 +415,12 @@ msgstr "" " - ΔÏο ΠυÏήνες [ΑÎΕÎΕΡΓΟ]\n" " - Throttle Ήχου [ΑÎΕÎΕΡΓΟ]\n" " - DSP-HLE με \"Null Audio\" ή DSP-LLE\n" -" - ΧειÏοκίνητη εισαγωγή του ακÏιβοÏÏ‚ αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ ελεγκτών που θα χÏησιμοποιηθοÏν σαν [Τυπικός Ελεγκτής]\n" +" - ΧειÏοκίνητη εισαγωγή του ακÏιβοÏÏ‚ αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ ελεγκτών που θα " +"χÏησιμοποιηθοÏν σαν [Τυπικός Ελεγκτής]\n" "\n" "Όλοι οι παίκτες Ï€Ïέπει να έχουν την ίδια έκδοση και Ïυθμίσεις του Dolphin.\n" -"ΑπενεÏγοποιήστε όλες τις κάÏτες μνήμης ή στείλτε τες σε όλους τους παίκτες Ï€Ïιν την εκκίνηση.\n" +"ΑπενεÏγοποιήστε όλες τις κάÏτες μνήμης ή στείλτε τες σε όλους τους παίκτες " +"Ï€Ïιν την εκκίνηση.\n" "Η υποστήÏιξη Wiimote δεν έχει ακόμα υλοποιηθεί.\n" "\n" "Θα Ï€Ïέπει να έχετε κάνει Ï€Ïοώθηση της πόÏτας TCP στον host!!" @@ -466,12 +480,14 @@ msgstr "ΑκÏιβής VBeam εξομοίωση" >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" "Accurately emulate EFB copies.\n" -"Some games depend on this for certain graphical effects or gameplay functionality.\n" +"Some games depend on this for certain graphical effects or gameplay " +"functionality.\n" "\n" "If unsure, check EFB to Texture instead." msgstr "" "Εξομοιώνει με ακÏίβεια τα EFB αντίγÏαφα.\n" -"Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες του gameplay.\n" +"Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες " +"του gameplay.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε EFB ΑντίγÏαφα σε Υφή." @@ -497,23 +513,38 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) στην ΠÏοσθήκη ÎšÏ‰Î´Î¹ÎºÎ¿Ï (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "" +"Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) στην " +"ΠÏοσθήκη ÎšÏ‰Î´Î¹ÎºÎ¿Ï (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:756 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" -msgstr "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Fill και Slide (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " +"(%s)" +msgstr "" +"Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Fill " +"και Slide (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:549 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" -msgstr "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Ram Write και Fill (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " +"Fill (%s)" +msgstr "" +"Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Ram " +"Write και Fill (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:609 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" -msgstr "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Write To Pointer (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " +"Pointer (%s)" +msgstr "" +"Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Write " +"To Pointer (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -522,8 +553,11 @@ msgstr "Σφάλμα Action Replay: Μη έγκυÏη τιμή (%08x) σε Memor #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "Σφάλμα Action Replay: Οι λειτουÏγίες Master Code και Write To CCXXXXXX δεν έχουν υλοποιηθεί (%s)" +msgid "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "" +"Σφάλμα Action Replay: Οι λειτουÏγίες Master Code και Write To CCXXXXXX δεν " +"έχουν υλοποιηθεί (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -574,6 +608,7 @@ msgstr "ΠÏοσθήκη νέου pane" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 @@ -592,6 +627,11 @@ msgstr "ΠÏοσθήκη νέου pane" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "ΠÏοσθήκη..." @@ -603,7 +643,8 @@ msgstr "ΔιεÏθυνση :" msgid "" "Adds the specified value to zFar Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " +"the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." @@ -613,7 +654,8 @@ msgstr "" msgid "" "Adds the specified value to zNear Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " +"the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." @@ -621,7 +663,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "ΡÏθμιση της απαιτοÏμενης πίεσης του Î±Î½Î±Î»Î¿Î³Î¹ÎºÎ¿Ï Ï‡ÎµÎ¹ÏιστηÏίου για την ενεÏγοποίηση των κουμπιών." +msgstr "" +"ΡÏθμιση της απαιτοÏμενης πίεσης του Î±Î½Î±Î»Î¿Î³Î¹ÎºÎ¿Ï Ï‡ÎµÎ¹ÏιστηÏίου για την " +"ενεÏγοποίηση των κουμπιών." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" @@ -646,6 +690,7 @@ msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ======= @@ -660,6 +705,10 @@ msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" @@ -677,11 +726,13 @@ msgstr "Όλα τα αÏχεία (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, 6 και 7 μέσα από το παÏάθυÏο εξομοίωσης.\n" +"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, " +"6 και 7 μέσα από το παÏάθυÏο εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -760,8 +811,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" -msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για πάντα!" +msgstr "" +"Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " +"πάντα!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= @@ -774,6 +828,9 @@ msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετ #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" @@ -795,6 +852,7 @@ msgstr "Backend Ήχου:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= @@ -807,6 +865,9 @@ msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" @@ -830,7 +891,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική ανάλυση.\n" +"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική " +"ανάλυση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -859,7 +921,8 @@ msgstr "" >>>>>>> Update Greek and Czech translations ======= "ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" -"Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα στις υφές.\n" +"Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα στις " +"υφές.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -953,8 +1016,12 @@ msgstr "Δεξί Μπλε" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Βάση" @@ -990,6 +1057,7 @@ msgstr "Buffer:" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 @@ -1002,6 +1070,9 @@ msgstr "Buffer:" ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1026,12 +1097,16 @@ msgstr "Cache Display Lists" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel depth calculations are necessary to properly emulate a small number of games.\n" +"In contrast to pixel lighting (which is merely an enhancement), per-pixel " +"depth calculations are necessary to properly emulate a small number of " +"games.\n" "\n" "If unsure, leave this checked." msgstr "" "Υπολογισμός των τιμών βάθους των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" -"Αντίθετα με τον φωτισμό ανά pixel (που είναι απλά μία βελτίωση), οι υπολογισμοί του βάθους ανά pixel είναι απαÏαίτητοι για την σωστή εξομοίωση ενός μικÏÎ¿Ï Î±ÏÎ¹Î¸Î¼Î¿Ï Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹ÏŽÎ½.\n" +"Αντίθετα με τον φωτισμό ανά pixel (που είναι απλά μία βελτίωση), οι " +"υπολογισμοί του βάθους ανά pixel είναι απαÏαίτητοι για την σωστή εξομοίωση " +"ενός μικÏÎ¿Ï Î±ÏÎ¹Î¸Î¼Î¿Ï Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹ÏŽÎ½.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -1045,7 +1120,8 @@ msgid "" msgstr "" "Υπολογίζει τον φωτισμό των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" "Μειώνει την ταχÏτητα εξομοίωσης κατά κάποιο ποσοστό (ανάλογα με την GPU).\n" -"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες φοÏές Ï€Ïοβλήματα.\n" +"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες " +"φοÏές Ï€Ïοβλήματα.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1199,22 +1275,29 @@ msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάÏτα μνήμης:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +>>>>>>> Update from master branch. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που " "απαÏτίζονται μόνο από φακέλους)" +<<<<<<< HEAD ======= msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" msgstr "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που απαÏτίζονται μόνο από φακέλους)" >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 @@ -1241,12 +1324,17 @@ msgid "Clear failed." msgstr "Το καθάÏισμα απέτυχε." #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." -msgstr "Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει απενεÏγοποιηθεί. Θα Ï€Ïέπει να σταματήσετε χειÏοκίνητα το παιχνίδι." +msgid "" +"Client disconnect while game is running!! NetPlay is disabled. You must " +"manually stop the game." +msgstr "" +"Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει " +"απενεÏγοποιηθεί. Θα Ï€Ïέπει να σταματήσετε χειÏοκίνητα το παιχνίδι." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1258,6 +1346,9 @@ msgstr "Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Close" @@ -1370,6 +1461,7 @@ msgstr "ΣÏνδεση Wiimote 4" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 @@ -1380,6 +1472,9 @@ msgstr "ΣÏνδεση Wiimote 4" ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Γίνεται ΣÏνδεση..." @@ -1420,10 +1515,15 @@ msgstr "Αποτυχία εκκίνησης backend %s" #: 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 backup. Please note that original Gamecube and Wii discs cannot be read by most PC DVD drives." +msgid "" +"Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " +"backup. Please note that original Gamecube and Wii discs cannot be read by " +"most PC DVD drives." msgstr "" -"Δεν μπόÏεσε να γίνει ανάγνωση \"%s\". Δεν υπάÏχει δίσκος στον οδηγό, ή δεν είναι ένα αντίγÏαφο εικόνας GC/Wii.\n" -" Σημειώστε πως αυθεντικοί Gamecube και Wii δίσκοι δεν μποÏοÏν να αναγνωστοÏν από τους πεÏισσότεÏους PC DVD οδηγοÏÏ‚." +"Δεν μπόÏεσε να γίνει ανάγνωση \"%s\". Δεν υπάÏχει δίσκος στον οδηγό, ή δεν " +"είναι ένα αντίγÏαφο εικόνας GC/Wii.\n" +" Σημειώστε πως αυθεντικοί Gamecube και Wii δίσκοι δεν μποÏοÏν να αναγνωστοÏν " +"από τους πεÏισσότεÏους PC DVD οδηγοÏÏ‚." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format @@ -1440,19 +1540,23 @@ 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" -"(ο καθοÏισμός των χειÏιστηÏίων ενώ το παιχνίδι Ï„Ïέχει δεν υποστηÏίζεται Ï€Ïος το παÏόν)" +"Αδυναμία καθοÏÎ¹ÏƒÎ¼Î¿Ï Ï‡ÎµÎ¹ÏιστηÏίων. Ο παίκτης εγκατέλειψε ή το παιχνίδι " +"Ï„Ïέχει!\n" +"(ο καθοÏισμός των χειÏιστηÏίων ενώ το παιχνίδι Ï„Ïέχει δεν υποστηÏίζεται Ï€Ïος " +"το παÏόν)" #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" "\n" -"Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?" +"Are you running Dolphin from a CD/DVD, or is the save file maybe write " +"protected?" msgstr "" "Δεν μπόÏεσε να γίνει εγγÏαφή των αÏχείων της κάÏτας μνήμης %s.\n" "\n" -"Μήπως εκτελείτε το Dolphin από CD/DVD, ή το αποθηκευόμενο αÏχείο έχει Ï€Ïοστασία εγγÏαφής;" +"Μήπως εκτελείτε το Dolphin από CD/DVD, ή το αποθηκευόμενο αÏχείο έχει " +"Ï€Ïοστασία εγγÏαφής;" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" @@ -1489,21 +1593,28 @@ msgstr "ΔημιουÏγία νέας οπτικής" msgid "Created by KDE-Look.org" msgstr "ΔημιουÏγήθηκε από KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +>>>>>>> Update from master branch. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "ΔημιουÏγήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart." "com]" +<<<<<<< HEAD ======= msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "ΔημιουÏγήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" @@ -1511,7 +1622,9 @@ msgstr "ΔημιουÏγήθηκε από VistaIcons.com" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "ΔημιουÏγήθηκε από black_rider και δημοσιεÏθηκε στο ForumW.org > Web Developments" +msgstr "" +"ΔημιουÏγήθηκε από black_rider και δημοσιεÏθηκε στο ForumW.org > Web " +"Developments" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 msgid "Creator: " @@ -1586,8 +1699,12 @@ msgstr "Μηχανή Εξομοίωσης DSP" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" @@ -1693,8 +1810,12 @@ msgstr "Ανίχνευση" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." -msgstr "Εντοπίστηκε Ï€Ïοσπάθεια ανάγνωσης πεÏισσότεÏων δεδομένων από το DVD από όσα χωÏάνε μέσα στο buffer. Clamp." +msgid "" +"Detected attempt to read more data from the DVD than fit inside the out " +"buffer. Clamp." +msgstr "" +"Εντοπίστηκε Ï€Ïοσπάθεια ανάγνωσης πεÏισσότεÏων δεδομένων από το DVD από όσα " +"χωÏάνε μέσα στο buffer. Clamp." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 @@ -1750,24 +1871,30 @@ msgstr "ΑπενεÏγοποίηση Υφών" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" -"Speeds up emulation a lot but causes heavy glitches in many games which rely on them (especially homebrew applications).\n" +"Speeds up emulation a lot but causes heavy glitches in many games which rely " +"on them (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "ΑπενεÏγοποιεί την XFB εξομοίωση.\n" -"ΕπιταχÏνει αÏκετά την εξομοίωση αλλά Ï€Ïοκαλεί μεγάλα ελαττώματα σε πολλά παιχνίδια που βασίζονται σε αυτήν (ειδικά σε homebrew εφαÏμογές).\n" +"ΕπιταχÏνει αÏκετά την εξομοίωση αλλά Ï€Ïοκαλεί μεγάλα ελαττώματα σε πολλά " +"παιχνίδια που βασίζονται σε αυτήν (ειδικά σε homebrew εφαÏμογές).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" -"These are often used for post-processing or render-to-texture effects, so while checking this setting gives a great speedup it almost always also causes issues.\n" +"These are often used for post-processing or render-to-texture effects, so " +"while checking this setting gives a great speedup it almost always also " +"causes issues.\n" "\n" "If unsure, leave this unchecked." msgstr "" "ΑπενεÏγοποιεί την εξομοίωση των EFB αντιγÏαφών.\n" -"ΧÏησιμοποιοÏνται συχνά για post-processing ή render-to-texture εφέ, έτσι αν και επιλέγοντάς το αυξάνονται κατά Ï€Î¿Î»Ï Î¿Î¹ επιδόσεις, σχεδόν πάντα Ï€ÏοκαλοÏνται Ï€Ïοβλήματα.\n" +"ΧÏησιμοποιοÏνται συχνά για post-processing ή render-to-texture εφέ, έτσι αν " +"και επιλέγοντάς το αυξάνονται κατά Ï€Î¿Î»Ï Î¿Î¹ επιδόσεις, σχεδόν πάντα " +"Ï€ÏοκαλοÏνται Ï€Ïοβλήματα.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1811,6 +1938,7 @@ msgstr "Divide" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 @@ -1821,6 +1949,9 @@ msgstr "Divide" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" @@ -1852,6 +1983,7 @@ msgstr "Dolphin FIFO" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" @@ -1880,6 +2012,14 @@ msgstr "Ρυθμίσεις Dolphin GCPad" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Ρυθμίσεις Dolphin GCPad" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1891,18 +2031,23 @@ msgstr "Ρυθμίσεις Dolphin Wiimote" msgid "Dolphin at &Google Code" msgstr "Dolphin στο &Google Code" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +>>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" "Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εÏÏεση " "αÏχείων..." +<<<<<<< HEAD ======= msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." msgstr "Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εÏÏεση αÏχείων..." @@ -1914,16 +2059,23 @@ msgstr "Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +>>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ " "εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." +<<<<<<< HEAD ======= msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." msgstr "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -1969,7 +2121,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή όλων των απεικονισμένων καÏέ σε ένα AVI αÏχείο στο User/Dump/Frames/\n" +"Εξαγωγή όλων των απεικονισμένων καÏέ σε ένα AVI αÏχείο στο User/Dump/" +"Frames/\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1979,7 +2132,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή των αποκωδικοποιημένων υφών του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï ÏƒÏ„Î¿ User/Dump/Textures//\n" +"Εξαγωγή των αποκωδικοποιημένων υφών του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï ÏƒÏ„Î¿ User/Dump/Textures/" +"/\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1996,6 +2150,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 @@ -2014,6 +2169,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Ολλανδικά" @@ -2027,8 +2187,16 @@ msgstr "EFB ΑντίγÏαφα" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, c-format -msgid "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least version %d.%d -- If you recently upgraded your Dolphin distribution, a reboot is probably required at this point to get Windows to see the new driver." -msgstr "ΣΦΑΛΜΑ: Αυτή η έκδοση του Dolphin απαιτεί TAP-Win32 οδηγοÏÏ‚ που να είναι τουλάχιστον έκδοσης %d.%d -- Αν Ï€Ïόσφατα αναβαθμίσατε την διανομή του Dolphin σας, μία επανεκκίνηση απαιτείται για να κάνει τα Windows να δοÏνε τους νέους οδηγοÏÏ‚." +msgid "" +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"version %d.%d -- If you recently upgraded your Dolphin distribution, a " +"reboot is probably required at this point to get Windows to see the new " +"driver." +msgstr "" +"ΣΦΑΛΜΑ: Αυτή η έκδοση του Dolphin απαιτεί TAP-Win32 οδηγοÏÏ‚ που να είναι " +"τουλάχιστον έκδοσης %d.%d -- Αν Ï€Ïόσφατα αναβαθμίσατε την διανομή του " +"Dolphin σας, μία επανεκκίνηση απαιτείται για να κάνει τα Windows να δοÏνε " +"τους νέους οδηγοÏÏ‚." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -2078,24 +2246,31 @@ msgstr "Το νήμα εξομοίωσης εκτελείται ήδη" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" -"Slows down emulation a lot and prohibits high-resolution rendering but is necessary to emulate a number of games properly.\n" +"Slows down emulation a lot and prohibits high-resolution rendering but is " +"necessary to emulate a number of games properly.\n" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" "Εξομοιώνει τα XFBs με ακÏίβεια.\n" -"ΕπιβÏαδÏνει αÏκετά την εξομοίωση και αποτÏέπει την απόδοση γÏαφικών υψηλής ανάλυσης, αλλά είναι απαÏαίτητο για την σωστή εξομοίωση οÏισμένου αÏÎ¹Î¸Î¼Î¿Ï Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹ÏŽÎ½.\n" +"ΕπιβÏαδÏνει αÏκετά την εξομοίωση και αποτÏέπει την απόδοση γÏαφικών υψηλής " +"ανάλυσης, αλλά είναι απαÏαίτητο για την σωστή εξομοίωση οÏισμένου αÏÎ¹Î¸Î¼Î¿Ï " +"παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε εικονική XFB εξομοίωση." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" -"Fixes many games which don't work without XFB emulation while not being as slow as real XFB emulation. However, it may still fail for a lot of other games (especially homebrew applications).\n" +"Fixes many games which don't work without XFB emulation while not being as " +"slow as real XFB emulation. However, it may still fail for a lot of other " +"games (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Εξομοιώνει XFBs χÏησιμοποιώντας GPU αντικείμενα υφής.\n" -"ΔιοÏθώνει πολλά παιχνίδια που δεν δουλεÏουν χωÏίς XFB εξομοίωση, χωÏίς παÏάληλα να είναι αÏγή όπως η Ï€Ïαγματική XFB εξομοίωση. ΠαÏόλα αυτά μποÏεί να αποτÏχει σε πολλά άλλα παιχνίδια (ειδικά homebrew εφαÏμογές).\n" +"ΔιοÏθώνει πολλά παιχνίδια που δεν δουλεÏουν χωÏίς XFB εξομοίωση, χωÏίς " +"παÏάληλα να είναι αÏγή όπως η Ï€Ïαγματική XFB εξομοίωση. ΠαÏόλα αυτά μποÏεί " +"να αποτÏχει σε πολλά άλλα παιχνίδια (ειδικά homebrew εφαÏμογές).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -2113,13 +2288,15 @@ msgstr "ΕνεÏγοποίηση" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" -"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\n" +"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " +"supported by your GPU.\n" "Possibly causes issues.\n" "Requires fullscreen to work.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιεί 3D εφέ μέσω στεÏεοσκοπίας χÏησιμοποιώντας την τεχνολογία 3D Vision της Nvidia αν υποστηÏίζεται από την GPU.\n" +"ΕνεÏγοποιεί 3D εφέ μέσω στεÏεοσκοπίας χÏησιμοποιώντας την τεχνολογία 3D " +"Vision της Nvidia αν υποστηÏίζεται από την GPU.\n" "Πιθανώς μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα.\n" "ΧÏειάζεται λειτουÏγία πλήÏης οθόνης για να λειτουÏγήσει.\n" "\n" @@ -2144,16 +2321,23 @@ msgstr "ΕνεÏγοποίηση Block Merging" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "ΕνεÏγοποίηση Cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= @@ -2168,6 +2352,9 @@ msgstr "ΕνεÏγοποίηση Cheat" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "ΕνεÏγοποίηση Cheat" @@ -2225,14 +2412,19 @@ msgid "" "If unsure, select 1x." msgstr "" "ΕνεÏγοποιεί το ανισοτÏοπικό φιλτÏάÏισμα.\n" -"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές γωνίες.\n" +"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές " +"γωνίες.\n" "ΜποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε έναν μικÏÏŒ αÏιθμό παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" -msgstr "ΕνεÏγοποιεί τη γÏήγοÏη Ï€Ïόσβαση δίσκου. ΑπαÏαίτητο για μεÏικά παιχνίδια. (ΕÎΕΡΓΟ = ΓÏήγοÏο, ΑÎΕÎΕΡΓΟ = Συμβατό)" +msgid "" +"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " +"Compatible)" +msgstr "" +"ΕνεÏγοποιεί τη γÏήγοÏη Ï€Ïόσβαση δίσκου. ΑπαÏαίτητο για μεÏικά παιχνίδια. " +"(ΕÎΕΡΓΟ = ΓÏήγοÏο, ΑÎΕÎΕΡΓΟ = Συμβατό)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Enable pages" @@ -2245,41 +2437,57 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την απεικόνιση.\n" +"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την " +"απεικόνιση.\n" "Αν αυτό είναι απενεÏγοποιημένο, θα δημιουÏγηθεί ένα παÏάθυÏο απεικόνισης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" -"Enable this if you want to use the main Dolphin window for rendering rather than a separate render window.\n" +"Enable this if you want to use the main Dolphin window for rendering rather " +"than a separate render window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιήστε το αν θέλετε να χÏησιμοποιήσετε το κÏÏιο παÏάθυÏο του Dolphin για απεικόνιση αντί για ξεχωÏιστό παÏάθυÏο απεικόνισης.\n" +"ΕνεÏγοποιήστε το αν θέλετε να χÏησιμοποιήσετε το κÏÏιο παÏάθυÏο του Dolphin " +"για απεικόνιση αντί για ξεχωÏιστό παÏάθυÏο απεικόνισης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update from master branch. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" "ΕνεÏγοποιήστε το για να επιταχÏνετε το The Legend of Zelda: Twilight " "Princess. ΑπενεÏγοποιήστε το για τα υπόλοιπα παιχνίδια." +<<<<<<< HEAD ======= msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." msgstr "ΕνεÏγοποιήστε το για να επιταχÏνετε το The Legend of Zelda: Twilight Princess. ΑπενεÏγοποιήστε το για τα υπόλοιπα παιχνίδια." >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 -msgid "Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)" -msgstr "ΕνεÏγοποιεί την Block Address Translation (BAT), μία λειτουÏγία της Μονάδας ΔιαχείÏισης Μνήμης. ΑκÏιβές ως Ï€Ïος το υλικό, αλλά αÏγό στην εξομοίωση. (ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" +msgid "" +"Enables Block Address Translation (BAT); a function of the Memory Management " +"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " +"Fast)" +msgstr "" +"ΕνεÏγοποιεί την Block Address Translation (BAT), μία λειτουÏγία της Μονάδας " +"ΔιαχείÏισης Μνήμης. ΑκÏιβές ως Ï€Ïος το υλικό, αλλά αÏγό στην εξομοίωση. " +"(ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" @@ -2292,13 +2500,18 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" +"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο " +"λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" -msgstr "ΕνεÏγοποιεί τη Μονάδα ΔιαχείÏισης Μνήμης, απαÏαίτητο για μεÏικά παιχνίδια. (ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" +msgid "" +"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " +"OFF = Fast)" +msgstr "" +"ΕνεÏγοποιεί τη Μονάδα ΔιαχείÏισης Μνήμης, απαÏαίτητο για μεÏικά παιχνίδια. " +"(ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" @@ -2317,6 +2530,7 @@ msgstr "Τέλος" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 @@ -2335,6 +2549,11 @@ msgstr "Τέλος" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Αγγλικά" @@ -2386,10 +2605,11 @@ msgstr "" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Σφάλμα" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. @@ -2418,9 +2638,37 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +======= +#: Source/Core/Core/Src/Movie.cpp:820 #, c-format -msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." -msgstr "Σφάλμα: ΠÏοσπάθεια Ï€Ïόσβασης των %s γÏαμματοσειÏών αλλά δεν είναι φοÏτωμένες. Τα παιχνίδια μποÏεί να μη δείχνουν τις γÏαμματοσειÏές σωστά, ή να κÏασάÏουν." +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +#: Source/Core/DolphinWX/Src/Main.cpp:346 +msgid "Error loading selected language. Falling back to system default." +msgstr "" +"Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " +"συστήματος." + +#: Source/Core/Common/Src/ChunkFile.h:180 +>>>>>>> Update from master branch. +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#, c-format +msgid "" +"Error: Trying to access %s fonts but they are not loaded. Games may not show " +"fonts correctly, or crash." +msgstr "" +"Σφάλμα: ΠÏοσπάθεια Ï€Ïόσβασης των %s γÏαμματοσειÏών αλλά δεν είναι " +"φοÏτωμένες. Τα παιχνίδια μποÏεί να μη δείχνουν τις γÏαμματοσειÏές σωστά, ή " +"να κÏασάÏουν." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2433,7 +2681,8 @@ msgstr "Euphoria" #: Source/Core/Core/Src/MemTools.cpp:214 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" -msgstr "ΧειÏιστής εξαιÏέσεων - Ï€Ïόσβαση κάτω από την πεÏιοχή μνήμης. %08llx%08llx" +msgstr "" +"ΧειÏιστής εξαιÏέσεων - Ï€Ïόσβαση κάτω από την πεÏιοχή μνήμης. %08llx%08llx" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Execute" @@ -2585,10 +2834,12 @@ msgstr "" "Αποτυχία φόÏτωσης DSP ROM:\t%s\n" "\n" "Αυτό το αÏχείο χÏειάζεται για να χÏησιμοποιηθεί το DSP LLE.\n" -"Δεν συμπεÏιλαμβάνεται με το Dolphin γιατί πεÏιέχει δεδομένα πνευματικής ιδιοκτησίας.\n" +"Δεν συμπεÏιλαμβάνεται με το Dolphin γιατί πεÏιέχει δεδομένα πνευματικής " +"ιδιοκτησίας.\n" "ΧÏησιμοποιήστε το DSPSpy για να εξάγετε το αÏχείο από την κονσόλα σας.\n" "\n" -"ΜποÏείτε να χÏησιμοποιήσετε την DSP HLE μηχανή η οποία δεν χÏειάζεται ROM dumps.\n" +"ΜποÏείτε να χÏησιμοποιήσετε την DSP HLE μηχανή η οποία δεν χÏειάζεται ROM " +"dumps.\n" "(Επιλέξτε την από την καÏτέλα \"Ήχος\" του παÏαθÏÏου των γενικών Ïυθμίσεων.)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:99 @@ -2797,7 +3048,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Επιβάλλει φιλτÏάÏισμα υφών ακόμα κι αν το παιχνίδι το έχει απενεÏγοποιήσει.\n" -"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε οÏισμένα παιχνίδια.\n" +"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα " +"σε οÏισμένα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2816,10 +3068,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" -"Left unchecked, dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games." +"Left unchecked, dolphin defaults to NTSC-U and automatically enables this " +"setting when playing Japanese games." msgstr "" -"Επιβάλει τη NTSC-J λειτουÏγία για να χÏησιμοποιηθεί η Ιαπωνική ROM γÏαμματοσειÏά.\n" -"Άμα αφεθεί αποεπιλεγμένο, το dolphin Ï€Ïοεπιλέγει τη NTSC-U και ενεÏγοποιεί αυτόματα αυτήν την ÏÏθμιση όταν παίζονται Ιαπωνικά παιχνίδια." +"Επιβάλει τη NTSC-J λειτουÏγία για να χÏησιμοποιηθεί η Ιαπωνική ROM " +"γÏαμματοσειÏά.\n" +"Άμα αφεθεί αποεπιλεγμένο, το dolphin Ï€Ïοεπιλέγει τη NTSC-U και ενεÏγοποιεί " +"αυτόματα αυτήν την ÏÏθμιση όταν παίζονται Ιαπωνικά παιχνίδια." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -2874,6 +3129,7 @@ msgstr "ΕλεÏθεÏη Ματιά" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 @@ -2892,6 +3148,11 @@ msgstr "ΕλεÏθεÏη Ματιά" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Γαλλικά" @@ -2961,6 +3222,7 @@ msgstr "Ρυθμίσεις Gamecube &Pad" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2973,6 +3235,9 @@ msgstr "Ρυθμίσεις Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -3011,7 +3276,8 @@ msgstr "" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "General" @@ -3024,6 +3290,7 @@ msgstr "Γενικές Ρυθμίσεις" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 @@ -3042,13 +3309,20 @@ msgstr "Γενικές Ρυθμίσεις" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "ΓεÏμανικά" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" -msgstr "GetARCode: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος %lu της λίστας των κωδικών ar" +msgstr "" +"GetARCode: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος %lu της λίστας των " +"κωδικών ar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Graphics" @@ -3076,15 +3350,19 @@ msgstr "ΜεγαλÏτεÏο από" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" -"Greatly increases quality of textures generated using render to texture effects.\n" +"Greatly increases quality of textures generated using render to texture " +"effects.\n" "Raising the internal resolution will improve the effect of this setting.\n" -"Slightly decreases performance and possibly causes issues (although unlikely).\n" +"Slightly decreases performance and possibly causes issues (although " +"unlikely).\n" "\n" "If unsure, leave this checked." msgstr "" -"Βελτιώνει Ï€Î¿Î»Ï Ï„Î·Î½ ποιότητα των υφών που παÏάγονται χÏησιμοποιώντας render to texture εφέ.\n" +"Βελτιώνει Ï€Î¿Î»Ï Ï„Î·Î½ ποιότητα των υφών που παÏάγονται χÏησιμοποιώντας render " +"to texture εφέ.\n" "Μία αÏξηση της εσωτεÏικής ανάλυσης θα βελτιώσει το εφέ αυτής της ÏÏθμισης.\n" -"Μειώνει ελαφÏÏŽÏ‚ την επίδοση και είναι πιθανό να Ï€Ïοκαλέσει Ï€Ïοβλήματα (αν και σπάνια).\n" +"Μειώνει ελαφÏÏŽÏ‚ την επίδοση και είναι πιθανό να Ï€Ïοκαλέσει Ï€Ïοβλήματα (αν " +"και σπάνια).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -3162,7 +3440,8 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο εξομοίωσης.\n" +"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο " +"εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -3194,8 +3473,13 @@ msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" @@ -3210,16 +3494,20 @@ msgstr "ΥβÏιδικό Wiimote" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" -msgstr "IOCTL_ES_GETVIEWS: ΑπόπειÏα ανάγνωσης δεδομένων από ένα άγνωστο εισιτήÏιο: %08x/%08x" +msgstr "" +"IOCTL_ES_GETVIEWS: ΑπόπειÏα ανάγνωσης δεδομένων από ένα άγνωστο εισιτήÏιο: " +"%08x/%08x" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 #, c-format msgid "" -"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available in your nand dump\n" +"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " +"in your nand dump\n" "TitleID %016llx.\n" " Dolphin will likely hang now" msgstr "" -"IOCTL_ES_LAUNCH: Το παιχνίδι Ï€Ïοσπάθησε να επαναφοÏτώσει ios ή έναν τίτλο που δεν είναι διαθέσιμος στο nand dump\n" +"IOCTL_ES_LAUNCH: Το παιχνίδι Ï€Ïοσπάθησε να επαναφοÏτώσει ios ή έναν τίτλο " +"που δεν είναι διαθέσιμος στο nand dump\n" "TitleID %016llx.\n" "Το Dolphin πιθανότατα θα κολλήσει Ï„ÏŽÏα." @@ -3266,9 +3554,13 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -msgid "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -msgstr "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" +msgid "" +"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" +msgstr "" +"Αν τα FPS διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = " +"Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= @@ -3281,9 +3573,17 @@ msgid "" ======= msgid "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you also have to disable Audio Throttle in DSP to make it effective." >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +msgid "" +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " +"also have to disable Audio Throttle in DSP to make it effective." +>>>>>>> Update from master branch. msgstr "" -"Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, PAL:50),\n" -"θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει αποτέλεσμα. " +"Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, " +"PAL:50),\n" +"θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει " +"αποτέλεσμα. " #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3292,24 +3592,29 @@ msgstr "Αγνόηση Αλλαγών Format" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" -"Improves performance in many games without any negative effect. Causes graphical defects in a small number of other games though.\n" +"Improves performance in many games without any negative effect. Causes " +"graphical defects in a small number of other games though.\n" "\n" "If unsure, leave this checked." msgstr "" "Αγνοεί οποιαδήποτε αλλαγή στο EFB format.\n" -"Βελτιώνει τις επιδόσεις σε πολλά παιχνίδια χωÏίς αÏνητικές συνέπειες. ΠÏοκαλεί όμως ελαττώματα στα γÏαφικά σε ένα μικÏÏŒ αÏιθμό παιχνιδιών.\n" +"Βελτιώνει τις επιδόσεις σε πολλά παιχνίδια χωÏίς αÏνητικές συνέπειες. " +"ΠÏοκαλεί όμως ελαττώματα στα γÏαφικά σε ένα μικÏÏŒ αÏιθμό παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" -"Improves performance in some games, but might disable some gameplay-related features or graphical effects.\n" +"Improves performance in some games, but might disable some gameplay-related " +"features or graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Αγνοεί οποιοδήποτε αίτημα από την CPU για ανάγνωση ή εγγÏαφή στο EFB.\n" -"Βελτιώνει τις επιδόσεις σε οÏισμένα παιχνίδια, αλλά μποÏεί να απενεÏγοποιήσει οÏισμένα χαÏακτηÏιστικά που σχετίζονται με το gameplay ή εφέ γÏαφικών.\n" +"Βελτιώνει τις επιδόσεις σε οÏισμένα παιχνίδια, αλλά μποÏεί να " +"απενεÏγοποιήσει οÏισμένα χαÏακτηÏιστικά που σχετίζονται με το gameplay ή εφέ " +"γÏαφικών.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3343,11 +3648,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" -"Improves performance but causes glitches in most games which rely on proper fog emulation.\n" +"Improves performance but causes glitches in most games which rely on proper " +"fog emulation.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί Ï€Ïοβλήματα σε παιχνίδια που βασίζονται στη σωστή εξομοίωση της ομίχλης.\n" +"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί Ï€Ïοβλήματα σε παιχνίδια που βασίζονται " +"στη σωστή εξομοίωση της ομίχλης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3357,7 +3664,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± πεÏισσότεÏα παιχνίδια.\n" +"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± " +"πεÏισσότεÏα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3407,12 +3715,16 @@ msgid "Install to Wii Menu" msgstr "Εγκατάσταση στο ÎœÎµÎ½Î¿Ï Wii" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "InstallExceptionHandler called, but this platform does not yet support it." -msgstr "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει ακόμα." +msgid "" +"InstallExceptionHandler called, but this platform does not yet support it." +msgstr "" +"InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει " +"ακόμα." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 @@ -3423,6 +3735,9 @@ msgstr "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλα ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3507,6 +3822,7 @@ msgstr "Μη έγκυÏο κατάσταση" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 @@ -3525,6 +3841,11 @@ msgstr "Μη έγκυÏο κατάσταση" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Ιταλικά" @@ -3685,6 +4006,7 @@ msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" @@ -3711,6 +4033,13 @@ msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii %d%c" @@ -3795,6 +4124,7 @@ msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 @@ -3805,6 +4135,9 @@ msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ΚÏÏιο Stick" @@ -3848,14 +4181,22 @@ msgstr "Memory Byte" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "ΚάÏτα Μνήμης" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" -msgstr "ΔιαχειÏιστής ΚαÏτών Μνήμης ΠΡΟΕΙΔΟΠΟΙΗΣΗ-Κάντε αντίγÏαφα ασφαλείας Ï€Ïιν την χÏήση, αν και διοÏθωμένος μποÏεί να χαλάσει Ï€Ïάγματα!" +msgid "" +"Memory Card Manager WARNING-Make backups before using, should be fixed but " +"could mangle stuff!" +msgstr "" +"ΔιαχειÏιστής ΚαÏτών Μνήμης ΠΡΟΕΙΔΟΠΟΙΗΣΗ-Κάντε αντίγÏαφα ασφαλείας Ï€Ïιν την " +"χÏήση, αν και διοÏθωμένος μποÏεί να χαλάσει Ï€Ïάγματα!" #: Source/Core/Core/Src/CoreParameter.cpp:369 #, c-format @@ -3876,7 +4217,9 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της κεφαλίδας." +msgstr "" +"Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της " +"κεφαλίδας." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" @@ -3906,11 +4249,13 @@ msgstr "Modifier" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" -"Modify textures to show the format they're encoded in. Needs an emulation reset in most cases.\n" +"Modify textures to show the format they're encoded in. Needs an emulation " +"reset in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΤÏοποποιεί τις υφές ώστε να εμφανίζουν το format στο οποίο είναι κωδικοποιημένες.\n" +"ΤÏοποποιεί τις υφές ώστε να εμφανίζουν το format στο οποίο είναι " +"κωδικοποιημένες.\n" "ΧÏειάζεται επανεκκίνηση της εξομοίωσης στις πεÏισσότεÏες πεÏιπτώσεις.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3938,7 +4283,8 @@ msgid "" "\n" "\n" msgstr "" -"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί μία λεπτομεÏής πεÏιγÏαφή.\n" +"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί " +"μία λεπτομεÏής πεÏιγÏαφή.\n" "\n" "\n" "\n" @@ -3949,8 +4295,12 @@ msgid "Multiply" msgstr "Multiply" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." -msgstr "ΑπενεÏγοποιεί το ηχείο του Wiimote. ΔιοÏθώνει τυχαίες αποσυνδέσεις σε Ï€Ïαγματικά wiimotes. Δεν έχει καμία επίδÏαση σε εξομοιωμένα wiimotes." +msgid "" +"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " +"effect on emulated wiimotes." +msgstr "" +"ΑπενεÏγοποιεί το ηχείο του Wiimote. ΔιοÏθώνει τυχαίες αποσυνδέσεις σε " +"Ï€Ïαγματικά wiimotes. Δεν έχει καμία επίδÏαση σε εξομοιωμένα wiimotes." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Add" @@ -4039,6 +4389,7 @@ msgstr "NP Up" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 @@ -4048,6 +4399,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4137,6 +4491,7 @@ msgstr "Μη ΟÏισμένο" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 @@ -4147,6 +4502,9 @@ msgstr "Μη ΟÏισμένο" ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -4218,7 +4576,11 @@ msgstr "Διαθέσιμα μόνο %d μπλοκ" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Άνοιγμα" @@ -4279,7 +4641,8 @@ msgid "" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -"Η σειÏά των αÏχείων στον Κατάλογο ΑÏχείων δεν ταιÏιάζει με την σειÏά των block.\n" +"Η σειÏά των αÏχείων στον Κατάλογο ΑÏχείων δεν ταιÏιάζει με την σειÏά των " +"block.\n" "Κάντε δεξί κλίκ, εξάγετε όλα τα αÏχεία αποθήκευσης\n" "και εισάγετέ τα σε μία νέα κάÏτα μνήμης.\n" @@ -4289,8 +4652,12 @@ msgid "Other" msgstr "Άλλα" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." -msgstr "Ο άλλος client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει απενεÏγοποιηθεί. Σταματήστε χειÏοκίνητα το παιχνίδι." +msgid "" +"Other client disconnected while game is running!! NetPlay is disabled. You " +"manually stop the game." +msgstr "" +"Ο άλλος client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει " +"απενεÏγοποιηθεί. Σταματήστε χειÏοκίνητα το παιχνίδι." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4348,6 +4715,7 @@ msgstr "Φάκελοι" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ======= @@ -4360,6 +4728,10 @@ msgstr "Φάκελοι" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "ΠαÏση" @@ -4395,9 +4767,14 @@ msgstr "Οπτική %d" ======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "ΑναπαÏαγωγή" @@ -4426,6 +4803,7 @@ msgstr "Παίχτες" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 @@ -4436,6 +4814,9 @@ msgstr "Παίχτες" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -4649,6 +5030,7 @@ msgstr "Ανανέωση λίστας παιχνιδιών" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 @@ -4671,6 +5053,12 @@ msgstr "Ανανέωση λίστας παιχνιδιών" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "ΑφαίÏεση" @@ -4701,6 +5089,7 @@ msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Επανεκκίνηση" @@ -4747,6 +5136,7 @@ msgid "Safe" msgstr "Ασφαλής" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +<<<<<<< HEAD ======= msgstr "" @@ -4760,6 +5150,8 @@ msgstr "Ασφαλής" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" @@ -4837,12 +5229,15 @@ msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO" #: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της εγγÏαφής της ταινίας..." +msgstr "" +"Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της " +"εγγÏαφής της ταινίας..." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" @@ -4856,6 +5251,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Ανίχνευση %s" @@ -4884,10 +5282,8 @@ msgstr "ΦίλτÏο Αναζήτησης" msgid "Search Subfolders" msgstr "Αναζήτηση σε Υποφακέλους" -#: Source/Core/Common/Src/SysConf.h:104 -#: Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 -#: Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" @@ -4897,6 +5293,7 @@ msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" msgid "Select" msgstr "Επιλογή" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4920,6 +5317,14 @@ msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" @@ -4948,6 +5353,7 @@ msgstr "Επιλέξτε το αÏχείο για φόÏτωση" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" @@ -4965,13 +5371,17 @@ msgstr "Επιλέξτε το σημείο φόÏτωσης" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 @@ -4982,6 +5392,9 @@ msgstr "Επιλέξτε το σημείο φόÏτωσης" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -4999,7 +5412,8 @@ msgstr "" "Αυτόματα: ΧÏήση της τοπικής αναλογίας οθόνης (4:3)\n" "Επιβολή 16:9: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 16:9.\n" "Επιβολή 4:3: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 4:3.\n" -"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του παÏαθÏÏου.\n" +"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του " +"παÏαθÏÏου.\n" "\n" "Αν δεν είστε σίγουÏοι επιλέξτε Αυτόματα." @@ -5010,26 +5424,32 @@ msgstr "Επιλεγμένη γÏαμματοσειÏά" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Selects the display resolution used in fullscreen mode.\n" -"This should always be bigger than or equal to the internal resolution. Performance impact is negligible.\n" +"This should always be bigger than or equal to the internal resolution. " +"Performance impact is negligible.\n" "\n" "If unsure, use your desktop resolution.\n" "If still unsure, use the highest resolution which works for you." msgstr "" -"Επιλέγει την ανάλυση της οθόνης που θα χÏησιμοποιηθεί σε λειτουÏγία πλήÏους οθόνης. Αυτή θα Ï€Ïέπει να είναι πάντα μεγαλÏτεÏη ή ίση με την εσωτεÏική ανάλυση. Το αντίκτυπο στις επιδόσεις είναι αμελητέο.\n" +"Επιλέγει την ανάλυση της οθόνης που θα χÏησιμοποιηθεί σε λειτουÏγία πλήÏους " +"οθόνης. Αυτή θα Ï€Ïέπει να είναι πάντα μεγαλÏτεÏη ή ίση με την εσωτεÏική " +"ανάλυση. Το αντίκτυπο στις επιδόσεις είναι αμελητέο.\n" "\n" -"Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την ανάλυση της επιφάνειας εÏγασίας σας.\n" +"Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την ανάλυση της επιφάνειας εÏγασίας " +"σας.\n" "Αν πάλι δεν είστε σίγουÏοι, χÏησιμοποιήστε την υψηλότεÏη λειτουÏγική ανάλυση." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects what graphics API to use internally.\n" -"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. Direct3D 11 is somewhere between the two.\n" +"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " +"Direct3D 11 is somewhere between the two.\n" "Note that the Direct3D backends are only available on Windows.\n" "\n" "If unsure, use Direct3D 9." msgstr "" "Επιλέγει το API γÏαφικών που θα χÏησιμοποιηθεί εσωτεÏικά.\n" -"Το Direct3D 9 συνήθως είναι το γÏηγοÏότεÏο. Το OpenGL είναι πεÏισσότεÏο ακÏιβές όμως. Το Direct3D 11 βÏίσκεται κάπου ενδιάμεσα Î¼ÎµÏ„Î±Î¾Ï Ï„Ï‰Î½ δÏο.\n" +"Το Direct3D 9 συνήθως είναι το γÏηγοÏότεÏο. Το OpenGL είναι πεÏισσότεÏο " +"ακÏιβές όμως. Το Direct3D 11 βÏίσκεται κάπου ενδιάμεσα Î¼ÎµÏ„Î±Î¾Ï Ï„Ï‰Î½ δÏο.\n" "Σημειώστε ότι τα Direct3D backends είναι διαθέσιμα μόνο στα Windows.\n" "\n" "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε το Direct3D 9." @@ -5050,21 +5470,28 @@ msgstr "ΔιαχωÏιστής" msgid "Serbian" msgstr "ΣεÏβικά" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +>>>>>>> Update from master branch. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "ΣειÏιακή ΘÏÏα 1 - Αυτή είναι η θÏÏα που χÏησιμοποιοÏν οι συσκευές όπως ο " "Ï€ÏοσαÏμογέας δικτÏου" +<<<<<<< HEAD ======= msgid "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "ΣειÏιακή ΘÏÏα 1 - Αυτή είναι η θÏÏα που χÏησιμοποιοÏν οι συσκευές όπως ο Ï€ÏοσαÏμογέας δικτÏου" >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -5082,7 +5509,9 @@ msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένη ΚάÏτα Μνήμης % #: Source/Core/Core/Src/ActionReplay.cpp:462 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" -msgstr "SetARCode_IsActive: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος λίστας των κωδικών ar %lu" +msgstr "" +"SetARCode_IsActive: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος λίστας των " +"κωδικών ar %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." @@ -5203,10 +5632,12 @@ msgstr "Εμφάνιση επιβεβαίωσης Ï€Ïιν τη διακοπή #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "Show a message box when a potentially serious error has occured.\n" -"Disabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all." +"Disabling this may avoid annoying and non-fatal messages, but it may also " +"mean that Dolphin suddenly crashes without any explanation at all." msgstr "" "Εμφάνιση μηνÏματος όταν Ï€ÏοκÏψει ένα πιθανά σοβαÏÏŒ σφάλμα.\n" -"ΑπενεÏγοποιώντας αυτήν την επιλογή μποÏεί να γλιτώσετε από ενοχλητικά μη κÏίσιμα σφάλματα, αλλά \n" +"ΑπενεÏγοποιώντας αυτήν την επιλογή μποÏεί να γλιτώσετε από ενοχλητικά μη " +"κÏίσιμα σφάλματα, αλλά \n" "το Dolphin μποÏεί να κÏασάÏει ξαφνικά χωÏίς καμία εξήγηση. " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 @@ -5231,11 +5662,13 @@ msgstr "Εμφάνιση αποθηκευμένου τίτλου" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" -"Show the number of frames rendered per second as a measure of emulation speed.\n" +"Show the number of frames rendered per second as a measure of emulation " +"speed.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Εμφανίζει τον αÏιθμό των καÏέ που απεικονίζονται ανά δευτεÏόλεπτο, ως Ï„Ïόπο μέτÏησης της ταχÏτητας εξομοίωσης.\n" +"Εμφανίζει τον αÏιθμό των καÏέ που απεικονίζονται ανά δευτεÏόλεπτο, ως Ï„Ïόπο " +"μέτÏησης της ταχÏτητας εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5292,11 +5725,13 @@ msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" -"Skip the destination alpha pass used in many games for various graphical effects.\n" +"Skip the destination alpha pass 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5304,13 +5739,16 @@ msgstr "" msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" -"If you're experiencing any issues, try raising texture cache accuracy or disable this option.\n" +"If you're experiencing any issues, try raising texture cache accuracy or " +"disable this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της εξομοίωσης.\n" +"ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της " +"εξομοίωσης.\n" "ΜεÏικές φοÏές μποÏεί να βελτιώσει την οπτική ποιότητα.\n" -"Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της cache υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" +"Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της cache " +"υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5378,13 +5816,16 @@ msgstr "Απεικόνιση ΛογισμικοÏ" #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:83 msgid "" -"Software rendering is an order of magnitude slower than using the other backends.\n" +"Software rendering is an order of magnitude slower than using the other " +"backends.\n" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -"Η απεικόνιση Î»Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÎ¿Ï ÎµÎ¯Î½Î±Î¹ αÏκετές βαθμίδες πιο αÏγή απ' ότι τα υπόλοιπα backends.\n" +"Η απεικόνιση Î»Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÎ¿Ï ÎµÎ¯Î½Î±Î¹ αÏκετές βαθμίδες πιο αÏγή απ' ότι τα υπόλοιπα " +"backends.\n" "Είναι μόνο χÏήσιμη για debugging σκοποÏÏ‚.\n" -"Θέλετε όντως να χÏησιμοποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε σίγουÏοι, επιλέξτε 'Όχι'." +"Θέλετε όντως να χÏησιμοποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε " +"σίγουÏοι, επιλέξτε 'Όχι'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" @@ -5407,6 +5848,7 @@ msgstr "Space" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 @@ -5425,6 +5867,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Ισπανικά" @@ -5434,13 +5881,22 @@ msgstr "Ένταση ηχείου:" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" -"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.\n" -"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n" +"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.\n" +"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less " +"issues. Generally speaking, the lower the internal resolution is, the better " +"your performance will be.\n" "\n" "If unsure, select 640x528." msgstr "" -"ΟÏίζει την ανάλυση που θα χÏησιμοποιηθεί κατά την απεικόνιση. Μια υψηλή ανάλυση θα βελτιώσει την οπτική ποιότητα αÏκετά αλλά επίσης θα έχει βαÏÏ Î±Î½Ï„Î¯ÎºÏ„Ï…Ï€Î¿ στις επιδόσεις και μποÏεί να Ï€Ïοκαλέσει ελαττώματα σε οÏισμένα παιχνίδια.\n" -"Το \"Πολλαπλάσιο του 640x528\" είναι λίγο πιο αÏγό από το \"Μέγεθος ΠαÏαθÏÏου\" αλλά αποδίδει λιγότεÏα Ï€Ïοβλήματα. Γενικά, όσο χαμηλότεÏη είναι η εσωτεÏική ανάλυση, θα είναι και καλÏτεÏες οι επιδόσεις.\n" +"ΟÏίζει την ανάλυση που θα χÏησιμοποιηθεί κατά την απεικόνιση. Μια υψηλή " +"ανάλυση θα βελτιώσει την οπτική ποιότητα αÏκετά αλλά επίσης θα έχει βαÏÏ " +"αντίκτυπο στις επιδόσεις και μποÏεί να Ï€Ïοκαλέσει ελαττώματα σε οÏισμένα " +"παιχνίδια.\n" +"Το \"Πολλαπλάσιο του 640x528\" είναι λίγο πιο αÏγό από το \"Μέγεθος ΠαÏαθÏÏου" +"\" αλλά αποδίδει λιγότεÏα Ï€Ïοβλήματα. Γενικά, όσο χαμηλότεÏη είναι η " +"εσωτεÏική ανάλυση, θα είναι και καλÏτεÏες οι επιδόσεις.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 640x528." @@ -5463,6 +5919,7 @@ msgstr "Τυπικός Controller" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 @@ -5472,6 +5929,9 @@ msgstr "Τυπικός Controller" ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5518,7 +5978,11 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Διακοπή" @@ -5550,12 +6014,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Store EFB copies in GPU texture objects.\n" -"This is not so accurate, but it works well enough for most games and gives a great speedup over EFB to RAM.\n" +"This is not so accurate, but it works well enough for most games and gives a " +"great speedup over EFB to RAM.\n" "\n" "If unsure, leave this checked." msgstr "" "Αποθήκευση των EFB αντιγÏάφων σε GPU αντικείμενα υφών.\n" -"Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" +"Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα " +"παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -5621,6 +6087,7 @@ msgstr "Δεξί Table" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. @@ -5629,6 +6096,9 @@ msgstr "Δεξί Table" ======= #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "ΔημιουÏγία Στιγμιότυπου" @@ -5705,8 +6175,12 @@ msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:51 #, c-format -msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." -msgstr "Αδυναμία ανοίγματος του αÏχείου %s για εγγÏαφή. ΠαÏακαλώ ελέγξτε αν είναι ήδη ανοιχτό από άλλο Ï€ÏόγÏαμμα." +msgid "" +"The file %s could not be opened for writing. Please check if it's already " +"opened by another program." +msgstr "" +"Αδυναμία ανοίγματος του αÏχείου %s για εγγÏαφή. ΠαÏακαλώ ελέγξτε αν είναι " +"ήδη ανοιχτό από άλλο Ï€ÏόγÏαμμα." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format @@ -5728,15 +6202,18 @@ msgstr "Το όνομα δεν μποÏεί να πεÏιέχει τον Ï‡Î±Ï #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:141 msgid "The resulting decrypted AR code doesn't contain any lines." -msgstr "Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." +msgstr "" +"Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" -"The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" "\n" "If unsure, use the second-fastest value from the right." msgstr "" -"Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να χάσει ανανεώσεις των υφών από την RAM.\n" +"Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να " +"χάσει ανανεώσεις των υφών από την RAM.\n" "\n" "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από δεξιά." @@ -5760,11 +6237,16 @@ msgstr "" >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" -msgstr "Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" +msgstr "" +"Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" #: Source/Core/DolphinWX/Src/Main.cpp:353 -msgid "The selected language is not supported by your system. Falling back to system default." -msgstr "Η επιλεγμένη γλώσσα δεν υποστηÏίζεται από το σÏστημά σας. ΕπαναφοÏά στην Ï€Ïοεπιλογή συστήματος." +msgid "" +"The selected language is not supported by your system. Falling back to " +"system default." +msgstr "" +"Η επιλεγμένη γλώσσα δεν υποστηÏίζεται από το σÏστημά σας. ΕπαναφοÏά στην " +"Ï€Ïοεπιλογή συστήματος." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5800,8 +6282,12 @@ msgid "Theme selection went wrong" msgstr "Η επιλογή θέματος απέτυχε" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 -msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." -msgstr "ΠÏέπει να υπάÏχει εισητήÏιο για 00000001/00000002. Το NAND dump σας είναι πιθανότατα ημιτελές." +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:304 msgid "" @@ -5809,25 +6295,40 @@ msgid "" "Undetermined means the game uses Dolphin's setting." msgstr "" "Αυτές οι Ïυθμίσεις υπεÏισχÏουν των γενικών Ïυθμίσεων του Dolphin.\n" -"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις του Dolphin. " +"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις " +"του Dolphin. " #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "This action replay simulator does not support codes that modify Action Replay itself." -msgstr "Αυτός ο Ï€Ïοσομοιωτής action replay δεν υποστηÏίζει κωδικοÏÏ‚ που αλλάζουν το ίδιο το Action Replay." +msgid "" +"This action replay simulator does not support codes that modify Action " +"Replay itself." +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 και σε μεÏικά παιχνίδια." +msgstr "" +"Αυτό μποÏεί να Ï€Ïοκαλέσει καθυστεÏήσεις στο ÎœÎµÎ½Î¿Ï Wii και σε μεÏικά " +"παιχνίδια." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. Hold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n" +"Hold the right mouse button and move the mouse to pan the camera around. " +"Hold SHIFT and press one of the WASD keys to move the camera by a certain " +"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " +"SHIFT+R to reset the camera.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Αυτό το χαÏακτηÏιστικό σας επιτÏέπει να πειÏάξετε την κάμεÏα του παιχνιδιοÏ.\n" -"ΚÏατώντας πατημένο το δεξί πλήκτÏο του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î¼ÎµÏ„Î±ÎºÎ¹Î½Î®ÏƒÏ„Îµ το ποντίκι για να μετακινήσετε Ï„ÏιγÏÏω την κάμεÏα. ΚÏατώντας πατημένο το SHIFT πιέστε ένα από τα WASD πλήκτÏα για να μετακινήσετε την κάμεÏα κατά μία καθοÏισμένη απόσταση (SHIFT+0 για να κινηθεί γÏηγοÏότεÏα και SHIFT+9 για να κινηθεί πιο αÏγά). Πατήστε SHIFT+R για να επαναφέÏετε την κάμεÏα στην αÏχική της θέση.\n" +"Αυτό το χαÏακτηÏιστικό σας επιτÏέπει να πειÏάξετε την κάμεÏα του " +"παιχνιδιοÏ.\n" +"ΚÏατώντας πατημένο το δεξί πλήκτÏο του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î¼ÎµÏ„Î±ÎºÎ¹Î½Î®ÏƒÏ„Îµ το ποντίκι για " +"να μετακινήσετε Ï„ÏιγÏÏω την κάμεÏα. ΚÏατώντας πατημένο το SHIFT πιέστε ένα " +"από τα WASD πλήκτÏα για να μετακινήσετε την κάμεÏα κατά μία καθοÏισμένη " +"απόσταση (SHIFT+0 για να κινηθεί γÏηγοÏότεÏα και SHIFT+9 για να κινηθεί πιο " +"αÏγά). Πατήστε SHIFT+R για να επαναφέÏετε την κάμεÏα στην αÏχική της θέση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5839,11 +6340,14 @@ msgid "" "\n" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" -"ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle ήχου.\n" -"ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€.χ. Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" +"ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle " +"ήχου.\n" +"ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€.χ. " +"Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" "Όμως οÏισμένες φοÏές η ενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μόνιμο θόÏυβο.\n" "\n" -"Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί η λειτουÏγία Throttle." +"Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί " +"η λειτουÏγία Throttle." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." @@ -5851,16 +6355,20 @@ msgstr "ΧÏησιμοποιείται για την αναπαÏαγωγή μο #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" -"This splits the Video and CPU threads, so they can be run on separate cores.\n" -"Causes major speed improvements on PCs with more than one core, but can also cause occasional crashes/glitches." +"This splits the Video and CPU threads, so they can be run on separate " +"cores.\n" +"Causes major speed improvements on PCs with more than one core, but can also " +"cause occasional crashes/glitches." msgstr "" -"ΧωÏίζει τα νήματα του Βίντεο και της CPU, ώστε να Ï„Ïέχουν σε ξεχωÏιστοÏÏ‚ πυÏήνες.\n" +"ΧωÏίζει τα νήματα του Βίντεο και της CPU, ώστε να Ï„Ïέχουν σε ξεχωÏιστοÏÏ‚ " +"πυÏήνες.\n" "ΠÏοκαλεί μεγάλη επιτάχυνση σε PC με πεÏισσότεÏους από έναν πυÏήνες,\n" "αλλά μποÏεί να Ï€Ïοκαλέσει κÏασαÏίσματα ή άλλα Ï€Ïοβλήματα. " #: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 msgid "This will let you Manually Edit the INI config file" -msgstr "Αυτό σας επιτÏέπει την χειÏοκίνητη επεξεÏγασία του αÏχείου Ïυθμίσεων INI" +msgstr "" +"Αυτό σας επιτÏέπει την χειÏοκίνητη επεξεÏγασία του αÏχείου Ïυθμίσεων INI" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:249 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:254 @@ -5906,15 +6414,20 @@ msgstr "Εναλλαγή ΠλήÏους Οθόνης" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Εναλλαγή ΠλήÏους Οθόνης" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "ΚοÏυφή" @@ -5930,8 +6443,7 @@ msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπο msgid "Triggers" msgstr "Σκανδάλες" -#: Source/Core/Common/Src/SysConf.h:92 -#: Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "ΠÏοσπάθεια ανάγνωσης από ένα μη έγκυÏο SYSCONF" @@ -5983,10 +6495,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format msgid "" -"Unable to parse line %lu of the entered AR code as a valid encrypted or decrypted code. Make sure you typed it correctly.\n" +"Unable to parse line %lu of the entered AR code as a valid encrypted or " +"decrypted code. Make sure you typed it correctly.\n" "Would you like to ignore this line and continue parsing?" msgstr "" -"Δεν μποÏεί να γίνει parse της γÏαμμής %lu από τον εισαγώμενο κωδικό AR ως ένας έγκυÏος κωδικοποιημένος ή αποκωδικοποιημένος κωδικός. ΣιγουÏευτείτε ότι τον πληκτÏολογήσατε σωστά.\n" +"Δεν μποÏεί να γίνει parse της γÏαμμής %lu από τον εισαγώμενο κωδικό AR ως " +"ένας έγκυÏος κωδικοποιημένος ή αποκωδικοποιημένος κωδικός. ΣιγουÏευτείτε ότι " +"τον πληκτÏολογήσατε σωστά.\n" "Θα θέλατε να αγνοήσετε αυτήν την γÏαμμή και να συνεχίσετε με το parsing;" #: Source/Core/DolphinWX/Src/FrameTools.cpp:404 @@ -6022,6 +6537,7 @@ msgstr "Ελήφθη άγνωστο μήνυμα με id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ελήφθη άγνωστο μήνυμα με:%d από τον παίκτη:%d ΑποσÏνδεση παίκτη!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -6042,6 +6558,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6080,19 +6598,23 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "ΧÏησιμοποίηση πολλαπλών νημάτων για την αποκωδικοποίηση υφών.\n" -"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο πυÏήνες).\n" +"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο " +"πυÏήνες).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" -"However, one may skip the popups to allow interruption free gameplay by checking this option.\n" +"However, one may skip the popups to allow interruption free gameplay by " +"checking this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Συνήθως άμα αποτÏχει η μεταγλώττιση ενός shader, θα εμφανιστεί ένα μÏνημα σφάλματος.\n" -"ΠαÏόλα αυτά μποÏείτε να παÏαλείψετε το αναδυόμενο μÏνημα ώστε να έχετε gameplay χωÏίς παÏεμβάσεις επιλέγοντας αυτήν την ÏÏθμιση.\n" +"Συνήθως άμα αποτÏχει η μεταγλώττιση ενός shader, θα εμφανιστεί ένα μÏνημα " +"σφάλματος.\n" +"ΠαÏόλα αυτά μποÏείτε να παÏαλείψετε το αναδυόμενο μÏνημα ώστε να έχετε " +"gameplay χωÏίς παÏεμβάσεις επιλέγοντας αυτήν την ÏÏθμιση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -6146,7 +6668,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της εικόνας.\n" +"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της " +"εικόνας.\n" "Μειώνει τις επιδόσεις αν η ταχÏτητα εξομοίωσης είναι μικÏότεÏη από 100%.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -6176,7 +6699,8 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων στον φάκελο:\n" +"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων " +"στον φάκελο:\n" "%s\n" "Θέλετε να συνεχίσετε;" @@ -6188,7 +6712,8 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης που υπάÏχουν στον φάκελο:\n" +"ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης " +"που υπάÏχουν στον φάκελο:\n" "%s\n" "και έχουν το ίδιο όνομα με αÏχεία στη memcard\n" "Συνέχεια;" @@ -6264,6 +6789,7 @@ msgstr "Εισαγωγή Αποθήκευσης Wii" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 @@ -6274,6 +6800,9 @@ msgstr "Εισαγωγή Αποθήκευσης Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -6307,6 +6836,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 @@ -6317,6 +6847,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -6351,6 +6884,7 @@ msgstr "Αναδίπλωση Λέξεων" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 @@ -6365,6 +6899,11 @@ msgstr "Αναδίπλωση Λέξεων" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Σε εÏγασία..." @@ -6429,7 +6968,8 @@ msgstr "ΠÏέπει να εισάγετε ένα έγκυÏο όνομα Ï€Ïο #: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." -msgstr "ΠÏέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή." +msgstr "" +"ΠÏέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή." #: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" @@ -6487,14 +7027,19 @@ msgstr "[ΠÏοσαÏμοζόμενο]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" -"Aims to speed up emulation by offloading texture decoding to the GPU using the OpenCL framework.\n" -"However, right now it's known to cause texture defects in various games. Also it's slower than regular CPU texture decoding in most cases.\n" +"Aims to speed up emulation by offloading texture decoding to the GPU using " +"the OpenCL framework.\n" +"However, right now it's known to cause texture defects in various games. " +"Also it's slower than regular CPU texture decoding in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" "[ΠΕΙΡΑΜΑΤΙΚΟ]\n" -"ΣτοχεÏει στην επιτάχυνση της εξομοίωσης φοÏτώνοντας την αποκωδικοποίηση των υφών στην GPU χÏησιμοποιώντας το OpenCL framework.\n" -"ΠαÏ'όλα αυτά, Ï€Ïος το παÏόν είναι γνωστό ότι Ï€Ïοκαλεί Ï€Ïοβλήματα στις υφές σε διάφοÏα παιχνίδια. Επίσης είναι πιο αÏγή από την τυπική αποκωδικοποίηση υφών από την CPU στις πεÏισσότεÏες πεÏιπτώσεις.\n" +"ΣτοχεÏει στην επιτάχυνση της εξομοίωσης φοÏτώνοντας την αποκωδικοποίηση των " +"υφών στην GPU χÏησιμοποιώντας το OpenCL framework.\n" +"ΠαÏ'όλα αυτά, Ï€Ïος το παÏόν είναι γνωστό ότι Ï€Ïοκαλεί Ï€Ïοβλήματα στις υφές " +"σε διάφοÏα παιχνίδια. Επίσης είναι πιο αÏγή από την τυπική αποκωδικοποίηση " +"υφών από την CPU στις πεÏισσότεÏες πεÏιπτώσεις.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -6541,7 +7086,9 @@ msgstr "iCacheJIT: Ανάγνωση Opcode από %x. ΠαÏακαλώ να το #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "δεν είναι σημείο αποθήκευσης wii ή αποτυχία ανάγνωσης κεφαλίδας αÏχείου μεγέθους %x" +msgstr "" +"δεν είναι σημείο αποθήκευσης wii ή αποτυχία ανάγνωσης κεφαλίδας αÏχείου " +"μεγέθους %x" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:461 msgid "s" @@ -6571,6 +7118,9 @@ msgstr "| OR" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #~ msgid "Cannot record movies in read-only mode." #~ msgstr "" #~ "Δεν μποÏεί να γίνει εγγÏαφή ταινιών σε λειτουÏγία μόνο για ανάγνωση." @@ -6581,6 +7131,7 @@ msgstr "| OR" #~ msgstr "" #~ "Άγνωστος δείκτης %#08x\n" #~ "Συνέχεια;" +<<<<<<< HEAD ======= #~ msgid "Disable Wiimote Speaker" #~ msgstr "ΑπενεÏγοποίηση Ηχείου Wiimote" @@ -6668,3 +7219,5 @@ msgstr "| OR" >>>>>>> Update Greek and Czech translations ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. diff --git a/Languages/po/en.po b/Languages/po/en.po index 2563333e4e..0667cfbf71 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -509,6 +513,7 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -518,6 +523,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "" @@ -571,6 +581,7 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -578,6 +589,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "" @@ -655,11 +670,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -680,11 +699,15 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -793,10 +816,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "" @@ -829,11 +856,15 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1056,10 +1087,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1168,11 +1203,15 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "" @@ -1348,10 +1387,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1561,11 +1604,15 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1594,6 +1641,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1609,6 +1657,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1691,6 +1747,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1700,6 +1757,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "" @@ -1823,21 +1885,31 @@ msgid "Enable Block Merging" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "" @@ -1963,6 +2035,7 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -1972,6 +2045,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "" @@ -2001,6 +2079,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -2018,6 +2097,19 @@ msgid "Error" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2432,6 +2524,7 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2441,6 +2534,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "" @@ -2507,10 +2605,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2532,11 +2634,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2545,6 +2652,7 @@ msgstr "" msgid "General Settings" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2554,6 +2662,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "" @@ -2669,11 +2782,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "" @@ -2863,11 +2981,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "" @@ -2944,6 +3066,7 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -2953,6 +3076,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "" @@ -3103,6 +3231,7 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3116,6 +3245,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3192,11 +3328,15 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3228,10 +3368,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "" @@ -3408,11 +3552,15 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3499,11 +3647,15 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3565,9 +3717,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "" @@ -3693,6 +3849,7 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3700,6 +3857,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3720,12 +3881,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "" @@ -3751,11 +3917,15 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "" @@ -3961,6 +4131,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -3972,6 +4143,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "" @@ -3988,9 +4165,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -4033,11 +4214,15 @@ msgstr "" msgid "Safe" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "" @@ -4121,11 +4306,15 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "" @@ -4165,6 +4354,7 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4180,6 +4370,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "" @@ -4202,6 +4400,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4214,15 +4413,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "" @@ -4556,6 +4762,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4565,6 +4772,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "" @@ -4600,11 +4812,15 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4640,9 +4856,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4715,9 +4935,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -4930,18 +5154,26 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "" @@ -5043,6 +5275,7 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5053,6 +5286,8 @@ msgid "" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5254,11 +5489,15 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5285,11 +5524,15 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5321,6 +5564,7 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5330,6 +5574,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "" diff --git a/Languages/po/es.po b/Languages/po/es.po index b16d557823..5b7d2b9a35 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -8,6 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-09 00:28+0100\n" ======= @@ -18,6 +19,10 @@ msgstr "" ======= "PO-Revision-Date: 2011-10-15 23:23+0100\n" >>>>>>> Updated Spanish translation +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-23 16:03+0100\n" +>>>>>>> Update from master branch. "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" "Language: Spanish\n" @@ -47,7 +52,7 @@ msgid "" " Create a new 16MB Memcard?" msgstr "" "\"%s\" no existe.\n" -"¿Crear una nueva tarjeta de memoria de 16 MB?" +"¿Crear una nueva tarjeta de memoria de 16 MB?" #: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format @@ -123,8 +128,8 @@ msgid "" "If you select \"No\", audio will be garbled." msgstr "" "%s tiene un hash incorrecto.\n" -"¿Desea detener ahora para reparar el problema?\n" -"Si selecciona \"No\", el audio se oirá con ruidos." +"¿Deseas detener ahora para reparar el problema?\n" +"Si seleccionas \"No\", el audio se oirá con ruidos." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360 #, c-format @@ -161,7 +166,7 @@ msgstr "%sImportar GCI%s" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" -msgstr "%u Bloques libres; %u entradas de directorio libres" +msgstr "%u Bloques libres; %u entradas de dir. libres" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "&& AND" @@ -458,7 +463,7 @@ msgstr "" "Algunos juegos dependen de esto para algunos efectos gráficos o " "funcionalidad del juego.\n" "\n" -"Si está inseguro, elija EFB a textura." +"Si está inseguro, elige EFB a textura." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 @@ -537,7 +542,7 @@ msgstr "Error de Action Replay: Línea de código AR no válida: %s" #: Source/Core/Core/Src/ActionReplay.cpp:873 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" -msgstr "Error de Action Replay: Código Condicional: Tamaño no válido %08x (%s)" +msgstr "Error de Action Replay: Código condicional: Tamaño no válido %08x (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:946 #, c-format @@ -575,6 +580,7 @@ msgstr "Añadir Parche" msgid "Add new pane" msgstr "Añadir nueva ventana" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -584,6 +590,11 @@ msgstr "Añadir nueva ventana" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Añadir..." @@ -630,7 +641,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -"Ajuste la presión requerida del control analógico para activar los botones." +"Ajusta la presión requerida del control analógico para activar los botones." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" @@ -652,6 +663,7 @@ msgstr "Todas las imágenes GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos los archivos Gamecube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -659,6 +671,10 @@ msgstr "Todos los archivos Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" @@ -742,25 +758,29 @@ msgstr "Ãrabe" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 #, c-format msgid "Are you sure you want to delete \"%s\"?" -msgstr "¿Seguro que quiere borrar \"%s\"?" +msgstr "¿Estás seguro de que quieres borrar \"%s\"?" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -"¿Seguro que quiere borrar estos archivos?\n" +"¿Seguro que quieres borrar estos archivos?\n" "¡Desaparecerán para siempre!" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" -msgstr "¿Seguro que quiere borrar este archivo? ¡Desaparecerá para siempre!" +msgstr "¿Seguro que quieres borrar este archivo? ¡Desaparecerá para siempre!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -781,11 +801,15 @@ msgstr "Motor de Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error al abrir dispositivo AO.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -808,9 +832,9 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Automáticamente ajusta el tamaño de la ventana a su resolución interna.\n" +"Ajusta automáticamente el tamaño de la ventana a su resolución interna.\n" "\n" -"Si está inseguro, déjelo sin marcar." +"Si estás inseguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" @@ -902,10 +926,14 @@ msgstr "Azul derecha" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Inferior" @@ -938,11 +966,15 @@ msgstr "Busca un directorio de salida" msgid "Buffer:" msgstr "Búfer" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1031,7 +1063,7 @@ msgid "" "Are you trying to use the same file in both slots?" msgstr "" "No se puede usar ese archivo como una tarjeta de memoria.\n" -"¿Está intentando usar el mismo archivo en ambas ranuras?" +"¿Estás intentando usar el mismo archivo en ambas ranuras?" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858 #, c-format @@ -1056,7 +1088,7 @@ msgstr "Bloq Mayús" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" -msgstr "Catalan" +msgstr "Catalán" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 msgid "Center" @@ -1139,7 +1171,7 @@ msgstr "Escoge una ISO por defecto:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" -msgstr "Escoja un directorio para añadir" +msgstr "Escoge un directorio para añadir" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" @@ -1149,16 +1181,20 @@ msgstr "Escoge un archivo a abrir" msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +>>>>>>> Update from master branch. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -"Escoja el archivo que usar como apploader (se aplica a los discos armados a " +"Escoge el archivo que usar como apploader (se aplica a los discos armados a " "partir de directorios solamente):" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 @@ -1196,10 +1232,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Cerrar" @@ -1308,11 +1348,15 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Conectando..." @@ -1430,11 +1474,15 @@ msgstr "Crear nueva perspectiva" msgid "Created by KDE-Look.org" msgstr "Creado por KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +>>>>>>> Update from master branch. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1509,10 +1557,14 @@ msgstr "Motor de emulación DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "Emulación DSP HLE (rápido)" @@ -1743,11 +1795,15 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" @@ -1776,6 +1832,7 @@ msgstr "Configuración de wiimote emulado de Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1791,6 +1848,14 @@ msgstr "Configuración de GCPad Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Configuración de GCPad Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" @@ -1802,11 +1867,15 @@ msgstr "Configuración de wiimote de Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin en &Google Code" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +>>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1814,11 +1883,15 @@ msgstr "" "Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para " "buscar..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +>>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1894,6 +1967,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1903,6 +1977,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holandés" @@ -1923,7 +2002,7 @@ msgid "" "driver." msgstr "" "ERROR: Esta versión de Dolphin requiere un controlador TAP-Win32 que sea por " -"lo menos de versión %d.%d. Si recientemente actualizó su distribución de " +"lo menos de versión %d.%d. Si actualizaste recientemente tu distribución de " "Dolphin, puede que se necesite reiniciar para que Windows reconozca el nuevo " "controlador." @@ -1966,7 +2045,7 @@ msgstr "Efecto" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" -msgstr "Bufer de frames embebido" +msgstr "Búfer de fotogramas embebido" #: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" @@ -2041,6 +2120,7 @@ msgstr "Habilitar BAT" msgid "Enable Block Merging" msgstr "Habilitar asociación de bloques" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -2048,15 +2128,25 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "Permitir el cálculo del cuadro delimitador" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Habilitar caché" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Habilitar trucos" @@ -2117,7 +2207,7 @@ msgstr "" "Mejora la calidad de las texturas que tienen un ángulo de visión obliquo.\n" "Puede causar problemas en algunos juegos.\n" "\n" -"Si está inseguro, déjelo sin marcar." +"Si estás inseguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" @@ -2142,7 +2232,7 @@ msgstr "" "representación.\n" "Si esto es desactivado, una ventana de renderizado se creará en su lugar.\n" "\n" -"Si no está seguro, déjelo sin marcar." +"Si no estás seguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" @@ -2154,13 +2244,17 @@ msgstr "" "Active esto si quiere usar la ventana principal de Dolphin para renderizar " "en vez de una ventana aparte.\n" "\n" -"Si está inseguro, déjelo sin marcar." +"Si no estás seguro, déjalo sin marcar." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update from master branch. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2191,7 +2285,8 @@ msgid "" msgstr "" "Activa el escaneo progresivo si es soportado por el software emulado.\n" "A muchos juegos no les afecta esto.\n" -"Si está inseguro, déjelo sin marcar." +"\n" +"Si no estás seguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "" @@ -2209,12 +2304,13 @@ msgid "" msgstr "" "Codificar el volcado de los frames usando el códec FFV1.\n" "\n" -"Si está inseguro, déjelo sin marcar." +"Si estás inseguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:50 msgid "End" msgstr "Fin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2224,6 +2320,11 @@ msgstr "Fin" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Inglés" @@ -2253,6 +2354,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2270,12 +2372,39 @@ msgid "Error" msgstr "Error" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Error" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" +"Error en PlayWiimote. %u != %u, byte %d.\n" +"Disculpa, la grabación de Wii no funciona temporalmente." + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error al cargar el idioma seleccionado. Volviendo al defecto del sistema." #: Source/Core/Common/Src/ChunkFile.h:180 +<<<<<<< HEAD +======= +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" +"Error: Después de \"%s\", se ha encontrado %d (0x%X) en vezde la marca de " +"guardado %d (0x%X). Cancelando carga del guardado..." + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +>>>>>>> Update from master branch. #, c-format msgid "" <<<<<<< HEAD @@ -2440,7 +2569,7 @@ msgstr "Fallo al descargar los códigos." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" -msgstr "Fallo al extraer a %s!" +msgstr "Falló al extraer a %s!" #: Source/Core/Core/Src/DSP/DSPCore.cpp:66 #, c-format @@ -2466,12 +2595,12 @@ msgstr "" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:99 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:119 msgid "Failed to load bthprops.cpl" -msgstr "Fallo al cargar bthprops.cpl" +msgstr "Falló al cargar bthprops.cpl" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:83 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:92 msgid "Failed to load hid.dll" -msgstr "Fallo al cargar hid.dll" +msgstr "Falló al cargar hid.dll" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" @@ -2503,7 +2632,7 @@ msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" msgstr "" -"Falló leer el directorio de respaldo correctamente\n" +"Falló la lectura del directorio de respaldo\n" "(0x4000-0x5FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:132 @@ -2511,7 +2640,7 @@ msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" msgstr "" -"Falló leer el directorio correctamente\n" +"Falló la lectura del directorio\n" "(0x2000-0x3FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:121 @@ -2534,25 +2663,25 @@ msgstr "" #: Source/Core/DiscIO/Src/VolumeGC.cpp:61 msgid "Failed to read unique ID from disc image" -msgstr "Fallo al leer la ID única de la imagen de disco" +msgstr "Falló al leer la ID única de la imagen de disco" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:83 msgid "Failed to write BT.DINF to SYSCONF" -msgstr "Fallo al escribir BT.DINF a SYSCONF" +msgstr "Falló al escribir BT.DINF a SYSCONF" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228 msgid "Failed to write bkhdr" -msgstr "Fallo al escribir bkhdr" +msgstr "Falló al escribir bkhdr" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164 #, c-format msgid "Failed to write header for %s" -msgstr "Fallo al escribir la cabecera para %s" +msgstr "Falló al escribir la cabecera para %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258 #, c-format msgid "Failed to write header for file %d" -msgstr "Fallo al escribir la cabecera para el archivo %d" +msgstr "Falló al escribir la cabecera para el archivo %d" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 msgid "Fast" @@ -2687,7 +2816,7 @@ msgid "" "Choose no for sjis (NTSC-J)" msgstr "" "Formato como ASCII (NTSC\\PAL)?\n" -"Escoger no para sjis (NTSC-J)" +"Elige no para sjis (NTSC-J)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:278 msgid "Forward" @@ -2731,6 +2860,7 @@ msgstr "Frames a grabar" msgid "Free Look" msgstr "Cámara libre" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2740,6 +2870,11 @@ msgstr "Cámara libre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francés" @@ -2765,9 +2900,14 @@ msgid "GCI File(*.gci)" msgstr "Archivo GCI (*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +<<<<<<< HEAD #, fuzzy msgid "GCMic Configuration" msgstr "Configuración de registro" +======= +msgid "GCMic Configuration" +msgstr "Configuración del micro de GC" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -2807,10 +2947,14 @@ msgstr "&Configuración del mando Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" @@ -2834,11 +2978,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2847,6 +2996,7 @@ msgstr "General" msgid "General Settings" msgstr "Ajustes generales" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2856,6 +3006,11 @@ msgstr "Ajustes generales" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Alemán" @@ -2895,6 +3050,7 @@ msgid "" "If unsure, leave this checked." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD "Mejora bastante la calidad de las texturas generadas usando los efectos de " "renderización para la textura.\n" "Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" @@ -2910,6 +3066,12 @@ msgstr "" "Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" "Diminuye ligeramente el desempeño y probablemente provoca fallos (aunque es " >>>>>>> Updated Spanish translation +======= +"Mejora bastante la calidad de las texturas generadas usando los efectos de " +"renderización para la textura.\n" +"Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" +"Reduce ligeramente el desempeño y posiblemente cause fallos (altamente " +>>>>>>> Update from master branch. "improbable).\n" "\n" "Si está inseguro, déjelo marcado." @@ -3008,11 +3170,16 @@ msgstr "Configuración de atajos" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Atajos" @@ -3085,6 +3252,11 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +<<<<<<< HEAD +======= +"Si se elige, los registros del cuadro delimitador serán actualizados. Es " +"usado por los juegos de Paper Mario." +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" @@ -3093,11 +3265,15 @@ msgstr "" "Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF = " "Rápido)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +>>>>>>> Update from master branch. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." @@ -3241,11 +3417,15 @@ msgstr "" "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " "todavía." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3327,6 +3507,7 @@ msgstr "Archivo de grabación no válido" msgid "Invalid state" msgstr "Estado no válido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3336,6 +3517,11 @@ msgstr "Estado no válido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italiano" @@ -3493,6 +3679,7 @@ msgstr "&Cargar estado 8" msgid "Load State..." msgstr "Cargar estado..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3506,6 +3693,13 @@ msgstr "Cargar Menú de sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Cargar Menú de sistema Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Cargar Menú de sistema Wii %d %c" @@ -3587,11 +3781,15 @@ msgstr "Hack de velocidad MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Archivos MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" @@ -3623,10 +3821,14 @@ msgstr "Byte de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Tarjeta de memoria" @@ -3733,6 +3935,9 @@ msgstr "" "\n" "\n" "\n" +"\n" +"\n" +"\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:72 msgid "Multiply" @@ -3830,11 +4035,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Arriba" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3914,18 +4123,22 @@ msgstr "Noruego Bokmal" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Not Equal" -msgstr "No Igual" +msgstr "No igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" -msgstr "No Definido" +msgstr "No definido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Sin conectar" @@ -3987,9 +4200,13 @@ msgstr "Solo %d bloques disponibles" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Abrir" @@ -4066,7 +4283,7 @@ msgid "" "manually stop the game." msgstr "" "¡¡El otro cliente se ha desconectado mientras el juego estaba ejecutándose!! " -"NetPlay ha sido deshabilitado. Debe detener el juego manualmente." +"NetPlay ha sido deshabilitado. Debes detener el juego manualmente." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4121,6 +4338,7 @@ msgstr "Parches" msgid "Paths" msgstr "Directorios" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4128,6 +4346,10 @@ msgstr "Directorios" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4148,12 +4370,17 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Reproducir" @@ -4179,17 +4406,21 @@ msgstr "Opciones de reproducción" msgid "Players" msgstr "Jugadores" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." -msgstr "Confirme, por favor..." +msgstr "Confirma, por favor..." #: Source/Core/DolphinWX/Src/FrameAui.cpp:578 msgid "Please create a perspective before saving" -msgstr "Por favor, cree una perspectiva antes de guardar" +msgstr "Por favor, crea una perspectiva antes de guardar" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:36 msgid "Plus-Minus" @@ -4235,17 +4466,29 @@ msgstr "Efecto de posprocesado:" #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "Final prematuro de la película en PlayController. %u + 8 > %u" +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:829 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "Final prematuro de la película en PlayWiimote. %u + %d > %u" +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:806 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "Final prematuro de la película en PlayWiimote. %u > %u" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4394,6 +4637,7 @@ msgstr "Actualizar lista" msgid "Refresh game list" msgstr "Actualizar lista de juegos" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4405,6 +4649,12 @@ msgstr "Actualizar lista de juegos" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Eliminar" @@ -4424,9 +4674,13 @@ msgstr "Renderizar a ventana principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4469,11 +4723,15 @@ msgstr "Guardar estado" msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Frecuencia del sonido:" @@ -4599,6 +4857,7 @@ msgstr "No se ha encontrado la sección %s en SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4614,6 +4873,14 @@ msgstr "Seleccionar archivo de grabación" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Seleccionar archivo de grabación" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" @@ -4639,6 +4906,7 @@ msgstr "Selecciona las ventanas flotantes" msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4651,15 +4919,22 @@ msgstr "Selecciona el estado para cargar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Selecciona el archivo de guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Selecciona el estado para cargar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Selecciona el estado para guardar" @@ -4734,11 +5009,15 @@ msgstr "Separador" msgid "Serbian" msgstr "Serbio" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +>>>>>>> Update from master branch. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5070,6 +5349,7 @@ msgstr "Falló la creación del búfer de sonido: %s" msgid "Space" msgstr "Espacio" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -5079,6 +5359,11 @@ msgstr "Espacio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Español" @@ -5122,11 +5407,15 @@ msgstr "Stick cuadrado" msgid "Standard Controller" msgstr "Control estándar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5162,9 +5451,13 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Detener" @@ -5245,15 +5538,23 @@ msgstr "Tabla derecha" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Captura de pantalla" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "TaruKonga (Bongos)" +<<<<<<< HEAD msgstr "" +======= +msgstr "TaruKonga (Bongos)" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5499,18 +5800,26 @@ msgstr "Alternar todos los tipos de registro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Cambiar a pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Superior" @@ -5583,7 +5892,7 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" "No es posible analizar la línea %lu del código AR introducido como un código " -"válido cifrado o descifrado. Asegúrese de que la ha escrito correctamente.\n" +"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:404 @@ -5622,6 +5931,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format msgid "" @@ -5631,6 +5941,8 @@ msgid "" msgstr "" "Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5796,6 +6108,12 @@ msgid "" "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" +<<<<<<< HEAD +======= +"Advertencia: Has cargado un guardado de después del final de la película " +"actual.(Byte %u > %u) (frame %u > %u). Deberías cargar otor guardado antes " +"de continuar, o cargar éste sin el modo de solo lectura." +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:646 #, c-format @@ -5804,6 +6122,13 @@ msgid "" "should load another save before continuing, or load this state with read-" "only mode off. Otherwise you'll probably get a desync." msgstr "" +<<<<<<< HEAD +======= +"Advertencia: has cargado una partida guardada con desjustes en %d bytes (0x" +"%X). Debe de cargar otro guardado antes de continuar, o cargar este guardado " +"con el modo de solo lectura desactivado. De lo contrario probablemente " +"obtenga una desincronización." +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:655 #, c-format @@ -5823,6 +6148,24 @@ 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 "" +<<<<<<< HEAD +======= +"Advertencia: has cargado una partida guardada con desajustes en %d bytes. " +"Debes cargar otro guardado antes de continuar, o cargar este guardado con el " +"modo de solo lectura desactivado. De lo contrario, probablemente obtengas " +"una desincronización.\n" +"\n" +"Más información: La película actual dura %d fotogramas y el guardado de la " +"película dura %d fotogramas.\n" +"\n" +"En el fotograma %d, la película actual presiona:\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" +"En el fotograma %d, el guardado de la película presiona:\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" +>>>>>>> Update from master branch. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5857,11 +6200,15 @@ msgstr "Raíz de la NAND de Wii:" msgid "Wii Save Import" msgstr "Importar guardado de Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -5892,11 +6239,15 @@ msgstr "" "o mucho tiempo de espera, o alguna otra razón.\n" "¿Desea reconectarlo inmediatamente?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote conectado" @@ -5928,6 +6279,7 @@ msgstr "Windows Derecha" msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5937,6 +6289,11 @@ msgstr "Word Wrap" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Trabajando..." @@ -5985,11 +6342,11 @@ msgstr "No puede cerrar ventanas que tengan páginas en ellas." #: Source/Core/DolphinWX/Src/NetWindow.cpp:194 msgid "You must choose a game!!" -msgstr "¡¡Debe elegir un juego!!" +msgstr "¡¡Debes elegir un juego!!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" -msgstr "¡Debe escribir un nombre!" +msgstr "¡Debes escribir un nombre!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 msgid "You must enter a valid decimal, hexadecimal or octal value." @@ -5997,11 +6354,11 @@ msgstr "Debes introducir un valor decimal o hexadecimal válido." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 msgid "You must enter a valid profile name." -msgstr "Debe introducir un nombre de perfil válido." +msgstr "Debes introducir un nombre de perfil válido." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." -msgstr "Debe reiniciar Dolphin para que el cambio tenga efecto." +msgstr "Debes reiniciar Dolphin para que el cambio tenga efecto." #: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" diff --git a/Languages/po/fr.po b/Languages/po/fr.po index 5af84de44e..d5f462ae2c 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-28 23:40+0100\n" ======= @@ -23,6 +24,10 @@ msgstr "" "POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-12-20 18:42+0100\n" >>>>>>> Update Hungarian and Turkish translations. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-10-28 23:40+0100\n" +>>>>>>> Update from master branch. "Last-Translator: Pascal\n" "Language-Team: \n" "Language: French\n" @@ -64,9 +69,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sCopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -194,11 +199,11 @@ msgstr "Gestionnaire de &cheats" msgid "&DSP Settings" msgstr "Paramètres &DSP (audio)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "&Supprimer l'ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "&Supprimer les ISO sélectionnés" @@ -262,7 +267,7 @@ msgstr "&Pause" msgid "&Play" msgstr "&Démarrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&Propriétés" @@ -306,7 +311,7 @@ msgstr "&Affichage" msgid "&Wiimote Settings" msgstr "Paramètres de la &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "&Wiki" @@ -355,10 +360,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -415,8 +421,8 @@ msgstr "" "\n" "Vous devez indiquer le port TCP à l'hôte !!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "AM-Baseboard" @@ -463,6 +469,7 @@ msgstr "" "Dans le doute, cochez plutôt EFB vers texture." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "Action" @@ -563,11 +570,11 @@ msgstr "Carte :" msgid "Add" msgstr "Ajouter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "Ajouter un code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "Ajouter un patch" @@ -575,6 +582,7 @@ msgstr "Ajouter un patch" msgid "Add new pane" msgstr "Ajouter un nouveau panneau" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -590,6 +598,11 @@ msgstr "Ajouter un nouveau panneau" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Ajouter..." @@ -642,7 +655,7 @@ msgstr "" msgid "Advanced" msgstr "Avancé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "Paramètres avancés" @@ -650,14 +663,15 @@ msgstr "Paramètres avancés" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tous les fichiers GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Toutes les images GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -670,18 +684,22 @@ msgstr "Tous les fichiers GameCube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "Tous les fichiers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "Tous les fichiers (*.*)|*.*" @@ -728,7 +746,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:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "Apploader :" @@ -747,7 +765,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" @@ -756,7 +774,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:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -764,12 +782,13 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ces fichiers ?\n" "Ils seront définitivement supprimés !" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 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 !" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -779,6 +798,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -787,11 +809,11 @@ 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:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "Moteur audio :" @@ -799,6 +821,7 @@ msgstr "Moteur audio :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -808,6 +831,9 @@ msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -852,7 +878,7 @@ msgstr "" msgid "Back" msgstr "Retour" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "Paramètres de l'interface audio" @@ -862,7 +888,7 @@ msgid "Backend:" msgstr "Moteur :" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Entrée en arrière-plan" @@ -875,15 +901,15 @@ msgid "Bad File Header" msgstr "Mauvaise entête de fichier" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "Bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "Détails de la bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "Bannière :" @@ -895,7 +921,7 @@ msgstr "Barre" msgid "Basic" msgstr "Paramètres de base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "Paramètres de base" @@ -928,6 +954,7 @@ msgstr "Bleu Droite" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -935,6 +962,9 @@ msgstr "Bleu Droite" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Bas" @@ -943,7 +973,7 @@ msgstr "Bas" msgid "Bound Controls: %lu" msgstr "Contrôles liés : %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Corrompu" @@ -951,7 +981,7 @@ msgstr "Corrompu" msgid "Browse" msgstr "Parcourir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "Choisir un dossier à ajouter" @@ -959,7 +989,7 @@ msgstr "Choisir un dossier à ajouter" msgid "Browse for an ISO directory..." msgstr "Rechercher un dossier contenant des ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "Parcourir un dossier de destination" @@ -967,6 +997,7 @@ msgstr "Parcourir un dossier de destination" msgid "Buffer:" msgstr "Buffer :" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 @@ -976,6 +1007,9 @@ msgstr "Buffer :" ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -985,11 +1019,11 @@ msgstr "Boutons" msgid "C Stick" msgstr "Stick-C" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "Stick-C" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "Moteur d'émulation du CPU" @@ -1042,16 +1076,12 @@ msgstr "Annuler" msgid "Cannot open %s" msgstr "Impossible d'ouvrir %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "Impossible d'enregistrer des films en mode Lecture seule." - #: Source/Core/Core/Src/CoreTiming.cpp:122 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:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1062,7 +1092,7 @@ msgstr "" "%s\n" "n'est pas un fichier de carte mémoire GameCube valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1093,7 +1123,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" @@ -1110,6 +1140,7 @@ msgid "Change &Disc..." msgstr "&Changer de disque..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "Changer de disque" @@ -1117,7 +1148,7 @@ msgstr "Changer de disque" msgid "Change Game" msgstr "Changer de Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1133,8 +1164,8 @@ 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:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: 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 !" @@ -1154,31 +1185,31 @@ msgstr "Rechercher un cheat" msgid "Cheats Manager" msgstr "Gestionnaire de Cheats" -#: 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:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "Choisir un dossier racine pour le DVD :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "Choisir un dossier racine pour la NAND :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "Choisir un ISO par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Choisir un fichier à ouvrir" @@ -1186,6 +1217,7 @@ msgstr "Choisir un fichier à ouvrir" msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 @@ -1196,6 +1228,9 @@ msgstr "Choisir une carte mémoire :" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +>>>>>>> Update from master branch. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1210,8 +1245,8 @@ msgstr "Choisir un fichier comme apploader : (uniquement pour les disques créé ======= >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "Choisir le dossier de destination de l'extraction" @@ -1230,7 +1265,7 @@ msgstr "Classique" msgid "Clear" msgstr "Effacer" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "Echec de l'éffacement" @@ -1246,6 +1281,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1253,6 +1289,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fermer" @@ -1277,20 +1316,20 @@ msgstr "Commande" msgid "Comment" msgstr "Commentaire" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Commentaire :" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "Compresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Compresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "Compression de l'ISO" @@ -1317,13 +1356,13 @@ msgstr "Configurer les manettes" msgid "Configure..." msgstr "Configurer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "Confirmer l'écrasement du fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "Confirmer l'arrêt de l'émulation" @@ -1332,7 +1371,7 @@ msgstr "Confirmer l'arrêt de l'émulation" msgid "Connect" msgstr "Connecter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "Connecter le clavier USB" @@ -1342,21 +1381,26 @@ msgid "Connect Wiimote %i" msgstr "Connecter la Wiimote %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "Connecter la 1ère Wiimote" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "Connecter la 2è Wiimote" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "Connecter la 3è Wiimote" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "Connecter la 4è Wiimote" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 @@ -1366,6 +1410,9 @@ msgstr "Connecter la 4è Wiimote" ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Connexion..." @@ -1390,7 +1437,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:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "Core" @@ -1421,7 +1468,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Impossible de reconnaître le fichier ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "Impossible de sauvegarder %s" @@ -1449,7 +1496,7 @@ msgstr "" "Exécutez-vous Dolpin à partir d'un CD/DVD, ou le fichier de sauvegarde est " "peut-être protégé contré l'écriture ?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossible de trouver la commande d'ouverture pour l'extension 'ini' !" @@ -1466,7 +1513,7 @@ msgstr "" msgid "Count:" msgstr "Nombre :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "Pays :" @@ -1480,10 +1527,11 @@ msgstr "Créer un code AR" msgid "Create new perspective" msgstr "Créer une nouvelle perspective" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "Créé par KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 @@ -1494,6 +1542,9 @@ msgstr "Créé par KDE-Look.org" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +>>>>>>> Update from master branch. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1506,11 +1557,11 @@ msgstr "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com ======= >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "Créé par VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Créé par black_rider et publié sur ForumW.org > Web Developments" @@ -1545,7 +1596,7 @@ msgstr "Crossfade" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Le dossier actuel a été changé de %s en %s après wxFileSelector !" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "Hack de projection personnalisé" @@ -1553,15 +1604,15 @@ msgstr "Hack de projection personnalisé" msgid "Custom Projection Hack Settings" msgstr "Paramètres du hack de projection personnalisé" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 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" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "Pad numérique" @@ -1569,13 +1620,14 @@ msgstr "Pad numérique" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 @@ -1583,18 +1635,21 @@ msgstr "Moteur d'émulation du DSP (Audio)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "Interpréteur du DSP en LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "DSP LLE sur thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "Recompilateur du DSP en LLE" @@ -1602,7 +1657,7 @@ msgstr "Recompilateur du DSP en LLE" msgid "DSP settings" msgstr "Paramètres DSP (audio)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "Racine du DVD :" @@ -1610,7 +1665,7 @@ msgstr "Racine du DVD :" msgid "Data Size" msgstr "Taille des données" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "Date :" @@ -1639,16 +1694,16 @@ msgstr "Débug" msgid "Decimal" msgstr "Décimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "Décompresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "Décompresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "Décompression de l'ISO" @@ -1656,7 +1711,7 @@ msgstr "Décompression de l'ISO" msgid "Default" msgstr "Par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "ISO par défaut :" @@ -1700,8 +1755,8 @@ msgstr "" msgid "Device" msgstr "Appareil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "Paramètres de la console virtuelle" @@ -1786,7 +1841,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Disque" @@ -1813,6 +1868,7 @@ msgstr "" msgid "Divide" msgstr "Diviser" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1822,10 +1878,13 @@ msgstr "Diviser" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1850,6 +1909,7 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1874,6 +1934,14 @@ msgstr "Configuration de la manette GC pour Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Configuration de la manette GC pour Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -1885,6 +1953,7 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 @@ -1895,6 +1964,9 @@ msgstr "Dolphin dans &Google Code" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +>>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1915,8 +1987,12 @@ msgstr "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher d >>>>>>> Update translation files for recent changes in the code. ======= +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +>>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1953,7 +2029,7 @@ msgstr "Percussions" msgid "Dummy" msgstr "Factice" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Enregistrer le son" @@ -2000,6 +2076,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -2015,6 +2092,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Néerlandais" @@ -2067,8 +2149,8 @@ msgstr "Editer le patch" msgid "Edit current perspective" msgstr "Modifier la perspective actuelle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "Editer..." @@ -2080,7 +2162,7 @@ msgstr "Effets" msgid "Embedded Frame Buffer" msgstr "Buffer d'image embarqué" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "Thread d'émulation déjà en cours d'exécution" @@ -2118,7 +2200,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote émulée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "Etat de l'émulation :" @@ -2146,7 +2228,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activer la journalisation AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "Activer le contrôle audio" @@ -2160,18 +2242,25 @@ msgstr "Activer l'assemblage de blocs" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activer le cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2181,10 +2270,13 @@ msgstr "Activer le cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Activer les Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "Activer la musique DTK" @@ -2192,7 +2284,7 @@ msgstr "Activer la musique DTK" msgid "Enable Dual Core" msgstr "Activer le Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "Activer le Dual Core (plus rapide)" @@ -2204,7 +2296,7 @@ msgstr "Activer les touches de raccourci" msgid "Enable Idle Skipping" msgstr "Activer le saut d'inactivité" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "Activer le saut d'inactivité (plus rapide)" @@ -2217,7 +2309,7 @@ msgstr "Activer le MMU" msgid "Enable Progressive Scan" msgstr "Activer le Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "Activer l'économiseur d'écran" @@ -2281,6 +2373,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 @@ -2291,6 +2384,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update from master branch. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2315,7 +2411,7 @@ msgstr "" "de gesiton de mémoire. Fidèle au matériel de la console, mais lent à émuler. " "(ON = Compatible, OFF = Rapide)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "Active un hack de projection personnalisé" @@ -2353,6 +2449,7 @@ msgstr "" msgid "End" msgstr "Fin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2368,6 +2465,11 @@ msgstr "Fin" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Anglais" @@ -2398,6 +2500,7 @@ msgstr "Egal" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erreur" @@ -2428,9 +2531,19 @@ msgid "" msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +>>>>>>> Update from master branch. msgid "Error" msgstr "Erreur" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2438,7 +2551,14 @@ msgstr "" "défaut du système." >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format <<<<<<< HEAD <<<<<<< HEAD @@ -2487,11 +2607,12 @@ msgstr "Quitter Dolphin avec l'émulateur" msgid "Export Failed" msgstr "Echec de l'exportation" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "Exporter un fichier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Exporter l'enregistrement..." @@ -2503,7 +2624,7 @@ msgstr "Exporter l'enregistrement..." msgid "Export Save" msgstr "Exporter une sauvegarde" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "Exporter une sauvegarde Wii (expérimental)" @@ -2535,44 +2656,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:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "Extraire tous les fichiers..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "Extraire l'Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "Extraire le DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "Extraire un dossier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "Extraire un fichier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "Extraire une partition..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "Extraction de %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "Extraction de tous les fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "Extraction du dossier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "Extraction..." @@ -2588,7 +2709,7 @@ msgstr "Lecteur FIFO" msgid "FRANCE" msgstr "France" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "Taille FST :" @@ -2604,7 +2725,7 @@ msgstr "Ecoute impossible !" msgid "Failed to download codes." msgstr "Impossible de télécharger les codes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "Impossible d'extraire vers %s !" @@ -2781,11 +2902,11 @@ msgstr "Fichier non compressé" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO : mode d'ouverture inconnu : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "Système de fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !" @@ -2805,7 +2926,7 @@ msgstr "Forcer 16/9è" msgid "Force 4:3" msgstr "Forcer 4/3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "Forcer la console comme NTSC-J" @@ -2839,7 +2960,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2871,6 +2992,7 @@ msgid "Frame " msgstr "Image " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Avancement d'image" @@ -2886,7 +3008,7 @@ msgstr "Plage d'images :" msgid "Frame S&kipping" msgstr "Saut d'&image :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "Image/s max :" @@ -2898,6 +3020,7 @@ msgstr "Images à enregistrer :" msgid "Free Look" msgstr "Vue libre" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2913,6 +3036,11 @@ msgstr "Vue libre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Français" @@ -2938,18 +3066,24 @@ msgid "GCI File(*.gci)" msgstr "Fichier GCI (*.gci)" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 #, fuzzy msgid "GCMic Configuration" msgstr "Configuration de la journalisation" +<<<<<<< HEAD ======= >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "Manette GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "ID du jeu :" @@ -2965,7 +3099,7 @@ msgstr "Le jeu n'est pas en cours d'émulation !" msgid "Game not found!!" msgstr "Jeu non trouvé !!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "Paramètres spécifiques au jeu" @@ -2973,7 +3107,7 @@ msgstr "Paramètres spécifiques au jeu" msgid "GameConfig" msgstr "Config du Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "GameCube" @@ -2984,6 +3118,7 @@ msgstr "Paramètres de la &manette GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2991,6 +3126,9 @@ msgstr "Paramètres de la &manette GameCube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" @@ -3015,6 +3153,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= @@ -3023,6 +3162,10 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Général" @@ -3031,6 +3174,7 @@ msgstr "Général" msgid "General Settings" msgstr "Paramètres généraux" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -3046,6 +3190,11 @@ msgstr "Paramètres généraux" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Allemand" @@ -3110,7 +3259,7 @@ msgstr "" "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "Grèque" @@ -3142,7 +3291,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:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "Hébreu" @@ -3207,6 +3356,7 @@ msgstr "Configuration des raccourcis clavier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= @@ -3215,10 +3365,14 @@ msgstr "Configuration des raccourcis clavier" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Raccourcis clavier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "Hongrois" @@ -3250,7 +3404,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - mauvaise destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "Paramètres IPL" @@ -3266,11 +3420,11 @@ msgstr "Pointeur IR" msgid "IR Sensitivity:" msgstr "Sensibilité de l'IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "Détails de l'ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "Dossiers des ISO" @@ -3283,14 +3437,20 @@ msgid "Icon" msgstr "Icône" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -3298,6 +3458,7 @@ msgstr "" "Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = " "Compatible, OFF = Vitesse)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 @@ -3308,6 +3469,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +>>>>>>> Update from master branch. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." @@ -3406,7 +3570,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "Dans le jeu" @@ -3435,7 +3599,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:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "Insérer une carte SD" @@ -3447,7 +3611,7 @@ msgstr "Indiquer un nom ici..." msgid "Install WAD" msgstr "Installer un WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "Installer dans le menu Wii" @@ -3458,6 +3622,7 @@ msgstr "" "InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas " "encore en charge." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3467,22 +3632,25 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Installation du WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "Paramètres de l'interface" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "Erreur interne LZO - échec de la compression" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3491,7 +3659,7 @@ msgstr "" "Erreur interne LZO - échec de la décompression (%d) (%li, %li) \n" "Essayez de charger à nouveau l'état" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "Erreur interne LZO - échec de lzo_init()" @@ -3499,11 +3667,11 @@ msgstr "Erreur interne LZO - échec de lzo_init()" msgid "Internal Resolution:" msgstr "Résolution interne :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "Interpréteur (TRES lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "Intro" @@ -3520,7 +3688,7 @@ msgstr "Valeur non valide !" msgid "Invalid bat.map or dir entry" msgstr "bar.map ou entrée dir non valide" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "Type d'évènement non valide : %i" @@ -3540,14 +3708,15 @@ msgstr "" "%s\n" "Vous devriez copier à nouveau ce jeu." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "Fichier d'enregitrement non valide" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "Etat non valide" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3563,6 +3732,11 @@ msgstr "Etat non valide" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italien" @@ -3570,16 +3744,16 @@ msgstr "Italien" msgid "JAPAN" msgstr "Japon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "Recompilateur JIT (recommandé) " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "Recompilateur expérimental JIT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "Japonais" @@ -3588,16 +3762,17 @@ msgid "KOREA" msgstr "Corée" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "Touche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "Coréen" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3606,11 +3781,11 @@ msgid "L Button" msgstr "Bouton L" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "L Analog." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "Langue :" @@ -3633,6 +3808,7 @@ msgid "Left Stick" msgstr "Stick Gauche" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3662,7 +3838,7 @@ msgstr "" msgid "Less Than" msgstr "Plus petit que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "Nb de FPS comme limite" @@ -3675,34 +3851,42 @@ msgid "Load Custom Textures" msgstr "Charger textures personnalisées" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" msgstr "Charger l'état du Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" msgstr "Charger l'état du Slot 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" msgstr "Charger l'état du Slot 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 4" msgstr "Charger l'état du Slot 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 msgid "Load State Slot 5" msgstr "Charger l'état du Slot 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Load State Slot 6" msgstr "Charger l'état du Slot 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Load State Slot 7" msgstr "Charger l'état du Slot 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "Charger l'état du Slot 8" @@ -3710,6 +3894,7 @@ msgstr "Charger l'état du Slot 8" msgid "Load State..." msgstr "Charger un état..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3731,6 +3916,13 @@ msgstr "Charger le Menu Système Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Charger le Menu Système Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" @@ -3759,7 +3951,7 @@ msgstr "Charge le fichier spécifié (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "Verrouiller les threads aux coeurs" @@ -3814,6 +4006,7 @@ msgstr "Hack de vitesse pour le MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Fichiers MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 @@ -3823,15 +4016,18 @@ msgstr "Fichiers MadCatz Gameshark (*.gcs)" ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "ID concepteur :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "Concepteur :" @@ -3855,6 +4051,7 @@ msgstr "Octet mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3862,6 +4059,9 @@ msgstr "Octet mémoire" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Carte mémoire" @@ -3900,7 +4100,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "Micro" @@ -3913,7 +4113,7 @@ msgstr "Min" msgid "Misc" msgstr "Divers" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "Paramètres divers" @@ -3944,7 +4144,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Vibreur" @@ -4062,6 +4262,7 @@ msgstr "NP Tabulation" msgid "NP Up" msgstr "NP Haut" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -4071,6 +4272,9 @@ msgstr "NP Haut" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4109,7 +4313,7 @@ msgstr "Pseudo :" msgid "No Country (SDK)" msgstr "Pas de pays (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "Aucun ISO ou WAD trouvé" @@ -4144,7 +4348,7 @@ msgstr "Aucun dossier de sauvegarde trouvé pour le titre %s" msgid "None" msgstr "Aucune" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "Norvégien BokmÃ¥l" @@ -4152,11 +4356,12 @@ msgstr "Norvégien BokmÃ¥l" msgid "Not Equal" msgstr "Différent" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "Non défini" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 @@ -4166,10 +4371,13 @@ msgstr "Non défini" ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Non connectée" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "Notes" @@ -4211,7 +4419,7 @@ msgstr "Objet" msgid "Object Range" msgstr "Plage d'objets :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "Arrêt" @@ -4228,19 +4436,23 @@ msgstr "%d blocs disponibles seulement" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Ouvrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "Ouvrir l'emplacement du fichier" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "Ouvrir le dossier de &sauvegarde Wii" @@ -4279,7 +4491,7 @@ msgid "Opens the logger" msgstr "Ouvrir le journaliseur" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Options" @@ -4360,10 +4572,11 @@ msgstr "Partition %i" msgid "Patches" msgstr "Patchs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "Chemins" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4376,6 +4589,10 @@ msgstr "Chemins" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4384,7 +4601,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Eclairage par pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Parfait" @@ -4397,6 +4614,7 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4407,18 +4625,24 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Démarrer" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "Jouer l'enregistrement..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "Démarrer/Arrêter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "Jouable" @@ -4430,6 +4654,7 @@ msgstr "Options de lecture" msgid "Players" msgstr "Joueurs" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4439,6 +4664,9 @@ msgstr "Joueurs" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4450,23 +4678,23 @@ msgstr "Merci de créer une perspective avant de sauvegarder" msgid "Plus-Minus" msgstr "Plus-Moins" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Polonais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "Port 4" @@ -4475,11 +4703,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "Portugais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "Portugais (brésilien)" @@ -4488,6 +4716,9 @@ msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" @@ -4503,8 +4734,11 @@ msgstr "" msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "Pré-réglages :" @@ -4547,7 +4781,7 @@ msgid "Quit" msgstr "Quitter" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -4556,7 +4790,7 @@ msgid "R Button" msgstr "Bouton R" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "R Analog." @@ -4573,6 +4807,7 @@ msgid "Range" msgstr "Etendue" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Mode Lecture seule" @@ -4644,6 +4879,7 @@ msgid "Refresh" msgstr "Rafraîchir" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "Rafraîchir la liste" @@ -4651,6 +4887,7 @@ msgstr "Rafraîchir la liste" msgid "Refresh game list" msgstr "Rafraîchir la liste des jeux" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4669,6 +4906,12 @@ msgstr "Rafraîchir la liste des jeux" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Retirer" @@ -4689,11 +4932,15 @@ msgstr "Rendu dans la fenêtre principale" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4716,15 +4963,15 @@ msgid "Right Stick" msgstr "Stick Droit" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Exécuter DSP LLE sur un thread dédié (non recommandé)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "Russe" @@ -4736,6 +4983,7 @@ msgstr "Sau&vegarder l'état" msgid "Safe" msgstr "Sûr " +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4745,6 +4993,9 @@ msgstr "Sûr " ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Echantillonnage :" @@ -4759,34 +5010,42 @@ msgid "Save GCI as..." msgstr "Enregistrer GCI sous..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "Sauvegarder l'état vers le Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "Sauvegarder l'état vers le Slot 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" msgstr "Sauvegarder l'état vers le Slot 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" msgstr "Sauvegarder l'état vers le Slot 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 msgid "Save State Slot 5" msgstr "Sauvegarder l'état vers le Slot 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" msgstr "Sauvegarder l'état vers le Slot 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 msgid "Save State Slot 7" msgstr "Sauvegarder l'état vers le Slot 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "Sauvegarder l'état vers le Slot 8" @@ -4794,12 +5053,12 @@ msgstr "Sauvegarder l'état vers le Slot 8" msgid "Save State..." msgstr "Enregistrer l'état" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Enregistrer sous..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Sauver le fichier compressé GCM/ISO" @@ -4807,11 +5066,11 @@ msgstr "Sauver le fichier compressé GCM/ISO" msgid "Save current perspective" msgstr "Sauvegarder la perspective actuelle" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "Sauvegarder le fichier GCM/ISO décompressé" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4822,16 +5081,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "Copie à l'échelle de l'EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "Analyse de %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "Recherche d'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "Recherche..." @@ -4847,7 +5106,7 @@ msgstr "Arrêt défil." msgid "Search Filter" msgstr "Fitre de recherche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" @@ -4862,6 +5121,7 @@ msgstr "La section %s n'a pas été trouvée dans SYSCONF" msgid "Select" msgstr "Select" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4886,6 +5146,14 @@ msgstr "Sélectionner le fichier d'enregistrement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Sélectionner le fichier d'enregistrement" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -4911,6 +5179,7 @@ msgstr "Sélectionner les fenêtres flottantes" msgid "Select the file to load" msgstr "Sélectionner le fichier à charger" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4928,18 +5197,25 @@ msgstr "Sélectionner l'état à charger" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Sélectionner l'état à charger" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -5011,10 +5287,11 @@ msgstr "Position de la Sensor Bar :" msgid "Separator" msgstr "Séparateur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Serbe" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 @@ -5025,6 +5302,9 @@ msgstr "Serbe" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +>>>>>>> Update from master branch. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5042,7 +5322,7 @@ msgstr "Port série 1 - C'est le port que les périphériques tels que l'adaptat msgid "Set" msgstr "Paramétrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "Définir comme l'ISO par &défaut" @@ -5058,11 +5338,11 @@ msgstr "" "SetARCode_IsActive : L'index est plus grand que la taille de la liste des " "codes AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "Configurer..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" @@ -5070,7 +5350,7 @@ msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" msgid "Shake" msgstr "Secouement" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "Nom court :" @@ -5130,7 +5410,7 @@ msgstr "Afficher Japon" msgid "Show Korea" msgstr "Afficher Corée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "Afficher la langue :" @@ -5170,11 +5450,11 @@ msgstr "Afficher WAD" msgid "Show Wii" msgstr "Afficher Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 msgid "Show a confirmation box before stopping a game." msgstr "Demande confirmation avant d'arrêter le jeu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -5239,15 +5519,15 @@ 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é" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Taille" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "Ne pas exécuter le BIOS" @@ -5326,11 +5606,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "Slot B" @@ -5355,7 +5635,7 @@ msgstr "" "Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez " "'Non'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Paramètres audio" @@ -5373,6 +5653,7 @@ msgstr "Echec de la création du buffer audio : %s" msgid "Space" msgstr "Espace" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5388,6 +5669,11 @@ msgstr "Espace" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Espagnol" @@ -5431,6 +5717,7 @@ msgstr "Stick carré" msgid "Standard Controller" msgstr "Contrôleur standard" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 @@ -5440,6 +5727,9 @@ msgstr "Contrôleur standard" ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5454,14 +5744,16 @@ msgid "Start Re&cording" msgstr "Commencer l'enregistrement" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "Commencer l'enregistrement" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "Etat" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Etats" @@ -5474,11 +5766,15 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arrêter" @@ -5522,8 +5818,8 @@ msgstr "Fichiers de sauvegarde importés avec succès" msgid "Swing" msgstr "Balancement" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "Langue du système :" @@ -5557,6 +5853,7 @@ msgstr "Table Droite" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. @@ -5572,6 +5869,16 @@ msgid "Take Screenshot" msgstr "Capture d'écran" >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +msgid "Take Screenshot" +msgstr "Capture d'écran" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Test" @@ -5600,13 +5907,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:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 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:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -5696,7 +6003,7 @@ 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:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "Thème" @@ -5728,7 +6035,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:509 +#: 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." @@ -5751,7 +6058,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -5767,11 +6074,11 @@ msgstr "" "Raccourci clavier : Appuyer pour instantanément désactiver cette " "option." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Ceci est utilisé pour lire les pistes de musique, comme les BGM." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5799,7 +6106,7 @@ msgid "Tilt" msgstr "Tilt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "Titre" @@ -5816,17 +6123,22 @@ msgstr "Activer tous les types de journaux" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Activer le plein écran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5834,10 +6146,13 @@ msgstr "Activer le plein écran" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Haut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Chinois traditionnel" @@ -5845,7 +6160,7 @@ msgstr "Chinois traditionnel" msgid "Tried to load an unknown file type." msgstr "Echec de chargement d'un type de fichier inconnu." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "Déclencheurs" @@ -5861,7 +6176,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:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "Turque" @@ -5954,6 +6269,7 @@ msgstr "" "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" >>>>>>> Update Hungarian and Turkish translations. +<<<<<<< HEAD #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format msgid "" @@ -5969,6 +6285,8 @@ msgstr "" "Continuer ?" >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5983,7 +6301,7 @@ msgstr "Mettre à jour" msgid "Upright Wiimote" msgstr "Wiimote debout" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utiliser le mode EuRGB60 (PAL60)" @@ -5995,7 +6313,7 @@ msgstr "&Plein écran" msgid "Use Hex" msgstr "Utiliser Hexa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "Utiliser les gestionnaires de panique" @@ -6051,7 +6369,7 @@ msgstr "Valeur" msgid "Verbosity" msgstr "Verbosité" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Vidéo" @@ -6059,7 +6377,7 @@ msgstr "Vidéo" msgid "Virtual" msgstr "Virtuel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "Volume" @@ -6127,6 +6445,9 @@ msgstr "" "Continuer ?" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:629 #, c-format msgid "" @@ -6162,8 +6483,11 @@ msgid "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -6181,15 +6505,15 @@ msgstr "Hack écran large (16/9è)" msgid "Width" msgstr "Largeur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "Racine de la NAND (Wii) :" @@ -6197,6 +6521,7 @@ msgstr "Racine de la NAND (Wii) :" msgid "Wii Save Import" msgstr "Importer une sauvegarde Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6206,6 +6531,9 @@ msgstr "Importer une sauvegarde Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -6236,6 +6564,7 @@ msgstr "" "ou bien c'est dû à un temps d'attente trop long, ou encore autre chose.\n" "Voulez-vous la reconnecter tout de suite ?" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 @@ -6245,6 +6574,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote connectée" @@ -6276,6 +6608,7 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6291,6 +6624,11 @@ msgstr "Casse" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Travail..." @@ -6354,7 +6692,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:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 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." @@ -6377,7 +6715,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:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "ZTP hack" @@ -6448,7 +6786,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6465,7 +6803,7 @@ msgstr "Impossible de lire les données du fichier %s" msgid "failed to read header" msgstr "Impossible de lire l'entête" -#: Source/Core/Core/Src/HW/Memmap.cpp:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT : Lecture de l'Opcode depuis %x. Merci de nous le signaler." @@ -6486,7 +6824,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Commande inconnue 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute a retourné -1 sur l'exécution de l'application !" @@ -6598,6 +6936,9 @@ msgstr "| OR" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "Impossible d'ouvrir %s, une fonction manque" +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "Impossible d'enregistrer des films en mode Lecture seule." + #~ msgid "Config..." #~ msgstr "Configurer..." @@ -6697,9 +7038,6 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Paramètres graphiques de l'émulateur" -#~ msgid "Enable Bounding Box Calculation" -#~ msgstr "Activer le calcul de la boît de saut" - #~ msgid "Enable CPU Access" #~ msgstr "Activer l'accès CPU" @@ -6758,13 +7096,6 @@ msgstr "| OR" #~ msgid "Error allocating buffer" #~ msgstr "Erreur d'allocation du buffer" -#~ msgid "" -#~ "Error in PlayWiimote. %u != %u, byte %d.\n" -#~ "Sorry, Wii recording is temporarily broken." -#~ msgstr "" -#~ "Erreur dans PlayWiimote. %u != %u, octet %d.\n" -#~ "Désolé, l'enregistrement Wii est temporairement instable." - #~ msgid "Error loading %s: can't read info" #~ msgstr "Erreur lors du chargement de %s : inpossible de lire l'info" @@ -6777,13 +7108,6 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "Erreur d'ouverture du fichier %s pour l'enregistrement" -#~ msgid "" -#~ "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -#~ "Aborting savestate load..." -#~ msgstr "" -#~ "Erreur : Apres \"%s\", %d (0x%X) a été trouvé au lieu du marqueur de " -#~ "sauvegarde %d (0x%X). Abandon du chargement de la sauvegarde d'état..." - #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6822,9 +7146,6 @@ msgstr "| OR" #~ "en ont besoin pour fonctionneer correctement, mais peut être aussi très " #~ "lent." -#~ msgid "GCMic Configuration" -#~ msgstr "Configuration du micro de la GC" - #~ msgid "GFX Config" #~ msgstr "Configurer..." @@ -6848,13 +7169,6 @@ msgstr "| OR" #~ "Si un jeu bloque, fonctionne seulement avec l'Interpreteur ou que Dolphin " #~ "plante, cette option peut corriger le jeu." -#~ msgid "" -#~ "If checked, the bounding box registers will be updated. Used by the Paper " -#~ "Mario games." -#~ msgstr "" -#~ "Si coché, les registres de la boîte de saut seront mis à jour. Utilisé " -#~ "par les jeux Paper Mario." - #~ msgid "Input Source" #~ msgstr "Source d'entrée" @@ -6943,15 +7257,6 @@ msgstr "| OR" #~ " Exécutez-vous Dolphin à partir d'un média en lecture seule ou d'un " #~ "dossier d'où Dolphin n'est pas situé ?" -#~ msgid "Premature movie end in PlayController. %u + 8 > %u" -#~ msgstr "Fin prématurée du film dans PlayController. %u + 8 > %u" - -#~ msgid "Premature movie end in PlayWiimote. %u + %d > %u" -#~ msgstr "Fin prématurée du film dans PlayWiimote. %u + %d > %u" - -#~ msgid "Premature movie end in PlayWiimote. %u > %u" -#~ msgstr "Fin prématurée du film dans PlayWiimote. %u > %u" - #~ msgid "Projection Stats" #~ msgstr "Stats de projection" @@ -7077,9 +7382,6 @@ msgstr "| OR" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Démarrer la fenêtre de rendu en plein écran." -#~ msgid "TaruKonga (Bongos)" -#~ msgstr "TaruKonga (Bongos)" - #~ msgid "The file " #~ msgstr "Le fichier " @@ -7094,6 +7396,13 @@ msgstr "| OR" #~ msgstr "" #~ "Le type de configuration %d n'est pas pris en charge dans le plug-in %s" +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Pointeur inconnu %#08x\n" +#~ "Continuer ?" + #~ msgid "Use FPS For Limiting" #~ msgstr "Utiliser les FPS pour limiter" @@ -7124,60 +7433,6 @@ msgstr "| OR" #~ "Attendre les blancs verticaux (ou synchro verticale).\n" #~ "Réduit les sauts mais peut aussi baisser les performances" -#~ msgid "" -#~ "Warning: You loaded a save that's after the end of the current movie. " -#~ "(byte %u > %u) (frame %u > %u). You should load another save before " -#~ "continuing, or load this state with read-only mode off." -#~ msgstr "" -#~ "Attention : vous avez chargé une sauvegarde qui se situe après la fin du " -#~ "film actuel. (octet %u > %u) (image %u > %u). Vous devriez charger une " -#~ "autre sauvegarde avant de continuer, ou charger cette sauvegarde en " -#~ "désactivant le mode Lecture seule." - -#~ msgid "" -#~ "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " -#~ "should load another save before continuing, or load this state with read-" -#~ "only mode off. Otherwise you'll probably get a desync." -#~ msgstr "" -#~ "Attention : vous avez chargé une sauvegarde dont le film ne correspond " -#~ "pas à l'octet %d (0x%X). Vous devriez charger une autre sauvegarde avant " -#~ "de continuer, ou charger cet état en désactivant le mode Lecture seule. " -#~ "Autrement, vous aurez probablement une désynchronisation." - -#~ msgid "" -#~ "Warning: You loaded a save whose movie mismatches on frame %d. You should " -#~ "load another save before continuing, or load this state with read-only " -#~ "mode off. Otherwise you'll probably get a desync.\n" -#~ "\n" -#~ "More information: The current movie is %d frames long and the savestate's " -#~ "movie is %d frames long.\n" -#~ "\n" -#~ "On frame %d, the current movie presses:\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" -#~ "On frame %d, the savestate's movie presses:\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" -#~ msgstr "" -#~ "Attention : vous avez chargé une sauvegarde dont le film ne correspond " -#~ "pas à l'image %d. Vous devriez charger une autre sauvegarde avant de " -#~ "continuer, ou charger cet état en désactivant le mode Lecture seule. " -#~ "Autrement, vous aurez probablement une désynchronisation.\n" -#~ "\n" -#~ "Infos complémentaires : Le film actuel fait %d images et alors que le " -#~ "film de la sauvegarde d'état fait %d images.\n" -#~ "\n" -#~ "A l'image %d, le film actuel appuie sur :\n" -#~ "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DHaut=%d, DBas=%d, DGauche=%d, " -#~ "DDroit=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=" -#~ "%d\n" -#~ "\n" -#~ "A l'image %d, le film de la sauvegarde d'état appuie sur :\n" -#~ "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DHaut=%d, DBas=%d, DGauche=%d, " -#~ "DDroit=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" - #~ msgid "" #~ "When using EFB to RAM we very often need to decode RAM data to a VRAM " #~ "texture, which is a very time-consuming task.\n" diff --git a/Languages/po/he.po b/Languages/po/he.po index 857ec27567..ea10f8cea4 100644 --- a/Languages/po/he.po +++ b/Languages/po/he.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-01-08 20:50+0200\n" "Last-Translator: Ely \n" "Language-Team: \n" @@ -510,6 +514,7 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -519,6 +524,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "" @@ -572,6 +582,7 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -579,6 +590,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "" @@ -656,11 +671,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -681,11 +700,15 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -795,10 +818,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "" @@ -831,11 +858,15 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1058,10 +1089,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1170,11 +1205,15 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "" @@ -1350,10 +1389,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1563,11 +1606,15 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1596,15 +1643,20 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +>>>>>>> Update from master branch. #, fuzzy msgid "Dolphin GCPad Configuration" msgstr "הגדרות גרפיקה" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 @@ -1612,6 +1664,10 @@ msgstr "הגדרות גרפיקה" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1694,6 +1750,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1703,6 +1760,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "" @@ -1826,21 +1888,31 @@ msgid "Enable Block Merging" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "" @@ -1966,6 +2038,7 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -1975,6 +2048,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "" @@ -2004,6 +2082,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -2021,6 +2100,19 @@ msgid "Error" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2435,6 +2527,7 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2444,6 +2537,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "" @@ -2513,10 +2611,14 @@ msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2538,11 +2640,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2552,6 +2659,7 @@ msgstr "" msgid "General Settings" msgstr "הגדרות קול" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2561,6 +2669,11 @@ msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "" @@ -2676,11 +2789,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "" @@ -2870,11 +2988,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "" @@ -2951,6 +3073,7 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -2960,6 +3083,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "" @@ -3110,6 +3238,7 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3123,6 +3252,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3200,11 +3336,15 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3236,10 +3376,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "" @@ -3416,11 +3560,15 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3507,11 +3655,15 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3573,9 +3725,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "" @@ -3701,6 +3857,7 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3708,6 +3865,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3728,12 +3889,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "" @@ -3759,11 +3925,15 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "" @@ -3969,6 +4139,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -3980,6 +4151,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "" @@ -3996,9 +4173,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -4041,11 +4222,15 @@ msgstr "" msgid "Safe" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "" @@ -4129,11 +4314,15 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "" @@ -4173,6 +4362,7 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4188,6 +4378,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "" @@ -4210,6 +4408,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4222,15 +4421,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "" @@ -4566,6 +4772,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4575,6 +4782,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "" @@ -4610,11 +4822,15 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4650,9 +4866,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4725,9 +4945,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -4940,18 +5164,26 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "" @@ -5053,6 +5285,7 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5063,6 +5296,8 @@ msgid "" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5265,11 +5500,15 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5296,11 +5535,15 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5332,6 +5575,7 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5341,6 +5585,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index 4e43ee3092..27ed2a0941 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -8,6 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:41-0600\n" ======= @@ -18,6 +19,10 @@ msgstr "" ======= "PO-Revision-Date: 2011-12-20 17:22-0600\n" >>>>>>> Update Hungarian and Turkish translations. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-27 08:22-0600\n" +>>>>>>> Update from master branch. "Last-Translator: Delirious \n" "Language-Team: Delirious \n" "Language: Hungarian\n" @@ -586,6 +591,7 @@ msgstr "Patch hozzáadása" msgid "Add new pane" msgstr "Új mezÅ‘ hozzáadása" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -595,6 +601,11 @@ msgstr "Új mezÅ‘ hozzáadása" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Hozzáadás..." @@ -664,6 +675,7 @@ msgstr "Minden GC/Wii képfájl (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Minden Gamecube GCM fájl (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -671,6 +683,10 @@ msgstr "Minden Gamecube GCM fájl (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" @@ -769,11 +785,15 @@ msgstr "" 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!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -794,11 +814,15 @@ msgstr "Hang feldolgozó:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatikus" @@ -916,10 +940,14 @@ msgstr "Kék jobbra" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Lent" @@ -952,11 +980,15 @@ msgstr "Kimeneti könyvtár tallózása" msgid "Buffer:" msgstr "Puffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1022,6 +1054,7 @@ msgstr "Mégsem" msgid "Cannot open %s" msgstr "%s nem nyitható meg" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:721 @@ -1029,15 +1062,21 @@ msgid "Cannot record movies in read-only mode." msgstr "A mozgások rögzítése nem lehetséges írásvédett módban." >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "Nem lehet események bejegyzéseket törölni függÅ‘ben lévÅ‘ eseményekkel" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +>>>>>>> Update from master branch. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1214,10 +1253,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Bezárás" @@ -1326,11 +1369,15 @@ msgstr "Wiimote 3 csatlakoztatása" msgid "Connect Wiimote 4" msgstr "Wiimote 4 csatlakoztatása" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Csatlakozás..." @@ -1521,10 +1568,14 @@ msgstr "DSP emulátor motor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emuláció (gyors)" @@ -1757,11 +1808,15 @@ msgstr "" msgid "Divide" msgstr "Megosztás" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Le akarod állítani az éppen működÅ‘ emulációt?" @@ -1790,6 +1845,7 @@ msgstr "Dolphin emulált Wiimote beállítások" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1805,6 +1861,14 @@ msgstr "Dolphin GCPad beállítások" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad beállítások" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" @@ -1901,6 +1965,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1910,6 +1975,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holland" @@ -2053,6 +2123,7 @@ msgstr "BAT használata" msgid "Enable Block Merging" msgstr "Blokk csatlakozás használata" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -2060,15 +2131,25 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "Bounding Box kalkuláció használata" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Gyorsítótár használata" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Csalások használata" @@ -2224,6 +2305,7 @@ msgstr "" msgid "End" msgstr "Vége" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2233,6 +2315,11 @@ msgstr "Vége" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Angol" @@ -2262,6 +2349,7 @@ msgstr "EgyenlÅ‘" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hiba" @@ -2279,6 +2367,21 @@ msgid "Error" msgstr "Hiba" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Hiba" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" +"PlayWiimote hiba. %u != %u, bájt %d.\n" +"Sajnos a Wii videó rögzítés egyenlÅ‘re nem működik." + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2291,6 +2394,11 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +<<<<<<< HEAD +======= +"Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x%X). " +"Mentés betöltésének leállítása..." +>>>>>>> Update from master branch. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format @@ -2738,6 +2846,7 @@ msgstr "RögzítendÅ‘ képkockák" msgid "Free Look" msgstr "Szabad nézet" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2747,6 +2856,11 @@ msgstr "Szabad nézet" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francia" @@ -2772,9 +2886,14 @@ msgid "GCI File(*.gci)" msgstr "GCI fájl(*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +<<<<<<< HEAD #, fuzzy msgid "GCMic Configuration" msgstr "Napló beállítások" +======= +msgid "GCMic Configuration" +msgstr "GCMic beállítások" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -2814,10 +2933,14 @@ msgstr "Gamecube &irányító beállítások" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" @@ -2841,11 +2964,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Ãltalános" @@ -2854,6 +2982,7 @@ msgstr "Ãltalános" msgid "General Settings" msgstr "Ãltalános beállítások" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2863,6 +2992,11 @@ msgstr "Ãltalános beállítások" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Német" @@ -3002,11 +3136,16 @@ msgstr "Gyorsbillentyű beállítások" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Gyorsbill." @@ -3079,6 +3218,11 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +<<<<<<< HEAD +======= +"Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario " +"játékok használják." +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" @@ -3231,11 +3375,15 @@ msgid "" msgstr "" "InstallExceptionHandler elÅ‘idézve, de ez a platform még nem támogatja azt." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "WAD telepítése..." @@ -3317,6 +3465,7 @@ msgstr "Nem megfelelÅ‘ rögzített fájl" msgid "Invalid state" msgstr "Nem megfelelÅ‘ mentés" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3326,6 +3475,11 @@ msgstr "Nem megfelelÅ‘ mentés" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Olasz" @@ -3483,6 +3637,7 @@ msgstr "Ãllás betöltése a 8. helyrÅ‘l" msgid "Load State..." msgstr "Ãllás betöltése..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3496,6 +3651,13 @@ msgstr "Wii rendszer menü betöltése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Wii rendszer menü betöltése" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii rendszer menü betöltése %d%c" @@ -3577,11 +3739,15 @@ msgstr "MMU sebesség növelÅ‘ hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark fájlok (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "FÅ‘kar" @@ -3613,10 +3779,14 @@ msgstr "Memória bájt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Memóriakártya" @@ -3814,11 +3984,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3905,11 +4079,15 @@ msgstr "Nem egyenlÅ‘" msgid "Not Set" msgstr "Nincs beállítva" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Nincs csatlakoztatva" @@ -3971,9 +4149,13 @@ msgstr "Csak %d blokk szabad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Megnyitás" @@ -4104,6 +4286,7 @@ msgstr "Javítások" msgid "Paths" msgstr "Mappák" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4111,6 +4294,10 @@ msgstr "Mappák" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Szünet" @@ -4131,12 +4318,17 @@ msgstr "%d perspektíva" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Indítás" @@ -4162,11 +4354,15 @@ msgstr "Visszajátszási lehetÅ‘ségek" msgid "Players" msgstr "Játékosok" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -4218,17 +4414,29 @@ msgstr "Utófeldolgozási effektus:" #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u" +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:829 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u" +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:806 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "Túl korai PlayWiimote videó befejezés. %u > %u" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4377,6 +4585,7 @@ msgstr "A lista frissítése" msgid "Refresh game list" msgstr "Játéklista frissítése" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4388,6 +4597,12 @@ msgstr "Játéklista frissítése" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Törlés" @@ -4407,9 +4622,13 @@ msgstr "Megjelenítés a fÅ‘ablakban" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Alapra állítás" @@ -4452,11 +4671,15 @@ msgstr "Ãl&lás mentése" msgid "Safe" msgstr "Biztonságos" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Mintavételezési frekvencia:" @@ -4540,11 +4763,15 @@ msgstr "%s állásmentés videója sérült, videó rögzítése leáll..." msgid "Scaled EFB Copy" msgstr "Méretezett EFB másolat" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Keresés %s" @@ -4584,6 +4811,7 @@ msgstr "%s rész nem található a SYSCONF fájlban" msgid "Select" msgstr "Választás" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4599,6 +4827,14 @@ msgstr "Válassz rögzítendÅ‘ fájlt" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Válassz rögzítendÅ‘ fájlt" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendÅ‘ Wii WAD fájlt" @@ -4624,6 +4860,7 @@ msgstr "Válassz lebegÅ‘ ablakokat" msgid "Select the file to load" msgstr "BetöltendÅ‘ fájl kiválasztása" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4636,15 +4873,22 @@ msgstr "Válassz betöltendÅ‘ állásmentést" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Válassz mentési fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Válassz betöltendÅ‘ állásmentést" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Válassz mentendÅ‘ állást" @@ -5026,6 +5270,7 @@ msgstr "Hang puffer létrehozása sikertelen: %s" msgid "Space" msgstr "Szóköz" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -5035,6 +5280,11 @@ msgstr "Szóköz" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spanyol" @@ -5078,11 +5328,15 @@ msgstr "Negyzetes kar" msgid "Standard Controller" msgstr "Normál irányító" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5118,9 +5372,13 @@ msgstr "Kar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Leállítás" @@ -5206,15 +5464,23 @@ msgstr "Tábla jobbra" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Pillanatkép készítése" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "TaruKonga (Bongos)" +<<<<<<< HEAD msgstr "" +======= +msgstr "TaruKonga (Bongos)" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5455,18 +5721,26 @@ msgstr "Minden napló típus kijelölése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Váltás teljes nézetre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Fent" @@ -5577,6 +5851,7 @@ msgstr "" "Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettÅ‘l a játékostól:%d " "Játékos kirúgása!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5589,6 +5864,8 @@ msgstr "" "Folytatod?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5751,6 +6028,13 @@ msgid "" "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" +<<<<<<< HEAD +======= +"Figyelem: Olyan mentést töltöttél be, ami a választott videó befejezése " +"utáni. (%u > %u bájt) (%u > %u képkocka). Folytatás elÅ‘tt betölthetsz egy " +"másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása " +"után." +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:646 #, c-format @@ -5759,6 +6043,13 @@ msgid "" "should load another save before continuing, or load this state with read-" "only mode off. Otherwise you'll probably get a desync." msgstr "" +<<<<<<< HEAD +======= +"Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d (0x%X) bájt " +"eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy " +"betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " +"esetben szinkronizációs hibák jelentkezhetnek." +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:655 #, c-format @@ -5778,6 +6069,24 @@ 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 "" +<<<<<<< HEAD +======= +"Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka eltérés " +"mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted " +"ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben " +"szinkronizációs hibák jelentkezhetnek.\n" +"\n" +"BÅ‘vebb információk: A választott videó %d képkocka hosszú, a mentett állás " +"videója pedig %d képkocka hosszú.\n" +"\n" +"%d képkockánál a videó tömörítve lesz:\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 képkockánál a mentett állás videója tömörítve lesz:\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" +>>>>>>> Update from master branch. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5812,11 +6121,15 @@ msgstr "Wii NAND gyökér könyvtár:" msgid "Wii Save Import" msgstr "Wii mentés importálása" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -5847,11 +6160,15 @@ msgstr "" "esetleg az üresjárati idÅ‘korlát letelt vagy egyéb ok miatt történt.\n" "Újra akarod csatlakoztatni most?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote csatlakoztatva" @@ -5883,6 +6200,7 @@ msgstr "Jobb Windows" msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5892,6 +6210,11 @@ msgstr "Word Wrap" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Folyamatban..." @@ -6298,9 +6621,6 @@ msgstr "| VAGY" #~ msgid "Emulator Display Settings" #~ msgstr "Emulátor kijelzÅ‘ beállítások" -#~ msgid "Enable Bounding Box Calculation" -#~ msgstr "Bounding Box kalkuláció használata" - #~ msgid "Enable CPU Access" #~ msgstr "Processzor hozzáférés engedélyezése" @@ -6358,13 +6678,6 @@ msgstr "| VAGY" #~ msgid "Error allocating buffer" #~ msgstr "Puffer kiosztási hiba" -#~ msgid "" -#~ "Error in PlayWiimote. %u != %u, byte %d.\n" -#~ "Sorry, Wii recording is temporarily broken." -#~ msgstr "" -#~ "PlayWiimote hiba. %u != %u, bájt %d.\n" -#~ "Sajnos a Wii videó rögzítés egyenlÅ‘re nem működik." - #~ msgid "Error loading %s: can't read info" #~ msgstr "Hiba a(z) %s betöltése közben: az infó nem olvasható" @@ -6377,13 +6690,6 @@ msgstr "| VAGY" #~ msgid "Error opening file %s for recording" #~ msgstr "Hiba a(z) %s fájl rögzítéshez történÅ‘ megnyitása közben" -#~ msgid "" -#~ "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -#~ "Aborting savestate load..." -#~ msgstr "" -#~ "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x" -#~ "%X). Mentés betöltésének leállítása..." - #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6421,9 +6727,6 @@ msgstr "| VAGY" #~ "Ez sokkal pontosabb mint az EFB másolás textúrába, és néhány játékhoz " #~ "szükséges a megfelelÅ‘ működéshez, ugyanakkor nagyon lassú is lehet." -#~ msgid "GCMic Configuration" -#~ msgstr "GCMic beállítások" - #~ msgid "GFX Config" #~ msgstr "GFX beállítások" @@ -6447,13 +6750,6 @@ msgstr "| VAGY" #~ "Ha a játék leáll, csak Interpreter módban működik vagy ha a Dolphin " #~ "kifagy, akkor ez a beállítás javíthat a játékon." -#~ msgid "" -#~ "If checked, the bounding box registers will be updated. Used by the Paper " -#~ "Mario games." -#~ msgstr "" -#~ "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper " -#~ "Mario játékok használják." - #~ msgid "Input Source" #~ msgstr "Bemeneti forrás" @@ -6543,15 +6839,6 @@ msgstr "| VAGY" #~ " A Dolphin emulátort csak olvasható eszközrÅ‘l futtatod vagy egy olyan " #~ "könyvtárból amely nem tartalmazza az emulátort?" -#~ msgid "Premature movie end in PlayController. %u + 8 > %u" -#~ msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u" - -#~ msgid "Premature movie end in PlayWiimote. %u + %d > %u" -#~ msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u" - -#~ msgid "Premature movie end in PlayWiimote. %u > %u" -#~ msgstr "Túl korai PlayWiimote videó befejezés. %u > %u" - #~ msgid "Projection Stats" #~ msgstr "Kivetítési statisztikák" @@ -6671,9 +6958,6 @@ msgstr "| VAGY" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "A megjelenítési ablak teljes képernyÅ‘s módban indul." -#~ msgid "TaruKonga (Bongos)" -#~ msgstr "TaruKonga (Bongos)" - #~ msgid "The file " #~ msgstr "A fájl" @@ -6723,60 +7007,6 @@ msgstr "| VAGY" #~ "Várakozás a függÅ‘leges képkioltásra.\n" #~ "Csökkenti a képszakadást de egyben a teljesítményt is." -#~ msgid "" -#~ "Warning: You loaded a save that's after the end of the current movie. " -#~ "(byte %u > %u) (frame %u > %u). You should load another save before " -#~ "continuing, or load this state with read-only mode off." -#~ msgstr "" -#~ "Figyelem: Olyan mentést töltöttél be, ami a választott videó befejezése " -#~ "utáni. (%u > %u bájt) (%u > %u képkocka). Folytatás elÅ‘tt betölthetsz egy " -#~ "másik mentést, vagy betöltheted ezt a mentést az írásvédett mód " -#~ "kikapcsolása után." - -#~ msgid "" -#~ "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " -#~ "should load another save before continuing, or load this state with read-" -#~ "only mode off. Otherwise you'll probably get a desync." -#~ msgstr "" -#~ "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d (0x%X) bájt " -#~ "eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy " -#~ "betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " -#~ "esetben szinkronizációs hibák jelentkezhetnek." - -#~ msgid "" -#~ "Warning: You loaded a save whose movie mismatches on frame %d. You should " -#~ "load another save before continuing, or load this state with read-only " -#~ "mode off. Otherwise you'll probably get a desync.\n" -#~ "\n" -#~ "More information: The current movie is %d frames long and the savestate's " -#~ "movie is %d frames long.\n" -#~ "\n" -#~ "On frame %d, the current movie presses:\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" -#~ "On frame %d, the savestate's movie presses:\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" -#~ msgstr "" -#~ "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka " -#~ "eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy " -#~ "betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " -#~ "esetben szinkronizációs hibák jelentkezhetnek.\n" -#~ "\n" -#~ "BÅ‘vebb információk: A választott videó %d képkocka hosszú, a mentett " -#~ "állás videója pedig %d képkocka hosszú.\n" -#~ "\n" -#~ "%d képkockánál a videó tömörítve lesz:\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 képkockánál a mentett állás videója tömörítve lesz:\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" - #~ msgid "" #~ "When using EFB to RAM we very often need to decode RAM data to a VRAM " #~ "texture, which is a very time-consuming task.\n" diff --git a/Languages/po/it.po b/Languages/po/it.po index c27de2da97..622cfea1fe 100644 --- a/Languages/po/it.po +++ b/Languages/po/it.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-04-08 20:40+0100\n" "Last-Translator: RebuMan, Dolphin Team\n" "Language-Team: \n" @@ -556,6 +560,7 @@ msgstr "Aggiungi Patch" msgid "Add new pane" msgstr "Aggiungi nuovo riquadro" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -565,6 +570,11 @@ msgstr "Aggiungi nuovo riquadro" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Aggiungi..." @@ -636,6 +646,7 @@ msgstr "Tutti i file di immagine GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tutti i file GCM GameCube (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -643,6 +654,10 @@ msgstr "Tutti i file GCM GameCube (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)" @@ -726,11 +741,15 @@ 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!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspetto:" @@ -751,11 +770,15 @@ msgstr "Interfaccia Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -869,10 +892,14 @@ msgstr "Blu Destro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Sotto" @@ -905,11 +932,15 @@ msgstr "Cerca una directory di destinazione" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1148,10 +1179,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Chiudi" @@ -1261,11 +1296,15 @@ msgstr "Collega Wiimote 3" msgid "Connect Wiimote 4" msgstr "Collega Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Connessione in corso..." @@ -1455,10 +1494,14 @@ msgstr "Motore di Emulazione DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "Emulazione DSP HLE (veloce)" @@ -1678,11 +1721,15 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Divide" msgstr "/" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" @@ -1711,6 +1758,7 @@ msgstr "Dolphin - Configurazione Wiimote Emulato" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1726,6 +1774,14 @@ msgstr "Dolphin - Configurazione Controlli GC" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin - Configurazione Controlli GC" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" @@ -1814,6 +1870,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1823,6 +1880,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Olandese" @@ -1952,22 +2014,32 @@ msgid "Enable Block Merging" msgstr "Attiva Unione Blocchi" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Attiva Cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Abilita Trucchi" @@ -2108,6 +2180,7 @@ msgstr "" msgid "End" msgstr "Fine" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2117,6 +2190,11 @@ msgstr "Fine" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Inglese" @@ -2146,6 +2224,7 @@ msgstr "Uguale" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Errore/i" @@ -2163,6 +2242,19 @@ msgid "Error" msgstr "Errore/i" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Errore/i" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2627,6 +2719,7 @@ msgstr "Fotogrammi da Registrare:" msgid "Free Look" msgstr "Visuale Libera" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2636,6 +2729,11 @@ msgstr "Visuale Libera" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francese" @@ -2704,10 +2802,14 @@ msgstr "Impostazioni &Controlli GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" @@ -2731,11 +2833,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generale" @@ -2745,6 +2852,7 @@ msgstr "Generale" msgid "General Settings" msgstr "Impostazioni Interfaccia" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2754,6 +2862,11 @@ msgstr "Impostazioni Interfaccia" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Tedesco" @@ -2879,11 +2992,16 @@ msgstr "Configurazione Tasti di Scelta Rapida" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Tasti di Scelta Rapida" @@ -3097,11 +3215,15 @@ msgstr "" "E' stata sollevata un'Eccezione all'Installazione, tuttavia questa " "piattaforma non la supporta ancora." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Installazione WAD..." @@ -3185,6 +3307,7 @@ msgstr "File di registrazione non valido" msgid "Invalid state" msgstr "Stato non valido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3194,6 +3317,11 @@ msgstr "Stato non valido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italiano" @@ -3352,20 +3480,28 @@ msgstr "Carica Stato di Gioco dall'Ingresso 8" msgid "Load State..." msgstr "Carica Stato di Gioco..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "Carica il Menu di Sistema Wii %d%c" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carica il Menu di Sistema Wii %d%c" @@ -3448,11 +3584,15 @@ msgstr "Hack Velocità MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "File MadCatz Gameshark(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Levetta Principale" @@ -3484,10 +3624,14 @@ msgstr "Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Scheda di Memoria" @@ -3673,11 +3817,15 @@ msgstr "TN Tab" msgid "NP Up" msgstr "TN Su" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3764,11 +3912,15 @@ msgstr "Diverso" msgid "Not Set" msgstr "Non Impostato" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Non collegato" @@ -3830,9 +3982,13 @@ msgstr "Solo %d blocchi disponibili" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Apri" @@ -3966,6 +4122,7 @@ msgstr "Patches" msgid "Paths" msgstr "Percorsi" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3973,6 +4130,10 @@ msgstr "Percorsi" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3994,12 +4155,17 @@ msgstr "Prospettiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Gioca" @@ -4025,11 +4191,15 @@ msgstr "Opzioni di Riproduzione" msgid "Players" msgstr "Giocatori" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Per favore confermare..." @@ -4243,6 +4413,7 @@ msgstr "Aggiorna Elenco" msgid "Refresh game list" msgstr "Aggiorna elenco giochi" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4254,6 +4425,12 @@ msgstr "Aggiorna elenco giochi" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Rimuovi" @@ -4273,9 +4450,13 @@ msgstr "Rendering nella finestra Principale" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetta" @@ -4318,11 +4499,15 @@ msgstr "Sa&lva Stato di Gioco" msgid "Safe" msgstr "Accurata" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Frequenza di Campionamento:" @@ -4407,11 +4592,15 @@ msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." msgid "Scaled EFB Copy" msgstr "Scala Copie EFB" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Scanning %s" msgstr "Ricerca..." @@ -4451,6 +4640,7 @@ msgstr "Sezione %s non trovata in SYSCONF" msgid "Select" msgstr "Seleziona" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4466,6 +4656,14 @@ msgstr "Seleziona il File di Registrazione" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Seleziona il File di Registrazione" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" @@ -4491,6 +4689,7 @@ msgstr "Seleziona finestre libere/mobili" msgid "Select the file to load" msgstr "Seleziona il file da caricare" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4503,15 +4702,22 @@ msgstr "Seleziona lo stato di gioco da caricare" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Seleziona il file di salvataggio" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" @@ -4866,6 +5072,7 @@ msgstr "Creazione buffer audio non riuscita: %s" msgid "Space" msgstr "Spazio" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4875,6 +5082,11 @@ msgstr "Spazio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spagnolo" @@ -4910,11 +5122,15 @@ msgstr "Levetta Quadrata" msgid "Standard Controller" msgstr "Controller Standard" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4950,9 +5166,13 @@ msgstr "Levetta" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arresta" @@ -5026,9 +5246,13 @@ msgstr "Semipiano destro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Genera un'Istantanea di Gioco" @@ -5274,18 +5498,26 @@ msgstr "Seleziona/Deseleziona tutti i Tipi di Log" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Commuta a Schermo Intero" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Sopra" @@ -5391,6 +5623,7 @@ msgstr "" "Messaggio sconosciuto avente id:%d ricevuto dal giocatore:%d Giocatore " "espluso!!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5403,6 +5636,8 @@ msgstr "" "Continuare?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5615,11 +5850,15 @@ msgstr "Origine DVD:" msgid "Wii Save Import" msgstr "Importa Salvataggi Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Salva i file Wii (*.bin)|*.bin" @@ -5650,11 +5889,15 @@ msgstr "" " o forse è dovuto ad altri motivi. \n" "Vuoi riconnettersi immediatamente?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Collegato" @@ -5687,6 +5930,7 @@ msgstr "Windows Destro" msgid "Word Wrap" msgstr "Adatta Testo" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5696,6 +5940,11 @@ msgstr "Adatta Testo" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Attività in corso..." diff --git a/Languages/po/ja.po b/Languages/po/ja.po index 1392815cb3..12fee69911 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -8,6 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-12 20:45+0900\n" ======= @@ -16,6 +17,9 @@ msgstr "" "PO-Revision-Date: 2011-08-19 08:37-0500\n" >>>>>>> Update translation files for recent changes in the code. ======= +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-10-12 20:45+0900\n" >>>>>>> Update Arabic and Japanese translations. "Last-Translator: DanbSky\n" @@ -566,6 +570,7 @@ msgstr "パッãƒã‚’追加" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -575,6 +580,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "追加" @@ -640,6 +650,7 @@ msgstr "å…¨ã¦ã® GC/Wii イメージ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "GC GCMファイル (gcm)|*.gcm" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -647,6 +658,10 @@ msgstr "GC GCMファイル (gcm)|*.gcm" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "å…¨ã¦ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイル (sav, s##)" @@ -745,11 +760,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿå…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "アスペクト比：" @@ -770,11 +789,15 @@ msgstr "出力API (Audio Backend)" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error opening AO device.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -890,10 +913,14 @@ msgstr "é’ - å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "下部" @@ -926,11 +953,15 @@ msgstr "出力先をé¸æŠž" msgid "Buffer:" msgstr "ãƒãƒƒãƒ•ã‚¡ï¼š" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1178,10 +1209,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "é–‰ã˜ã‚‹" @@ -1290,11 +1325,15 @@ msgstr "3Pã®Wii リモコンを接続ï¼åˆ‡æ–­" msgid "Connect Wiimote 4" msgstr "4Pã®Wii リモコンを接続ï¼åˆ‡æ–­" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "接続中..." @@ -1486,10 +1525,14 @@ msgstr "DSPエミュレーション方å¼" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP-HLE エミュレーション (高速)" @@ -1720,11 +1763,15 @@ msgstr "" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "動作中ã®ã‚²ãƒ¼ãƒ ã‚’åœæ­¢ã—ã¾ã™ã‹ï¼Ÿ" @@ -1753,6 +1800,7 @@ msgstr "Wii リモコンã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³è¨­å®š" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1768,6 +1816,14 @@ msgstr "GCコントローラ設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "GCコントローラ設定" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" @@ -1864,6 +1920,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1873,6 +1930,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "オランダ語" @@ -2017,21 +2079,31 @@ msgid "Enable Block Merging" msgstr "Enable Block Merging" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Enable Cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ã‚’有効化" @@ -2185,6 +2257,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2194,6 +2267,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "英語" @@ -2223,6 +2301,7 @@ msgstr "ã«ä¸€è‡´ã™ã‚‹" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "エラー" @@ -2240,6 +2319,19 @@ msgid "Error" msgstr "エラー" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "エラー" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2698,6 +2790,7 @@ msgstr "録画フレーム数設定" msgid "Free Look" msgstr "フリールック" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2707,6 +2800,11 @@ msgstr "フリールック" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "フランス語" @@ -2774,10 +2872,14 @@ msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp" @@ -2801,11 +2903,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2814,6 +2921,7 @@ msgstr "一般" msgid "General Settings" msgstr "一般" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2823,6 +2931,11 @@ msgstr "一般" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "ドイツ語" @@ -2962,11 +3075,16 @@ msgstr "ホットキーã®è¨­å®š" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "ホットキー" @@ -3189,11 +3307,15 @@ msgstr "" "InstallExceptionHandler ãŒå‘¼ã³å‡ºã•ã‚Œã¾ã—ãŸãŒã€ã“ã®ãƒ—ラットフォームã¯ã¾ã ã‚µ" "ãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "WADファイルを追加ã—ã¦ã„ã¾ã™..." @@ -3275,6 +3397,7 @@ msgstr "ä¸æ­£ãªéŒ²ç”»ãƒ•ã‚¡ã‚¤ãƒ«" msgid "Invalid state" msgstr "ä¸æ­£ãªã‚»ãƒ¼ãƒ–ï¼ãƒ­ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3284,6 +3407,11 @@ msgstr "ä¸æ­£ãªã‚»ãƒ¼ãƒ–ï¼ãƒ­ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "イタリア語" @@ -3441,6 +3569,7 @@ msgstr "ステートロード - スロット 8" msgid "Load State..." msgstr "ファイルã‹ã‚‰ãƒ­ãƒ¼ãƒ‰" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3454,6 +3583,13 @@ msgstr "Wiiメニューを起動" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Wiiメニューを起動" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wiiメニューを起動 ( ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š%d %c )" @@ -3536,11 +3672,15 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark セーブファイル(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "コントロールスティック" @@ -3572,10 +3712,14 @@ msgstr "メモリãƒã‚¤ãƒˆ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "メモリーカード" @@ -3771,11 +3915,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3862,11 +4010,15 @@ msgstr "ã«ä¸€è‡´ã—ãªã„" msgid "Not Set" msgstr "未確èª" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "未接続" @@ -3928,9 +4080,13 @@ msgstr "残り %d ブロックã—ã‹ã‚ã‚Šã¾ã›ã‚“ï¼" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "é–‹ã" @@ -4061,6 +4217,7 @@ msgstr "パッãƒ" msgid "Paths" msgstr "フォルダ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4068,6 +4225,10 @@ msgstr "フォルダ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "一時åœæ­¢" @@ -4088,12 +4249,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "開始" @@ -4119,11 +4285,15 @@ msgstr "å†ç”Ÿã‚ªãƒ—ション" msgid "Players" msgstr "プレイヤー一覧" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "確èª" @@ -4335,6 +4505,7 @@ msgstr "ゲームリストをå†æ›´æ–°" msgid "Refresh game list" msgstr "ゲームリストをå†æ›´æ–°ã—ã¾ã™" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4346,6 +4517,12 @@ msgstr "ゲームリストをå†æ›´æ–°ã—ã¾ã™" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "削除" @@ -4365,9 +4542,13 @@ msgstr "メインウィンドウ部分ã«æç”»" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "åˆæœŸåŒ–" @@ -4410,11 +4591,15 @@ msgstr "ステートセーブ(&V)" msgid "Safe" msgstr "Safe" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "サンプルレート" @@ -4498,11 +4683,15 @@ msgstr "Savestate movie %s ã®ç ´æを確èªã—ã¾ã—ãŸã€‚録画を中止㗠msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "確èªä¸­... .%s" @@ -4542,6 +4731,7 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "é¸æŠž" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4557,6 +4747,14 @@ msgstr "録画ファイルをé¸æŠž" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "録画ファイルをé¸æŠž" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "追加ã™ã‚‹WADファイルをé¸æŠž" @@ -4582,6 +4780,7 @@ msgstr "" msgid "Select the file to load" msgstr "ロードã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4594,15 +4793,22 @@ msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "セーブファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "ステートセーブã®ä¿å­˜å…ˆã‚’é¸æŠž" @@ -4981,6 +5187,7 @@ msgstr "Sound buffer creation failed: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4990,6 +5197,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "スペイン語" @@ -5033,11 +5245,15 @@ msgstr "丸ã¿" msgid "Standard Controller" msgstr "標準コントローラ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5073,9 +5289,13 @@ msgstr "スティック" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -5153,9 +5373,13 @@ msgstr "å³ãƒ†ãƒ¼ãƒ–ル" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "スクリーンショット" @@ -5407,18 +5631,26 @@ msgstr "å…¨ã¦ã®ãƒ­ã‚°æƒ…報をé¸æŠžï¼è§£é™¤" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "フルスクリーン表示切り替ãˆ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "上部" @@ -5527,6 +5759,7 @@ msgstr "次ã®IDã‹ã‚‰ä¸æ˜Žãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å—ä¿¡ : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Unknown message with id:%d received from player:%d Kicking player!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5539,6 +5772,8 @@ msgstr "" "Continue?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5762,11 +5997,15 @@ msgstr "Wii NANDルート" msgid "Wii Save Import" msgstr "Wiiã®ã‚»ãƒ¼ãƒ–データをインãƒãƒ¼ãƒˆ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -5797,11 +6036,15 @@ msgstr "" "ã¾ãŸã¯ã—ã°ã‚‰ã入力ãŒãªã‹ã£ãŸãŸã‚çœé›»åŠ›ãƒ¢ãƒ¼ãƒ‰ã«å…¥ã£ãŸã®ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“\n" "å†æŽ¥ç¶šã—ã¾ã™ã‹ï¼Ÿ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wii リモコン接続中" @@ -5833,6 +6076,7 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ワードラップ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5842,6 +6086,11 @@ msgstr "ワードラップ" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "動作中..." @@ -6549,6 +6798,13 @@ msgstr "| (...ã‚‚ã—ãã¯)" ======= >>>>>>> Update translation files for recent changes in the code. +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" + #~ msgid "Use FPS For Limiting" #~ msgstr "有効化" diff --git a/Languages/po/ko.po b/Languages/po/ko.po index 6378880eee..a8cc90fdaa 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-07-07 10:24+0900\n" "Last-Translator: \n" "Language-Team: \n" @@ -553,6 +557,7 @@ msgstr "패치 추가" msgid "Add new pane" msgstr "새로운 ì°½ 추가" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -562,6 +567,11 @@ msgstr "새로운 ì°½ 추가" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "추가..." @@ -629,6 +639,7 @@ msgstr "모든 GC/Wii ì´ë¯¸ì§€ë“¤ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임í브 GCM 파ì¼ë“¤ (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -636,6 +647,10 @@ msgstr "모든 게임í브 GCM 파ì¼ë“¤ (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "모든 ìƒíƒœë“¤ 저장 (sav, s##)" @@ -723,11 +738,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ì´ íŒŒì¼ì„ ì •ë§ë¡œ 지우고 싶습니까? ê·¸ê²ƒì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -748,11 +767,15 @@ msgstr "오디오 백엔드:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO 장치를 열기 ì—러.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "ìžë™" @@ -868,10 +891,14 @@ msgstr "파랑 오른쪽" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "아래" @@ -904,11 +931,15 @@ msgstr "출력 디렉토리 둘러보기" msgid "Buffer:" msgstr "버í¼:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1150,10 +1181,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "닫기" @@ -1262,11 +1297,15 @@ msgstr "위모트 3 ì—°ê²°" msgid "Connect Wiimote 4" msgstr "위모트 4 ì—°ê²°" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "연결중..." @@ -1458,10 +1497,14 @@ msgstr "DSP ì—뮬레ì´í„° 엔진" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE ì—뮬레ì´ì…˜ (빠름)" @@ -1690,11 +1733,15 @@ msgstr "" msgid "Divide" msgstr "나누기" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "현재 ì—뮬레ì´ì…˜ì„ 중단하고 싶습니까?" @@ -1723,6 +1770,7 @@ msgstr "ëŒí•€ ì—ë®¬ëœ ìœ„ëª¨íŠ¸ 환경설정" msgid "Dolphin FIFO" msgstr "ëŒí•€ FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1738,6 +1786,14 @@ msgstr "ëŒí•€ GC패드 환경설정" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "ëŒí•€ GC패드 환경설정" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "ëŒí•€ TAS ë™ì˜ìƒ (*.dtm)" @@ -1833,6 +1889,7 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1842,6 +1899,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "네ëœëž€ë“œì–´" @@ -1985,21 +2047,31 @@ msgid "Enable Block Merging" msgstr "ë¸”ë¡ í•©ì¹˜ê¸° 활성" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "ìºì‰¬ 활성" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "치트 활성" @@ -2150,6 +2222,7 @@ msgstr "" msgid "End" msgstr "ë" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2159,6 +2232,11 @@ msgstr "ë" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "ì˜ì–´" @@ -2188,6 +2266,7 @@ msgstr "ê°™ìŒ" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "ì—러" @@ -2205,6 +2284,19 @@ msgid "Error" msgstr "ì—러" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "ì—러" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "ì„ íƒëœ 언어 로딩 ì—러. 시스템 기본으로 ëŒì•„갑니다." @@ -2659,6 +2751,7 @@ msgstr "녹화할 프레임" msgid "Free Look" msgstr "ìžìœ ë¡œìš´ 보기" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2668,6 +2761,11 @@ msgstr "ìžìœ ë¡œìš´ 보기" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "프랑스어" @@ -2735,10 +2833,14 @@ msgstr "게임í브 패드 설정(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임í브 메모리 카드들 (*.raw,*.gcp)" @@ -2762,11 +2864,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "ì¼ë°˜" @@ -2775,6 +2882,7 @@ msgstr "ì¼ë°˜" msgid "General Settings" msgstr "ì¼ë°˜ 설정" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2784,6 +2892,11 @@ msgstr "ì¼ë°˜ 설정" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "ë…ì¼ì–´" @@ -2914,11 +3027,16 @@ msgstr "단축키 설정" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "단축키들" @@ -3140,11 +3258,15 @@ msgstr "" "InstallExceptionHandler 호출ë¨, 하지만 ì´ í”Œëž«í¼ì€ ì•„ì§ ê·¸ê²ƒì„ ì§€ì›í•˜ì§€ 않습" "니다." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "WAD 설치하기..." @@ -3226,6 +3348,7 @@ msgstr "비ì í•© ê¸°ë¡ íŒŒì¼" msgid "Invalid state" msgstr "비ì í•© ìƒíƒœ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3235,6 +3358,11 @@ msgstr "비ì í•© ìƒíƒœ" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "ì´íƒˆë¦¬ì•„ì–´" @@ -3392,6 +3520,7 @@ msgstr "슬롯8 ìƒíƒœ 로드" msgid "Load State..." msgstr "ìƒíƒœ 로드..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3405,6 +3534,13 @@ msgstr "Wii 시스템 메뉴 로드" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Wii 시스템 메뉴 로드" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii 시스템 메뉴 %d %c 로드" @@ -3486,11 +3622,15 @@ msgstr "MMU 스피드 핵" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz ê²Œìž„ìƒ¤í¬ íŒŒì¼ë“¤(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ë©”ì¸ ìŠ¤í‹±" @@ -3522,10 +3662,14 @@ msgstr "메모리 ë°”ì´íŠ¸" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "메모리 ì¹´ë“œ" @@ -3723,11 +3867,15 @@ msgstr "NP 탭" msgid "NP Up" msgstr "NP 위" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3814,11 +3962,15 @@ msgstr "같지 ì•ŠìŒ" msgid "Not Set" msgstr "설정 안함" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "ì—°ê²°ë˜ì§€ ì•ŠìŒ" @@ -3880,9 +4032,13 @@ msgstr "%d 블럭들만 유용한" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "열기" @@ -4010,6 +4166,7 @@ msgstr "패치" msgid "Paths" msgstr "경로" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4017,6 +4174,10 @@ msgstr "경로" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "ì¼ì‹œì •ì§€" @@ -4037,12 +4198,17 @@ msgstr "ê´€ì  %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr " 실행 " @@ -4068,11 +4234,15 @@ msgstr "ìž¬ìƒ ì˜µì…˜" msgid "Players" msgstr "플레ì´ì–´" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "확ì¸í•´ì£¼ì„¸ìš”..." @@ -4284,6 +4454,7 @@ msgstr "ëª©ë¡ ìƒˆë¡œ 고침" msgid "Refresh game list" msgstr "게임 ëª©ë¡ ìƒˆë¡œ 고침" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4295,6 +4466,12 @@ msgstr "게임 ëª©ë¡ ìƒˆë¡œ 고침" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "제거" @@ -4314,9 +4491,13 @@ msgstr "ë©”ì¸ ìœˆë„ìš°ì— ë Œë”" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "리셋" @@ -4359,11 +4540,15 @@ msgstr "ìƒíƒœ 저장(&v) " msgid "Safe" msgstr "안전" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "샘플율:" @@ -4447,11 +4632,15 @@ msgstr "%s ì˜ìƒ ìƒíƒœì €ìž¥ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤, ì˜ìƒ ê¸°ë¡ ì¤‘ì§€... msgid "Scaled EFB Copy" msgstr "스케ì¼ëœ EFB 복사" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "스ìºë‹ %s" @@ -4491,6 +4680,7 @@ msgstr "섹션 %s를 SYSCONFì—ì„œ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "Select" msgstr "ì„ íƒ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4506,6 +4696,14 @@ msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD íŒŒì¼ ì„ íƒ" @@ -4531,6 +4729,7 @@ msgstr "유ë™ì ì¸ 윈ë„우즈 ì„ íƒ" msgid "Select the file to load" msgstr "로드할 íŒŒì¼ ì„ íƒ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4543,15 +4742,22 @@ msgstr "로드할 ìƒíƒœ ì„ íƒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "저장 파ì¼ì„ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "로드할 ìƒíƒœ ì„ íƒ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "저장할 ìƒíƒœ ì„ íƒ" @@ -4926,6 +5132,7 @@ msgstr "사운드 ë²„í¼ ìƒì„± 실패했습니다: %s" msgid "Space" msgstr "스페ì´ìŠ¤" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4935,6 +5142,11 @@ msgstr "스페ì´ìŠ¤" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "스페ì¸ì–´" @@ -4978,11 +5190,15 @@ msgstr "스퀘어 스틱" msgid "Standard Controller" msgstr "표준 컨트롤러" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5018,9 +5234,13 @@ msgstr "스틱" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "중지" @@ -5097,9 +5317,13 @@ msgstr "í…Œì´ë¸” 오른쪽" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "스í¬ë¦°ìƒ· ì°ê¸°" @@ -5342,18 +5566,26 @@ msgstr "모든 로그 타입 토글" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "전체화면 토글" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "위" @@ -5461,6 +5693,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "id:%dì˜ ì•Œë ¤ì§€ì§€ ì•Šì€ ë©”ì‹œì§€, 플레ì´ì–´:%d 플레ì´ì–´ 킥킹으로 부터 전달ëœ!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5473,6 +5706,8 @@ msgstr "" "계ì†í•©ë‹ˆê¹Œ?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5694,11 +5929,15 @@ msgstr "Wii NAND 루트:" msgid "Wii Save Import" msgstr "Wii 저장 가져오기" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파ì¼ë“¤ (*.bin)|*.bin" @@ -5729,11 +5968,15 @@ msgstr "" "í˜¹ì€ ì•„ë§ˆë„ ì•„ì´ë“¤ 타임 아웃ì´ê±°ë‚˜ 다른 ì›ì¸ ë•Œë¬¸ì¸ ê²ƒ 같습니다.\n" "ë‹¹ì‹ ì€ ì¦‰ì‹œ 재연결 하고 싶습니까?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "위모트가 ì—°ê²°ë¨" @@ -5766,6 +6009,7 @@ msgstr "윈ë„우즈 오른쪽" msgid "Word Wrap" msgstr "ìžë™ 줄바꿈" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5775,6 +6019,11 @@ msgstr "ìžë™ 줄바꿈" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "ìž‘ë™ì¤‘..." diff --git a/Languages/po/nb.po b/Languages/po/nb.po index f916e21416..d321d1dde5 100644 --- a/Languages/po/nb.po +++ b/Languages/po/nb.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-06-06 20:15+0100\n" "Last-Translator: Knut \n" "Language-Team: Norwegian \n" @@ -559,6 +563,7 @@ msgstr "Legg til Patch" msgid "Add new pane" msgstr "Legg til ny rute" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -568,6 +573,11 @@ msgstr "Legg til ny rute" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Legg til..." @@ -635,6 +645,7 @@ msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -642,6 +653,10 @@ msgstr "Alle GameCube GCM-filer (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" @@ -733,11 +748,15 @@ msgstr "" "Er du sikker pÃ¥ at du vil slette denne filen?\n" "Den vil bli borte for alltid!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -758,11 +777,15 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Feil ved Ã¥pning av AO-device.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisk" @@ -878,10 +901,14 @@ msgstr "BlÃ¥ Høyre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Bunn" @@ -914,11 +941,15 @@ msgstr "Bla etter lagringssted" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1162,10 +1193,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Lukk" @@ -1274,11 +1309,15 @@ msgstr "Koble til Wiimote 3" msgid "Connect Wiimote 4" msgstr "Koble til Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Kobler til..." @@ -1469,10 +1508,14 @@ msgstr "CPU Emulatormotor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulering (raskt)" @@ -1703,11 +1746,15 @@ msgstr "" msgid "Divide" msgstr "Del" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pÃ¥gÃ¥ende emulering?" @@ -1736,6 +1783,7 @@ msgstr "Dolphin Emulert Wiimote Konfigurasjon" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1751,6 +1799,14 @@ msgstr "Dolphin GC-kontroll konfigurasjon" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC-kontroll konfigurasjon" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" @@ -1846,6 +1902,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1855,6 +1912,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Nederlansk" @@ -1998,21 +2060,31 @@ msgid "Enable Block Merging" msgstr "Aktiver Block Merging" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Aktiver cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Aktiver Juksekoder" @@ -2167,6 +2239,7 @@ msgstr "" msgid "End" msgstr "Slutt" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2176,6 +2249,11 @@ msgstr "Slutt" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Engelsk" @@ -2205,6 +2283,7 @@ msgstr "Lik" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Feil" @@ -2222,6 +2301,19 @@ msgid "Error" msgstr "Feil" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Feil" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Feil ved lasting av valgt sprÃ¥k. Faller tilbake til systemstandarden." @@ -2677,6 +2769,7 @@ msgstr "Bilder Til Opptak" msgid "Free Look" msgstr "Fri Utkikk" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2686,6 +2779,11 @@ msgstr "Fri Utkikk" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Fransk" @@ -2753,10 +2851,14 @@ msgstr "Innstillinger for &GameCube-kontroll" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" @@ -2780,11 +2882,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generelt" @@ -2793,6 +2900,7 @@ msgstr "Generelt" msgid "General Settings" msgstr "Generelle Innstillinger" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2802,6 +2910,11 @@ msgstr "Generelle Innstillinger" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Tysk" @@ -2933,11 +3046,16 @@ msgstr "Konfigurer Snarveistaster" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Snarveistaster" @@ -3156,11 +3274,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Installer WAD..." @@ -3242,6 +3364,7 @@ msgstr "Ugyldig opptaksfil" msgid "Invalid state" msgstr "Ugyldig save state" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3251,6 +3374,11 @@ msgstr "Ugyldig save state" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italiensk" @@ -3408,6 +3536,7 @@ msgstr "Last Inn Save State Slot 8" msgid "Load State..." msgstr "Last Inn Save State..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3421,6 +3550,13 @@ msgstr "Last inn Wii System Meny" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Last inn Wii System Meny" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Last inn Wii System Meny %d %c" @@ -3502,11 +3638,15 @@ msgstr "Ytelses-hack for MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark-filer(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hoved-joystick" @@ -3538,10 +3678,14 @@ msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Minnekort" @@ -3739,11 +3883,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Opp" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3830,11 +3978,15 @@ msgstr "Ikke Lik" msgid "Not Set" msgstr "Ikke Satt" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Ikke tilkoblet" @@ -3896,9 +4048,13 @@ msgstr "Kun %d blokker tilgjengelig" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Ã…pne" @@ -4029,6 +4185,7 @@ msgstr "Patcher" msgid "Paths" msgstr "Mappestier" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4036,6 +4193,10 @@ msgstr "Mappestier" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4056,12 +4217,17 @@ msgstr "Perspektiv %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Spill" @@ -4087,11 +4253,15 @@ msgstr "Avspillingsalterntiver" msgid "Players" msgstr "Spillere" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -4304,6 +4474,7 @@ msgstr "Oppdater liste" msgid "Refresh game list" msgstr "Oppdater spilliste" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4315,6 +4486,12 @@ msgstr "Oppdater spilliste" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Fjern" @@ -4334,9 +4511,13 @@ msgstr "Render til Hovedvindu" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Restart" @@ -4379,11 +4560,15 @@ msgstr "Lagre Sa&ve State" msgid "Safe" msgstr "Sikker" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Samplingsratio:" @@ -4467,11 +4652,15 @@ msgstr "Save State-film %s er korrupt, opptak avsluttes..." msgid "Scaled EFB Copy" msgstr "Skalert EFB-kopi" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Søker i %s" @@ -4511,6 +4700,7 @@ msgstr "Seksjon %s ikke funnet i SYSCONF" msgid "Select" msgstr "Velg" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4526,6 +4716,14 @@ msgstr "Velg Opptaksfil" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Velg Opptaksfil" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil Ã¥ innstallere" @@ -4551,6 +4749,7 @@ msgstr "Velg flytvindu" msgid "Select the file to load" msgstr "Velg fil Ã¥ laste" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4563,15 +4762,22 @@ msgstr "Velg en save state Ã¥ laste" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Velg lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Velg en save state Ã¥ laste" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Velg en save state Ã¥ lagre" @@ -4948,6 +5154,7 @@ msgstr "Laging av lydbuffer mislyktes: %s" msgid "Space" msgstr "Mellomrom" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4957,6 +5164,11 @@ msgstr "Mellomrom" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spansk" @@ -4999,11 +5211,15 @@ msgstr "Kvadrat-joystick" msgid "Standard Controller" msgstr "Standardkontroller" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5039,9 +5255,13 @@ msgstr "Joystick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" @@ -5120,9 +5340,13 @@ msgstr "Tabell Høyre" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Ta Skjermbilde" @@ -5366,18 +5590,26 @@ msgstr "Vipp Alle Loggtyper" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Vipp Mellom Vindu/Fullskjerm" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Topp" @@ -5484,6 +5716,7 @@ msgstr "Ukjent melding mottatt med ID: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ukjent melding mottatt med ID: %d fra spiller: %d Sparker spiller!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5496,6 +5729,8 @@ msgstr "" "Fortsett?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5718,11 +5953,15 @@ msgstr "Wii NAND-rot:" msgid "Wii Save Import" msgstr "Importer Wii-lagringsfil" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -5753,11 +5992,15 @@ msgstr "" "eller kanskje den koblet seg fra pga. inaktivitet.\n" "Vil du koble til igjen øyeblikkelig?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Tilkoblet" @@ -5790,6 +6033,7 @@ msgstr "Windows Høyre" msgid "Word Wrap" msgstr "Ordkrumning" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5799,6 +6043,11 @@ msgstr "Ordkrumning" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Arbeider..." diff --git a/Languages/po/nl.po b/Languages/po/nl.po index 76e2b607fc..f6c2081f53 100644 --- a/Languages/po/nl.po +++ b/Languages/po/nl.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-08-07 16:43+0100\n" "Last-Translator: Goost \n" "Language-Team: DevPro Team. \n" @@ -560,6 +564,7 @@ msgstr "Voeg Patch toe" msgid "Add new pane" msgstr "Voeg een nieuwe paneel toe" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -569,6 +574,11 @@ msgstr "Voeg een nieuwe paneel toe" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Voeg toe..." @@ -636,6 +646,7 @@ msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -643,6 +654,10 @@ msgstr "Alle Gamecube GCM bestanden (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Alle Opgeslagen Staten (sav, s##)" @@ -733,11 +748,15 @@ msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet " "terug te halen!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -758,11 +777,15 @@ msgstr "Geluid Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -874,10 +897,14 @@ msgstr "Blauw Rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Onder" @@ -910,11 +937,15 @@ msgstr "Zoek een uitvoer folder" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1160,10 +1191,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Sluit" @@ -1273,11 +1308,15 @@ msgstr "Verbind Wiimote 3" msgid "Connect Wiimote 4" msgstr "Verbind Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Verbinden..." @@ -1469,10 +1508,14 @@ msgstr "DSP Emulator Motor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulatie (snel)" @@ -1705,11 +1748,15 @@ msgstr "" msgid "Divide" msgstr "Verdelen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" @@ -1738,6 +1785,7 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1753,6 +1801,14 @@ msgstr "Dolphin GCPad Configuratie" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Configuratie" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" @@ -1847,6 +1903,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1856,6 +1913,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Nederlands" @@ -1999,22 +2061,32 @@ msgid "Enable Block Merging" msgstr "Activeer Block Merging" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Activeer Cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Activeer Cheats" @@ -2170,6 +2242,7 @@ msgstr "" msgid "End" msgstr "Einde" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2179,6 +2252,11 @@ msgstr "Einde" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Engels" @@ -2208,6 +2286,7 @@ msgstr "Gelijk" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error (Fout)" @@ -2225,6 +2304,19 @@ msgid "Error" msgstr "Error (Fout)" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Error (Fout)" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2687,6 +2779,7 @@ msgstr "Frames om op te nemen" msgid "Free Look" msgstr "Vrije kijk" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2696,6 +2789,11 @@ msgstr "Vrije kijk" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Frans" @@ -2764,10 +2862,14 @@ msgstr "Gamecube &Pad Instellingen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" @@ -2791,11 +2893,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Algemeen" @@ -2804,6 +2911,7 @@ msgstr "Algemeen" msgid "General Settings" msgstr "Algemene Instellingen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2813,6 +2921,11 @@ msgstr "Algemene Instellingen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Duits" @@ -2944,11 +3057,16 @@ msgstr "Sneltoets Configuratie" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Hotkeys" @@ -3173,11 +3291,15 @@ msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "WAD aan het installeren..." @@ -3260,6 +3382,7 @@ msgstr "Onjuist opname bestand" msgid "Invalid state" msgstr "Onjuiste staat" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3269,6 +3392,11 @@ msgstr "Onjuiste staat" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italië" @@ -3426,20 +3554,28 @@ msgstr "Laad staat 8" msgid "Load State..." msgstr "Laad staat..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "Laad Wii System Menu(%d %c)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Laad Wii System Menu(%d %c)" @@ -3521,11 +3657,15 @@ msgstr "MMU Snelheids Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark bestanden(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3557,10 +3697,14 @@ msgstr "Geheugen Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Geheugen Kaart" @@ -3759,11 +3903,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Omhoog" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3850,11 +3998,15 @@ msgstr "Niet gelijk" msgid "Not Set" msgstr "Niet ingesteld" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Niet verbonden" @@ -3916,9 +4068,13 @@ msgstr "Er zijn maar %d blocks beschikaarr" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Open" @@ -4050,6 +4206,7 @@ msgstr "Patches" msgid "Paths" msgstr "Pad" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4057,6 +4214,10 @@ msgstr "Pad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauze" @@ -4077,12 +4238,17 @@ msgstr "Perspectief %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Speel" @@ -4108,11 +4274,15 @@ msgstr "Terugspeel Opties" msgid "Players" msgstr "Spelers" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -4325,6 +4495,7 @@ msgstr "Lijst Verversen" msgid "Refresh game list" msgstr "Ververs de speellijst" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4336,6 +4507,12 @@ msgstr "Ververs de speellijst" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Verwijder" @@ -4356,9 +4533,13 @@ msgstr "Geef weer op hoofdscherm" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Opnieuw" @@ -4401,11 +4582,15 @@ msgstr "S&la Staat Op" msgid "Safe" msgstr "Opslaan" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Sample Rate:" @@ -4490,11 +4675,15 @@ msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." msgid "Scaled EFB Copy" msgstr "EFB Verkleinde Kopie" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Scannen van %s" @@ -4534,6 +4723,7 @@ msgstr "Sectie %s niet gevonden in SYSCONF" msgid "Select" msgstr "Selecteer" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4549,6 +4739,14 @@ msgstr "Selecteer de opname Bestand" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Selecteer de opname Bestand" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" @@ -4574,6 +4772,7 @@ msgstr "Selecteer zwevende vensters" msgid "Select the file to load" msgstr "Selecteer het bestand om het te laden" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4586,15 +4785,22 @@ msgstr "Selecteer de Staat om te laden" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Selecteer het save - bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" @@ -4967,6 +5173,7 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s" msgid "Space" msgstr "Ruimte" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4976,6 +5183,11 @@ msgstr "Ruimte" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spaans" @@ -5019,11 +5231,15 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5059,9 +5275,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" @@ -5134,9 +5354,13 @@ msgstr "Rechter Tabel" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Neem een Schermafdruk" @@ -5383,18 +5607,26 @@ msgstr "Zet Alle Log Types Aan" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Volledig Scherm Inschakelen" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Boven" @@ -5504,6 +5736,7 @@ msgstr "" "Onbekend bericht ontvagen met id : %d ontvangen van speler: %d Speler " "eruitgeschopt!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5516,6 +5749,8 @@ msgstr "" "Doorgaan?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5739,11 +5974,15 @@ msgstr "Wii NAND basismap:" msgid "Wii Save Import" msgstr "Wii Save Importeren" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -5774,11 +6013,15 @@ msgstr "" "of misschien is het te wijten aan een time-out of een andere reden.\n" "Wilt u meteen opnieuw verbinden?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Connected" @@ -5811,6 +6054,7 @@ msgstr "Venster Rechts" msgid "Word Wrap" msgstr "Regelafbreking" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5820,6 +6064,11 @@ msgstr "Regelafbreking" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Werken..." diff --git a/Languages/po/pl.po b/Languages/po/pl.po index 39aa254b51..1da1a68e37 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-08-12 17:04+0100\n" "Last-Translator: Krzysztof Baszczok \n" "Language-Team: Polish \n" @@ -558,6 +562,7 @@ msgstr "Dodaj Å‚atkÄ™" msgid "Add new pane" msgstr "Dodaj nowy panel" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -567,6 +572,11 @@ msgstr "Dodaj nowy panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Dodaj..." @@ -634,6 +644,7 @@ msgstr "Wszystkie obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -641,6 +652,10 @@ msgstr "Pliki GCM" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" @@ -728,11 +743,15 @@ msgstr "" 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!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -753,11 +772,15 @@ msgstr "Audio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: BÅ‚Ä…d otwarcia urzÄ…dzenia AO.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -873,10 +896,14 @@ msgstr "Niebieski prawo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Dół" @@ -909,11 +936,15 @@ msgstr "Szukaj folderu wyjÅ›ciowego" msgid "Buffer:" msgstr "Bufor:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1114,11 +1145,15 @@ msgstr "Wybierz plik do otwarcia" msgid "Choose a memory card:" msgstr "Wybierz kartÄ™ pamiÄ™ci:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +>>>>>>> Update from master branch. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1161,10 +1196,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zamknij" @@ -1273,11 +1312,15 @@ msgstr "PoÅ‚Ä…cz Wiilot 3" msgid "Connect Wiimote 4" msgstr "PoÅ‚Ä…cz Wiilot 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "ÅÄ…czÄ™..." @@ -1393,11 +1436,15 @@ msgstr "Utwórz nowÄ… perspektywÄ™" msgid "Created by KDE-Look.org" msgstr "Utworzone przez KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +>>>>>>> Update from master branch. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1474,10 +1521,14 @@ msgstr "DSP Emulator Engine" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulacja (szybkie)" @@ -1708,11 +1759,15 @@ msgstr "" msgid "Divide" msgstr "Podziel" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualnÄ… emulacjÄ™?" @@ -1741,6 +1796,7 @@ msgstr "Konfiguracja emulowanego Wiilota" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1756,6 +1812,14 @@ msgstr "Konfiguracja GCPad'a" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Konfiguracja GCPad'a" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" @@ -1767,11 +1831,15 @@ msgstr "Konfiguracja Wiilot'a" msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +>>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1779,11 +1847,15 @@ msgstr "" "Program nie mógÅ‚ znaleść żadnych obrazów GC/Wii ISO. Kliknij tutaj by " "przeglÄ…dać pliki..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +>>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1859,6 +1931,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1868,6 +1941,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holenderski" @@ -2012,21 +2090,31 @@ msgid "Enable Block Merging" msgstr "WÅ‚Ä…cz Å‚Ä…czenie bloków" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "WÅ‚Ä…cz cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "WÅ‚Ä…cz kody" @@ -2125,11 +2213,15 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update from master branch. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2185,6 +2277,7 @@ msgstr "" msgid "End" msgstr "Koniec" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2194,6 +2287,11 @@ msgstr "Koniec" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Angielski" @@ -2223,6 +2321,7 @@ msgstr "Równy" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "BÅ‚Ä…d" @@ -2240,6 +2339,19 @@ msgid "Error" msgstr "BÅ‚Ä…d" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "BÅ‚Ä…d" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." @@ -2248,6 +2360,9 @@ msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." #, c-format msgid "" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" @@ -2697,6 +2812,7 @@ msgstr "Ramki do nagrania" msgid "Free Look" msgstr "Free Look" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2706,6 +2822,11 @@ msgstr "Free Look" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francuski" @@ -2773,10 +2894,14 @@ msgstr "Ustawienia &pada GC" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamiÄ™ci GC (*.raw,*.gcp)" @@ -2800,11 +2925,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Główne" @@ -2813,6 +2943,7 @@ msgstr "Główne" msgid "General Settings" msgstr "Ustawienia ogólne" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2822,6 +2953,11 @@ msgstr "Ustawienia ogólne" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Niemiecki" @@ -2951,11 +3087,16 @@ msgstr "Konfiguracja skrótów klawiszowych" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Skróty klawiszowe" @@ -3035,11 +3176,15 @@ msgstr "" "JeÅ›li FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, OFF " "= szybko)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +>>>>>>> Update from master branch. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." @@ -3180,11 +3325,15 @@ msgid "" msgstr "" "InstallExceptionHandler wywoÅ‚any, ale ta platforma nie wspiera go jeszcze." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Instalacja WAD..." @@ -3266,6 +3415,7 @@ msgstr "NewÅ‚aÅ›ciwy plik nagrania" msgid "Invalid state" msgstr "NiewÅ‚aÅ›ciwy stan" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3275,6 +3425,11 @@ msgstr "NiewÅ‚aÅ›ciwy stan" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "WÅ‚oski" @@ -3432,6 +3587,7 @@ msgstr "Wczytaj stan Slot 8" msgid "Load State..." msgstr "Wczytaj stan..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3445,6 +3601,13 @@ msgstr "Wczytaj Wii System Menu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Wczytaj Wii System Menu" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wczytaj Wii System Menu %d %c" @@ -3526,11 +3689,15 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Pliki MadCatz Gameshark(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Główna gaÅ‚ka" @@ -3562,10 +3729,14 @@ msgstr "Bajt pamiÄ™ci" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Karta pamiÄ™ci" @@ -3763,11 +3934,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3854,11 +4029,15 @@ msgstr "Nie równe" msgid "Not Set" msgstr "Nie ustawiono" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Nie poÅ‚Ä…czono" @@ -3920,9 +4099,13 @@ msgstr "DostÄ™pnych tylko %d bloków" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Otwórz" @@ -4053,6 +4236,7 @@ msgstr "Patche" msgid "Paths" msgstr "Åšcieżki" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4060,6 +4244,10 @@ msgstr "Åšcieżki" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4080,12 +4268,17 @@ msgstr "Perspekrtywa %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Play" @@ -4111,11 +4304,15 @@ msgstr "Opcje playback'u" msgid "Players" msgstr "Gracze" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Potwierdź..." @@ -4326,6 +4523,7 @@ msgstr "OdÅ›wież listÄ™" msgid "Refresh game list" msgstr "OdÅ›wież listÄ™ gier" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4337,6 +4535,12 @@ msgstr "OdÅ›wież listÄ™ gier" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "UsuÅ„" @@ -4356,9 +4560,13 @@ msgstr "Generuj w oknie głównym" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4401,11 +4609,15 @@ msgstr "Zapisz &stan" msgid "Safe" msgstr "Bezpieczny" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Wskaźnik próbkowania:" @@ -4489,11 +4701,15 @@ msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "SknaujÄ™ %s" @@ -4533,6 +4749,7 @@ msgstr "Nie odnaleziono sekcji %s w SYSCONF" msgid "Select" msgstr "Select" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4548,6 +4765,14 @@ msgstr "Wybierz plik nagrania" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Wybierz plik nagrania" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" @@ -4573,6 +4798,7 @@ msgstr "Select floating windows" msgid "Select the file to load" msgstr "Wybierz plik do wczytania" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4585,15 +4811,22 @@ msgstr "Wybierz stan do wczytania" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Wybierz plik do zapisu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Wybierz stan do wczytania" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Wybierz stan do zapisu" @@ -4666,11 +4899,15 @@ msgstr "Separator" msgid "Serbian" msgstr "Serbski" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +>>>>>>> Update from master branch. 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" @@ -4972,6 +5209,7 @@ msgstr "Utworzenie bufora dźwiÄ™ku nie powiodÅ‚o siÄ™: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4981,6 +5219,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "HiszpaÅ„ski" @@ -5024,11 +5267,15 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "Standard Controller" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5064,9 +5311,13 @@ msgstr "GaÅ‚ka" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" @@ -5144,9 +5395,13 @@ msgstr "Talerz prawo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Zrób zdjÄ™cie" @@ -5392,18 +5647,26 @@ msgstr "PrzeÅ‚Ä…cz wszystkie typy logów" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "PrzeÅ‚Ä…cz na peÅ‚ny ekran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Góra" @@ -5512,6 +5775,7 @@ msgstr "Nieznana wiadomość o ID: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Nieznana wiadomość o ID: %d od gracza: %d Gracz wylatuje!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5524,6 +5788,8 @@ msgstr "" "Kontynuować?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5746,11 +6012,15 @@ msgstr "ŹródÅ‚o Wii NAND:" msgid "Wii Save Import" msgstr "Import zapisów Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -5781,11 +6051,15 @@ msgstr "" "lub zbyt dÅ‚ugi czas nieobecnoÅ›ci lub coÅ› innego.\n" "PoÅ‚Ä…czyć ponownie?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiilot poÅ‚Ä…czony" @@ -5817,6 +6091,7 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Zawijanie wierszy" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5826,6 +6101,11 @@ msgstr "Zawijanie wierszy" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "PracujÄ™..." diff --git a/Languages/po/pt.po b/Languages/po/pt.po index 62025d0da8..89c344c8b5 100644 --- a/Languages/po/pt.po +++ b/Languages/po/pt.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-07-23 15:53-0000\n" "Last-Translator: Zilaan \n" "Language-Team: Zilaan \n" @@ -560,6 +564,7 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -569,6 +574,11 @@ msgstr "Adicionar novo painel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Adicionar..." @@ -637,6 +647,7 @@ msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos os ficheiros Gamecube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -644,6 +655,10 @@ msgstr "Todos os ficheiros Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" @@ -733,11 +748,15 @@ msgstr "" "Tem a certeza que quer eliminar este ficheiro? Será eliminado " "permanentemente!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -758,11 +777,15 @@ msgstr "Ãudio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -879,10 +902,14 @@ msgstr "Azul Direita" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Inferior" @@ -915,11 +942,15 @@ msgstr "Procurar por pasta de destino" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1168,10 +1199,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fechar" @@ -1280,11 +1315,15 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "A conectar..." @@ -1476,10 +1515,14 @@ msgstr "Motor de Emulador DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "Emulação de DSP HLE (rápido)" @@ -1710,11 +1753,15 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" @@ -1743,6 +1790,7 @@ msgstr "Configuração da emulação de Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1758,6 +1806,14 @@ msgstr "Configuração de GCPad " #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Configuração de GCPad " + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" @@ -1854,6 +1910,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1863,6 +1920,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holandês" @@ -2007,21 +2069,31 @@ msgid "Enable Block Merging" msgstr "Activar Fusão de blocos" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activar Cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Activar Cheats" @@ -2177,6 +2249,7 @@ msgstr "" msgid "End" msgstr "Fim" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2186,6 +2259,11 @@ msgstr "Fim" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Inglês" @@ -2215,6 +2293,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" @@ -2232,6 +2311,19 @@ msgid "Error" msgstr "Erro" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Erro" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2692,6 +2784,7 @@ msgstr "Quadros para Gravar" msgid "Free Look" msgstr "Vista Livre" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2701,6 +2794,11 @@ msgstr "Vista Livre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francês" @@ -2768,10 +2866,14 @@ msgstr "Definições de Comando &Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" @@ -2795,11 +2897,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2808,6 +2915,7 @@ msgstr "Geral" msgid "General Settings" msgstr "Definições Gerais" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2817,6 +2925,11 @@ msgstr "Definições Gerais" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Alemão" @@ -2947,11 +3060,16 @@ msgstr "Configuração de Teclas de atalho" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Teclas de Atalho" @@ -3175,11 +3293,15 @@ msgid "" msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "A Instalar WAD..." @@ -3261,6 +3383,7 @@ msgstr "Ficheiro de Gravação inválido" msgid "Invalid state" msgstr "Estado Inválido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3270,6 +3393,11 @@ msgstr "Estado Inválido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italiano" @@ -3427,6 +3555,7 @@ msgstr "Carregar Estado Slot 8" msgid "Load State..." msgstr "Carregar Estado..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3440,6 +3569,13 @@ msgstr "Carregar Sistema de Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Carregar Sistema de Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Sistema de Menu Wii %d%c" @@ -3521,11 +3657,15 @@ msgstr "MMU Hack de velocidade" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ficheiros MadCatz Gameshark(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick Principal" @@ -3557,10 +3697,14 @@ msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Cartão de memória" @@ -3759,11 +3903,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3850,11 +3998,15 @@ msgstr "Não igual" msgid "Not Set" msgstr "Não definido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Não conectado" @@ -3916,9 +4068,13 @@ msgstr "Apenas %d blocos disponíveis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Abrir" @@ -4049,6 +4205,7 @@ msgstr "Patches" msgid "Paths" msgstr "Caminhos" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4056,6 +4213,10 @@ msgstr "Caminhos" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4076,12 +4237,17 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Começar" @@ -4107,11 +4273,15 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Por favor confirme..." @@ -4324,6 +4494,7 @@ msgstr "Actualizar Lista" msgid "Refresh game list" msgstr "Actualizar lista de Jogos" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4335,6 +4506,12 @@ msgstr "Actualizar lista de Jogos" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Remover" @@ -4354,9 +4531,13 @@ msgstr "Renderizar para a Janela Principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4399,11 +4580,15 @@ msgstr "Gua&rdar Estado" msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4487,11 +4672,15 @@ msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..." msgid "Scaled EFB Copy" msgstr "Cópia EFB Escalada" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "A procurar %s" @@ -4531,6 +4720,7 @@ msgstr "Selecção %s não encontrada em SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4546,6 +4736,14 @@ msgstr "Seleccione o Ficheiro de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Seleccione o Ficheiro de Gravação" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" @@ -4571,6 +4769,7 @@ msgstr "Seleccionar janelas flutuantes" msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4583,15 +4782,22 @@ msgstr "Seleccione o estado para carregar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Seleccione o estado para carregar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Seleccione o estado para gravar" @@ -4972,6 +5178,7 @@ msgstr "Criação do buffer de som falhou: %s" msgid "Space" msgstr "Espaço" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4981,6 +5188,11 @@ msgstr "Espaço" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Espanhol" @@ -5024,11 +5236,15 @@ msgstr "Stick quadrado" msgid "Standard Controller" msgstr "Comando padrão" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5064,9 +5280,13 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" @@ -5144,9 +5364,13 @@ msgstr "Table Direita" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Tirar Screenshot" @@ -5398,18 +5622,26 @@ msgstr "Alternar Todos os Tipos de Relatório" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Alternar Ecrã Inteiro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Topo" @@ -5518,6 +5750,7 @@ msgstr "" "Mensagem desconhecida com a id:%d recebida pelo jogador:%d Excluindo o " "jogador!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5530,6 +5763,8 @@ msgstr "" "Continuar?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5755,11 +5990,15 @@ msgstr "Raiz de NAND Wii:" msgid "Wii Save Import" msgstr "Importação de Jogo Guardado Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -5791,11 +6030,15 @@ msgstr "" "razão.\n" "Quer reconectar imediatamente?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5828,6 +6071,7 @@ msgstr "Janelas Direita" msgid "Word Wrap" msgstr "Moldar o texto" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5837,6 +6081,11 @@ msgstr "Moldar o texto" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "A trabalhar..." @@ -6450,6 +6699,9 @@ msgstr "| OU" #~ msgstr "Começar a janela renderizada em ecrã inteiro" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6457,8 +6709,11 @@ msgstr "| OU" #~ "Apontador desconhecido %#08x\n" #~ "Continuar?" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "Usar FPS como limitador" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 8f2c968751..6dc3dd9b7b 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -8,12 +8,17 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:38-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-09-11 23:35-0300\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-18 13:38-0600\n" +>>>>>>> Update from master branch. "Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" "Language: \n" @@ -563,6 +568,7 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painél" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -572,6 +578,11 @@ msgstr "Adicionar novo painél" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Adicionar..." @@ -639,6 +650,7 @@ msgstr "Todas as imagens CG/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos os arquivos Gamecube CGM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -646,6 +658,10 @@ msgstr "Todos os arquivos Gamecube CGM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" @@ -735,11 +751,15 @@ msgstr "" "Você tem certeza que quer deletar este arquivo? Ele ficará perdido para " "sempre!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -760,11 +780,15 @@ msgstr "Backend de Audio" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -881,10 +905,14 @@ msgstr "Azul Direito" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Embaixo" @@ -917,11 +945,15 @@ msgstr "Procurar por um diretório de saída" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1126,11 +1158,15 @@ msgstr "Escolher um arquivo para abrir" msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +>>>>>>> Update from master branch. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1173,10 +1209,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fechar" @@ -1285,11 +1325,15 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Conectando..." @@ -1406,11 +1450,15 @@ msgstr "Criar nova perspectiva" msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +>>>>>>> Update from master branch. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1485,10 +1533,14 @@ msgstr "Engine de Emulação do DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "Emulação HLE do DSP (rápido)" @@ -1719,11 +1771,15 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" @@ -1752,6 +1808,7 @@ msgstr "Configuração de Wiimote Emulado do Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1767,6 +1824,14 @@ msgstr "Configuração do GCPad do Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Configuração do GCPad do Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS Dolphin (*.dtm)" @@ -1778,11 +1843,15 @@ msgstr "Configuração de Wiimote Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin no &Google Code" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +>>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1790,11 +1859,15 @@ msgstr "" "Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por " "arquivos..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +>>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1870,6 +1943,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1879,6 +1953,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holandês" @@ -2023,21 +2102,31 @@ msgid "Enable Block Merging" msgstr "Ativar Block Merging" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Ativar Cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Ativar Cheats" @@ -2137,11 +2226,15 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update from master branch. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2197,6 +2290,7 @@ msgstr "" msgid "End" msgstr "Fim" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2206,6 +2300,11 @@ msgstr "Fim" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Inglês" @@ -2235,6 +2334,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" @@ -2252,11 +2352,34 @@ msgid "Error" msgstr "Erro" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Erro" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." #: Source/Core/Common/Src/ChunkFile.h:180 +<<<<<<< HEAD +======= +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +>>>>>>> Update from master branch. #, c-format msgid "" <<<<<<< HEAD @@ -2711,6 +2834,7 @@ msgstr "QUadros para Capturar" msgid "Free Look" msgstr "Olhar Livre" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2720,6 +2844,11 @@ msgstr "Olhar Livre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francês" @@ -2787,10 +2916,14 @@ msgstr "Configurações de &Controle de Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" @@ -2814,11 +2947,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2827,6 +2965,7 @@ msgstr "Geral" msgid "General Settings" msgstr "Configurações Gerais" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2836,6 +2975,11 @@ msgstr "Configurações Gerais" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Alemão" @@ -2967,11 +3111,16 @@ msgstr "Configuração de hotkey" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Hotkeys" @@ -3051,11 +3200,15 @@ msgstr "" "Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = Compatível, " "OFF = Rápido)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +>>>>>>> Update from master branch. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." @@ -3199,11 +3352,15 @@ msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3285,6 +3442,7 @@ msgstr "Arquivo de gravação inválido" msgid "Invalid state" msgstr "Estado Salvo Inválido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3294,6 +3452,11 @@ msgstr "Estado Salvo Inválido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italiano" @@ -3451,6 +3614,7 @@ msgstr "Carregar Estado do Slot 8" msgid "Load State..." msgstr "Carregar State..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3464,6 +3628,13 @@ msgstr "Carregar Menu de Sistema do Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Carregar Menu de Sistema do Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Menu de Sistema do Wii %d %c" @@ -3546,11 +3717,15 @@ msgstr "Hack de velocidade MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arquivos de Gameshark MadCatz(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Analógico Principal" @@ -3582,10 +3757,14 @@ msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Cartão de memoria" @@ -3784,11 +3963,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3875,11 +4058,15 @@ msgstr "Não igual" msgid "Not Set" msgstr "Indefinido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Não conectado" @@ -3941,9 +4128,13 @@ msgstr "Apenas %d blocos disponíveis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Abrir" @@ -4074,6 +4265,7 @@ msgstr "Patches" msgid "Paths" msgstr "Diretórios" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4081,6 +4273,10 @@ msgstr "Diretórios" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausar" @@ -4101,12 +4297,17 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Executar" @@ -4132,11 +4333,15 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Favor confirmar..." @@ -4347,6 +4552,7 @@ msgstr "Atualizar Lista" msgid "Refresh game list" msgstr "Atualizar a lista de jogos" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4358,6 +4564,12 @@ msgstr "Atualizar a lista de jogos" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Remover" @@ -4377,9 +4589,13 @@ msgstr "Renderizar na Janela Principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4422,11 +4638,15 @@ msgstr "Sal&var estado atual" msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4510,11 +4730,15 @@ msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." msgid "Scaled EFB Copy" msgstr "Cópia Escalada do EFB" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Escaneando %s" @@ -4554,6 +4778,7 @@ msgstr "A seção %s não foi encontrada no SYSCONF" msgid "Select" msgstr "Selecionar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4569,6 +4794,14 @@ msgstr "Selecione o arquivo de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Selecione o arquivo de Gravação" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" @@ -4593,6 +4826,7 @@ msgstr "Selecionar Janelas flutuantes" msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4605,15 +4839,22 @@ msgstr "Selecione um estado para carregar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Selecione o arquivo de salva" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Selecione um estado para carregar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Selecione um estado para salvar" @@ -4687,11 +4928,15 @@ msgstr "Separador" msgid "Serbian" msgstr "Sérvio" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +>>>>>>> Update from master branch. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4998,6 +5243,7 @@ msgstr "Falha na criação do buffer de som: %s" msgid "Space" msgstr "Barra de Espaço" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -5007,6 +5253,11 @@ msgstr "Barra de Espaço" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Espanhol" @@ -5050,11 +5301,15 @@ msgstr "Analógico Quadrado" msgid "Standard Controller" msgstr "Controle Padrão" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5090,9 +5345,13 @@ msgstr "Analógico" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" @@ -5170,9 +5429,13 @@ msgstr "Direita da Mesa" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Capturar Tela" @@ -5421,18 +5684,26 @@ msgstr "Ligar/Desligar Todos os Logs" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Ir para Tela Cheia" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Topo" @@ -5545,6 +5816,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format msgid "" @@ -5554,6 +5826,8 @@ msgid "" msgstr "" "Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5779,11 +6053,15 @@ msgstr "Raiz do Wii NAND" msgid "Wii Save Import" msgstr "Importar Save de Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Arquivos de Salva do Wii (*.bin)|*.bin" @@ -5814,11 +6092,15 @@ msgstr "" "ou talvez tenha sido pelo tempo parado ou por outra razão.\n" "Você quer reconectar imediatamente?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5850,6 +6132,7 @@ msgstr "Janelas da Direita" msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5859,6 +6142,11 @@ msgstr "Word Wrap" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Funcionando..." diff --git a/Languages/po/ru.po b/Languages/po/ru.po index 02636c4777..31745e4349 100644 --- a/Languages/po/ru.po +++ b/Languages/po/ru.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-01-20 14:40+0300\n" "Last-Translator: firnis \n" "Language-Team: Russian <>\n" @@ -543,6 +547,7 @@ msgstr "Добавление патча" msgid "Add new pane" msgstr "Добавить панель" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -552,6 +557,11 @@ msgstr "Добавить панель" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Добавить..." @@ -606,6 +616,7 @@ msgstr "Ð’Ñе образа от GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Ð’Ñе GCM-файлы Gamecube (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -613,6 +624,10 @@ msgstr "Ð’Ñе GCM-файлы Gamecube (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Файлы быÑтрых Ñохранений (sav, s##)" @@ -693,11 +708,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтот файл? Он иÑчезнет навÑегда!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Соотношение Ñторон:" @@ -719,11 +738,15 @@ msgstr "СиÑтема вывода" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва вывода звука.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Ðвто" @@ -839,10 +862,14 @@ msgstr "СинÑÑ Ñправа" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Ñнизу" @@ -875,11 +902,15 @@ msgstr "Укажите папку Ð´Ð»Ñ ÑохранениÑ" msgid "Buffer:" msgstr "Буфер:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1114,10 +1145,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Закрыть" @@ -1227,11 +1262,15 @@ msgstr "Подключить Wiimote 3" msgid "Connect Wiimote 4" msgstr "Подключить Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Подключение..." @@ -1418,10 +1457,14 @@ msgstr "Режим ÑмулÑции CPU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1637,11 +1680,15 @@ msgstr "" msgid "Divide" msgstr "/" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Ð’Ñ‹ хотите оÑтановить ÑмулÑцию?" @@ -1671,6 +1718,7 @@ msgstr "ÐаÑтройки Ñмулируемого Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1686,6 +1734,14 @@ msgstr "ÐаÑтройки Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "ÐаÑтройки Dolphin GCPad" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1773,6 +1829,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1782,6 +1839,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. #, fuzzy msgid "Dutch" msgstr "Dutch" @@ -1910,22 +1972,32 @@ msgid "Enable Block Merging" msgstr "Включить Ñовмещение блоков" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "кÑшировать" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Включить чит-коды" @@ -2066,6 +2138,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2075,6 +2148,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. #, fuzzy msgid "English" msgstr "English" @@ -2105,6 +2183,7 @@ msgstr "Равно" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Ошибки" @@ -2122,6 +2201,19 @@ msgid "Error" msgstr "Ошибки" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Ошибки" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Ошибка загрузки выбранного Ñзыка. ВозвращаемÑÑ Ðº Ñтандартному." @@ -2556,6 +2648,7 @@ msgstr "" msgid "Free Look" msgstr "Свободный обзор" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2565,6 +2658,11 @@ msgstr "Свободный обзор" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. #, fuzzy msgid "French" msgstr "French" @@ -2635,10 +2733,14 @@ msgstr "Опции &контроллера Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памÑти Gamecube (*.raw,*.gcp)" @@ -2660,11 +2762,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Общие" @@ -2674,6 +2781,7 @@ msgstr "Общие" msgid "General Settings" msgstr "ÐаÑтройки интерфейÑа" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2683,6 +2791,11 @@ msgstr "ÐаÑтройки интерфейÑа" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. #, fuzzy msgid "German" msgstr "German" @@ -2811,11 +2924,16 @@ msgstr "ÐаÑтройка \"горÑчих\" клавиш" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Клавиши" @@ -3032,11 +3150,15 @@ msgid "" msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. #, fuzzy msgid "Installing WAD..." msgstr "УÑтанавливаетÑÑ WAD в меню Wii..." @@ -3121,6 +3243,7 @@ msgstr "Ðеверный файл запиÑи" msgid "Invalid state" msgstr "Ðеверное Ñохранение" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3130,6 +3253,11 @@ msgstr "Ðеверное Ñохранение" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. #, fuzzy msgid "Italian" msgstr "Italian" @@ -3295,20 +3423,28 @@ msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" msgid "Load State..." msgstr "Загрузить игру..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "Загрузить Wii System Menu (%d %c)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Загрузить Wii System Menu (%d %c)" @@ -3392,11 +3528,15 @@ msgstr "УÑкорить MMU (Ñпидхак)" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Файлы Gameshark MadCatz (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3429,10 +3569,14 @@ msgstr "Па&мÑÑ‚ÑŒ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Карта памÑти" @@ -3610,11 +3754,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Вверх" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3703,11 +3851,15 @@ msgstr "Ðе равно" msgid "Not Set" msgstr "ÐеизвеÑтно" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Ðе подключено" @@ -3769,9 +3921,13 @@ msgstr "ДоÑтупно только %d блоков" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Открыть" @@ -3897,6 +4053,7 @@ msgstr "Патчи" msgid "Paths" msgstr "Папки" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3904,6 +4061,10 @@ msgstr "Папки" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Пауза" @@ -3925,12 +4086,17 @@ msgstr "Точка %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "ЗапуÑк" @@ -3958,11 +4124,15 @@ msgstr "Опции" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "" @@ -4187,6 +4357,7 @@ msgstr "&Обновить ÑпиÑок игр" msgid "Refresh game list" msgstr "Обновление ÑпиÑка игр" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4198,6 +4369,12 @@ msgstr "Обновление ÑпиÑка игр" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Удалить" @@ -4217,9 +4394,13 @@ msgstr "Выводить изображение в главное окно" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð½Ð°Ñтроек" @@ -4262,11 +4443,15 @@ msgstr "БыÑтрое &Ñохранение" msgid "Safe" msgstr "безопаÑное" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. #, fuzzy msgid "Sample Rate:" msgstr "ЧаÑтота" @@ -4359,11 +4544,15 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Scanning %s" msgstr "ПоиÑк..." @@ -4403,6 +4592,7 @@ msgstr "Ð¡ÐµÐºÑ†Ð¸Ñ %s не найдена в SYSCONF" msgid "Select" msgstr "Выбрать" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4418,6 +4608,14 @@ msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового проц #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°" @@ -4444,6 +4642,7 @@ msgstr "" msgid "Select the file to load" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4456,15 +4655,22 @@ msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Выберите файл Ñохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Выберите или укажите файл Ð´Ð»Ñ Ð±Ñ‹Ñтрого ÑохранениÑ" @@ -4825,6 +5031,7 @@ msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð°ÑƒÐ´Ð¸Ð¾-буфера %s." msgid "Space" msgstr "Пробел" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4834,6 +5041,11 @@ msgstr "Пробел" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. #, fuzzy msgid "Spanish" msgstr "Spanish" @@ -4871,11 +5083,15 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4913,9 +5129,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Стоп" @@ -4988,9 +5208,13 @@ msgstr "ÐŸÑ€Ð°Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Сделать Ñкриншот" @@ -5236,18 +5460,26 @@ msgstr "Включить вÑе" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Включение полноÑкранного режима" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Ñверху" @@ -5351,6 +5583,7 @@ msgstr "Получено неизвеÑтное Ñообщение Ñ id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Получено неизвеÑтное Ñообщение Ñ id : %d от игрока:%d Игрок выкинут!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5363,6 +5596,8 @@ msgstr "" "Продолжить?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5573,11 +5808,15 @@ msgstr "DVD-диÑк:" msgid "Wii Save Import" msgstr "Импорт Ñохранений Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы Ñохранений Wii (*.bin)|*.bin" @@ -5604,11 +5843,15 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote подключен" @@ -5644,6 +5887,7 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5653,6 +5897,11 @@ msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Подождите..." diff --git a/Languages/po/sr.po b/Languages/po/sr.po index 098435044b..c90b7828e7 100644 --- a/Languages/po/sr.po +++ b/Languages/po/sr.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-03-02 21:58+0100\n" "Last-Translator: nikolassj\n" "Language-Team: \n" @@ -512,6 +516,7 @@ msgstr "Dodaj Patch " msgid "Add new pane" msgstr "Dodaj nova okna" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -521,6 +526,11 @@ msgstr "Dodaj nova okna" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Dodaj..." @@ -574,6 +584,7 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -581,6 +592,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "" @@ -660,11 +675,15 @@ msgstr "" 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!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -685,11 +704,15 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -801,10 +824,14 @@ msgstr "Blue right " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Donji deo/dno" @@ -837,11 +864,15 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1069,10 +1100,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zatvori" @@ -1181,11 +1216,15 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Povezivanje..." @@ -1361,10 +1400,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1576,11 +1619,15 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1610,6 +1657,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1625,6 +1673,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1707,6 +1763,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1716,6 +1773,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "" @@ -1839,21 +1901,31 @@ msgid "Enable Block Merging" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "" @@ -1979,6 +2051,7 @@ msgstr "" msgid "End" msgstr "Kraj" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -1988,6 +2061,11 @@ msgstr "Kraj" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "" @@ -2017,6 +2095,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2034,6 +2113,19 @@ msgid "Error" msgstr "Error" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Error" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2450,6 +2542,7 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2459,6 +2552,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "" @@ -2527,10 +2625,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2552,11 +2654,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2566,6 +2673,7 @@ msgstr "" msgid "General Settings" msgstr "Opcije Uredjaja " +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2575,6 +2683,11 @@ msgstr "Opcije Uredjaja " #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Nemacki " @@ -2692,11 +2805,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "" @@ -2892,11 +3010,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "" @@ -2974,6 +3096,7 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -2983,6 +3106,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italianski " @@ -3134,20 +3262,28 @@ msgstr "Ucitaj State Slot 8" msgid "Load State..." msgstr "Ucitaj State" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "Ucitaj Wii Sistem Meni (%d %c)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Ucitaj Wii Sistem Meni (%d %c)" @@ -3224,11 +3360,15 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3261,10 +3401,14 @@ msgstr "&Memorija" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "" @@ -3441,11 +3585,15 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3532,11 +3680,15 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3598,9 +3750,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Otvori " @@ -3726,6 +3882,7 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3733,6 +3890,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauza " @@ -3754,12 +3915,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Pokreni " @@ -3786,11 +3952,15 @@ msgstr "Opcije " msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "" @@ -3998,6 +4168,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4009,6 +4180,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "" @@ -4025,9 +4202,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset/Restart " @@ -4070,11 +4251,15 @@ msgstr "" msgid "Safe" msgstr "Siguran " +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "" @@ -4158,11 +4343,15 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Scanning %s" msgstr "Skeniranje..." @@ -4202,6 +4391,7 @@ msgstr "" msgid "Select" msgstr "Izaberi " +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4217,6 +4407,14 @@ msgstr "Izaberi Snimani fajl" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Izaberi Snimani fajl" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " @@ -4243,6 +4441,7 @@ msgstr "" msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4255,15 +4454,22 @@ msgstr "Izaberi state za ucitavanje " #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" @@ -4599,6 +4805,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4608,6 +4815,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "" @@ -4643,11 +4855,15 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4683,9 +4899,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr " Zaustavi" @@ -4758,9 +4978,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -4975,18 +5199,26 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "" @@ -5088,6 +5320,7 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5098,6 +5331,8 @@ msgid "" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5305,11 +5540,15 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5336,11 +5575,15 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5373,6 +5616,7 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5382,6 +5626,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Radi..." diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index 331fbb422d..4a55b8ea04 100644 --- a/Languages/po/zh_CN.po +++ b/Languages/po/zh_CN.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-01-09 13:55-0800\n" "Last-Translator: thegfw \n" "Language-Team: \n" @@ -540,6 +544,7 @@ msgstr "添加补ä¸" msgid "Add new pane" msgstr "添加新é¢æ¿" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -549,6 +554,11 @@ msgstr "添加新é¢æ¿" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "添加..." @@ -602,6 +612,7 @@ msgstr "所有 GC/Wii é•œåƒ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -609,6 +620,10 @@ msgstr "所有 Gamecube GCM 文件 (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "æ‰€æœ‰å­˜æ¡£çŠ¶æ€ (sav, s##)" @@ -689,11 +704,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?这将是永久性的删除!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "高宽比:" @@ -714,11 +733,15 @@ msgstr "音频åŽç«¯:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: 打开 AO 设备错误.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自动" @@ -831,10 +854,14 @@ msgstr "è“ å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "底部" @@ -867,11 +894,15 @@ msgstr "æµè§ˆè¾“出目录" msgid "Buffer:" msgstr "缓冲区:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1107,10 +1138,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "关闭" @@ -1220,11 +1255,15 @@ msgstr "连接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "连接 Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "连接中..." @@ -1411,10 +1450,14 @@ msgstr "音频模拟引擎" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "音频 HLE 模拟(很快)" @@ -1634,11 +1677,15 @@ msgstr "按模拟器显示输入读å–" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "您确定是å¦åœæ­¢å½“å‰æ¨¡æ‹Ÿ?" @@ -1668,6 +1715,7 @@ msgstr "Dolphin 模拟 Wiimote 设置" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1683,6 +1731,14 @@ msgstr "Dolphin GC 手柄设置" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC 手柄设置" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" @@ -1766,6 +1822,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1775,6 +1832,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "è·å…°è¯­" @@ -1903,22 +1965,32 @@ msgid "Enable Block Merging" msgstr "å¯ç”¨åŒºå—åˆå¹¶" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "å¯ç”¨ç¼“å­˜" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "å¯ç”¨ä½œå¼Š" @@ -2053,6 +2125,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2062,6 +2135,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "英语" @@ -2091,6 +2169,7 @@ msgstr "等于" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "错误" @@ -2108,6 +2187,19 @@ msgid "Error" msgstr "错误" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "错误" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Error loading selected language. Falling back to system default." @@ -2562,6 +2654,7 @@ msgstr "" msgid "Free Look" msgstr "自由视点" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2571,6 +2664,11 @@ msgstr "自由视点" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "法语" @@ -2639,10 +2737,14 @@ msgstr "Gamecube 手柄设置(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube å†…å­˜å¡ (*.raw,*.gcp)" @@ -2666,11 +2768,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "常规" @@ -2680,6 +2787,7 @@ msgstr "常规" msgid "General Settings" msgstr "ç•Œé¢è®¾ç½®" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2689,6 +2797,11 @@ msgstr "ç•Œé¢è®¾ç½®" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "德语" @@ -2811,11 +2924,16 @@ msgstr "热键设置" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "热键" @@ -3025,11 +3143,15 @@ msgid "" msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. #, fuzzy msgid "Installing WAD..." msgstr "安装 WAD 到 Wii èœå•ä¸­..." @@ -3114,6 +3236,7 @@ msgstr "无效录制文件" msgid "Invalid state" msgstr "Invalid state" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3123,6 +3246,11 @@ msgstr "Invalid state" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "æ„大利语" @@ -3281,20 +3409,28 @@ msgstr "载入存档æ’槽 8" msgid "Load State..." msgstr "载入状æ€..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "载入 Wii 系统èœå•(%d %c)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "载入 Wii 系统èœå•(%d %c)" @@ -3375,11 +3511,15 @@ msgstr "MMU 速度破解" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 文件(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主摇æ†" @@ -3412,10 +3552,14 @@ msgstr "内存(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "内存å¡" @@ -3599,11 +3743,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3691,11 +3839,15 @@ msgstr "ä¸ç­‰äºŽ" msgid "Not Set" msgstr "未设置" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "未连接" @@ -3757,9 +3909,13 @@ msgstr "åªæœ‰ %d 区å—有效" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "打开" @@ -3890,6 +4046,7 @@ msgstr "è¡¥ä¸" msgid "Paths" msgstr "路径" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3897,6 +4054,10 @@ msgstr "路径" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "æš‚åœ" @@ -3918,12 +4079,17 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "开始" @@ -3950,11 +4116,15 @@ msgstr "选项" msgid "Players" msgstr "玩家" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "请确认..." @@ -4169,6 +4339,7 @@ msgstr "刷新列表" msgid "Refresh game list" msgstr "刷新游æˆåˆ—表" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4180,6 +4351,12 @@ msgstr "刷新游æˆåˆ—表" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "移除" @@ -4199,9 +4376,13 @@ msgstr "附加到主窗å£" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "é‡ç½®" @@ -4244,11 +4425,15 @@ msgstr "ä¿å­˜çŠ¶æ€(&V)" msgid "Safe" msgstr "安全" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "采样率:" @@ -4333,11 +4518,15 @@ msgstr "Savestate movie %s is corrupted, movie recording stopping..." msgid "Scaled EFB Copy" msgstr "EFB 比例å¤åˆ¶" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Scanning %s" msgstr "扫æ中..." @@ -4377,6 +4566,7 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "选择" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4392,6 +4582,14 @@ msgstr "选择录制文件" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "选择录制文件" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "选择è¦å¯¼å…¥çš„存档" @@ -4418,6 +4616,7 @@ msgstr "选择浮动窗å£" msgid "Select the file to load" msgstr "选择è¦è½½å…¥çš„文件" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4430,15 +4629,22 @@ msgstr "选择è¦è½½å…¥çš„状æ€" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "选择一个存档文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "选择è¦è½½å…¥çš„状æ€" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "选择è¦ä¿å­˜çš„状æ€" @@ -4787,6 +4993,7 @@ msgstr "声音缓冲区创建失败: %s" msgid "Space" msgstr "空格" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4796,6 +5003,11 @@ msgstr "空格" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "西ç­ç‰™è¯­" @@ -4831,11 +5043,15 @@ msgstr "æ–¹å—é”®" msgid "Standard Controller" msgstr "标准控制器" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4871,9 +5087,13 @@ msgstr "摇æ†" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -4947,9 +5167,13 @@ msgstr "Table Right" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "å±å¹•æˆªå›¾(&T)" @@ -5186,18 +5410,26 @@ msgstr "切æ¢æ‰€æœ‰æ—¥å¿—类型" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "切æ¢å…¨å±" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "顶部" @@ -5301,6 +5533,7 @@ msgstr "Unknown message received with id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Unknown message with id:%d received from player:%d Kicking player!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5313,6 +5546,8 @@ msgstr "" "继续?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5523,11 +5758,15 @@ msgstr "DVD 根目录:" msgid "Wii Save Import" msgstr "导入 Wii 存档" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5558,11 +5797,15 @@ msgstr "" "or maybe it is due to idle time out or other reason.\n" "Do you want to reconnect immediately?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote 已连接" @@ -5595,6 +5838,7 @@ msgstr "窗å£å³ä¾§" msgid "Word Wrap" msgstr "自动æ¢è¡Œ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5604,6 +5848,11 @@ msgstr "自动æ¢è¡Œ" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "工作中..." diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index ab270c846f..d171170136 100644 --- a/Languages/po/zh_TW.po +++ b/Languages/po/zh_TW.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-03-15 02:51+0800\n" "Last-Translator: khiav \n" "Language-Team: khiav&yrbn \n" @@ -540,6 +544,7 @@ msgstr "新增修正" msgid "Add new pane" msgstr "新增é¢ç‰ˆ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -549,6 +554,11 @@ msgstr "新增é¢ç‰ˆ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "新增..." @@ -615,6 +625,7 @@ msgstr "所有 GC/Wii 映åƒæª” (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -622,6 +633,10 @@ msgstr "所有 Gamecube GCM 檔案 (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "所有å³æ™‚存檔 (sav, s##)" @@ -702,11 +717,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？刪了之後就回ä¸ä¾†äº†å“¦ï¼" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "ç•«é¢æ¯”例：" @@ -727,11 +746,15 @@ msgstr "è²éŸ³è£ç½®ï¼š" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon：開啟 AO è£ç½®å‡ºéŒ¯ã€‚\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -844,10 +867,14 @@ msgstr "è— å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "下方" @@ -880,11 +907,15 @@ msgstr "ç€è¦½è¼¸å‡ºçš„資料夾" msgid "Buffer:" msgstr "ç·©è¡ï¼š" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1116,10 +1147,14 @@ msgstr "在éŠæˆ²åŸ·è¡Œæ™‚客戶端斷開連接ï¼ï¼ç¶²è·¯å°æˆ°å·²ç¶“被關閉 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "關閉" @@ -1229,11 +1264,15 @@ msgstr "連接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "連接 Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "正在連接..." @@ -1419,10 +1458,14 @@ msgstr "DSP 模擬引擎" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 模擬器 (å¿«)" @@ -1642,11 +1685,15 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "您è¦åœæ­¢ç›®å‰çš„模擬嗎？" @@ -1676,6 +1723,7 @@ msgstr "Dolphin 模擬 Wiimote 設定" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1691,6 +1739,14 @@ msgstr "Dolphin GC 控制器設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC 控制器設定" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" @@ -1774,6 +1830,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1783,6 +1840,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Dutch" @@ -1909,22 +1971,32 @@ msgid "Enable Block Merging" msgstr "é–‹å•Ÿå¡Šåˆä½µ" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "é–‹å•Ÿå¿«å–" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "開啟作弊" @@ -2056,6 +2128,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2065,6 +2138,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "English" @@ -2094,6 +2172,7 @@ msgstr "等於" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "錯誤" @@ -2111,6 +2190,19 @@ msgid "Error" msgstr "錯誤" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "錯誤" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "讀å–é¸æ“‡çš„語系出錯。返回使用系統é è¨­å€¼ã€‚" @@ -2563,6 +2655,7 @@ msgstr "" msgid "Free Look" msgstr "自由視點" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2572,6 +2665,11 @@ msgstr "自由視點" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "French" @@ -2640,10 +2738,14 @@ msgstr "Gamecube 控制器設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube è¨˜æ†¶å¡ (*.raw,*.gcp)" @@ -2667,11 +2769,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2681,6 +2788,7 @@ msgstr "一般" msgid "General Settings" msgstr "ç•Œé¢è¨­å®š" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2690,6 +2798,11 @@ msgstr "ç•Œé¢è¨­å®š" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "German" @@ -2812,11 +2925,16 @@ msgstr "å¿«æ·éµè¨­å®š" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "å¿«æ·éµ" @@ -3018,11 +3136,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler，但是這個平å°å°šæœªæ”¯æ´æ­¤åŠŸèƒ½ã€‚" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "æ­£åœ¨å®‰è£ WAD 至 Wii é¸å–®..." @@ -3106,6 +3228,7 @@ msgstr "無效的錄åƒæª”" msgid "Invalid state" msgstr "無效的狀態" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3115,6 +3238,11 @@ msgstr "無效的狀態" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italian" @@ -3273,20 +3401,28 @@ msgstr "讀å–儲存格 8" msgid "Load State..." msgstr "讀å–進度檔..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" @@ -3367,11 +3503,15 @@ msgstr "MMU 速度修正" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 檔案(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主æ–æ¡¿" @@ -3404,10 +3544,14 @@ msgstr "記憶å¡(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "記憶å¡" @@ -3591,11 +3735,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3683,11 +3831,15 @@ msgstr "ä¸ç›¸ç­‰" msgid "Not Set" msgstr "未設定" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "未連接" @@ -3749,9 +3901,13 @@ msgstr "僅 %d 個å€å¡Šå¯ç”¨" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "é–‹å•Ÿ" @@ -3880,6 +4036,7 @@ msgstr "修正" msgid "Paths" msgstr "路徑" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3887,6 +4044,10 @@ msgstr "路徑" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "æš«åœ" @@ -3908,12 +4069,17 @@ msgstr "ç‰ˆå¼ %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "執行" @@ -3940,11 +4106,15 @@ msgstr "é¸é …" msgid "Players" msgstr "玩家" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "請確èª..." @@ -4158,6 +4328,7 @@ msgstr "更新列表" msgid "Refresh game list" msgstr "æ›´æ–°éŠæˆ²åˆ—表" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4169,6 +4340,12 @@ msgstr "æ›´æ–°éŠæˆ²åˆ—表" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "移除" @@ -4188,9 +4365,13 @@ msgstr "渲染至主視窗" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "é‡ç½®" @@ -4233,11 +4414,15 @@ msgstr "儲存進度(&V)" msgid "Safe" msgstr "安全" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "å–樣率：" @@ -4322,11 +4507,15 @@ msgstr "儲存的影片 %s 是æ毀的，影片錄製åœæ­¢..." msgid "Scaled EFB Copy" msgstr "EFB 縮放複製" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Scanning %s" msgstr "正在掃瞄..." @@ -4366,6 +4555,7 @@ msgstr "é …ç›® %s 在 SYSCONF 中找ä¸åˆ°" msgid "Select" msgstr "é¸æ“‡" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4381,6 +4571,14 @@ msgstr "é¸æ“‡å·²éŒ„製的檔案" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "é¸æ“‡å·²éŒ„製的檔案" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "é¸æ“‡è¦å®‰è£çš„ Wii WAD" @@ -4406,6 +4604,7 @@ msgstr "é¸æ“‡æµ®å‹•è¦–窗" msgid "Select the file to load" msgstr "é¸æ“‡è¦è®€å–的檔案" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4418,15 +4617,22 @@ msgstr "é¸æ“‡è¦è®€å–的進度" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "é¸æ“‡å­˜æª”" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "é¸æ“‡è¦è®€å–的進度" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "é¸æ“‡è¦å„²å­˜çš„進度" @@ -4774,6 +4980,7 @@ msgstr "è²éŸ³ç·©è¡å»ºç«‹å¤±æ•—：%s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4783,6 +4990,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spanish" @@ -4818,11 +5030,15 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "標準控制器" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4858,9 +5074,13 @@ msgstr "æ–æ¡¿" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -4934,9 +5154,13 @@ msgstr "Table å³" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "截å–ç•«é¢" @@ -5163,18 +5387,26 @@ msgstr "å…¨é¸/全部å–消" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "切æ›å…¨èž¢å¹•" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "上方" @@ -5278,6 +5510,7 @@ msgstr "接收到帶有未知 id 的錯誤訊æ¯ï¼š%d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "知訊æ¯å¸¶æœ‰ id:%d 接收於玩家:%d 正在æ出玩家ï¼" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5290,6 +5523,8 @@ msgstr "" "是å¦ç¹¼çºŒï¼Ÿ" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5500,11 +5735,15 @@ msgstr "DVD 根：" msgid "Wii Save Import" msgstr "匯入 Wii 存檔" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5535,11 +5774,15 @@ msgstr "" "或閒置的時間太久。\n" "是å¦è¦é‡æ–°é€£æŽ¥ï¼Ÿ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote 已連接" @@ -5572,6 +5815,7 @@ msgstr "視窗 å³" msgid "Word Wrap" msgstr "自動æ›è¡Œ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5581,6 +5825,11 @@ msgstr "自動æ›è¡Œ" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "執行中..." From 685d02c0a607b241437ac1c758aeb23f0c6adcbd Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 27 Dec 2011 08:37:26 -0600 Subject: [PATCH 044/185] Clean up Turkish translation file. --- Languages/po/tr.po | 417 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 322 insertions(+), 95 deletions(-) diff --git a/Languages/po/tr.po b/Languages/po/tr.po index fe4f784856..a3e5d84924 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -8,6 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -15,6 +16,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-08-19 08:38-0500\n" ======= +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Clean up Turkish translation file. "PO-Revision-Date: 2011-12-20 19:22+0200\n" >>>>>>> Update Hungarian and Turkish translations. "Last-Translator: nlgzrgn \n" @@ -561,6 +565,7 @@ msgstr "Yama Ekle" msgid "Add new pane" msgstr "Bölme ekle" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -570,6 +575,11 @@ msgstr "Bölme ekle" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Clean up Turkish translation file. msgid "Add..." msgstr "Ekle..." @@ -639,6 +649,7 @@ msgstr "Tüm GC/Wii kalıpları (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -646,6 +657,10 @@ msgstr "Tüm GameCube GCM Dosyaları (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Clean up Turkish translation file. msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" @@ -734,11 +749,15 @@ msgstr "" "Bu dosyayı gerçekten silmek istiyor musunuz? Silindikten sonra bu dosyaları " "geri döndüremezsiniz!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -759,11 +778,15 @@ msgstr "Ses Çözücüsü:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO sürücüyü açarken hata.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Otomatik" @@ -879,10 +902,14 @@ msgstr "Mavi SaÄŸ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Clean up Turkish translation file. msgid "Bottom" msgstr "Alt" @@ -915,11 +942,15 @@ msgstr "Çıkış klasörü için gözat" msgid "Buffer:" msgstr "Tampon:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1166,10 +1197,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Kapat" @@ -1278,11 +1313,15 @@ msgstr "Wiimote 3'ü BaÄŸla" msgid "Connect Wiimote 4" msgstr "Wiimote 4'ü BaÄŸla" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Clean up Turkish translation file. msgid "Connecting..." msgstr "BaÄŸlanıyor..." @@ -1476,10 +1515,14 @@ msgstr "Ses Emülatörü Motoru" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Clean up Turkish translation file. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emülasyonu (Hızlı)" @@ -1709,11 +1752,15 @@ msgstr "" msgid "Divide" msgstr "Böl" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Clean up Turkish translation file. msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" @@ -1742,6 +1789,7 @@ msgstr "Dolphin Taklit Wiimote Yapılandırması" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1757,6 +1805,14 @@ msgstr "Dolphin GC Kolu Yapılandırması" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC Kolu Yapılandırması" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Clean up Turkish translation file. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" @@ -1853,6 +1909,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1862,6 +1919,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Clean up Turkish translation file. msgid "Dutch" msgstr "Flemenkçe" @@ -2004,6 +2066,7 @@ msgstr "BAT'a Ä°zin Ver" msgid "Enable Block Merging" msgstr "Blok BirleÅŸimine Ä°zin Ver" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -2011,15 +2074,25 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "Sınırlayıcı Kutu Hesaplama'yı EtkinleÅŸtir" + +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Ön BelleÄŸe Ä°zin Ver" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Clean up Turkish translation file. msgid "Enable Cheats" msgstr "Hilelere Ä°zin Ver" @@ -2176,6 +2249,7 @@ msgstr "" msgid "End" msgstr "Son" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2185,6 +2259,11 @@ msgstr "Son" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Clean up Turkish translation file. msgid "English" msgstr "Ä°ngilizce" @@ -2214,6 +2293,7 @@ msgstr "EÅŸit" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hata" @@ -2231,6 +2311,21 @@ msgid "Error" msgstr "Hata" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Hata" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" +"PlayWiimote'da hata. %u != %u, byte %d.\n" +"Ãœzgünüz, Wii kaydında geçici hasar var." + +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/Main.cpp:346 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." @@ -2241,6 +2336,11 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +<<<<<<< HEAD +======= +"Hata: \"%s\" 'dan sonra, %d (0x%X) bulundu ( %d (0x%X) yerine). Durum kaydı " +"yüklemesinden vazgeçiliyor..." +>>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format @@ -2685,6 +2785,7 @@ msgstr "Çekilecek Çerçeveler" msgid "Free Look" msgstr "Serbest Bakış" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2694,6 +2795,11 @@ msgstr "Serbest Bakış" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Clean up Turkish translation file. msgid "French" msgstr "Fransızca" @@ -2719,9 +2825,14 @@ msgid "GCI File(*.gci)" msgstr "GCI Dosyası (*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +<<<<<<< HEAD #, fuzzy msgid "GCMic Configuration" msgstr "GeçmiÅŸ Yapılandırması" +======= +msgid "GCMic Configuration" +msgstr "GCMic Yapılandırması" +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -2761,10 +2872,14 @@ msgstr "Gamecube Kolu Ayarları (&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Clean up Turkish translation file. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" @@ -2788,11 +2903,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Genel" @@ -2801,6 +2921,7 @@ msgstr "Genel" msgid "General Settings" msgstr "Genel Ayarlar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2810,6 +2931,11 @@ msgstr "Genel Ayarlar" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Clean up Turkish translation file. msgid "German" msgstr "Almanca" @@ -2939,11 +3065,16 @@ msgstr "Kısayol TuÅŸu Yapılandırması" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Clean up Turkish translation file. msgid "Hotkeys" msgstr "TuÅŸlar" @@ -3014,6 +3145,11 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +<<<<<<< HEAD +======= +"EÄŸer iÅŸaretlenmiÅŸse, sınırlayıcı kutu kayıtları güncellenecektir. Paper " +"Mario oyunları tarafından kullanılır." +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" @@ -3166,11 +3302,15 @@ msgstr "" "Kurulum Özel Durum Ä°ÅŸleyici çaÄŸrıldı, ama bu platform henüz bunu " "desteklemiyor." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Clean up Turkish translation file. msgid "Installing WAD..." msgstr "WAD kuruluyor..." @@ -3252,6 +3392,7 @@ msgstr "Hatalı çekim dosyası" msgid "Invalid state" msgstr "Hatalı durum" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3261,6 +3402,11 @@ msgstr "Hatalı durum" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Clean up Turkish translation file. msgid "Italian" msgstr "Ä°talyanca" @@ -3418,6 +3564,7 @@ msgstr "Durumu Yükle : 8" msgid "Load State..." msgstr "Durumu Yükle..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3431,6 +3578,13 @@ msgstr "Wii Sistem Menüsünü Yükle" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Wii Sistem Menüsünü Yükle" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Clean up Turkish translation file. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii Sistem Menüsünü Yükle %d%c" @@ -3512,11 +3666,15 @@ msgstr "MMU Hız Hilesi" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark dosyaları(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Ana Çubuk" @@ -3548,10 +3706,14 @@ msgstr "Hafıza Baytı" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Clean up Turkish translation file. msgid "Memory Card" msgstr "Hafıza Kartı" @@ -3749,11 +3911,15 @@ msgstr "NP Sekme" msgid "NP Up" msgstr "NP Yukarı" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3840,11 +4006,15 @@ msgstr "EÅŸit DeÄŸil" msgid "Not Set" msgstr "Ayarlanmamış" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Clean up Turkish translation file. msgid "Not connected" msgstr "BaÄŸlı deÄŸil" @@ -3906,9 +4076,13 @@ msgstr "Sadece %d blok kullanılabilir" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Clean up Turkish translation file. msgid "Open" msgstr "Aç" @@ -4039,6 +4213,7 @@ msgstr "Yamalar" msgid "Paths" msgstr "Yollar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4046,6 +4221,10 @@ msgstr "Yollar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Duraklat" @@ -4066,12 +4245,17 @@ msgstr "Perspektif %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Clean up Turkish translation file. msgid "Play" msgstr "Oynat" @@ -4097,11 +4281,15 @@ msgstr "Oynatma Seçenekleri" msgid "Players" msgstr "Oyuncular" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Clean up Turkish translation file. msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -4153,17 +4341,29 @@ msgstr "Geç Ä°ÅŸleme Etkisi:" #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "PlayController'da erken kayıt bitiÅŸi. %u + 8 > %u" +>>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:829 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u + %d > %u" +>>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:806 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u > %u" +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4312,6 +4512,7 @@ msgstr "Listeyi Yenile" msgid "Refresh game list" msgstr "Oyun Listesini Yenile" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4323,6 +4524,12 @@ msgstr "Oyun Listesini Yenile" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Clean up Turkish translation file. msgid "Remove" msgstr "Kaldır" @@ -4342,9 +4549,13 @@ msgstr "Ana pencerede yorumla" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Sıfırla" @@ -4387,11 +4598,15 @@ msgstr "Durumu Kaydet (&V)" msgid "Safe" msgstr "Güvenli" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Clean up Turkish translation file. msgid "Sample Rate:" msgstr "Örnek Oran:" @@ -4475,11 +4690,15 @@ msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." msgid "Scaled EFB Copy" msgstr "Boyutlandırılmış EFB Kopyası" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Clean up Turkish translation file. #, c-format msgid "Scanning %s" msgstr "Taranıyor %s" @@ -4519,6 +4738,7 @@ msgstr "SYSCONF içinde %s bölümü bulunamadı" msgid "Select" msgstr "Seç" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4534,6 +4754,14 @@ msgstr "Çekim Dosyasını Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Çekim Dosyasını Seç" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Clean up Turkish translation file. msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" @@ -4559,6 +4787,7 @@ msgstr "Sabit olmayan pencereyi seçin" msgid "Select the file to load" msgstr "Yüklemek için dosyayı seçin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4571,15 +4800,22 @@ msgstr "Yüklemek için durum seçin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Clean up Turkish translation file. msgid "Select the save file" msgstr "Kayıt dosyasını seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Yüklemek için durum seçin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Clean up Turkish translation file. msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" @@ -4955,6 +5191,7 @@ msgstr "Ses tamponu oluÅŸturulamadı: %s" msgid "Space" msgstr "BoÅŸluk" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4964,6 +5201,11 @@ msgstr "BoÅŸluk" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Clean up Turkish translation file. msgid "Spanish" msgstr "Ä°spanyolca" @@ -5007,11 +5249,15 @@ msgstr "Kare Çubuk" msgid "Standard Controller" msgstr "Varsayılan Denetim Aygıtı" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5047,9 +5293,13 @@ msgstr "Çubuk" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Durdur" @@ -5127,15 +5377,23 @@ msgstr "Tablo SaÄŸ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Clean up Turkish translation file. msgid "Take Screenshot" msgstr "Ekran Görüntüsü Al" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "TaruKonga (Bongos)" +<<<<<<< HEAD msgstr "" +======= +msgstr "TaruKonga (Bongos)" +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5374,18 +5632,26 @@ msgstr "Tüm GeçmiÅŸ Türlerini Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Clean up Turkish translation file. msgid "Toggle Fullscreen" msgstr "Tam Ekran Moduna Geç" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Clean up Turkish translation file. msgid "Top" msgstr "Ãœst" @@ -5494,6 +5760,7 @@ msgstr "Åžu ID ile bilinmeyen mesaj alındı : %d" 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!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5506,6 +5773,8 @@ msgstr "" "Devam?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Clean up Turkish translation file. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5667,6 +5936,13 @@ msgid "" "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" +<<<<<<< HEAD +======= +"Dikkat: Åžu anki kaydın bitiÅŸinden sonra yer alan bir kayıt yüklediniz. (Bayt " +"%u > %u) (Çerçeve %u > %u). Devam etmeden önce baÅŸka bir kayıt yüklemeniz, " +"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." +>>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:646 #, c-format @@ -5675,6 +5951,13 @@ msgid "" "should load another save before continuing, or load this state with read-" "only mode off. Otherwise you'll probably get a desync." msgstr "" +<<<<<<< HEAD +======= +"Dikkat: Bayt %d (0x%X) ile eÅŸleÅŸmeyen bir kayıt yüklediniz. Devam etmeden " +"önce baÅŸka bir kayıt yüklemeniz, 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." +>>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:655 #, c-format @@ -5694,6 +5977,24 @@ 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 "" +<<<<<<< HEAD +======= +"Dikkat: Çerçeve %d ile eÅŸleÅŸmeyen bir kayıt yüklediniz. Devam etmeden önce " +"baÅŸka bir kayıt yüklemeniz, 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.\n" +"\n" +"Daha fazla bilgi: Åžu anki kayıt %d çerçeve uzunluÄŸunda, ama durum kaydı %d " +"çerçeve uzunluÄŸunda.\n" +"\n" +"Çerçeve %d 'de, ÅŸu anki kayıt bunları basıyor:\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" +"Çerçeve %d 'de, durum kaydı bunları basıyor:\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" +>>>>>>> Clean up Turkish translation file. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5728,11 +6029,15 @@ msgstr "Wii NAND Kök Dizini:" msgid "Wii Save Import" msgstr "Wii Kaydı Al" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Clean up Turkish translation file. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -5763,11 +6068,15 @@ msgstr "" "bir zaman aşımı olabilir veya baÅŸka bir ÅŸey olabilir. \n" "Tekrar baÄŸlamak istiyor musunuz?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Clean up Turkish translation file. msgid "Wiimote Connected" msgstr "Wiimote BaÄŸlandı" @@ -5799,6 +6108,7 @@ msgstr "Pencereleri SaÄŸa Döşe" msgid "Word Wrap" msgstr "Heceleme" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5808,6 +6118,11 @@ msgstr "Heceleme" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Clean up Turkish translation file. msgid "Working..." msgstr "Çalışıyor..." @@ -6112,11 +6427,17 @@ msgstr "| VEYA" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "%s açılamıyor, kayıp bir iÅŸleve sahip." +<<<<<<< HEAD <<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "Salt-okunur modda film çekilemez." ======= +======= +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "Salt-okunur modda film çekilemez." + +>>>>>>> Clean up Turkish translation file. #, fuzzy >>>>>>> Update Hungarian and Turkish translations. #~ msgid "Config..." @@ -6230,9 +6551,6 @@ msgstr "| VEYA" #~ msgid "Emulator Display Settings" #~ msgstr "Emülatör Görüntü Ayarları" -#~ msgid "Enable Bounding Box Calculation" -#~ msgstr "Sınırlayıcı Kutu Hesaplama'yı EtkinleÅŸtir" - #, fuzzy #~ msgid "Enable CPU Access" #~ msgstr "Ön BelleÄŸe Ä°zin Ver" @@ -6296,13 +6614,6 @@ msgstr "| VEYA" #~ msgid "Error allocating buffer" #~ msgstr "Tampon ayırma hatası" -#~ msgid "" -#~ "Error in PlayWiimote. %u != %u, byte %d.\n" -#~ "Sorry, Wii recording is temporarily broken." -#~ msgstr "" -#~ "PlayWiimote'da hata. %u != %u, byte %d.\n" -#~ "Ãœzgünüz, Wii kaydında geçici hasar var." - #~ msgid "Error loading %s: can't read info" #~ msgstr "%s yüklenirken hata: Bilgi okunamıyor." @@ -6315,13 +6626,6 @@ msgstr "| VEYA" #~ msgid "Error opening file %s for recording" #~ msgstr "Kayıt için %s dosyasını açarken hata." -#~ msgid "" -#~ "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -#~ "Aborting savestate load..." -#~ msgstr "" -#~ "Hata: \"%s\" 'dan sonra, %d (0x%X) bulundu ( %d (0x%X) yerine). Durum " -#~ "kaydı yüklemesinden vazgeçiliyor..." - #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6360,9 +6664,6 @@ msgstr "| VEYA" #~ "Dokuya EFB Kopyalamaktan daha doÄŸrudur, ve bazı oyunlar düzgün çalışmak " #~ "için buna ihtiyaç duyar, ama çok yavaÅŸ olabilir." -#~ msgid "GCMic Configuration" -#~ msgstr "GCMic Yapılandırması" - #, fuzzy #~ msgid "GFX Config" #~ msgstr "Yapılandırma" @@ -6388,13 +6689,6 @@ msgstr "| VEYA" #~ "EÄŸer bir oyun çakılırsa, sadece Interpreter'da çalışıyorsa veya Dolphin " #~ "çökerse, bu seçenek oyunu düzeltebilir." -#~ msgid "" -#~ "If checked, the bounding box registers will be updated. Used by the Paper " -#~ "Mario games." -#~ msgstr "" -#~ "EÄŸer iÅŸaretlenmiÅŸse, sınırlayıcı kutu kayıtları güncellenecektir. Paper " -#~ "Mario oyunları tarafından kullanılır." - #~ msgid "Input Source" #~ msgstr "GiriÅŸ Kaynağı" @@ -6489,15 +6783,6 @@ msgstr "| VEYA" #~ "Dolphin'i salt okunur bir konumdan veya kurulmadığı yerden mi " #~ "çalıştırıyorsunuz?" -#~ msgid "Premature movie end in PlayController. %u + 8 > %u" -#~ msgstr "PlayController'da erken kayıt bitiÅŸi. %u + 8 > %u" - -#~ msgid "Premature movie end in PlayWiimote. %u + %d > %u" -#~ msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u + %d > %u" - -#~ msgid "Premature movie end in PlayWiimote. %u > %u" -#~ msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u > %u" - #, fuzzy #~ msgid "Projection Stats" #~ msgstr "Özel Görüntüleme Hilesi Ayarları" @@ -6624,9 +6909,6 @@ msgstr "| VEYA" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Oyununuz tam ekran görüntüyle baÅŸlar." -#~ msgid "TaruKonga (Bongos)" -#~ msgstr "TaruKonga (Bongos)" - #~ msgid "The file " #~ msgstr "Dosya" @@ -6678,61 +6960,6 @@ msgstr "| VEYA" #~ "Dikey boÅŸlukları bekle. \n" #~ "Yırtılmayı azaltır ama performansı da azaltır." -#~ msgid "" -#~ "Warning: You loaded a save that's after the end of the current movie. " -#~ "(byte %u > %u) (frame %u > %u). You should load another save before " -#~ "continuing, or load this state with read-only mode off." -#~ msgstr "" -#~ "Dikkat: Åžu anki kaydın bitiÅŸinden sonra yer alan bir kayıt yüklediniz. " -#~ "(Bayt %u > %u) (Çerçeve %u > %u). Devam etmeden önce baÅŸka bir kayıt " -#~ "yüklemeniz, 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." - -#~ msgid "" -#~ "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " -#~ "should load another save before continuing, or load this state with read-" -#~ "only mode off. Otherwise you'll probably get a desync." -#~ msgstr "" -#~ "Dikkat: Bayt %d (0x%X) ile eÅŸleÅŸmeyen bir kayıt yüklediniz. Devam etmeden " -#~ "önce baÅŸka bir kayıt yüklemeniz, 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." - -#~ msgid "" -#~ "Warning: You loaded a save whose movie mismatches on frame %d. You should " -#~ "load another save before continuing, or load this state with read-only " -#~ "mode off. Otherwise you'll probably get a desync.\n" -#~ "\n" -#~ "More information: The current movie is %d frames long and the savestate's " -#~ "movie is %d frames long.\n" -#~ "\n" -#~ "On frame %d, the current movie presses:\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" -#~ "On frame %d, the savestate's movie presses:\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" -#~ msgstr "" -#~ "Dikkat: Çerçeve %d ile eÅŸleÅŸmeyen bir kayıt yüklediniz. Devam etmeden " -#~ "önce baÅŸka bir kayıt yüklemeniz, 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.\n" -#~ "\n" -#~ "Daha fazla bilgi: Åžu anki kayıt %d çerçeve uzunluÄŸunda, ama durum kaydı " -#~ "%d çerçeve uzunluÄŸunda.\n" -#~ "\n" -#~ "Çerçeve %d 'de, ÅŸu anki kayıt bunları basıyor:\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" -#~ "Çerçeve %d 'de, durum kaydı bunları basıyor:\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" - #~ msgid "" #~ "When using EFB to RAM we very often need to decode RAM data to a VRAM " #~ "texture, which is a very time-consuming task.\n" From 5c66c5b138071e454061f3a68b578f7bd2f01d95 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Wed, 28 Dec 2011 08:55:06 -0600 Subject: [PATCH 045/185] Update Hungarian translation. --- Languages/po/hu.po | 666 +++++++++++++++------------------------------ 1 file changed, 224 insertions(+), 442 deletions(-) diff --git a/Languages/po/hu.po b/Languages/po/hu.po index 27ed2a0941..7bdf045357 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -21,8 +21,12 @@ msgstr "" >>>>>>> Update Hungarian and Turkish translations. ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-12-27 08:22-0600\n" >>>>>>> Update from master branch. +======= +"PO-Revision-Date: 2011-12-28 09:44+0100\n" +>>>>>>> Update Hungarian translation. "Last-Translator: Delirious \n" "Language-Team: Delirious \n" "Language: Hungarian\n" @@ -128,8 +132,7 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s memóriakártyakénti betöltése sikertelen\n" -"a fájl nem elég nagy ahhoz, hogy megfelelÅ‘ memóriakártya fájl lehessen (0x%x " -"bájt)" +"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:367 #, c-format @@ -264,7 +267,7 @@ msgstr "&Memória" #: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Open..." -msgstr "&Megnyitás" +msgstr "&Megnyitás..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "&Options" @@ -395,19 +398,17 @@ msgid "" "(Only the Microsoft bluetooth stack is supported.)" msgstr "" "Nem található támogatott bluetooth eszköz!\n" -"(Csak a Microsoft bluetooth eszközök támogatottak.)" +"(Csak Microsoft rangsorolású bluetooth eszköz támogatott.)" #: Source/Core/DolphinWX/Src/NetWindow.cpp:93 msgid "" "ALERT:\n" "\n" -"NetPlay will currently only work properly when using the following " -"settings:\n" +"NetPlay will currently only work properly when using the following settings:\n" " - Dual Core [OFF]\n" " - Audio Throttle [OFF]\n" " - DSP-HLE with \"Null Audio\" or DSP-LLE\n" -" - Manually set the exact number of controllers that will be used to " -"[Standard Controller]\n" +" - Manually set the exact number of controllers that will be used to [Standard Controller]\n" "\n" "All players should try to use the same Dolphin version and settings.\n" "Disable all memory cards or send them to all players before starting.\n" @@ -417,17 +418,14 @@ msgid "" msgstr "" "FIGYELEM:\n" "\n" -"A NetPlay jelenleg csak a következÅ‘ beállítások használatával működik " -"megfelelÅ‘en:\n" +"A NetPlay jelenleg csak a következÅ‘ beállítások használatával működik megfelelÅ‘en:\n" " - Dual Core [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" +" - 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" +"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!!" @@ -468,14 +466,12 @@ msgstr "Pontos VBeam emuláció" >>>>>>> Update Hungarian and Turkish translations. msgid "" "Accurately emulate EFB copies.\n" -"Some games depend on this for certain graphical effects or gameplay " -"functionality.\n" +"Some games depend on this for certain graphical effects or gameplay functionality.\n" "\n" "If unsure, check EFB to Texture instead." msgstr "" "EFB másolatok pontos emulációja.\n" -"Néhány játék számára elengedhetetlen bizonyos grafikai effektushoz vagy a " -"játszhatóság végett.\n" +"Néhány játék számára elengedhetetlen bizonyos grafikai effektushoz vagy a játszhatóság végett.\n" "\n" "Ha bizonytalan vagy, válaszd az EFB textúrába másolása lehetÅ‘séget." @@ -501,38 +497,23 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "" -"Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kód " -"hozzáadásban (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kód hozzáadásban (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:756 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " -"(%s)" -msgstr "" -"Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kitöltésben " -"és regiszterben (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" +msgstr "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kitöltésben és regiszterben (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:549 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " -"Fill (%s)" -msgstr "" -"Action Replay hiba: érvénytelen méret (%08x : address = %08x) a RAM írásban " -"és kitöltésben (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" +msgstr "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a RAM írásban és kitöltésben (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:609 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " -"Pointer (%s)" -msgstr "" -"Action Replay hiba: érvénytelen méret (%08x : address = %08x) a mutató " -"írásában (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" +msgstr "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a mutató írásában (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -541,8 +522,7 @@ msgstr "Action Replay hiba: érvénytelen érték (%08x) a memória másolásban #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" msgstr "Action Replay hiba: Mester kód és CCXXXXXX írása nincs beépítve (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -617,16 +597,14 @@ msgstr "Cím:" msgid "" "Adds the specified value to zFar Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " -"the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" "Meghatározott értéket ad a zFar paraméterhez.\n" "Két módja a lebegÅ‘pontos értékek kifejezésének.\n" -"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos " -"hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" +"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" "Értékek: (0->+/-egész szám) vagy (0->+/-FP[6 számjegyes pontosság])\n" "\n" "MEGJEGYZÉS: EllenÅ‘rizd a napló ablakot/konzolt a kapott értékekhez." @@ -635,25 +613,21 @@ msgstr "" msgid "" "Adds the specified value to zNear Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " -"the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" "Meghatározott értéket ad a zNear paraméterhez.\n" "Két módja a lebegÅ‘pontos értékek kifejezésének.\n" -"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos " -"hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" +"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" "Értékek: (0->+/-egész szám) vagy (0->+/-FP[6 számjegyes pontosság])\n" "\n" "MEGJEGYZÉS: EllenÅ‘rizd a napló ablakot/konzolt a kapott értékekhez." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "" -"Az analóg irányító gombok aktiválásához szükséges lenyomás érzékenységének " -"beállítása." +msgstr "Az analóg irányító gombok aktiválásához szükséges lenyomás érzékenységének beállítása." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" @@ -704,13 +678,11 @@ msgstr "Minden fájl (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Bizonyos opciók elérhetÅ‘vé válnak a 3, 4, 5, 6 és 7 gyorsbillentyűkkel az " -"emulációs ablakon belül.\n" +"Bizonyos opciók elérhetÅ‘vé válnak a 3, 4, 5, 6 és 7 gyorsbillentyűkkel az emulációs ablakon belül.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -739,8 +711,7 @@ msgstr "Élsimítás:" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:317 msgid "Apploader is the wrong size...is it really an apploader?" -msgstr "" -"A betöltÅ‘ program nem megfelelÅ‘ méretű...ez tényleg egy betöltÅ‘ program?" +msgstr "A betöltÅ‘ program nem megfelelÅ‘ méretű...ez tényleg egy betöltÅ‘ program?" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:311 msgid "Apploader unable to load from file" @@ -752,7 +723,7 @@ msgstr "BetöltÅ‘ program:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 msgid "Apply" -msgstr "Elfogadás" +msgstr "Alkalmaz" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" @@ -760,7 +731,7 @@ msgid "" "\n" "If unsure, select (off)." msgstr "" -"Egy képkocka elkészültét követÅ‘en egy utófeldolgozási effektus alkalmazása.\n" +"Képkocka létrehozását követÅ‘en utófeldolgozási effektus alkalmazása.\n" "\n" "Ha bizonytalan vagy, válaszd ezt: (ki)." @@ -856,10 +827,8 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Automatikusan létrehozza a mipmapeket, inkább mintsem kikódolná azokat a " -"memóriából.\n" -"Egy keveset növel a teljesítményen, de kisebb textúra hiányosságokat " -"okozhat.\n" +"Automatikusan létrehozza a mipmapeket, inkább mintsem kikódolná azokat a memóriából.\n" +"Egy keveset növel a teljesítményen, de kisebb textúra hiányosságokat okozhat.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -949,7 +918,7 @@ msgstr "Kék jobbra" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. msgid "Bottom" -msgstr "Lent" +msgstr "Gomb" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 #, c-format @@ -1013,17 +982,12 @@ msgstr "KijelzÅ‘ listák gyorsítótárazása" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" +"In contrast to pixel lighting (which is merely an enhancement), per-pixel depth calculations are necessary to properly emulate a small number of games.\n" "\n" "If unsure, leave this checked." msgstr "" -"A 3D-s grafika mélységének értékét képpont alapon számolja inkább, mintsem " -"csúcspont alapon.\n" -"Ellentétben a képpont megvilágítással (ami pusztán egy finomítás), a képpont " -"alapú mélység számítás csupán csak néhány játék pontos emulálásához " -"szükséges.\n" +"A 3D-s grafika mélységének értékét képpont alapon számolja inkább, mintsem csúcspont alapon.\n" +"Ellentétben a képpont megvilágítással (ami pusztán egy finomítás), a képpont alapú mélység számítás csupán csak néhány játék pontos emulálásához szükséges.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -1035,8 +999,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"A 3D-s grafikai fényhatásokat képpont alapon számolja inkább, mintsem " -"csúcspont alapon.\n" +"A 3D-s grafikai fényhatásokat képpont alapon számolja inkább, mintsem csúcspont alapon.\n" "Néhány százalékkal csökkenti az emuláció sebességét (videókártyától függ).\n" "Ez többnyire biztonságos finomítás, de idÅ‘nként hibákat okozhat.\n" "\n" @@ -1045,7 +1008,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" -msgstr "Mégsem" +msgstr "Mégse" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 @@ -1066,7 +1029,7 @@ msgstr "A mozgások rögzítése nem lehetséges írásvédett módban." >>>>>>> Update from master branch. #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" -msgstr "Nem lehet események bejegyzéseket törölni függÅ‘ben lévÅ‘ eseményekkel" +msgstr "Nem lehet esemény bejegyzéseket törölni függÅ‘ben lévÅ‘ eseményekkel" <<<<<<< HEAD <<<<<<< HEAD @@ -1211,12 +1174,8 @@ msgid "Choose a memory card:" msgstr "Válassz memóriakártyát:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -msgid "" -"Choose file to use as apploader: (applies to discs constructed from " -"directories only)" -msgstr "" -"Válassz betöltÅ‘ programnak használandó fájlt: (csak könyvtárakból " -"létrehozott lemezekre érvényesíthetÅ‘)" +msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" +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:768 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 @@ -1243,12 +1202,8 @@ msgid "Clear failed." msgstr "Törlés sikertelen." #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "" -"Client disconnect while game is running!! NetPlay is disabled. You must " -"manually stop the game." -msgstr "" -"A kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. Kézileg " -"kell leállítanod a játékot." +msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." +msgstr "A kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. Kézileg kell leállítanod a játékot." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 @@ -1418,14 +1373,8 @@ msgstr "%s hang feldolgozó iniciálása sikertelen." #: 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 " -"backup. Please note that original Gamecube and Wii discs cannot be read by " -"most PC DVD drives." -msgstr "" -"\"%s\" nem olvasható. Nincs lemez a meghajtóban, vagy ez nem egy GC/Wii " -"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." +msgid "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii backup. Please note that original Gamecube and Wii discs cannot be read by most PC DVD drives." +msgstr "\"%s\" nem olvasható. Nincs lemez a meghajtóban, vagy ez nem egy GC/Wii 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:294 #, c-format @@ -1450,8 +1399,7 @@ msgstr "" msgid "" "Could not write memory card file %s.\n" "\n" -"Are you running Dolphin from a CD/DVD, or is the save file maybe write " -"protected?" +"Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?" msgstr "" "%s memóriakártya fájl nem írható.\n" "\n" @@ -1493,10 +1441,8 @@ msgid "Created by KDE-Look.org" msgstr "Készítette: KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"Készítette: Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +msgstr "Készítette: Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" @@ -1504,8 +1450,7 @@ msgstr "Készítette: VistaIcons.com" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "" -"Készítette: black_rider és közzétette ForumW.org > Web Developments oldalon" +msgstr "Készítette: black_rider és közzétette ForumW.org > Web Developments oldalon" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 msgid "Creator: " @@ -1681,12 +1626,8 @@ msgstr "Észlelés" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -msgid "" -"Detected attempt to read more data from the DVD than fit inside the out " -"buffer. Clamp." -msgstr "" -"A kimeneti puffernél nagyobb adamennyiség kiolvasására történÅ‘ probálkozás " -"észlelve a DVD lemezrÅ‘l. Beszabályozás." +msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." +msgstr "A kimeneti puffernél nagyobb adamennyiség kiolvasására történÅ‘ probálkozás észlelve a DVD lemezrÅ‘l. Beszabályozás." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 @@ -1742,32 +1683,24 @@ msgstr "Textúrák kikapcsolása" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" -"Speeds up emulation a lot but causes heavy glitches in many games which rely " -"on them (especially homebrew applications).\n" +"Speeds up emulation a lot but causes heavy glitches in many games which rely on them (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Bármilyen XFB emuláció kikapcsolása.\n" -"Nagymértékben gyorsítja az emulációt, de számos grafikai hibát okoz sok " -"olyan játékban, amelyhez szükséges az XFB (fÅ‘leg egyedi fejlesztésű " -"alkalmazások).\n" +"Nagymértékben gyorsítja az emulációt, de számos grafikai hibát okoz sok olyan játékban, amelyhez szükséges az XFB (fÅ‘leg egyedi fejlesztésű alkalmazások).\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" -"These are often used for post-processing or render-to-texture effects, so " -"while checking this setting gives a great speedup it almost always also " -"causes issues.\n" +"These are often used for post-processing or render-to-texture effects, so while checking this setting gives a great speedup it almost always also causes issues.\n" "\n" "If unsure, leave this unchecked." msgstr "" "EFB másolatok emulációjának kikapcsolása.\n" -"A másolatok gyakran használatosak utófeldolgozáshoz vagy textúra " -"megjelenítési effektusokhoz, ezért ennek a beállításnak a kijelölésével " -"nagymértékű sebesség növekedés érhetÅ‘ el, azonban majdnem mindig hibákat is " -"okoz.\n" +"A másolatok gyakran használatosak utófeldolgozáshoz vagy textúra megjelenítési effektusokhoz, ezért ennek a beállításnak a kijelölésével nagymértékű sebesség növekedés érhetÅ‘ el, azonban majdnem mindig hibákat is okoz.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -1881,20 +1814,12 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin &Google Code oldal" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -msgid "" -"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " -"files..." -msgstr "" -"Dolphin nem talált egyetlen GC/Wii ISO fájlt sem. Fájlok tallózásához dupla " -"kattintás ide..." +msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." +msgstr "Dolphin nem talált egyetlen GC/Wii ISO fájlt sem. Fájlok tallózásához dupla kattintás ide..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -msgid "" -"Dolphin is currently set to hide all games. Doubleclick here to show all " -"games..." -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..." +msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." +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/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -1940,8 +1865,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Az összes létrehozott képkocka mentése egy AVI fájlba ide: User/Dump/" -"Frames/\n" +"Az összes létrehozott képkocka mentése egy AVI fájlba ide: User/Dump/Frames/\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -1993,16 +1917,8 @@ msgstr "EFB másolatok" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, c-format -msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " -"version %d.%d -- If you recently upgraded your Dolphin distribution, a " -"reboot is probably required at this point to get Windows to see the new " -"driver." -msgstr "" -"HIBA: A Dolphin ezen változatához szükséges a TAP-Win32 driver %d.%d " -"verziója legalább -- Ha mostanában telepítetted a Dolphin emulátort, akkor " -"valószínűleg újra kell indítanod a számítógépet, hogy a Windows felismerje " -"az új illesztÅ‘programot." +msgid "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least version %d.%d -- If you recently upgraded your Dolphin distribution, a reboot is probably required at this point to get Windows to see the new driver." +msgstr "HIBA: A Dolphin ezen változatához szükséges a TAP-Win32 driver %d.%d verziója legalább -- Ha mostanában telepítetted a Dolphin emulátort, akkor valószínűleg újra kell indítanod a számítógépet, hogy a Windows felismerje az új illesztÅ‘programot." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -2052,30 +1968,24 @@ msgstr "Az emuláció már fut" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" -"Slows down emulation a lot and prohibits high-resolution rendering but is " -"necessary to emulate a number of games properly.\n" +"Slows down emulation a lot and prohibits high-resolution rendering but is necessary to emulate a number of games properly.\n" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" "Az XFB pontos emulációja.\n" -"JelentÅ‘sen lassítja az emulációt és korlátozza a nagy felbontású " -"megjelenítést, azonban szükséges számos játék pontos emulációjához.\n" +"JelentÅ‘sen lassítja az emulációt és korlátozza a nagy felbontású megjelenítést, azonban szükséges számos játék pontos emulációjához.\n" "\n" "Ha bizonytalan vagy, jelöld ki inkább az XFB emulációt." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" -"Fixes many games which don't work without XFB emulation while not being as " -"slow as real XFB emulation. However, it may still fail for a lot of other " -"games (especially homebrew applications).\n" +"Fixes many games which don't work without XFB emulation while not being as slow as real XFB emulation. However, it may still fail for a lot of other games (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "XFB emuláció grafikai processzor textúra objektumainak használatával.\n" -"Javít sok XFB emuláció nélkül nem működÅ‘ játékot miközben nem olyan lassú, " -"mint a valódi XFB emuláció. Azonban, még mindig nem használható sok más " -"játék esetén (fÅ‘leg egyedi fejlesztésű alkalmazások).\n" +"Javít sok XFB emuláció nélkül nem működÅ‘ játékot miközben nem olyan lassú, mint a valódi XFB emuláció. Azonban, még mindig nem használható sok más játék esetén (fÅ‘leg egyedi fejlesztésű alkalmazások).\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -2093,15 +2003,13 @@ msgstr "Használat" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" -"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " -"supported by your GPU.\n" +"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\n" "Possibly causes issues.\n" "Requires fullscreen to work.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"A 3D-s effektusok megjelenítése sztereoszkópikus módon az Nvidia 3D Vision " -"technológia használatával, ha támogatja a videókártya.\n" +"A 3D-s effektusok megjelenítése sztereoszkópikus módon az Nvidia 3D Vision technológia használatával, ha támogatja a videókártya.\n" "Estleg hibákat okozhat.\n" "Működéséhez teljes képernyÅ‘ szükséges.\n" "\n" @@ -2213,12 +2121,8 @@ msgstr "" "Ha bizonytalan vagy, válaszd ezt: 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "" -"Enable fast disc access. Needed for a few 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)" +msgid "Enable fast disc access. Needed for a few 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/DolphinWX/Src/MemcardManager.cpp:799 msgid "Enable pages" @@ -2238,33 +2142,21 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" -"Enable this if you want to use the main Dolphin window for rendering rather " -"than a separate render window.\n" +"Enable this if you want to use the main Dolphin window for rendering rather than a separate render window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Kapcsold be ha azt akarod, hogy inkább a Dolphin fÅ‘ ablakában jelenjen meg " -"az emuláció, mint sem egy különálló ablakban.\n" +"Kapcsold be ha azt akarod, hogy inkább a Dolphin fÅ‘ ablakában jelenjen meg az emuláció, mint sem egy különálló ablakban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -msgid "" -"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " -"ANY other game." -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." +msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." +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:311 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Bekapcsolja a Blokk cím átvitelt (BAT); a memória vezérlÅ‘ egység egyik " -"funkcióját. A hardverhez viszonyítva pontos, de az emulációhoz lassú. (BE = " -"kompatibilis, KI = gyors)" +msgid "Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)" +msgstr "Bekapcsolja a Blokk cím átvitelt (BAT); a memória vezérlÅ‘ egység egyik funkcióját. A hardverhez viszonyítva pontos, de az emulációhoz lassú. (BE = kompatibilis, KI = gyors)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" @@ -2277,19 +2169,14 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Bekapcsolja a progresszív pásztázást, ha az támogatott az emulált szoftver " -"által.\n" +"Bekapcsolja a progresszív pásztázást, ha az támogatott az emulált szoftver által.\n" "A legtöbb játék nem használja ezt.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "" -"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " -"OFF = Fast)" -msgstr "" -"Bekapcsolja a memória kezelÅ‘ egységet (Memory Management Unit), szükséges " -"néhány játékhoz. (BE = kompatibilis, KI = gyors)" +msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" +msgstr "Bekapcsolja a memória kezelÅ‘ egységet (Memory Management Unit), szükséges néhány játékhoz. (BE = kompatibilis, KI = gyors)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" @@ -2384,12 +2271,11 @@ msgstr "" >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." -msgstr "" -"Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett " -"visszaállítva." +msgstr "Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett visszaállítva." #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format +<<<<<<< HEAD msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." @@ -2399,16 +2285,15 @@ msgstr "" "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x%X). " "Mentés betöltésének leállítása..." >>>>>>> Update from master branch. +======= +msgid "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load..." +msgstr "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x%X). Mentés betöltésének leállítása..." +>>>>>>> Update Hungarian translation. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format -msgid "" -"Error: Trying to access %s fonts but they are not loaded. Games may not show " -"fonts correctly, or crash." -msgstr "" -"Hiba: A(z) %s betűtípusokhoz történÅ‘ hozzáférési próbálkozás során, a " -"betöltésük sikertelen. A játékokban a betűk lehet nem jelennek meg " -"megfelelÅ‘en, vagy kifagynak." +msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." +msgstr "Hiba: A(z) %s betűtípusokhoz történÅ‘ hozzáférési próbálkozás során, a betöltésük sikertelen. A játékokban a betűk lehet nem jelennek meg megfelelÅ‘en, vagy kifagynak." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2598,8 +2483,7 @@ msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -"A blokk kiosztási tábla biztonsági mentésének pontos visszaolvasása " -"sikertelen\n" +"A blokk kiosztási tábla biztonsági mentésének pontos visszaolvasása sikertelen\n" "(0x8000-0x9FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:144 @@ -2768,8 +2652,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Kényszerített textúra szűrés lesz még akkor is, ha a játék határozottan " -"letiltotta azt.\n" +"Kényszerített textúra szűrés lesz még akkor is, ha a játék határozottan letiltotta azt.\n" "Némileg javítja a textúra minÅ‘séget, de képhibákat okozhat néhány játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -2781,7 +2664,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"A játék kiemeneti grafikája kényszerített szélesvásznú felbontású lesz.\n" +"A játék kimeneti grafikája kényszerített szélesvásznú felbontású lesz.\n" "Grafikai hibákat okozhat néhány játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -2789,12 +2672,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" -"Left unchecked, dolphin defaults to NTSC-U and automatically enables this " -"setting when playing Japanese games." +"Left unchecked, dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games." msgstr "" "Az NTSC-J működési módot kényszeríti japán ROM betűkészlet használatához.\n" -"Hagyd kijelöletlenül, a Dolphin alapértelmezett az NTSC-U és automatikusan " -"bekapcsolódik ez a beállítás japán játékok használatakor." +"Hagyd kijelöletlenül, a Dolphin alapértelmezett az NTSC-U és automatikusan bekapcsolódik ez a beállítás japán játékok használatakor." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -3026,19 +2907,15 @@ msgstr "Nagyobb mint" ======= >>>>>>> Update Hungarian and Turkish translations. msgid "" -"Greatly increases quality of textures generated using render to texture " -"effects.\n" +"Greatly increases quality of textures generated using render to texture effects.\n" "Raising the internal resolution will improve the effect of this setting.\n" -"Slightly decreases performance and possibly causes issues (although " -"unlikely).\n" +"Slightly decreases performance and possibly causes issues (although unlikely).\n" "\n" "If unsure, leave this checked." msgstr "" -"Nagymértékben javítja azon textúrák minÅ‘ségét, amelyeket a textúra " -"effektusokhoz használatos képalkotó hozott létre.\n" +"Nagymértékben javítja azon textúrák minÅ‘ségét, amelyeket a textúra effektusokhoz használatos képalkotó hozott létre.\n" "A belsÅ‘ felbontás növelése javítja ennek a beállításnak a hatását.\n" -"Némileg csökkenti a teljesítményt és esetlegesen hibákat okozhat (habár " -"valószínűtlen).\n" +"Némileg csökkenti a teljesítményt és esetlegesen hibákat okozhat (habár valószínűtlen).\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -3097,8 +2974,7 @@ msgid "" msgstr "" "Szia,\n" "\n" -"A Dolphin működéséhez szükséges, hogy a processzor rendelkezzen SSE2 " -"utasításkészlettel.\n" +"A Dolphin működéséhez szükséges, hogy a processzor rendelkezzen SSE2 utasításkészlettel.\n" "Sajnos a processzorod nem támogatja azt, ezért a Dolphin nem fog működni.\n" "\n" "Sayonara!\n" @@ -3160,20 +3036,16 @@ msgstr "Hibrid Wiimote" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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" +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:795 #, c-format msgid "" -"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " -"in your nand dump\n" +"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available in your nand dump\n" "TitleID %016llx.\n" " Dolphin will likely hang now" msgstr "" -"IOCTL_ES_LAUNCH: A játék megkísérelte az IOS újratöltését vagy egy olyan " -"címét ami nem érhetÅ‘ el a NAND mentésedben\n" +"IOCTL_ES_LAUNCH: A játék megkísérelte az IOS újratöltését vagy egy olyan címét ami nem érhetÅ‘ el a NAND mentésedben\n" "TitleID %016llx.\n" " A Dolphin valószínűleg kifagy most" @@ -3214,6 +3086,7 @@ msgid "Icon" msgstr "Ikon" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +<<<<<<< HEAD msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3223,22 +3096,18 @@ msgstr "" "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario " "játékok használják." >>>>>>> Update from master branch. +======= +msgid "If checked, the bounding box registers will be updated. Used by the Paper Mario games." +msgstr "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario játékok használják." +>>>>>>> Update Hungarian translation. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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 "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)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." -msgstr "" -"Ha a képkocka korlát értéke magasabb a játék teljes sebességénél (NTSC:60, " -"PAL:50), akkor a hatékonyság eléréséhez ki kell kapcsolni a hang " -"szabályozást is a DSP beállításoknál. " +msgid "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you also have to disable Audio Throttle in DSP to make it effective." +msgstr "Ha a képkocka korlát értéke magasabb a játék teljes sebességénél (NTSC:60, PAL:50), akkor a hatékonyság eléréséhez ki kell kapcsolni a hang szabályozást is a DSP beállításoknál. " #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3247,29 +3116,24 @@ msgstr "Formátum változások kihagyása" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" -"Improves performance in many games without any negative effect. Causes " -"graphical defects in a small number of other games though.\n" +"Improves performance in many games without any negative effect. Causes graphical defects in a small number of other games though.\n" "\n" "If unsure, leave this checked." msgstr "" "Minden EFB formátum változás figyelmen kívül hagyása.\n" -"Sok játékban növeli a teljesítményt bármilyen negatív hatás nélkül. Noha " -"grafikai hiányosságok jelentkezhetnek kevés egyéb játékban.\n" +"Sok játékban növeli a teljesítményt bármilyen negatív hatás nélkül. Noha grafikai hiányosságok jelentkezhetnek kevés egyéb játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" -"Improves performance in some games, but might disable some gameplay-related " -"features or graphical effects.\n" +"Improves performance in some games, but might disable some gameplay-related features or graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Figyelmen kívül hagyja a processzor összes EFB-re irányuló kiolvasási vagy " -"írási kérelmét.\n" -"Néhány játékban növeli a teljesítményt, de kikapcsolhat néhány játékmenetre " -"vonatkozó funkciót vagy grafikus effektust.\n" +"Figyelmen kívül hagyja a processzor összes EFB-re irányuló kiolvasási vagy írási kérelmét.\n" +"Néhány játékban növeli a teljesítményt, de kikapcsolhat néhány játékmenetre vonatkozó funkciót vagy grafikus effektust.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -3303,13 +3167,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" -"Improves performance but causes glitches in most games which rely on proper " -"fog emulation.\n" +"Improves performance but causes glitches in most games which rely on proper fog emulation.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Növeli a teljesítményt de képhibákat okoz azokban a játékban, amelykben " -"fontos a megfelelÅ‘ köd emuláció.\n" +"Növeli a teljesítményt de képhibákat okoz azokban a játékban, amelykben fontos a megfelelÅ‘ köd emuláció.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -3319,8 +3181,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Növeli a teljesítményt, de használatával a fényhatások eltűnnek a legtöbb " -"játékban.\n" +"Növeli a teljesítményt, de használatával a fényhatások eltűnnek a legtöbb játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -3351,7 +3212,7 @@ msgstr "Insert" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:175 msgid "Insert Encrypted or Decrypted code here..." -msgstr "Lekódolt vagy kódolatlan kódok beszúrása ide..." +msgstr "Lekódolt vagy kódolatlan kód beszúrása ide..." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" @@ -3370,10 +3231,8 @@ msgid "Install to Wii Menu" msgstr "Telepítés a Wii menübe" #: Source/Core/Core/Src/MemTools.cpp:248 -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." +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." <<<<<<< HEAD <<<<<<< HEAD @@ -3791,12 +3650,8 @@ msgid "Memory Card" msgstr "Memóriakártya" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "" -"Memory Card Manager WARNING-Make backups before using, should be fixed but " -"could mangle stuff!" -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!" +msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" +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:369 #, c-format @@ -3847,13 +3702,11 @@ msgstr "Változó" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" -"Modify textures to show the format they're encoded in. Needs an emulation " -"reset in most cases.\n" +"Modify textures to show the format they're encoded in. Needs an emulation reset in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Tetxúrák módosítása a kódolásukhoz használt formátum megjelenítéséhez. A " -"legtöbb esetben az emuláció alapra állítása szükséges.\n" +"Tetxúrák módosítása a kódolásukhoz használt formátum megjelenítéséhez. A legtöbb esetben az emuláció alapra állítása szükséges.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -3893,12 +3746,8 @@ msgid "Multiply" msgstr "Multiply" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "" -"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " -"effect on emulated wiimotes." -msgstr "" -"Lenémítja a Wiimote hangszórót. Javítja a valódi Wiimote irányítók " -"véletlenszerű lekapcsolódási hibáját. Nincs hatással az emulált irányítókra." +msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." +msgstr "Lenémítja a Wiimote hangszórót. Javítja a valódi Wiimote irányítók véletlenszerű lekapcsolódási hibáját. Nincs hatással az emulált irányítókra." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Add" @@ -4226,12 +4075,8 @@ msgid "Other" msgstr "Egyéb" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "" -"Other client disconnected while game is running!! NetPlay is disabled. You " -"manually stop the game." -msgstr "" -"A másik kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. " -"Kézileg kell leállítanod a játékot." +msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." +msgstr "A másik kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. Kézileg kell leállítanod a játékot." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4405,7 +4250,7 @@ msgstr "Portugál" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" -msgstr "Portugál (brazíliai)" +msgstr "Portugál (brazil)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" @@ -4564,8 +4409,7 @@ msgid "" "\n" "If unsure, select None." msgstr "" -"Csökkenti az éltöredezettséget, amit a képpontokra felbontott 3D-s grafika " -"okoz.\n" +"Csökkenti az éltöredezettséget, amit a képpontokra felbontott 3D-s grafika okoz.\n" "Ezáltal a megjelenített kép kevésbé lesz recézett.\n" "ErÅ‘sen csökkenti az emuláció sebességét és néha hibákat okoz.\n" "Ha bizonytalan vagy, válaszd ezt: Nincs. " @@ -4800,8 +4644,10 @@ msgstr "Keresési szűrÅ‘" msgid "Search Subfolders" msgstr "Keresés az almappákban" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 +#: Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 +#: Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "%s rész nem található a SYSCONF fájlban" @@ -4917,15 +4763,13 @@ msgstr "Kiválasztott betűtípus" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Selects the display resolution used in fullscreen mode.\n" -"This should always be bigger than or equal to the internal resolution. " -"Performance impact is negligible.\n" +"This should always be bigger than or equal to the internal resolution. Performance impact is negligible.\n" "\n" "If unsure, use your desktop resolution.\n" "If still unsure, use the highest resolution which works for you." msgstr "" "A teljes kijelzÅ‘ estén használatos felbontást állítja be.\n" -"Ennek mindig nagyobbnak, vagy azonosnak kell lennie a belsÅ‘ felbontással. " -"Hatása a teljesítményre elhanyagolható.\n" +"Ennek mindig nagyobbnak, vagy azonosnak kell lennie a belsÅ‘ felbontással. Hatása a teljesítményre elhanyagolható.\n" "\n" "Ha bizonytalan vagy, használd az asztali felbontást.\n" "Ha továbbra is bizonytalan vagy, használd a legmagasabb működÅ‘ felbontást." @@ -4933,17 +4777,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects what graphics API to use internally.\n" -"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " -"Direct3D 11 is somewhere between the two.\n" +"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. Direct3D 11 is somewhere between the two.\n" "Note that the Direct3D backends are only available on Windows.\n" "\n" "If unsure, use Direct3D 9." msgstr "" "Kiválasztja melyik grafikus API legyen használva belsÅ‘leg.\n" -"A Direct3D 9 többnyire a leggyorsabb. Az OpenGL azonban pontosabb. A " -"Direct3D 11 valahol a kettÅ‘ között van.\n" -"Vedd figyelembe, hogy a Direct3D feldolgozók csak Windows esetén állnak " -"rendelkezésre.\n" +"A Direct3D 9 többnyire a leggyorsabb. Az OpenGL azonban pontosabb. A Direct3D 11 valahol a kettÅ‘ között van.\n" +"Vedd figyelembe, hogy a Direct3D feldolgozók csak Windows esetén állnak rendelkezésre.\n" "\n" "Ha bizonytalan vagy, használd ezt: Direct3D 9." @@ -4957,17 +4798,15 @@ msgstr "ÉrzékelÅ‘ helyzete:" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:74 msgid "Separator" -msgstr "Separator" +msgstr "Elválasztó" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Szerb" #: 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. soros port - Ezt a portot használják azok az eszközök, mint a net adapter" +msgid "Serial Port 1 - This is the port which devices such as the net adapter use" +msgstr "1. soros port - Ezt a portot használják azok az eszközök, mint a net adapter" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -4985,8 +4824,7 @@ msgstr "Beállítás alapértelmezett %c. memóriakártyaként" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, c-format 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" +msgstr "SetARCode_IsActive: A jelzÅ‘szám nagyobb mint az ar kód lista mérete %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." @@ -5107,13 +4945,10 @@ msgstr "A játék leállítása elÅ‘tt megjelenik egy megerÅ‘sítÅ‘ ablak." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "" "Show a message box when a potentially serious error has occured.\n" -"Disabling this may avoid annoying and non-fatal messages, but it may also " -"mean that Dolphin suddenly crashes without any explanation at all." +"Disabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -"FigyelmeztetÅ‘ üzenet jelenik meg egy potenciálisan komoly hiba " -"bekövetkezésekor.\n" -"Kikapcsolásával megszűntethetÅ‘k a kellemetlen és nem végzetes üzenetek, de " -"ezáltal a Dolphin hirtelen kifagyhat bármilyen magyarázat nélkül." +"FigyelmeztetÅ‘ üzenet jelenik meg egy potenciálisan komoly hiba bekövetkezésekor.\n" +"Kikapcsolásával megszűntethetÅ‘k a kellemetlen és nem végzetes üzenetek, de ezáltal a Dolphin hirtelen kifagyhat bármilyen magyarázat nélkül." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Show first block" @@ -5137,13 +4972,11 @@ msgstr "MentendÅ‘ címek megjelenítése" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" -"Show the number of frames rendered per second as a measure of emulation " -"speed.\n" +"Show the number of frames rendered per second as a measure of emulation speed.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"A másodpercenként megjelenített képkockák számát jelzi ki az emuláció " -"sebességének méréséhez.\n" +"A másodpercenként megjelenített képkockák számát jelzi ki az emuláció sebességének méréséhez.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5191,13 +5024,11 @@ msgstr "Az EFB processzor hozzáférésének átugrása" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" -"Skip the destination alpha pass used in many games for various graphical " -"effects.\n" +"Skip the destination alpha pass 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" +"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." @@ -5205,15 +5036,13 @@ msgstr "" msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" -"If you're experiencing any issues, try raising texture cache accuracy or " -"disable this option.\n" +"If you're experiencing any issues, try raising texture cache accuracy or disable this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Kissé gyorsítja az EFB RAM másolatokat az emuláció pontosságának rovására.\n" "Néha a vizuális minÅ‘séget is növeli.\n" -"Ha bármely hibát tapasztalsz, próbáld növelni a textúra gyorsítótár " -"pontosságát vagy kapcsold ki ezt az opciót.\n" +"Ha bármely hibát tapasztalsz, próbáld növelni a textúra gyorsítótár pontosságát vagy kapcsold ki ezt az opciót.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5241,16 +5070,13 @@ msgstr "Szoftveres képalkotó" #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:83 msgid "" -"Software rendering is an order of magnitude slower than using the other " -"backends.\n" +"Software rendering is an order of magnitude slower than using the other backends.\n" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -"A szoftveres képleképezés egy fontosságbeli sorrenden alapul és lassabb a " -"feldolgozók használatánál.\n" +"A szoftveres képalkotó egy fontosságbeli sorrenden alapul és lassabb a feldolgozók használatánál.\n" "Csak hibakeresési célra hasznos.\n" -"Biztosan be kívánod kapcsolni a szoftveres képleképezést? Ha bizonytalan " -"vagy, válaszd ezt: 'Nem'." +"Biztosan be kívánod kapcsolni a szoftveres képalkotót? Ha bizonytalan vagy, válaszd ezt: 'Nem'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" @@ -5294,21 +5120,13 @@ msgstr "Hangszóró hangerÅ‘:" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" -"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.\n" -"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less " -"issues. Generally speaking, the lower the internal resolution is, the better " -"your performance will be.\n" +"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.\n" +"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n" "\n" "If unsure, select 640x528." msgstr "" -"Meghatározza a megjelenítéshez használatos felbontást. A magas felbontás " -"nagyban növeli a vizuális minÅ‘séget, de erÅ‘sen befolyásolja a teljesítményt " -"és képhibákat okozhat bizonyos játékoknál.\n" -"\"640x528 többszöröse\" egy kicsivel lassabb, mint az \"Ablak méret\" " -"viszont kevesebb hibák eredményez. Ãltalánosságban elmondható, minél kisebb " -"a belsÅ‘ felbontás, annál jobb a teljesítmény.\n" +"Meghatározza a megjelenítéshez használatos felbontást. A magas felbontás nagyban növeli a vizuális minÅ‘séget, de erÅ‘sen befolyásolja a teljesítményt és képhibákat okozhat bizonyos játékoknál.\n" +"\"640x528 többszöröse\" egy kicsivel lassabb, mint az \"Ablak méret\" viszont kevesebb hibák eredményez. Ãltalánosságban elmondható, minél kisebb a belsÅ‘ felbontás, annál jobb a teljesítmény.\n" "\n" "Ha bizonytalan vagy, válaszd ezt: 640x528." @@ -5322,7 +5140,7 @@ msgstr "A lemez adatátviteli arány gyorsítása" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:243 msgid "Square Stick" -msgstr "Negyzetes kar" +msgstr "Négyzetes kar" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 msgid "Standard Controller" @@ -5386,15 +5204,12 @@ msgstr "Leállítás" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Store EFB copies in GPU texture objects.\n" -"This is not so accurate, but it works well enough for most games and gives a " -"great speedup over EFB to RAM.\n" +"This is not so accurate, but it works well enough for most games and gives a great speedup over EFB to RAM.\n" "\n" "If unsure, leave this checked." msgstr "" "Az EFB másolatokat a grafikai processzor textúra objektumaiban tárolja.\n" -"Ez nem annyira pontos, de elég jól működik a legtöbb játék esetén és " -"jelentÅ‘s sebességnövekedést okoz az EFB RAM-ban történÅ‘ tárolásával " -"szemben.\n" +"Ez nem annyira pontos, de elég jól működik a legtöbb játék esetén és jelentÅ‘s sebességnövekedést okoz az EFB RAM-ban történÅ‘ tárolásával szemben.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -5527,12 +5342,8 @@ msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:51 #, c-format -msgid "" -"The file %s could not be opened for writing. Please check if it's already " -"opened by another program." -msgstr "" -"%s fájl nem nyitható meg íráshoz. EllenÅ‘rizd, hogy nincs-e megnyitva már " -"másik program által." +msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." +msgstr "%s fájl nem nyitható meg íráshoz. EllenÅ‘rizd, hogy nincs-e megnyitva már másik program által." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format @@ -5558,13 +5369,11 @@ msgstr "A kapott kódolatlan AR kód nem tartalmaz sorokat." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" -"The safer you adjust this, the less likely the emulator will be missing any " -"texture updates from RAM.\n" +"The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n" "\n" "If unsure, use the second-fastest value from the right." msgstr "" -"Minél biztonságosabb a beállítás, annál kevésbé valószínű, hogy az emulátor " -"textúra frissítést fog a RAM-ból hiányolni.\n" +"Minél biztonságosabb a beállítás, annál kevésbé valószínű, hogy az emulátor textúra frissítést fog a RAM-ból hiányolni.\n" "\n" "Ha bizonytalan vagy, használd a második leggyorsabb értéket jobbról." @@ -5573,12 +5382,8 @@ 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:353 -msgid "" -"The selected language is not supported by your system. Falling back to " -"system default." -msgstr "" -"A választott nyelvet nem támogatja az oprációs rendszer. Visszaállás a " -"rendszer alapértelmezettre." +msgid "The selected language is not supported by your system. Falling back to system default." +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:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5614,12 +5419,8 @@ msgid "Theme selection went wrong" msgstr "Kinézet választáskor hiba történt" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 -msgid "" -"There must be a ticket for 00000001/00000002. Your NAND dump is probably " -"incomplete." -msgstr "" -"Kell lennie egy jegynek itt: 00000001/00000002. A NAND mentésed valószínűleg " -"befejezetlen." +msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." +msgstr "Kell lennie egy jegynek itt: 00000001/00000002. A NAND mentésed valószínűleg befejezetlen." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "" @@ -5630,12 +5431,8 @@ msgstr "" "A módosítatlan opcióknál a játék a Dolphin beállításait használja." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "" -"This action replay simulator does not support codes that modify Action " -"Replay itself." -msgstr "" -"Az action replay szimulátor nem támogat olyan kódokat, amelyek módosítját " -"magát az Action Replay-t." +msgid "This action replay simulator does not support codes that modify Action Replay itself." +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:513 msgid "This could cause slow down in Wii Menu and some games." @@ -5644,19 +5441,12 @@ msgstr "Ez lassulást okozhat a Wii menüben és néhány játékban." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " -"Hold SHIFT and press one of the WASD keys to move the camera by a certain " -"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " -"SHIFT+R to reset the camera.\n" +"Hold the right mouse button and move the mouse to pan the camera around. Hold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Ez a funkció lehetÅ‘vé teszi a játék kamera szabad irányítását.\n" -"Tartsd lenyomva a jobb egér gombot és mozgasd az egeret, hogy körbepásztázz " -"a kamerával. Tartsd lenyomva a SHIFT billentyűt és a WASD billentyűk " -"valamelyikével mozgasd a kamerát távolsági léptékenként (SHIFT+0 megduplázza " -"(x2) és a SHIFT+9 megfelezi (x0.5)). Nyomd le a SHIFT+R kombinációt a " -"kamera alapértékre állításához.\n" +"Tartsd lenyomva a jobb egér gombot és mozgasd az egeret, hogy körbepásztázz a kamerával. Tartsd lenyomva a SHIFT billentyűt és a WASD billentyűk valamelyikével mozgasd a kamerát távolsági léptékenként (SHIFT+0 megduplázza (x2) és a SHIFT+9 megfelezi (x0.5)). Nyomd le a SHIFT+R kombinációt a kamera alapértékre állításához.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5672,8 +5462,7 @@ msgstr "" "Kikapcsolása rendellenes sebességet okozhat, többnyire túl gyorsat.\n" "Viszont néha a bekapcsolása folyamatos zajt eredményezhet.\n" "\n" -"Gyorsbillentyű : Tartsd lenyomva a szabályozás azonnali " -"kikapcsolásához." +"Gyorsbillentyű : Tartsd lenyomva a szabályozás azonnali kikapcsolásához." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." @@ -5681,15 +5470,11 @@ msgstr "Ez a zenei sávok, mint BGM lejátszásra szolgál." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" -"This splits the Video and CPU threads, so they can be run on separate " -"cores.\n" -"Causes major speed improvements on PCs with more than one core, but can also " -"cause occasional crashes/glitches." +"This splits the Video and CPU threads, so they can be run on separate cores.\n" +"Causes major speed improvements on PCs with more than one core, but can also cause occasional crashes/glitches." msgstr "" -"Ez megosztja a videó és processzor folyamatágakat, így azok külön magon " -"futhatnak.\n" -"SzámottevÅ‘ sebességnövekedés érhetÅ‘ el egynél több magos számítógépeken, " -"ugyanakkor véletlenszerű fagyásokat/hibákat is okozhat." +"Ez megosztja a videó és processzor folyamatágakat, így azok külön magon futhatnak.\n" +"SzámottevÅ‘ sebességnövekedés érhetÅ‘ el egynél több magos számítógépeken, ugyanakkor véletlenszerű fagyásokat/hibákat is okozhat." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 msgid "This will let you Manually Edit the INI config file" @@ -5756,7 +5541,8 @@ msgstr "Próbálkozás egy ismeretlen fájltípus betöltésével. " msgid "Triggers" msgstr "Kioldó gombok" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 +#: Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "Olvasási próbálkozás az érvénytelen SYSCONF fájlból" @@ -5808,12 +5594,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format msgid "" -"Unable to parse line %lu of the entered AR code as a valid encrypted or " -"decrypted code. Make sure you typed it correctly.\n" +"Unable to parse line %lu of the entered AR code as a valid encrypted or decrypted code. Make sure you typed it correctly.\n" "Would you like to ignore this line and continue parsing?" msgstr "" -"A megadott AR kód %lu sorának érvényes kódolt, vagy kódolatlan kódként " -"történÅ‘ elemzése nem lehetséges. GyÅ‘zÅ‘dj meg róla, hogy helyesen írtad be.\n" +"A megadott AR kód %lu sorának érvényes kódolt, vagy kódolatlan kódként 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:404 @@ -5847,9 +5631,7 @@ msgstr "Ismeretlen üzenet érkezett ezzel az azonosítóval : %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -msgstr "" -"Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettÅ‘l a játékostól:%d " -"Játékos kirúgása!" +msgstr "Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettÅ‘l a játékostól:%d Játékos kirúgása!" <<<<<<< HEAD <<<<<<< HEAD @@ -5894,7 +5676,7 @@ msgstr "Hexa használat" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" -msgstr "Hibaüzenetek megjelenítése" +msgstr "HibakezelÅ‘k használata" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" @@ -5904,23 +5686,19 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Több folyamatág használata a textúrák dekódolásához.\n" -"Sebesség növekedést eredményezhet (fÅ‘leg a két magnál többel rendelkezÅ‘ " -"processzorok esetén).\n" +"Sebesség növekedést eredményezhet (fÅ‘leg a két magnál többel rendelkezÅ‘ processzorok esetén).\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" -"However, one may skip the popups to allow interruption free gameplay by " -"checking this option.\n" +"However, one may skip the popups to allow interruption free gameplay by checking this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Ãltalában ha az árnyaló összeállítása sikertelen, megjelenik egy " -"hibaüzenet.\n" -"Azonban, ennek az opciónak a kijelölésével elérhetÅ‘ a felugró ablak " -"kihagyása, azaz a megszakítás nélküli játékmenet.\n" +"Ãltalában ha az árnyaló összeállítása sikertelen, megjelenik egy hibaüzenet.\n" +"Azonban, ennek az opciónak a kijelölésével elérhetÅ‘ a felugró ablak kihagyása, azaz a megszakítás nélküli játékmenet.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5930,7 +5708,7 @@ msgstr "Kellékek" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" -msgstr "Várakozás a képfrissítésre" +msgstr "V-Sync" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 msgid "Value" @@ -5965,7 +5743,7 @@ msgstr "HangerÅ‘" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 #, c-format msgid "WAD installation failed: error creating %s" -msgstr "WAD telepítési hiba: hiba naplózása %s" +msgstr "WAD telepítési hiba: hiba a(z) %s létrehozása közben" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" @@ -6023,6 +5801,7 @@ msgstr "" #: Source/Core/Core/Src/Movie.cpp:629 #, c-format +<<<<<<< HEAD msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " "%u > %u) (frame %u > %u). You should load another save before continuing, or " @@ -6050,43 +5829,53 @@ 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." >>>>>>> Update from master branch. +======= +msgid "Warning: You loaded a save that's after the end of the current movie. (byte %u > %u) (frame %u > %u). You should load another save before continuing, or load this state with read-only mode off." +msgstr "Figyelem: Olyan mentést töltöttél be, ami a választott videó befejezése utáni. (%u > %u bájt) (%u > %u képkocka). Folytatás elÅ‘tt betölthetsz egy 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:646 +#, c-format +msgid "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync." +msgstr "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d (0x%X) bájt eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben szinkronizációs hibák jelentkezhetnek." +>>>>>>> Update Hungarian translation. #: Source/Core/Core/Src/Movie.cpp:655 #, c-format msgid "" -"Warning: You loaded a save whose movie mismatches on frame %d. You should " -"load another save before continuing, or load this state with read-only mode " -"off. Otherwise you'll probably get a desync.\n" +"Warning: You loaded a save whose movie mismatches on frame %d. You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync.\n" "\n" -"More information: The current movie is %d frames long and the savestate's " -"movie is %d frames long.\n" +"More information: The current movie is %d frames long and the savestate's movie is %d frames long.\n" "\n" "On frame %d, the current movie presses:\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" +"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" "On frame %d, the savestate's movie presses:\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" +"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 "" <<<<<<< HEAD +<<<<<<< HEAD ======= "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka eltérés " "mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted " "ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben " "szinkronizációs hibák jelentkezhetnek.\n" +======= +"Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben szinkronizációs hibák jelentkezhetnek.\n" +>>>>>>> Update Hungarian translation. "\n" -"BÅ‘vebb információk: A választott videó %d képkocka hosszú, a mentett állás " -"videója pedig %d képkocka hosszú.\n" +"BÅ‘vebb információk: A választott videó %d képkocka hosszú, a mentett állás videója pedig %d képkocka hosszú.\n" "\n" "%d képkockánál a videó tömörítve lesz:\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" +"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 képkockánál a mentett állás videója tömörítve lesz:\n" +<<<<<<< HEAD "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" >>>>>>> Update from master branch. +======= +"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" +>>>>>>> Update Hungarian translation. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -6271,8 +6060,7 @@ msgstr "Meg kell adnod egy nevet!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 msgid "You must enter a valid decimal, hexadecimal or octal value." -msgstr "" -"Be kell írnod egy érvényes decimális, hexadecimális vagy oktális értéket." +msgstr "Be kell írnod egy érvényes decimális, hexadecimális vagy oktális értéket." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 msgid "You must enter a valid profile name." @@ -6280,8 +6068,7 @@ msgstr "Meg kell adnod egy érvényes profil nevet." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 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." +msgstr "Újra kell indítanod a Dolphin emulátort a változtatások érvényesítéséhez." #: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" @@ -6339,19 +6126,14 @@ msgstr "[Egyedi]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" -"Aims to speed up emulation by offloading texture decoding to the GPU using " -"the OpenCL framework.\n" -"However, right now it's known to cause texture defects in various games. " -"Also it's slower than regular CPU texture decoding in most cases.\n" +"Aims to speed up emulation by offloading texture decoding to the GPU using the OpenCL framework.\n" +"However, right now it's known to cause texture defects in various games. Also it's slower than regular CPU texture decoding in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" "[KÃSÉRLETI]\n" -"Az emuláció gyorsítása a célja a textúrák kirakásával dekódolva a grafikai " -"processzor számára az OpenCL keretrendszert használva.\n" -"Azonban, jelenleg köztudottan textúra hiányosságokat okoz számos játékban. " -"Lassabb is mint az átlagos processzoros textúra dekódolás a legtöbb " -"esetben.\n" +"Az emuláció gyorsítása a célja a textúrák kirakásával dekódolva a grafikai processzor számára az OpenCL keretrendszert használva.\n" +"Azonban, jelenleg köztudottan textúra hiányosságokat okoz számos játékban. Lassabb is mint az átlagos processzoros textúra dekódolás a legtöbb esetben.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." From d73f4d8240565b5adb1d2cc1a53175c2b3584160 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 24 Jan 2012 23:27:19 -0600 Subject: [PATCH 046/185] Update Korean translations. --- Languages/po/ko.po | 202 ++++++++++++++++++++++++++------------------- 1 file changed, 119 insertions(+), 83 deletions(-) diff --git a/Languages/po/ko.po b/Languages/po/ko.po index a8cc90fdaa..f756486f36 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -10,6 +10,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +<<<<<<< HEAD ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. @@ -17,6 +18,9 @@ msgstr "" "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. "PO-Revision-Date: 2011-07-07 10:24+0900\n" +======= +"PO-Revision-Date: 2012-01-19 11:47+0900\n" +>>>>>>> Update Korean translations. "Last-Translator: \n" "Language-Team: \n" "Language: Korean\n" @@ -66,9 +70,9 @@ msgid "%d Hz" msgstr "%d Hz" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 -#, fuzzy, c-format +#, c-format msgid "%i connected" -msgstr "ì—°ê²°í•´ì œëœ" +msgstr "%i ì—°ê²°ë˜ì—ˆìŠµë‹ˆë‹¤" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296 @@ -82,22 +86,22 @@ msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s ê°€ 실패해서 취소ë˜ì—ˆìŠµë‹ˆë‹¤. ì´ë¯¸ì§€ê°€ ì†ìƒëœ 것 같습니다." #: Source/Core/Core/Src/HW/GCMemcard.cpp:97 -#, fuzzy, c-format +#, c-format msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" msgstr "" -"메모리카드가 ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤\n" -" ì¹´ë“œ í¬ê¸°ê°€ 비ì í•©í•¨ (%04X)" +"%s 는 ë©”ëª¨ë¦¬ì¹´ë“œë¡œì¨ ë¶ˆëŸ¬ì˜¤ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤ \n" +" ì¹´ë“œ íŒŒì¼ í¬ê¸°ê°€ 유효하지 않습니다 (0x%x bytes)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:112 -#, fuzzy, c-format +#, c-format msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" msgstr "" -"메모리카드가 ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤\n" -" ì¹´ë“œ í¬ê¸°ê°€ 비ì í•©í•¨ (%04X)" +"%s 는 ë©”ëª¨ë¦¬ì¹´ë“œë¡œì¨ ë¡œë“œí•˜ëŠ”ë°ì— 실패했습니다 \n" +" ì¹´ë“œ í¬ê¸°ê°€ 유효하지 않습니다 (0x%x bytes)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format @@ -105,6 +109,8 @@ 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 bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -433,7 +439,6 @@ msgid "Accurate VBeam emulation" msgstr "정확한 VBeam ì—뮬레ì´ì…˜" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -444,7 +449,7 @@ msgstr "" "정확하게 EFB 복사를 ì—뮬합니다.\n" "ì¼ë¶€ ê²Œìž„ë“¤ì€ ê·¸ëž˜í”½ 효과나 ê²Œìž„í”Œë ˆì´ ê¸°ëŠ¥ì„ ì´ê²ƒì— ì˜ì¡´í•©ë‹ˆë‹¤.\n" "\n" -"확신 없으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요" +"확신 없으면, í…ìŠ¤ì²˜ì— EFB를 ì²´í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 @@ -679,9 +684,8 @@ msgstr "" "확신 없으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -#, fuzzy msgid "Alternate Wiimote Timing" -msgstr "ì—ë®¬ëœ ìœ„ëª¨íŠ¸" +msgstr "위모트 타ì´ë° 대안" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -800,7 +804,7 @@ msgid "" msgstr "" "윈ë„ìš° í¬ê¸°ë¥¼ 내부 í•´ìƒë„ë¡œ ìžë™ 조정합니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" @@ -812,7 +816,7 @@ msgstr "" "메모리ì—ì„œ ë°‰ë§µë“¤ì„ ë””ì½”ë”©í•˜ëŠ” ëŒ€ì‹ ì— ìžë™ì ìœ¼ë¡œ ìƒì„±í•©ë‹ˆë‹¤.\n" "성능향ìƒì„ 조금 가져옵니다만 미약한 í…스처 ê²°í•¨ì´ ë°œìƒí• ì§€ë„ 모릅니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ ì²´í¬ìƒíƒœë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ ì²´í¬ìƒíƒœë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" @@ -974,7 +978,7 @@ msgstr "" "í”½ì…€ê´‘ì› ëª…ì•”(í–¥ìƒ)ì—ì„œ, 픽셀단위 ê¹Šì´ ê³„ì‚°ì€ ì†Œìˆ˜ ê²Œìž„ë“¤ì„ ì œëŒ€ë¡œ ì—뮬할 ë•Œ " "필요가 있습니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ ì²´í¬ìƒíƒœë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ ì²´í¬ìƒíƒœë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" @@ -988,7 +992,7 @@ msgstr "" "ì¼ë¶€ 비율(GPUíž˜ì— ë‹¬ë¦¼)ë¡œ ì—뮬레ì´ì…˜ ì†ë„를 ê°ì†Œì‹œí‚µë‹ˆë‹¤.\n" "ì´ê²ƒì€ 보통 안전한 í–¥ìƒìž…니다, 하지만 때때로 ì´ìŠˆë“¤ì„ ìœ ë°œí• ì§€ë„ ëª¨ë¦…ë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì–¸ì²´í¬ ìƒíƒœë¡œ ë‘세요." +"모르겠으면, ì–¸ì²´í¬ ìƒíƒœë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 @@ -1007,14 +1011,15 @@ msgid "Cannot unregister events with events pending" msgstr "ì´ë²¤íŠ¸ë“¤ ë¯¸í•´ê²°ì„ ì§€ë‹Œ ì´ë²¤íŠ¸ë“¤ì„ 등ë¡í•˜ì§€ ì•Šì„ ìˆ˜ ì—†ìŒ" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 -#, fuzzy, c-format +#, c-format msgid "" "Cannot use that file as a memory card.\n" "%s\n" "is not a valid gamecube memory card file" msgstr "" -"ê·¸ 파ì¼ì„ 메모리 카드로 사용할 수 ì—†ìŒ.\n" -"ë‘˜ë‹¤ì˜ ìŠ¬ë¡¯ë“¤ì— ê°™ì€ íŒŒì¼ì„ 사용하려 합니까?" +"ê·¸ 파ì¼ì„ 메모리 카드로 사용할 수 없습니다.\n" +"%s\n" +"는 유효한 게임í브 메모리 ì¹´ë“œ 파ì¼ì´ 아닙니다" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" @@ -1442,7 +1447,7 @@ msgstr "만든ì´:" #: Source/Core/Common/Src/MsgHandler.cpp:68 msgid "Critical" -msgstr "" +msgstr "치명ì " #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" @@ -1456,7 +1461,7 @@ msgid "" msgstr "" "ê·¸ë¦¼ì„ 4:3ì—ì„œ 5:4ë¡œ í˜¹ì€ 16:9ì—ì„œ 16:10으로 ìžë¦…니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48 msgid "Crossfade" @@ -1680,7 +1685,7 @@ msgstr "" "ì—뮬레ì´ì…˜ ì†ë„ê°€ ë§Žì´ í–¥ìƒë˜ì§€ë§Œ ê·¸ê²ƒë“¤ì— ì˜ì¡´í•˜ëŠ” ë§Žì€ ê²Œìž„ë“¤(특히 ìžê°€ ì–´" "플들)ì—ì„œ 심ê°í•œ ê²°í•¨ë“¤ì„ ìœ ë°œí•©ë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" @@ -1694,7 +1699,7 @@ msgstr "" "\"EFB 복사\" ì—뮬레ì´ì…˜ì„ 비활성합니다.\n" "ì´ë“¤ì€ 종종 후-처리나 í…스처로 ë Œë” íš¨ê³¼ë“¤ì— ì‚¬ìš©ë©ë‹ˆë‹¤, 그래서 ì´ ì„¸íŒ…ì„ ì²´" "í¬í•˜ë©´ 대단한 ì†ë„í–¥ìƒì„ 가져오지만 ê·¸ê²ƒì€ ê±°ì˜ í•­ìƒ ì´ìŠˆë“¤ë„ 유발합니다.\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" @@ -1704,7 +1709,7 @@ msgid "" msgstr "" "í…스처ë§ì„ 비활성합니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" @@ -1727,7 +1732,7 @@ msgid "" msgstr "" "ì—뮬레ì´í„°ì—ì„œ ì½í˜€ì§„ ìž…ë ¥ë“¤ì„ í‘œì‹œí•©ë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:77 msgid "Divide" @@ -1867,7 +1872,7 @@ msgid "" msgstr "" "모든 ë Œë”ëœ í”„ë ˆìž„ë“¤ì„ User/Dump/Frames/ì•ˆì— AVI 파ì¼ë¡œ ë¤í”„합니다\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" @@ -1877,7 +1882,7 @@ msgid "" msgstr "" "User/Dump/Textures// ì— ë””ì½”ë“œëœ ê²Œìž„ í…ìŠ¤ì²˜ë“¤ì„ ë¤í”„합니다\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" @@ -1887,7 +1892,7 @@ msgid "" msgstr "" "User/Dump/Textures/ë¡œ EFB ë³µì‚¬ì˜ ë‚´ìš©ì„ ë¤í”„합니다\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." <<<<<<< HEAD <<<<<<< HEAD @@ -1984,7 +1989,7 @@ msgstr "" "ì—뮬레ì´ì…˜ì´ ë§Žì´ ëŠë ¤ì§€ê³  ê³ í•´ìƒ ë Œë”ë§ì„ 막지만 ë‹¤ìˆ˜ì˜ ê²Œìž„ë“¤ì„ ì ì ˆížˆ ì—뮬" "하기위해 필요합니다.\n" "\n" -"확신 없다면, ëŒ€ì‹ ì— \"ê°€ìƒ XFB ì—뮬레ì´ì…˜\"ì„ ì²´í¬í•˜ì„¸ìš”." +"모르겠으면, ëŒ€ì‹ ì— \"ê°€ìƒ XFB ì—뮬레ì´ì…˜\"ì„ ì²´í¬í•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" @@ -2000,7 +2005,7 @@ msgstr "" "않는 ë§Žì€ ê²Œìž„ë“¤ì„ ê³ ì¹©ë‹ˆë‹¤. 하지만, 여전히 ë§Žì€ ë‹¤ë¥¸ 게임들(특히 ìžê°€ 어플)" "ì—서는 실패합니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 msgid "Emulated Wiimote" @@ -2028,7 +2033,7 @@ msgstr "" "ì•„ë§ˆë„ ì´ìŠˆë“¤ì„ ì¼ìœ¼í‚µë‹ˆë‹¤.\n" "ìž‘ë™í•˜ë ¤ë©´ ì „ì²´í™”ë©´ì´ ìš”êµ¬ë©ë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 msgid "Enable AR Logging" @@ -2052,7 +2057,7 @@ msgstr "ë¸”ë¡ í•©ì¹˜ê¸° 활성" >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" -msgstr "" +msgstr "바운딩 박스 계산 켜기" <<<<<<< HEAD ======= @@ -2132,7 +2137,7 @@ msgstr "" "비스듬한 보기 ê°ë„ë“¤ì— ìžˆëŠ” í…ìŠ¤ì²˜ë“¤ì˜ ë¹„ì£¼ì–¼ í’ˆì§ˆì„ í–¥ìƒì‹œí‚¨ë‹¤.\n" "소수 게임ì—ì„œ ì´ìŠˆë“¤ì„ ì¼ìœ¼í‚¬ì§€ë„ 모른다.\n" "\n" -"확신 없다면, 1x를 ì„ íƒí•˜ì„¸ìš”." +"모르겠으면, 1x를 ì„ íƒí•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" @@ -2155,7 +2160,7 @@ msgstr "" "ì „ì²´ í™”ë©´ì´ ë Œë”ë§ì— 사용ë˜ê¸¸ ì›í•˜ë©´ ì´ê²ƒì„ 활성화하세요.\n" "ì´ê²ƒì´ 비활성화ë˜ë©´, ë Œë” ìœˆë„ìš°ê°€ 대신 ìƒì„±ë  것입니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" @@ -2167,7 +2172,7 @@ msgstr "" "ë Œë”를 위해 ë¶„ë¦¬ëœ ë Œë” ì°½ì´ ì•„ë‹Œ ë©”ì¸ ëŒí•€ ì°½ì„ ì‚¬ìš©í•˜ë ¤ë©´ ì´ê²ƒì„ 활성화하세" "ìš”.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" @@ -2200,7 +2205,7 @@ msgstr "" "ì—ë®¬ëœ ì†Œí”„íŠ¸ì—ì„œ 지ì›ë˜ë©´ 프로그레시브 ìŠ¤ìº”ì„ í™œì„±í™”í•©ë‹ˆë‹¤.\n" "ëŒ€ë¶€ë¶„ì˜ ê²Œìž„ë“¤ì€ ì´ê²ƒì— 대해 ìƒê´€í•˜ì§€ 않습니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "" @@ -2216,7 +2221,7 @@ msgid "" msgstr "" "FFV1 ì½”ë±ì„ 사용하여 프레임 ë¤í”„ë“¤ì„ ì¸ì½”드합니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:50 msgid "End" @@ -2295,6 +2300,8 @@ msgid "" "Error in PlayWiimote. %u != %u, byte %d.\n" "Sorry, Wii recording is temporarily broken." msgstr "" +"PlayWiimoteì— ì—러발ìƒ. %u != %u, byte %d.\n" +"죄송합니다, Wii 녹화가 ì¼ì‹œì ìœ¼ë¡œ 깨졌습니다." >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 @@ -2307,6 +2314,8 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +"ì—러: \"%s\" ë’¤ì—, %d (0x%X)를 발견 %d (0x%X) 세ì´ë¸Œ 표시 대신ì—. ìƒíƒœì €ìž¥ ë¡œ" +"드를 취소합니다..." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format @@ -2677,7 +2686,7 @@ msgstr "" "ê²Œìž„ì´ ëª…ë°±ížˆ ê·¸ê²ƒì„ ê»ë”ë¼ë„ í…스처 í•„í„°ë§ì„ 강제시킨다.\n" "í…스처 í’ˆì§ˆì„ í–¥ìƒì‹œí‚¨ë‹¤ 하지만 ì¼ë¶€ 게임들ì—서는 ê²°í•¨ë“¤ì„ ìœ ë°œí•œë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" @@ -2689,7 +2698,7 @@ msgstr "" "와ì´ë“œìŠ¤í¬ë¦° í•´ìƒë„ ê·¸ëž˜í”½ì„ ì¶œë ¥í•˜ê²Œ ê²Œìž„ì„ ê°•ì œì‹œí‚µë‹ˆë‹¤.\n" "ì¼ë¶€ 게임ì—ì„œ 그래픽 ê²°í•¨ì„ ìœ ë°œí•©ë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" @@ -2791,9 +2800,8 @@ msgid "GCI File(*.gci)" msgstr "GCI 파ì¼(*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 -#, fuzzy msgid "GCMic Configuration" -msgstr "로그 환경설정" +msgstr "GCMic 환경설정" #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -2918,7 +2926,6 @@ msgid "Greater Than" msgstr "보다 í°" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -#, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2928,10 +2935,12 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"\"í…ìŠ¤ì²˜ì— ë Œë”\"를 사용하여 ìƒì„±ëœ í…스ì³ë“¤ì˜ ì§ˆì„ ì—„ì²­ë‚˜ê²Œ í–¥ìƒì‹œí‚µë‹ˆë‹¤.\n" -"내부 í•´ìƒë„를 올리면 ì´ ì„¸íŒ…ì˜ íš¨ê³¼ë¥¼ í–¥ìƒì‹œí‚¬ 것입니다.\n" +"\"í…ìŠ¤ì²˜ì— ë Œë”\" íš¨ê³¼ë“¤ì„ ì‚¬ìš©í•˜ì—¬ ìƒì„±ëœ í…스ì³ë“¤ì˜ ì§ˆì„ ì—„ì²­ë‚˜ê²Œ í–¥ìƒì‹œí‚µ" +"니다.\n" +"내부 í•´ìƒë„를 올리면 ì´ ì„¸íŒ…ì˜ íš¨ê³¼ë¥¼ í–¥ìƒì‹œí‚µë‹ˆë‹¤.\n" +"ì„±ëŠ¥ì„ ì•½ê°„ ê°ì†Œì‹œí‚¤ê³  ì´ìŠˆë¥¼ ì•„ë§ˆë„ ìœ ë°œí•  수 있습니다 (ì˜ˆìƒ ë°–ì¼ì§€ë¼ë„).\n" "\n" -"확신 없다면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" @@ -3010,7 +3019,7 @@ msgid "" msgstr "" "ì—뮬레ì´ì…˜ 윈ë„ìš° ìœ„ì— ë§ˆìš°ìŠ¤ 커서가 ìžˆì„ ë•Œ 숨ê¹ë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Home" @@ -3109,6 +3118,8 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +"ì²´í¬í•˜ë©´, 바운딩 박스 ë ˆì§€ìŠ¤í„°ë“¤ì´ ì—…ë°ì´íŠ¸ë  것입니다. Paper Mario 게임들ì—" +"ì„œ 사용ë©ë‹ˆë‹¤." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" @@ -3141,7 +3152,7 @@ msgstr "" "네거티브 효과 없는 ë§Žì€ ê²Œìž„ë“¤ì—ì„œ ì„±ëŠ¥ì„ í–¥ìƒì‹œí‚µë‹ˆë‹¤. 소수 다른 게임들ì—ì„œ " "그래픽 ê²°í•¨ì„ ìœ ë°œí•˜ê¸´ 합니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" @@ -3155,7 +3166,7 @@ msgstr "" "ì¼ë¶€ 게임들ì—ì„œ ì„±ëŠ¥ì„ í–¥ìƒì‹œí‚µë‹ˆë‹¤, 하지만 ì¼ë¶€ 게임플레ì´ê´€ë ¨ 특성들ì´ë‚˜ ê·¸" "래픽 íš¨ê³¼ë“¤ì´ ë¹„í™œì„±í™” ë ì§€ 모릅니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 msgid "Import Save" @@ -3194,7 +3205,7 @@ msgid "" msgstr "" "ì„±ëŠ¥ì´ í–¥ìƒë˜ì§€ë§Œ 올바른 안개 ì—뮬레ì´ì…˜ì— ì˜ì¡´í•œ ëŒ€ë¶€ë¶„ì˜ ê²Œìž„ì—ì„œ ê²°í•¨ì„ ìœ " "발합니다.\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" @@ -3204,7 +3215,7 @@ msgid "" msgstr "" "ì„±ëŠ¥ì´ í–¥ìƒë˜ì§€ë§Œ ëŒ€ë¶€ë¶„ì˜ ê²Œìž„ì—ì„œ ë¹›ì´ ì‚¬ë¼ì§ì„ 유발합니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" @@ -3553,7 +3564,7 @@ msgid "" msgstr "" "User/Load/Textures// ì—ì„œ 커스텀 í…ìŠ¤ì²˜ë“¤ì„ ë¡œë“œ\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/PHackSettings.cpp:49 msgid "Load preset values from hack patterns available." @@ -3700,7 +3711,7 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "" +msgstr "메모리카드 파ì¼í¬ê¸°ê°€ í—¤ë” í¬ê¸°ì™€ 불ì¼ì¹˜í•©ë‹ˆë‹¤" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" @@ -3738,7 +3749,7 @@ msgstr "" "ì¸ì½”딩ë˜ê³  있는 í¬ë©§ì„ 보여주기위해 í…ìŠ¤ì²˜ë“¤ì„ ìˆ˜ì •í•©ë‹ˆë‹¤. ëŒ€ê°œì˜ ê²½ìš° ì—뮬레" "ì´ì…˜ 리셋ì´ìš”구ë©ë‹ˆë‹¤.\n" "\n" -"확신 없다면 ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/LogWindow.cpp:113 msgid "Monospaced font" @@ -4294,17 +4305,17 @@ msgstr "후-처리 효과:" #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" -msgstr "" +msgstr "PlayControllerì— ì˜ìƒë§ˆë¬´ë¦¬ê°€ 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u + 8 > %u" #: Source/Core/Core/Src/Movie.cpp:829 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" -msgstr "" +msgstr "PlayWiimoteì— ì˜ìƒ 마무리가 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u + %d > %u" #: Source/Core/Core/Src/Movie.cpp:806 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" -msgstr "" +msgstr "PlayWiimoteì— ì˜ìƒ 마무리가 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u > %u" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4387,9 +4398,8 @@ msgid "Real Wiimote" msgstr "실제 위모트" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 -#, fuzzy msgid "Real Wiimotes" -msgstr "실제 위모트" +msgstr "리얼 위모트" #: Source/Core/DolphinWX/Src/Frame.cpp:163 msgid "Reconnect Wiimote Confirm" @@ -4437,7 +4447,7 @@ msgstr "" "ì´ê²ƒì€ ë Œë”ëœ ê·¸ë¦¼ì´ ëœ ë¸”ëŸ­ì ¸ ë³´ì´ê²Œ 합니다.\n" "심ê°í•˜ê²Œ ì—뮬레ì´ì…˜ ì†ë„를 ê°ì†ì‹œí‚¤ê³  때때로 ì´ìŠˆë“¤ì„ 유발합니다.\n" "\n" -"확신 없다면, ì—†ìŒì„ ì„ íƒí•˜ì„¸ìš”." +"모르겠으면, ì—†ìŒì„ ì„ íƒí•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 #: Source/Core/DolphinWX/Src/FrameTools.cpp:434 @@ -4483,7 +4493,7 @@ msgid "" msgstr "" "와ì´ì–´í”„레임으로 ìž¥ë©´ì„ ë Œë”합니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" @@ -4777,7 +4787,7 @@ msgstr "" "ê°•ì œ 4:3: ê·¸ë¦¼ì„ 4:3 종횡비로 늘림\n" "윈ë„ìš°ë¡œ 늘림: ê·¸ë¦¼ì„ ìœˆë„ìš° í¬ê¸°ë¡œ 늘림\n" "\n" -"확신 없다면, ìžë™ì„ ì„ íƒí•˜ì„¸ìš”." +"모르겠으면, ìžë™ì„ ì„ íƒí•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/LogWindow.cpp:114 msgid "Selected font" @@ -4796,8 +4806,8 @@ msgstr "" "ì´ê²ƒì€ 내부 í•´ìƒë„보다 ë” í¬ê±°ë‚˜ 같아야합니다. 성능 ì˜í–¥ì€ ë¬´ì‹œí•´ë„ ë  ì •ë„ìž…" "니다.\n" "\n" -"ìžì‹  없으면, ë°ìŠ¤í¬íƒ‘ í•´ìƒë„를 사용하세요.\n" -"여전히 ìžì‹  없으면, ìž‘ë™í•˜ëŠ” 최고 í•´ìƒë„를 사용하세요." +"모르겠으면, ë°ìŠ¤í¬íƒ‘ í•´ìƒë„를 사용하세요.\n" +"ê·¸ëž˜ë„ ëª¨ë¥´ê² ìœ¼ë©´, ìž‘ë™í•˜ëŠ” 최고 í•´ìƒë„를 사용하세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" @@ -4813,7 +4823,7 @@ msgstr "" "둘 ì‚¬ì´ ì–´ë”˜ê°€ìž…ë‹ˆë‹¤.\n" "Direct3D ë°±ì—”ë“œë“¤ì€ ìœˆë„우즈 ìƒì—서만 사용할 수 있다는 ê²ƒì„ ì•Œì•„ë‘세요.\n" "\n" -"ìžì‹  없으면, Direct3D 9ì„ ì‚¬ìš©í•˜ì„¸ìš”." +"모르겠으면, Direct3D 9ì„ ì‚¬ìš©í•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/NetWindow.cpp:275 msgid "Send" @@ -5009,7 +5019,7 @@ msgid "" msgstr "" "ì—뮬레ì´ì…˜ ì†ë„ì˜ ì¸¡ì •ìœ¼ë¡œ 초당 ë Œë”ë˜ëŠ” 프레임 수치를 ë³´ì—¬ì¤ë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/Main.cpp:119 msgid "Show this help message" @@ -5027,7 +5037,7 @@ msgid "" msgstr "" "다양한 í†µê³„ë“¤ì„ ë³´ì—¬ì¤ë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 msgid "Sideways Wiimote" @@ -5063,7 +5073,7 @@ msgstr "" "다양한 그래픽 íš¨ê³¼ë“¤ì„ ìœ„í•´ ë§Žì€ ê²Œìž„ë“¤ì—ì„œ 사용ë˜ëŠ” \"목표 알파 패스\"를 스" "킵합니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" @@ -5079,7 +5089,7 @@ msgstr "" "때때로 비주얼 í€„ë¦¬í‹°ë„ í–¥ìƒì‹œí‚µë‹ˆë‹¤.\n" "ì–´ëŠ ì´ìŠˆë¥¼ 겪는다면, í…스처 ìºì‰¬ 정확ë„를 올려보거나 ì´ ì˜µì…˜ì„ ë„세요.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 @@ -5112,7 +5122,7 @@ msgid "" msgstr "" "소프트웨어 ë Œë”ë§ì€ 다른 백엔드들 보다 ìƒë‹¹ížˆ ëŠë¦½ë‹ˆë‹¤.\n" "디버깅 목ì ìœ¼ë¡œë§Œ 유용합니다.\n" -"소프트웨어 ë Œë”ë§ì„ í™œì„±ì„ ì •ë§ ì›í•©ë‹ˆê¹Œ? ìžì‹  없으면, '아니오'를 ì„ íƒí•˜ì„¸ìš”." +"소프트웨어 ë Œë”ë§ì„ í™œì„±ì„ ì •ë§ ì›í•©ë‹ˆê¹Œ? 모르겠으면, '아니오'를 ì„ íƒí•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" @@ -5172,7 +5182,7 @@ msgstr "" "다. ì¼ë°˜ì ìœ¼ë¡œ ë§í•´ì„œ, ë‚®ì€ ë‚´ë¶€ í•´ìƒë„ì¼ ìˆ˜ë¡, ë” ë‚˜ì€ ì„±ëŠ¥ì´ ë‚˜ì˜¬ 것입니" "다.\n" "\n" -"확신 없다면, 640x528를 ì„ íƒí•˜ì„¸ìš”." +"모르겠으면, 640x528를 ì„ íƒí•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/Main.cpp:144 msgid "Specify a video backend" @@ -5256,7 +5266,7 @@ msgstr "" "GPU í…스처 오브ì íŠ¸ì•ˆì˜ EFB ë³µì‚¬ë“¤ì„ ë‹´ìŠµë‹ˆë‹¤.\n" "ì´ê²ƒì€ 그렇게 정확하지는 않습니다. 하지만 ëŒ€ë¶€ë¶„ì˜ ê²Œìž„ì—ì„œ 충분히 잘 ìž‘ë™í•˜" "ê³  \"ëž¨ì— EFB\"를 넘는 대단한 ì†ë„í–¥ìƒì„ ì¤ë‹ˆë‹¤.\n" -"확신 없다면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" @@ -5329,7 +5339,7 @@ msgstr "스í¬ë¦°ìƒ· ì°ê¸°" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "TaruKonga (Bongos)" -msgstr "" +msgstr "타루콩가 (봉고스)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5414,7 +5424,7 @@ msgid "" msgstr "" "ì´ê²ƒì„ 안전하게 ì •í•  수ë¡, ì—뮬레ì´í„°ê°€ 램으로 부터 í…스처 ì—…ë°ì´íŠ¸ë“¤ì„ ëœ ë†“" "치는 ê²½í–¥ì´ ìžˆìŠµë‹ˆë‹¤.\n" -"확신 없다면, 오른쪽ì—ì„œ ë‘번째-ê°€ìž¥ë¹ ë¦„ì„ ì‚¬ìš©í•˜ì„¸ìš”." +"모르겠으면, 오른쪽ì—ì„œ ë‘번째-ê°€ìž¥ë¹ ë¦„ì„ ì‚¬ìš©í•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" @@ -5505,7 +5515,7 @@ msgstr "" "ì— í•˜ë‚˜ë¥¼ 누르세요 (쉬프트+0 ì€ ë” ë¹ ë¥¸ ì´ë™ì´ê³  쉬프트+9ì€ ë” ëŠë¦° ì´ë™). ì¹´" "ë©”ë¼ë¥¼ 리셋하려면 쉬프트+Rì„ ëˆ„ë¥´ì„¸ìš”.\n" "\n" -"확신 없다면. ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면. ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" @@ -5647,6 +5657,8 @@ msgid "" "Unable to create patch from given values.\n" "Entry not modified." msgstr "" +"주어진 값들ì—ì„œ 패치를 ìƒì„±í•  수 없습니다.\n" +"í•­ëª©ì´ ìˆ˜ì •ë˜ì§€ 않았습니다." #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format @@ -5748,7 +5760,7 @@ msgstr "" "í…스처를 디코드하기 위해 멀티 쓰레드를 사용합니다.\n" "ì†ë„í–¥ìƒë  ê²ë‹ˆë‹¤ (특히 듀얼코어 ì´ìƒì˜ CPU들 ìƒì—ì„œ).\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" @@ -5762,7 +5774,7 @@ msgstr "" "그렇지만, ì´ ì˜µì…˜ ì²´í¬ë¡œ ìžìœ ë¡œìš´ 게임플레ì´ë¥¼ 방해하는 íŒì—…ë“¤ì„ ìŠ¤í‚µí•  수 있" "습니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" @@ -5817,7 +5829,7 @@ msgstr "" "ê°ˆë¼ì§ì„ 줄ì´ê¸°ìœ„í•´ ìˆ˜ì§ ë¸”ëž­í¬ë¥¼ 기다립니다. \n" "ì—뮬레ì´ì…˜ ì†ë„ê°€ 100% ì´í•˜ë¼ë©´ ì„±ëŠ¥ì„ ì €í•˜ì‹œí‚µë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/Common/Src/MsgHandler.cpp:67 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 @@ -5868,6 +5880,9 @@ msgid "" "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" +"경고: 최근 ì˜ìƒì˜ ë ë’¤ì— ìžˆëŠ” ì €ìž¥ì„ ë¡œë“œí•˜ì˜€ìŠµë‹ˆë‹¤. (byte %u > %u) (frame " +"%u > %u). You should load another save before continuing, or load this state " +"with read-only mode off." #: Source/Core/Core/Src/Movie.cpp:646 #, c-format @@ -5876,6 +5891,9 @@ 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:655 #, c-format @@ -5895,6 +5913,20 @@ 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:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5951,9 +5983,9 @@ msgid "Wiimote" msgstr "위모트" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 -#, fuzzy, c-format +#, c-format msgid "Wiimote %i" -msgstr "위모트" +msgstr "위모트 %i" #: Source/Core/DolphinWX/Src/Frame.cpp:162 #, c-format @@ -5989,7 +6021,6 @@ msgid "Wiimote settings" msgstr "위모트 설정" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 -#, fuzzy msgid "Wiimotes" msgstr "위모트" @@ -6063,6 +6094,8 @@ msgid "" "You are using free dsp roms made by Dolphin Team.\n" "Only Zelda ucode games will work correctly with them.\n" msgstr "" +"ë‹¹ì‹ ì€ ëŒí•€ íŒ€ì— ì˜í•´ 만들어진 공짜 dsp ë¡¬ë“¤ì„ ì‚¬ìš©í•˜ê³  있습니다.\n" +"Zelda ucode ê²Œìž„ë“¤ë§Œì´ ê·¸ê²ƒë“¤ë¡œ 올바르게 ìž‘ë™í•  것입니다.\n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:72 msgid "You can't close panes that have pages in them." @@ -6135,7 +6168,7 @@ msgstr "" "[고장남]\n" "EFB ì˜ì—­ 하ì´ë¼ì´íŠ¸ê°€ 복사ë˜ì—ˆìŠµë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/PHackSettings.cpp:90 msgid "[Custom]" @@ -6157,7 +6190,7 @@ msgstr "" "하지만, 지금 ë‹¹ìž¥ì€ ë‹¤ì–‘í•œ 게임ì—ì„œ í…스처 ê²°í•¨ì„ ìœ ë°œí•˜ëŠ” 것으로 알려집니" "다. ë˜í•œ ëŒ€ë¶€ë¶„ì˜ ê²½ìš°ì—ì„œ ì •ê·œ CPU í…스처 디코딩보다 ëŠë¦½ë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" @@ -6171,7 +6204,7 @@ msgstr "" "화면표시 목ë¡ì„ ìºì‰¬í•¨ìœ¼ë¡œ ì—뮬레ì´ì…˜ì„ 약간 ì†ë„í–¥ìƒì‹œí‚µë‹ˆë‹¤.\n" "ì´ìŠˆë“¤ì„ ì¼ìœ¼í‚¬ 수 있지만.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 msgid "^ ADD" @@ -6320,6 +6353,9 @@ msgstr "| OR" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "%s를 열수 ì—†ìŒ, ê·¸ê²ƒì€ ë†“ì¹œ 함수를 가진다" +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "ì½ê¸°-ì „ìš© 모드ì—ì„œ ì˜ìƒì„ 기ë¡í•  수 없습니다." + #~ msgid "Config..." #~ msgstr "환경설정..." From 1b1016ece71a637a3589396fad66e7338d045c4c Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Fri, 9 Mar 2012 16:58:57 -0600 Subject: [PATCH 047/185] Update the pot file to reflect recent changes in the code. --- Languages/po/ar.po | 968 ++++++++++++-------- Languages/po/ca.po | 964 ++++++++++++-------- Languages/po/cs.po | 1556 +++++++++++++++++++++----------- Languages/po/de.po | 967 ++++++++++++-------- Languages/po/dolphin-emu.pot | 937 ++++++++++++-------- Languages/po/el.po | 996 +++++++++++++-------- Languages/po/en.po | 937 ++++++++++++-------- Languages/po/es.po | 989 +++++++++++++-------- Languages/po/fa.po | 883 ++++++++++--------- Languages/po/fr.po | 988 +++++++++++++-------- Languages/po/he.po | 937 ++++++++++++-------- Languages/po/hu.po | 1614 ++++++++++++++++++++++------------ Languages/po/it.po | 971 ++++++++++++-------- Languages/po/ja.po | 970 ++++++++++++-------- Languages/po/ko.po | 970 ++++++++++++-------- Languages/po/nb.po | 966 ++++++++++++-------- Languages/po/nl.po | 967 ++++++++++++-------- Languages/po/pl.po | 980 +++++++++++++-------- Languages/po/pt.po | 968 ++++++++++++-------- Languages/po/pt_BR.po | 981 +++++++++++++-------- Languages/po/ru.po | 962 ++++++++++++-------- Languages/po/sr.po | 937 ++++++++++++-------- Languages/po/tr.po | 973 ++++++++++++-------- Languages/po/zh_CN.po | 963 ++++++++++++-------- Languages/po/zh_TW.po | 963 ++++++++++++-------- 25 files changed, 15680 insertions(+), 9627 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 10b8d4bb51..08cfb17be9 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-16 11:25-0500\n" "Last-Translator: mansoor\n" @@ -22,6 +23,9 @@ msgstr "" "PO-Revision-Date: 2011-10-16 11:25-0500\n" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-27 08:27-0600\n" >>>>>>> Update from master branch. "Last-Translator: mansoor\n" @@ -65,9 +69,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sنسخ%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d هرتز" @@ -157,7 +161,7 @@ msgstr "%sتصدير GCI%s" msgid "%sImport GCI%s" msgstr "%sاستيراد GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -190,11 +194,11 @@ msgstr "&مدير الاسرار" msgid "&DSP Settings" msgstr "&إعدادات الصوت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&مسح ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&حذ٠تحديد ايزو" @@ -258,7 +262,7 @@ msgstr "&وقÙØ©" msgid "&Play" msgstr "&ابداء اللعبه" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&خصائص" @@ -302,7 +306,7 @@ msgstr "&القائمة" msgid "&Wiimote Settings" msgstr "&إعدادات تحكم الوي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&معلومات عن اللعبة" @@ -346,7 +350,7 @@ msgstr "<أدخل اسم هنا>" msgid "" msgstr "<لم يتم العثور على القرارات>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<لا شيء>" @@ -355,7 +359,7 @@ msgstr "<لا شيء>" msgid "" msgstr "<اضغط على Ù…Ùتاح>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<النظام>" @@ -409,13 +413,13 @@ msgstr "" "\n" "يجب عليك إعادة توجيه البرنامج منÙØ° الهوست!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "اسرار" @@ -427,11 +431,11 @@ msgstr "ترجمة البرنامج بواسطة الررائع" msgid "Acceleration" msgstr "تسريع" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "ضبط:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" @@ -542,11 +546,11 @@ msgstr "كرت الشاشه :" msgid "Add" msgstr "أضÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "إضاÙØ© رمز ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "أض٠باتش" @@ -554,6 +558,7 @@ msgstr "أض٠باتش" msgid "Add new pane" msgstr "إضاÙØ© جزء جديد" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -569,6 +574,11 @@ msgstr "إضاÙØ© جزء جديد" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "أضÙ" @@ -602,11 +612,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "ضبط السيطرة على ضغط التناظرية المطلوبة لتنشيط الأزرار." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "متقدم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "إعدادات متقدمة" @@ -614,14 +624,15 @@ msgstr "إعدادات متقدمة" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "All GC/Wii images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملÙات الجيم كيوب (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -634,18 +645,22 @@ msgstr "جميع ملÙات الجيم كيوب (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Ø­Ùظ جميع الحالات (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "جميع ملÙات ايزو الوي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "جميع مضغوط GC/Wii ISO files (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "جميع الملÙات (*.*)|*.*" @@ -661,6 +676,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD <<<<<<< HEAD @@ -672,6 +688,9 @@ msgid "Alternate Wiimote Timing" msgstr "محاكاة ويموت" >>>>>>> Update translation files for recent changes in the code. ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "بديل ويموت" >>>>>>> Update Arabic and Japanese translations. @@ -692,7 +711,7 @@ msgstr "محمل التطبيق هو حجم الخطأ... هل حقا محمل msgid "Apploader unable to load from file" msgstr "Apploader غير قادر على تحميل مل٠من" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -710,7 +729,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد إيقاÙ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabic" @@ -719,16 +738,17 @@ msgstr "Arabic" msgid "Are you sure you want to delete \"%s\"?" msgstr "هل أنت متأكد أنك تريد حذ٠\"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙØŸ " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙات؟" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -738,6 +758,9 @@ msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙات؟" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -746,18 +769,20 @@ msgstr "نسبة العرض :" msgid "At least one pane must remain open." msgstr "يجب أن لا يقل عن جزء واحد لا تزال Ù…Ùتوحة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "صوت الخلÙية :" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -767,6 +792,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "تلقائي" @@ -809,7 +837,7 @@ msgstr "" msgid "Back" msgstr "رجوع" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "إعدادات الخلÙية" @@ -836,11 +864,11 @@ msgstr "سيء بداية المل٠" msgid "Banner" msgstr "بنر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "تÙاصيل بنر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "بنر:" @@ -852,7 +880,7 @@ msgstr "شريط" msgid "Basic" msgstr "الأساسية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "إعدادات أساسية" @@ -883,6 +911,7 @@ msgstr "اليمين أزرق" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -890,6 +919,9 @@ msgstr "اليمين أزرق" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "أسÙÙ„" @@ -898,7 +930,7 @@ msgstr "أسÙÙ„" msgid "Bound Controls: %lu" msgstr "يلزم التحكم: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "معطلة" @@ -914,7 +946,7 @@ msgstr "لتصÙØ­ دليل لإضاÙØ©" msgid "Browse for an ISO directory..." msgstr "لاستعراض الدليل ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "لاستعراض الدليل الإخراج" @@ -944,11 +976,11 @@ msgstr "العصا الأيمن " msgid "C-Stick" msgstr "العصا الأيمن " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "محرك محاكي المعالج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "شاشة القوائم المؤقته" @@ -1008,6 +1040,7 @@ msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة ÙÙ‚ msgid "Cannot unregister events with events pending" msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 @@ -1017,6 +1050,9 @@ msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1027,7 +1063,7 @@ msgstr "" "%s\n" "ليست ذاكرة جيم كيوب مل٠بطاقة صالحة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1045,8 +1081,6 @@ msgstr "غير قادر العثور على ويموت: %02x:%02x:%02x:%02x:%02x msgid "Cant find WiiMote by connection handle %02x" msgstr "غير قادر على العثور ويموت بواسطة معالج الاتصال %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1056,7 +1090,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalan" @@ -1081,7 +1115,7 @@ msgstr "تغيير القرص" msgid "Change Game" msgstr "تغيير اللعبة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1097,8 +1131,8 @@ 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 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "تغيير هذه ليس لها أي أثر ÙÙŠ حين أن المحاكي قيد التشغيل!" @@ -1118,31 +1152,31 @@ msgstr "بحث عن اسرار" msgid "Cheats Manager" msgstr "قائمة الاسرار" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "DVD اختيار الدليل أصل :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Choose a NAND root directory:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "اختيار ايزو الاÙتراضية :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "اختيار دليل لإضاÙØ©" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "اختيار مل٠لÙتح" @@ -1150,15 +1184,15 @@ msgstr "اختيار مل٠لÙتح" msgid "Choose a memory card:" msgstr "اختيار بطاقة الذاكرة :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "اختيار مل٠لاستخدام راÙعة التطبيقات: (ينطبق على الأقراص مصنوعة من الادله Ùقط)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "اختيار مجلد لاستخراج" @@ -1170,14 +1204,14 @@ msgstr "دائرة العصا" msgid "Classic" msgstr "الكلاسيكية" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "أزال" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Ùشل ÙÙŠ الازاله." @@ -1193,6 +1227,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1201,6 +1236,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "إغلاق" @@ -1224,20 +1263,20 @@ msgstr "الأمر" msgid "Comment" msgstr "التعليق" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "التعليق:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "اختيار ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "ضغط ايزو" @@ -1264,13 +1303,13 @@ msgstr "تكوين منصات" msgid "Configure..." msgstr "إعدادات" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "تأكيد الكتابة Ùوق ملÙ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "تأكيد على التوقÙ" @@ -1279,7 +1318,7 @@ msgstr "تأكيد على التوقÙ" msgid "Connect" msgstr "اتصال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "ربط كيبورد يو اس بي" @@ -1336,12 +1375,12 @@ msgstr "GCIتحويل إلى " msgid "Copy failed" msgstr "Ùشل نسخ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "نسخ إلى بطاقة الذاكرة %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "الأساسية" @@ -1371,7 +1410,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "لا يمكن التعر٠مل٠ايزو %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "لا يمكن Ø­Ùظ %s" @@ -1384,7 +1423,7 @@ msgstr "" "تعذر تعيين منصات. وغادر لاعب أو لعبة قيد التشغيل حاليا!\n" "(منصات الإعداد أثناء قيد التشغيل اللعبة غير معتمد حتى الآن)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1397,7 +1436,7 @@ msgstr "" "Are you running Dolphin from a CD/DVD, or is the save file maybe write " "protected?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "لا يمكن العثور Ùتح الأوامر للتمديد 'ini'!" @@ -1414,7 +1453,7 @@ msgstr "" msgid "Count:" msgstr "الاحصاء :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "البلد:" @@ -1428,28 +1467,28 @@ msgstr "إنشاء رموز اسرار" msgid "Create new perspective" msgstr "إنشاء منظور جديد" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr " KDE-Look.org تم بواسطة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" " Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com] تم بواسطة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr " VistaIcons.com تم بواسطة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" " black_rider and published on ForumW.org > Web DevelopmentsCreated by " "black_rider and published on ForumW.org > Web Developments black_rider and " "published on ForumW.org > Web Developments تم بواسطة" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "المنشئ :" @@ -1457,7 +1496,7 @@ msgstr "المنشئ :" msgid "Critical" msgstr "حرج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "محصول" @@ -1480,7 +1519,7 @@ msgstr "الإبهات المتداخل" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "المسار الحالي تغيرت من %s to %s after wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "هاك مخصص العرض" @@ -1488,11 +1527,11 @@ msgstr "هاك مخصص العرض" msgid "Custom Projection Hack Settings" msgstr "إعدادات هاك مخصص العرض" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "تخصيص بعض المعلمات العرض على إملائي." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Czech" @@ -1504,10 +1543,11 @@ msgstr "الاسهم" msgid "DSP" msgstr "الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "محرك محاكي الصوت" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1518,18 +1558,22 @@ msgstr "محرك محاكي الصوت" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulation (سريع)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (بطيء)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE on Thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" @@ -1537,15 +1581,23 @@ msgstr "DSP LLE recompiler" msgid "DSP settings" msgstr "إعدادات الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD Root:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "حجم البيانات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "التاريخ :" @@ -1566,7 +1618,7 @@ msgstr "المنطقة الميتة" msgid "Debug" msgstr "التصحيح" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "التصحيح" @@ -1574,16 +1626,16 @@ msgstr "التصحيح" msgid "Decimal" msgstr "عشري" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "اختيار إلغاء ضغط ايزو " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "ÙÙƒ ايزو" @@ -1591,11 +1643,11 @@ msgstr "ÙÙƒ ايزو" msgid "Default" msgstr "الاÙتراضي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ايزو الاÙتراضية :" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "الخط الاÙتراضي" @@ -1604,7 +1656,7 @@ msgstr "الخط الاÙتراضي" msgid "Delete" msgstr "حذÙ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "حذ٠الحÙظ" @@ -1613,7 +1665,7 @@ msgstr "حذ٠الحÙظ" msgid "Delete the existing file '%s'?" msgstr "حذ٠المل٠الموجود '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "الوصÙ" @@ -1621,8 +1673,8 @@ msgstr "الوصÙ" msgid "Detect" msgstr "كشÙ" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1633,8 +1685,8 @@ msgstr "" msgid "Device" msgstr "أداة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "إعدادات الجهاز" @@ -1659,23 +1711,23 @@ msgstr "" " Ùˆ Ùشل دليل الاختباري الاحتياطية" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "تعطيل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "تعطيل الضباب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "تعطيل إضاءة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "تعطيل العمق لكل بكسل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Texturesتعطيل " @@ -1719,7 +1771,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "القرص" @@ -1746,6 +1798,7 @@ msgstr "" msgid "Divide" msgstr "انقسام" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1755,10 +1808,13 @@ msgstr "انقسام" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "دولÙين" @@ -1783,6 +1839,7 @@ msgstr "إعدادات تحكم الوي" msgid "Dolphin FIFO" msgstr "دولÙين" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1807,6 +1864,14 @@ msgstr "إعدادات تحكم الجيم كيوب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "إعدادات تحكم الجيم كيوب" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1837,11 +1902,11 @@ msgstr "" msgid "Down" msgstr "أسÙÙ„" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "تحميل اسرار للعبة" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu وأضا٠%lu تم تحميل الاسرار " @@ -1850,23 +1915,23 @@ msgstr "%lu وأضا٠%lu تم تحميل الاسرار " msgid "Drums" msgstr "الطبول" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "وهمي " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Dump Audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Dump EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "تÙريغ الإطارات" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Dump Textures" @@ -1900,6 +1965,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1915,6 +1981,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Dutch" @@ -1935,7 +2006,7 @@ msgid "" "driver." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "أوروبا" @@ -1951,7 +2022,7 @@ msgstr "تحرير" msgid "Edit ActionReplay Code" msgstr "تعديل رمز ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "تعديل الاعدادات" @@ -1963,8 +2034,8 @@ msgstr "تعديل الباتش" msgid "Edit current perspective" msgstr "تعديل المنظور الحالي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "تحرير" @@ -2009,7 +2080,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "محاكاة ويموت" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "حالة المحاكاه: " @@ -2038,18 +2109,15 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Enable Audio Throttle" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT تمكين" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "تمكين منع الدمج" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 @@ -2060,6 +2128,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "تمكين تنظيم حساب الإطار" @@ -2068,6 +2139,7 @@ msgstr "تمكين تنظيم حساب الإطار" msgid "Enable Cache" msgstr "تمكين التخزين المؤقت" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2077,51 +2149,54 @@ msgstr "تمكين التخزين المؤقت" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "تمكين الاسرار " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Enable DTK Music" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Enable Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Enable Dual Core (لزيادة السرعة)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "تمكين الاختصارات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Enable Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Enable Idle Skipping (لزيادة السرعة)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU تمكين" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "تمكين المسح التقدمي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "تمكين شاشة التوقÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "تمكين شاشة عريضة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "تمكين الإطار السلكي" @@ -2139,7 +2214,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد X1." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2147,7 +2222,7 @@ msgstr "" "تمكين الوصول السريع القرص.اللازمة لعدد قليل من الألعاب. (ON = Fast, OFF = " "Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "تمكين صÙحات" @@ -2175,20 +2250,20 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "تمكين هذا لتسريع أسطورة زيلدا : الشÙÙ‚ الاميرة. لتعطيل أي لعبة أخرى." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "يمكن توقعات مخصص هاك" @@ -2204,7 +2279,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذه غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2224,6 +2299,7 @@ msgstr "" msgid "End" msgstr "نهاية" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2239,6 +2315,11 @@ msgstr "نهاية" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "English" @@ -2269,6 +2350,7 @@ msgstr "المساواة" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "خطأ" @@ -2299,18 +2381,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "خطأ" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "خطأ ÙÙŠ تحميل اللغة المختارة. يتراجع إلى النظام الاÙتراضية." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2344,7 +2432,7 @@ msgstr "للخروج مع المحاكي" msgid "Export Failed" msgstr "Ùشل تصدير" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Ùشل تصدير" @@ -2357,15 +2445,15 @@ msgstr "تصدير تسجيل" msgid "Export Recording..." msgstr "تصدير تسجيل" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "تصدير Ø­Ùظ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "تصدير Ø­Ùظ الوي" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "تصدير جميع الحÙظ" @@ -2381,7 +2469,7 @@ msgstr "تصدير Ø­Ùظ باسم" msgid "Extension" msgstr "تمديد" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "عزل الاطار الخارجي" @@ -2393,44 +2481,44 @@ msgstr "معلمة إضاÙية" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "استخراج كاÙØ© الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "استخراج Apploader" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "استخراج دليل" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "استخراج الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "استخراج التقسيم" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "استخراج %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "استخراج كاÙØ© الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "استخراج دليل" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "استخراج" @@ -2442,11 +2530,11 @@ msgstr "بايت" msgid "FIFO Player" msgstr "لاعبين" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "Ùرنسا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "الحجم :" @@ -2458,11 +2546,11 @@ msgstr "خطأ الاتصال" msgid "Failed to Listen!!" msgstr "لم اسمع!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "اللعبه لاتوجد ÙÙŠ قاعده البيانات." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Ùشل ÙÙŠ الاستخراج إلى %s!" @@ -2561,18 +2649,28 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "Ùشل لكتابة عنوان لمل٠%d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "سريع" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Mipmaps سريع" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr " لا يعمل ÙÙŠ كل لعبة MMU إصدار سريع من." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "لاعبين" @@ -2581,7 +2679,7 @@ msgstr "لاعبين" msgid "File Info" msgstr "مل٠المعلومات" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "المل٠لا يتضمن اسرار." @@ -2614,16 +2712,16 @@ msgstr "لم يتم التعر٠على المل٠كمل٠بطاقة ذاكر msgid "File not compressed" msgstr "مل٠غير مضغوط " -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "نوع المل٠غير معروÙ! لن تÙتح!" @@ -2631,7 +2729,7 @@ msgstr "نوع المل٠غير معروÙ! لن تÙتح!" msgid "First Block" msgstr "أول بلوك" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "الإصلاح اختبارية" @@ -2643,7 +2741,7 @@ msgstr "العرض 16:9" msgid "Force 4:3" msgstr "العرض 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Ùرض وحدة التحكم على النظام الياباني" @@ -2675,7 +2773,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2709,7 +2807,7 @@ msgstr "الإطار" msgid "Frame Advance" msgstr "الإطار المسبق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Frame Dumps use FFV1" @@ -2721,7 +2819,7 @@ msgstr "مجموعة الإطار " msgid "Frame S&kipping" msgstr "تخطي الإطار " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "حد الإطار:" @@ -2729,10 +2827,11 @@ msgstr "حد الإطار:" msgid "Frames To Record" msgstr "إطارات لتسجيل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "تحكم بكاميرا اللعبة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2748,6 +2847,11 @@ msgstr "تحكم بكاميرا اللعبة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "French" @@ -2785,7 +2889,7 @@ msgstr "سجل الإعدادات" msgid "GCPad" msgstr "تحكم الجيم كيوب" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "معر٠اللعبة:" @@ -2801,15 +2905,15 @@ msgstr "اللعبة ليست على التوالي!" msgid "Game not found!!" msgstr "لم يتم العثور على لعبة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "إعدادات معينه للعبه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "إعدادات اللعبة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "جيم كيوب" @@ -2820,6 +2924,7 @@ msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2827,6 +2932,9 @@ msgstr "إعدادات تحكم جيم كيوب" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " @@ -2835,15 +2943,17 @@ msgid "Gamecube Pad settings" msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "تحميل اسرار" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "GeckoCode Ùشل تشغيل (CT%i CST%i) (%s)\n" "(إما غير رمز سيئة أو نوع رمز غير مدعومة حتى الآن.)" @@ -2852,6 +2962,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2860,6 +2971,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "عام" @@ -2868,6 +2982,7 @@ msgstr "عام" msgid "General Settings" msgstr "الإعدادات العامة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2883,6 +2998,11 @@ msgstr "الإعدادات العامة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "German" @@ -2926,7 +3046,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا، اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Greek" @@ -2958,7 +3078,7 @@ msgstr "هاك" msgid "Header checksum failed" msgstr "عنوان اختباري Ùشل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebrew" @@ -3028,12 +3148,16 @@ msgstr "إعدادات الاختصارات" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "الاختصارات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hungarian" @@ -3041,12 +3165,12 @@ msgstr "Hungarian" msgid "Hybrid Wiimote" msgstr "ويموت هجين" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3055,11 +3179,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL إعدادات" @@ -3075,15 +3199,15 @@ msgstr "IR المؤشر" msgid "IR Sensitivity:" msgstr "IR حساسية:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "تÙاصيل ايزو" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "مجلد الايزو" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "إيطاليا" @@ -3091,7 +3215,7 @@ msgstr "إيطاليا" msgid "Icon" msgstr " أيقونة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3102,15 +3226,17 @@ msgstr "" "ماريو" >>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). 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 إذا قمت بتعيين " "حد الإطار أعلى من السرعة لعبة الاÙتراضية " @@ -3147,7 +3273,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Ø­Ùظ استيراد" @@ -3193,7 +3319,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا ترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "تتعطل ÙÙŠ اللعبة" @@ -3202,7 +3328,7 @@ msgid "In-Game" msgstr "ÙÙŠ اللعبة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "معلومات" @@ -3222,7 +3348,7 @@ msgstr "إدراج" msgid "Insert Encrypted or Decrypted code here..." msgstr "إدراج رمز المشÙرة أو ÙÙƒ Ø´Ùرة هنا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD Card ادرج " @@ -3234,7 +3360,7 @@ msgstr "أدخل اسم هنا" msgid "Install WAD" msgstr "wad تثبيت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "تثبيت إلى قائمة الوي" @@ -3243,6 +3369,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3252,14 +3379,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "wad تثبيت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "الواجهة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "واجهة الإعدادات" @@ -3284,11 +3414,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "الدقة الداخلية :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (بطيئة جدا)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "تتعطل ÙÙŠ المقدمة" @@ -3305,7 +3435,7 @@ msgstr "قيمة غير صالحة!" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "غير صالح نوع الحدث %i" @@ -3322,14 +3452,15 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "تسجيل المل٠غير صالح" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "غير صالح حالة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3345,27 +3476,32 @@ msgstr "غير صالح حالة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italian" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "اليابان" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (موصى به)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL recompiler (تجريبي )" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japanese" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "كوريا" @@ -3374,8 +3510,8 @@ msgstr "كوريا" msgid "Key" msgstr "المÙتاح" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Korean" @@ -3393,7 +3529,7 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "اللغة :" @@ -3441,7 +3577,7 @@ msgstr "" msgid "Less Than" msgstr "أقل من" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "الحد من عدد الإطارات ÙÙŠ الثانية " @@ -3449,7 +3585,7 @@ msgstr "الحد من عدد الإطارات ÙÙŠ الثانية " msgid "Load" msgstr "تحميل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "تحميل القوام المخصص" @@ -3497,6 +3633,7 @@ msgstr "8 تحميل حالة" msgid "Load State..." msgstr "تحميل حالة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3518,6 +3655,13 @@ msgstr "تحميل قائمة نظام الوي" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "تحميل قائمة نظام الوي" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "تحميل قائمة نظام الوي %d%c" @@ -3544,7 +3688,7 @@ msgstr "تحميل المل٠المحدد (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "المحلية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Lock Threads to Cores" @@ -3556,11 +3700,11 @@ msgstr "سجل" msgid "Log Configuration" msgstr "سجل الإعدادات" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "نوع السجل" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "مختلÙان النواتج" @@ -3588,7 +3732,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU سرعة هاك" @@ -3610,11 +3754,11 @@ msgstr "" msgid "Main Stick" msgstr "العصا الأيسر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "معر٠المنتج :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "المنتج :" @@ -3638,6 +3782,7 @@ msgstr "ذاكرة بايت" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3645,6 +3790,9 @@ msgstr "ذاكرة بايت" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "بطاقة الذاكرة" @@ -3679,7 +3827,7 @@ msgstr "حجم بطاقة الذاكرة لا تتطابق مع حجم المل msgid "Menu" msgstr "القائمة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "الميكروÙون" @@ -3688,11 +3836,11 @@ msgstr "الميكروÙون" msgid "Min" msgstr "منخÙض" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "متÙرقات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "إعدادات منوعة" @@ -3713,7 +3861,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "الخط أحادي المساÙØ©" @@ -3726,7 +3874,7 @@ msgstr "موشن بلس" msgid "Motor" msgstr "محرك" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3748,7 +3896,7 @@ msgstr "" msgid "Multiply" msgstr "تضاعÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3840,6 +3988,7 @@ msgstr "التبويب" msgid "NP Up" msgstr "Ùوق" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3849,6 +3998,9 @@ msgstr "Ùوق" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3857,7 +4009,7 @@ msgstr "الاسم :" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "الاسم :" @@ -3871,7 +4023,7 @@ msgid "New Scan" msgstr "بحث جديد" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "الصÙحة التالية" @@ -3883,7 +4035,7 @@ msgstr "البحث التالي" msgid "Nickname :" msgstr "اسمك :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "لا يوجد بلد (SDK)" @@ -3922,7 +4074,7 @@ msgstr "لا Ø­Ùظ المجلد نتيجة البحث عن العنوان %s" msgid "None" msgstr "لا شيء" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" @@ -3930,8 +4082,8 @@ msgstr "Norwegian Bokmaal" msgid "Not Equal" msgstr "لا يساوي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "غير مجموعة" @@ -3951,7 +4103,7 @@ msgstr "غير متصل" msgid "Notes" msgstr "ملاحظات" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "ملاحظات :" @@ -3989,7 +4141,7 @@ msgstr "الهدÙ" msgid "Object Range" msgstr "نطاق الهدÙ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "إيقاÙ" @@ -4015,11 +4167,11 @@ msgstr "Ùقط %d كتل متاحة" msgid "Open" msgstr "Ùتح" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Ùتح المجلد المتضمن" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "اÙتح مجلد Ø­Ùظ الوي" @@ -4041,11 +4193,11 @@ msgstr "OpenAL : لا يمكن العثور على أجهزة الصوت" msgid "OpenAL: can't open device %s" msgstr "OpenAL : لا يمكن Ùتح الجهاز %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -4077,7 +4229,7 @@ msgstr "" "واستيراد وحÙظ لبطاقة ذاكرة جديدة\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "أخرى" @@ -4129,19 +4281,20 @@ msgstr "الÙقرة" msgid "Parameters" msgstr "معلمات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "قسم %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "باتش" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "مسارات" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4154,6 +4307,10 @@ msgstr "مسارات" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "وقÙØ©" @@ -4162,7 +4319,7 @@ msgstr "وقÙØ©" msgid "Per-Pixel Lighting" msgstr "لكل بكسل إضاءة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "مثالية" @@ -4175,6 +4332,7 @@ msgstr "مشهد %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4185,6 +4343,10 @@ msgstr "مشهد %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "بدأ اللعبه" @@ -4198,7 +4360,7 @@ msgstr "تشغيل التسجيل" msgid "Play/Pause" msgstr "بدأ/ايقاÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "قابلة للتشغيل" @@ -4210,6 +4372,7 @@ msgstr "خيارات التشغيل" msgid "Players" msgstr "لاعبين" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4219,6 +4382,9 @@ msgstr "لاعبين" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -4230,23 +4396,23 @@ msgstr "الرجاء إنشاء منظور قبل الحÙظ" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "تحكم 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "تحكم 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "تحكم 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "تحكم 4" @@ -4255,11 +4421,11 @@ msgstr "تحكم 4" msgid "Port :" msgstr "المنÙØ° :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" @@ -4267,17 +4433,17 @@ msgstr "Portuguese (Brazilian)" msgid "Post-Processing Effect:" msgstr "بعد معالجة تأثير:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4290,7 +4456,7 @@ msgstr "إعدادات مسبقة :" msgid "Prev Page" msgstr "الصÙحة السابقة" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "الصÙحة السابقة" @@ -4341,7 +4507,7 @@ msgstr "R-Analog" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "روسيا" @@ -4354,7 +4520,7 @@ msgstr "قوه" msgid "Read-only mode" msgstr "وضع القراءة Ùقط" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "حقيقي" @@ -4429,6 +4595,7 @@ msgstr "تحديث قائمة" msgid "Refresh game list" msgstr "تحديث القائمة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4447,6 +4614,12 @@ msgstr "تحديث القائمة" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "إزالة" @@ -4499,11 +4672,11 @@ msgstr "العصا الايمن" msgid "Rumble" msgstr "هزاز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Run DSP LLE on a dedicated thread (غير مستحسن)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russian" @@ -4511,10 +4684,11 @@ msgstr "Russian" msgid "Sa&ve State" msgstr "Ø­Ùظ الحالة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "آمنة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4524,6 +4698,9 @@ msgstr "آمنة" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "معدل العينة :" @@ -4581,12 +4758,12 @@ msgstr "8 Ø­Ùظ حالة" msgid "Save State..." msgstr "Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Ø­Ùظ باسم" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Ø­Ùظ مضغوط GCM/ISO" @@ -4594,11 +4771,11 @@ msgstr "Ø­Ùظ مضغوط GCM/ISO" msgid "Save current perspective" msgstr "Ø­Ùظ المنظور الحالي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Ø­Ùظ الضغط GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4609,6 +4786,7 @@ msgid "Scaled EFB Copy" <<<<<<< HEAD msgstr "EFB Copia a escala" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 <<<<<<< HEAD ======= @@ -4621,15 +4799,18 @@ msgstr "EFB Copia a escala" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Ùحص %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "بحث ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Ùحص" @@ -4645,12 +4826,12 @@ msgstr "انتقل تأمين" msgid "Search Filter" msgstr "بحث Ùلتر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "البحث ÙÙŠ المجلدات الÙرعية" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "" @@ -4660,6 +4841,7 @@ msgstr "" msgid "Select" msgstr "حدد" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4684,6 +4866,14 @@ msgstr "اختر مل٠تسجيل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "اختر مل٠تسجيل" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملÙ" @@ -4709,16 +4899,21 @@ msgstr "اختر النواÙØ° العائمة" msgid "Select the file to load" msgstr "حدد المل٠لتحميل" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "حدد Ø­Ùظ الملÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "حدد حالة التحميل" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4738,6 +4933,9 @@ msgstr "حدد حالة التحميل" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "حدد حالة الحÙظ" @@ -4759,7 +4957,7 @@ msgstr "" "\n" "إذاغير متأكد حدد التلقائي." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "تحديد الخط" @@ -4807,11 +5005,11 @@ msgstr "موضع الاستشعار:" msgid "Separator" msgstr "الÙاصل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbian" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "المنÙØ° التسلسلي 1 -- وهذا هو المنÙØ° الذي الأجهزة مثل استخدام محول شبكة" @@ -4820,11 +5018,11 @@ msgstr "المنÙØ° التسلسلي 1 -- وهذا هو المنÙØ° الذي msgid "Set" msgstr "ضبط" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "تعيين كاÙتراضي ايزو" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "تعيين كاÙتراضي بطاقة الذاكرة %c" @@ -4834,7 +5032,7 @@ msgstr "تعيين كاÙتراضي بطاقة الذاكرة %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "إعدادات" @@ -4846,7 +5044,7 @@ msgstr "SetupWiiMem: الإعداد غير قادر على إيجاد ملÙ" msgid "Shake" msgstr "هزة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "الاسم المختصر :" @@ -4874,7 +5072,7 @@ msgstr "أظهر شريط الأدوات" msgid "Show Drives" msgstr "اظهر محرك الاقراص" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "إظهار نسخة الصادرات للمناطق" @@ -4890,7 +5088,7 @@ msgstr "Ùرنسا" msgid "Show GameCube" msgstr "جيم كيوب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "إظهار مدخلات العرض" @@ -4906,7 +5104,7 @@ msgstr "اليابان" msgid "Show Korea" msgstr "كوريا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "أظهر اللغة :" @@ -4926,7 +5124,7 @@ msgstr "عرض الاجهزه" msgid "Show Regions" msgstr "إظهار المناطق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "إظهار الإحصاءات" @@ -4946,11 +5144,11 @@ msgstr "Wad اظهار" msgid "Show Wii" msgstr "الوي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "ظهور رسالة قبل وق٠اللعبة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4960,23 +5158,23 @@ msgstr "" "يمكن تجنب تعطيل هذه الرسائل المزعجة ØŒ ولكنه يمكن تعني أيضا أن دولÙين يتعطل " "Ùجأة دون أي تÙسير على الإطلاق." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "إظهار اول كتلة" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "إظهار كتل Ø­Ùظ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "إظهار Ø­Ùظ التعليقات" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "إظهار أيقونة الحÙظ " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "إظهارعنوان الحÙظ " @@ -5013,7 +5211,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "ويموت جانبي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Simplified Chinese" @@ -5021,11 +5219,11 @@ msgstr "Simplified Chinese" msgid "Size" msgstr "الحجم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "تخطي البيوس" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -5066,11 +5264,11 @@ msgstr "" msgid "Slot %i" msgstr "Ùتحة %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "A خانة " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "B خانة " @@ -5093,7 +5291,7 @@ msgstr "" "انها Ù…Ùيدة Ùقط لأغراض التصحيح.\n" "هل حقا تريد تمكين تقديم البرامج؟ إذا لم تكن متأكدا، اختر 'لا'.." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "إعدادات الصوت" @@ -5111,6 +5309,7 @@ msgstr "Ùشل إنشاء المخزن المؤقت الصوت : %s" msgid "Space" msgstr "مجال" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5126,6 +5325,11 @@ msgstr "مجال" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanish" @@ -5157,7 +5361,7 @@ msgstr "" msgid "Specify a video backend" msgstr "حدد الخلÙية مل٠Ùيديو" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "تسريع معدل نقل القرص" @@ -5165,7 +5369,7 @@ msgstr "تسريع معدل نقل القرص" msgid "Square Stick" msgstr "مربع العصا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "وحدة تحكم القياسية" @@ -5263,12 +5467,12 @@ msgstr "استيرادها بنجاح Ø­Ùظ الملÙات" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "نظام اللغة :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "تايوان" @@ -5307,7 +5511,7 @@ msgstr "الجدول الأيمن" msgid "Take Screenshot" msgstr "اخذ لقطه من الشاشه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" <<<<<<< HEAD msgstr "" @@ -5348,7 +5552,7 @@ msgstr "" msgstr "Texture Cache" >>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "" @@ -5364,13 +5568,13 @@ msgstr "عنوان غير صالح" msgid "The checksum was successfully fixed" msgstr "تم إصلاح بنجاح الاختباري" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "الدليل المختار هو بالÙعل ÙÙŠ قائمة" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5392,7 +5596,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "المل٠%s بالÙعل Ù…Ùتوح، لن المل٠غير عنوان مكتوب." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "لا وجود له (%s) المل٠الذي حددته" @@ -5410,11 +5614,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "أكثر أمانا ضبط هذا، Ùإن على الأرجح أقل المضاهاة تكون Ù…Ùقودة أي تحديثات " "الملمس من ذاكرة الوصول العشوائي.\n" @@ -5457,7 +5662,7 @@ msgstr "" msgid "The value is invalid" msgstr "قيمة غير صالحة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "ثيم" @@ -5465,13 +5670,13 @@ msgstr "ثيم" msgid "Theme selection went wrong" msgstr "اختيار ثيم خاظئ" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5483,7 +5688,7 @@ msgid "" "Replay itself." msgstr "هذه المحاكاة إعادة العمل لا تدعم تعديل الرموز التي اعادتها العمل Ù†Ùسه." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "هذا يمكن أن يسبب بطء ÙÙŠ القائمة لوى وبعض الألعاب." @@ -5507,24 +5712,10 @@ msgstr "" "إذا لم تكن متأكدا اترك هذا غير محددة." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"يستخدم هذا للسيطرة على سرعة اللعبة خنق الصوت.\n" -"يؤدي تعطيل هذا غير عادية يمكن أن يسبب سرعة اللعبة ØŒ مثل سريع جدا.\n" -"لكن ÙÙŠ بعض الأحيان يمكن أن يسبب تمكين هذا الضجيج المستمر.\n" -"\n" -"اختصار : اضغط باستمرار على الÙور لتعطيل الخنق ÙÙŠ لوحة المÙاتيح." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr " BGM هذا وتستخدم لتشغيل مسارات الموسيقى ØŒ مثل." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5532,7 +5723,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "هذا تسمح لك التعديل اليدوي رسائل كتبها هذا المؤل٠مل٠التكوين" @@ -5555,7 +5746,7 @@ msgstr "العنوان" msgid "To" msgstr "إلى" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "تبديل جميع أنواع السجل" @@ -5575,6 +5766,7 @@ msgstr "اللعب بالشاشة كاملة" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5582,14 +5774,17 @@ msgstr "اللعب بالشاشة كاملة" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "أعلى" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "حاول تحميل نوع مل٠غير معروÙ." @@ -5597,7 +5792,7 @@ msgstr "حاول تحميل نوع مل٠غير معروÙ." msgid "Triggers" msgstr "Triggers" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "محاولة قراءة من SYSCONF غير صالحة" @@ -5607,7 +5802,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turkish" @@ -5628,11 +5823,11 @@ msgstr "UDP منÙØ° :" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "غير معروÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "امريكا" @@ -5717,7 +5912,7 @@ msgstr "التحديث" msgid "Upright Wiimote" msgstr "ويموت مستقيم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "(PAL60) استخدم وضع " @@ -5729,7 +5924,7 @@ msgstr "استخدام شاشة كاملة" msgid "Use Hex" msgstr "استخدام الهيكس" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" @@ -5760,7 +5955,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Ùائدة" @@ -5784,25 +5979,29 @@ msgstr "القيمة:" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Ùديو" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "الظاهري" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "الصوت" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "خطأ ÙÙŠ إنشاء wad: Ùشل التثبيت %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "خطأ ÙÙŠ إنشاء wad: Ùشل التثبيت %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5821,15 +6020,15 @@ msgstr "" msgid "Warning" msgstr "التنبيه" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "تحذير -- ايزو ابتداء من الخطأ وضع وحدة التحكم!" @@ -5895,7 +6094,7 @@ msgstr "" ======= >>>>>>> Update Arabic and Japanese translations. -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5903,7 +6102,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5911,7 +6110,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5939,7 +6138,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "شاشة واسعة هاك" @@ -5947,15 +6146,15 @@ msgstr "شاشة واسعة هاك" msgid "Width" msgstr "عرض" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "الوي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "جهاز الوي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND Root:" @@ -5963,6 +6162,7 @@ msgstr "Wii NAND Root:" msgid "Wii Save Import" msgstr "استيراد Ø­Ùظ الوي" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5972,6 +6172,9 @@ msgstr "استيراد Ø­Ùظ الوي" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "ملÙات Ø­Ùظ الوي (*.bin)|*.bin" @@ -6038,10 +6241,11 @@ msgstr "نواÙØ° القائمة" msgid "Windows Right" msgstr "نواÙØ° اليمين" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "كلمة ختامية" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6057,6 +6261,11 @@ msgstr "كلمة ختامية" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "العمل" @@ -6064,6 +6273,11 @@ msgstr "العمل" msgid "Write to Console" msgstr "الكتابة إلى وحدة التحكم" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "الكتابة على الملÙ" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "الكتابة على الملÙ" @@ -6117,7 +6331,7 @@ msgstr "يجب إدخال صالح العشري، أو الست عشرية قي msgid "You must enter a valid profile name." msgstr "يجب إدخال اسم المل٠صالح." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "يجب إعادة تشغيل دولÙين من أجل التغيير ناÙØ° المÙعول." @@ -6138,7 +6352,7 @@ msgstr "" "يجب أن يكون 0x%04x (but is 0x%04llx)\n" "هل تريد إنشاء واحدة جديدة?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP هاك" @@ -6208,7 +6422,7 @@ msgstr "" msgid "^ ADD" msgstr "^أض٠" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6239,12 +6453,12 @@ msgstr "ليس Ø­Ùظ الوي أو قراءة Ùشلة لحجم عنوان ا msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "أمر غير معرو٠0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -6486,6 +6700,9 @@ msgstr "أو" #~ msgid "Emulator Display Settings" #~ msgstr "إعدادات العرض " +#~ msgid "Enable Audio Throttle" +#~ msgstr "Enable Audio Throttle" + #~ msgid "Enable CPU Access" #~ msgstr "CPU Access تمكين" @@ -6877,6 +7094,19 @@ msgstr "أو" #~ msgid "The file " #~ msgstr "El archivo " +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "يستخدم هذا للسيطرة على سرعة اللعبة خنق الصوت.\n" +#~ "يؤدي تعطيل هذا غير عادية يمكن أن يسبب سرعة اللعبة ØŒ مثل سريع جدا.\n" +#~ "لكن ÙÙŠ بعض الأحيان يمكن أن يسبب تمكين هذا الضجيج المستمر.\n" +#~ "\n" +#~ "اختصار : اضغط باستمرار على الÙور لتعطيل الخنق ÙÙŠ لوحة المÙاتيح." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Esto es usado comunmente para reproducir voces y efectos de sonido." diff --git a/Languages/po/ca.po b/Languages/po/ca.po index e7664edac1..2cdcaf6800 100644 --- a/Languages/po/ca.po +++ b/Languages/po/ca.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-08-19 08:36-0500\n" "Last-Translator: Jordi Coma \n" "Language-Team: Catalan \n" @@ -63,9 +67,9 @@ msgstr "\"%s\" no és un fitxer GCM/ISO valid, o no és una ISO GC/Wii." msgid "%1$sCopy%1$s" msgstr "%1$sCopia%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -162,7 +166,7 @@ msgstr "%sExportar com a GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u blocs lliures; %u Entrades Lliures" @@ -195,11 +199,11 @@ msgstr "Gestor de &Trucs" msgid "&DSP Settings" msgstr "Configuració de &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Eliminar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&EliminarISOs seleccionades ..." @@ -263,7 +267,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Executar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Propietats" @@ -307,7 +311,7 @@ msgstr "&Visualitza" msgid "&Wiimote Settings" msgstr "Configuració «&Wiimote»" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -351,7 +355,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -360,7 +364,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -417,13 +421,13 @@ msgstr "" "\n" "Vostè ha d'enviar el port TCP per rebre!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-placa base" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Codis AR " @@ -435,11 +439,11 @@ msgstr "Sobre Dolphin" msgid "Acceleration" msgstr "Acceleració" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Precisió:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulació acurada de Vbeam" @@ -560,11 +564,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Afegeix" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Afegeix codi ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Afegeix Pegat" @@ -572,6 +576,7 @@ msgstr "Afegeix Pegat" msgid "Add new pane" msgstr "Afegeix un nou panell" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -587,6 +592,11 @@ msgstr "Afegeix un nou panell" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Afegir ..." @@ -634,11 +644,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Ajustar la pressió de control analògic per activar els botons." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avançada" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Configuració avançada" @@ -646,14 +656,15 @@ msgstr "Configuració avançada" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tots els arxius GC / Wii (elf, dol, gcm, iso, ciso, GCZ, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Tots els fitxers GameCube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -666,18 +677,22 @@ msgstr "Tots els fitxers GameCube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tots els Estats (savi, s##\")" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Tots els fitxers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tots els fitxers ISO comprimits de GC o Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Tots els fitxers (*.*)|*.*" @@ -693,7 +708,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Wiimote emulat" @@ -714,7 +729,7 @@ msgstr "«Apploader» té una mida dolenta ...realment és un «apploader»?" msgid "Apploader unable to load from file" msgstr "«Apploader» no ha pogut carregar des de l'arxiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -732,7 +747,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Àrab" @@ -741,7 +756,7 @@ msgstr "Àrab" msgid "Are you sure you want to delete \"%s\"?" msgstr "Esteu segur que voleu suprimir \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -749,11 +764,12 @@ msgstr "" "Esteu segur que voleu eliminar aquests arxius? \n" "No es podran recuperar mai més!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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à irrecuperable!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -763,6 +779,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -771,18 +790,20 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Àudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Suport d'àudio:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error en obrir el dispositiu AO \n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -792,6 +813,9 @@ msgstr "AudioCommon: Error en obrir el dispositiu AO \n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -835,7 +859,7 @@ msgstr "" msgid "Back" msgstr "Tornar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Configuració del Suport" @@ -862,11 +886,11 @@ msgstr "Mala capçalera a l'arxiu" msgid "Banner" msgstr "Imatge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Detalls del Imatge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Imatge:" @@ -878,7 +902,7 @@ msgstr "Barra" msgid "Basic" msgstr "Bàsic" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Configuració bàsica" @@ -909,6 +933,7 @@ msgstr "Blau dret" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -916,6 +941,9 @@ msgstr "Blau dret" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Abaix" @@ -924,7 +952,7 @@ msgstr "Abaix" msgid "Bound Controls: %lu" msgstr "Controls enllaçats: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Trencat" @@ -940,7 +968,7 @@ msgstr "Examineu un directori per afegir" msgid "Browse for an ISO directory..." msgstr "Examineu un directori ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Examineu el directori de sortida" @@ -970,11 +998,11 @@ msgstr "Palanca-C" msgid "C-Stick" msgstr "Palanca-C" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Motor d'emulació de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Llistes de memòria cau de pantalla" @@ -1037,7 +1065,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1048,7 +1076,7 @@ msgstr "" "%s\n" "No és un arxiu de targeta de memòria gamecube vàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1066,8 +1094,6 @@ msgstr "No es pot trobar WiiMote per bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "No es pot trobar l'identificador de connexió WiiMote %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1077,7 +1103,7 @@ msgstr "No es pot llegir des del connector DVD - Interfície DVD: Error greu" msgid "Caps Lock" msgstr "Bloc Maj." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Català" @@ -1102,7 +1128,7 @@ msgstr "Canviar Disc" msgid "Change Game" msgstr "Canvi de joc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1118,8 +1144,8 @@ 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 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Canviar això no tindrà cap efecte mentre l'emulador s'executa!" @@ -1139,31 +1165,31 @@ msgstr "Cerca trucs" msgid "Cheats Manager" msgstr "Administrador de trucs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Xinès (simplificat)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Xinès (tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Tria un directori arrel del DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Tria el directori arrel del NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Triar una ISO per defecte:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Trieu un directori per afegir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Trieu un arxiu per obrir" @@ -1171,7 +1197,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:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1179,8 +1205,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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Seleccioneu la carpeta on extreure" @@ -1192,14 +1218,14 @@ msgstr "Palanca Cercle" msgid "Classic" msgstr "Clàssic" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Esborrar" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Fallada a l'esborrar." @@ -1215,6 +1241,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1223,6 +1250,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Tancar" @@ -1246,20 +1277,20 @@ msgstr "Comanda" msgid "Comment" msgstr "Comentari" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Comentari:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Comprimir ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionades ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Comprimeix ISO" @@ -1286,13 +1317,13 @@ msgstr "Configurar Control" msgid "Configure..." msgstr "Configuració..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Confirmar contraescriptura del fitxer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmar a l'aturar" @@ -1301,7 +1332,7 @@ msgstr "Confirmar a l'aturar" msgid "Connect" msgstr "Connectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Connectar el teclat USB" @@ -1358,12 +1389,12 @@ msgstr "Convertir a GCI" msgid "Copy failed" msgstr "Copia fallada" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar a la targeta de memòria %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Nucli" @@ -1393,7 +1424,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "No es pot reconèixer el fitxer ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "No s'ha pogut desar %s" @@ -1407,7 +1438,7 @@ msgstr "" "executant actualment! \n" "(Configurar els controls mentre el joc s'executa no està actualment suportat)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1420,7 +1451,7 @@ msgstr "" "Esteu executant Dolphin des d'un CD / DVD, o l'arxiu de targeta de memòria " "està protegit contra escriptura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "No s'ha trobat la comanda d'obertura per l'extensió 'ini'!" @@ -1437,7 +1468,7 @@ msgstr "" msgid "Count:" msgstr "Compta:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "País:" @@ -1451,25 +1482,25 @@ msgstr "Crear Codi AR" msgid "Create new perspective" msgstr "Crear una nova perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Creat per KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Creat per Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Creat per VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Creat per black_rider i publicat en ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Creador:" @@ -1477,7 +1508,7 @@ msgstr "Creador:" msgid "Critical" msgstr "Crític" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Retallar" @@ -1500,7 +1531,7 @@ msgstr "Atenuar" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "El directori actual ha canviat de %s a %s després de wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Projecció personalitzada" @@ -1508,11 +1539,11 @@ msgstr "Projecció personalitzada" msgid "Custom Projection Hack Settings" msgstr "Configuració de la projecció personalitzada" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Configuració d'alguns paràmetres de projecció Ortogràfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Txec" @@ -1524,10 +1555,11 @@ msgstr "Direcció digital" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Motor d'emulació DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1538,18 +1570,22 @@ msgstr "Motor d'emulació DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulació DSP HLE (ràpid)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Intèrpret DSP LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE al fil d'execució" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilador DSP LLE " @@ -1557,15 +1593,23 @@ msgstr "Recompilador DSP LLE " msgid "DSP settings" msgstr "Configuració DSP " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Arrel del DVD:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Mida de dades" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Data:" @@ -1586,7 +1630,7 @@ msgstr "Zona morta" msgid "Debug" msgstr "Depuració" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Depuració" @@ -1594,16 +1638,16 @@ msgstr "Depuració" msgid "Decimal" msgstr "Decimals" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Descomprimir ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISO seleccionades..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Descomprimint ISO" @@ -1611,11 +1655,11 @@ msgstr "Descomprimint ISO" msgid "Default" msgstr "Per defecte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO per defecte:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Font per defecte" @@ -1624,7 +1668,7 @@ msgstr "Font per defecte" msgid "Delete" msgstr "Eliminar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Eliminar partida desada" @@ -1633,7 +1677,7 @@ msgstr "Eliminar partida desada" msgid "Delete the existing file '%s'?" msgstr "Eliminar el fitxer existent '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Descripció" @@ -1641,8 +1685,8 @@ msgstr "Descripció" msgid "Detect" msgstr "Detectar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1654,8 +1698,8 @@ msgstr "" msgid "Device" msgstr "Dispositiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Configuració del dispositiu" @@ -1680,23 +1724,23 @@ msgstr "" "i també ha fallat la comprovació de la suma de la copia del directory" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Deshabilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Deshabilitar boira" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Deshabilitar l'il·luminació" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Deshabilitar la profunditat per-pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Deshabilitar Textures" @@ -1741,7 +1785,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disc" @@ -1768,6 +1812,7 @@ msgstr "" msgid "Divide" msgstr "Divideix" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1777,10 +1822,13 @@ msgstr "Divideix" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1805,6 +1853,7 @@ msgstr "Configuració de Wiimote emulat" msgid "Dolphin FIFO" msgstr "FIFO Dolphin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1829,6 +1878,14 @@ msgstr "Configuració del control GC Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Configuració del control GC Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" @@ -1861,11 +1918,11 @@ msgstr "" msgid "Down" msgstr "Avall" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Descarregar Codis (base de dades WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Descarregat %lu codis. (Afegits %lu)" @@ -1874,23 +1931,23 @@ msgstr "Descarregat %lu codis. (Afegits %lu)" msgid "Drums" msgstr "Tambors" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Maniquí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Bolcat d'àudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Bolcat de destinació EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Bolcat d'imatges" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Bolcat de textures" @@ -1925,6 +1982,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1940,6 +1998,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandès" @@ -1964,7 +2027,7 @@ msgstr "" "Dolphin, probablement és necessari reiniciar el Windows per veure el nou " "controlador." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1980,7 +2043,7 @@ msgstr "Edita" msgid "Edit ActionReplay Code" msgstr "Modificar codi ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Modificar configuració" @@ -1992,8 +2055,8 @@ msgstr "Modificar el pagat" msgid "Edit current perspective" msgstr "Modificar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Modificació ..." @@ -2043,7 +2106,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote emulat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Estat d'emulació:" @@ -2072,23 +2135,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Habilitar el registre de logs d'AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Habilitar la regulació de so" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Habilitar les millors tècniques disponibles" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Habilitar fusió de Bloc" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2101,6 +2164,7 @@ msgstr "" msgid "Enable Cache" msgstr "Habilitar memòria cau" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2110,51 +2174,54 @@ msgstr "Habilitar memòria cau" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activar Trucs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Habilitar Música DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Habilitar Doble nucli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Habilitar Doble nucli (acceleració)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Activar tecles d'accés ràpid" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Habilitar salt d'inactiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Habilitar salt d'inactiu (acceleració)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Habilitar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Habilitar exploració &Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Habilitar el protector de pantalla" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Habilitar pantalla panoràmica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Habilitar malla" @@ -2170,7 +2237,7 @@ msgstr "" "Millora la qualitat visual de les textures que es troben en un angle de " "visió obliqua." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2178,7 +2245,7 @@ msgstr "" "Habilitar l'accés al disc ràpid. Necessari per a alguns jocs. (Activat = " "ràpid, Desactivat = Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Habilitar pàgines" @@ -2206,7 +2273,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2214,7 +2281,7 @@ msgstr "" "Activi aquesta opció per accelerar The Legend of Zelda: Twilight Princess. " "Deshabilitar per a qualsevol altre joc." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2224,7 +2291,7 @@ msgstr "" "Gestió de memòria. Precisa en el maquinari, però lent per emular. " "(Activat=compatible, Desactivat = ràpid)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Activa la modificació personalitzada de projecció" @@ -2240,7 +2307,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2262,6 +2329,7 @@ msgstr "" msgid "End" msgstr "Fi" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2277,6 +2345,11 @@ msgstr "Fi" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Anglès" @@ -2307,6 +2380,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2337,20 +2411,26 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Error" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error en carregar l'idioma seleccionat. Es retorna a l'idioma per defecte " "del sistema." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2385,7 +2465,7 @@ msgstr "Sortir de Dolphin amb emulador" msgid "Export Failed" msgstr "Fallada d'exportació" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exportar fitxer" @@ -2398,15 +2478,15 @@ msgstr "Exportar gravació" msgid "Export Recording..." msgstr "Exportar gravació ..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exportar partida desada" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exportar partida desada Wii (Experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exportar totes les partides desades" @@ -2422,7 +2502,7 @@ msgstr "Desar exportació com a..." msgid "Extension" msgstr "Extensió" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Memòria cau d'imatge externa" @@ -2434,44 +2514,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Extreure tots els arxius ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Extreure «Apploader» ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Extreure DOL ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Extreure del repertori ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Extreure arxiu ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Extreure partició ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Extraient %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Extreure tots els arxius" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Extraient Directori" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Extraient ..." @@ -2483,11 +2563,11 @@ msgstr "Byte FIFO" msgid "FIFO Player" msgstr "Jugador FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Mida FST:" @@ -2499,11 +2579,11 @@ msgstr "Error al connectar!" msgid "Failed to Listen!!" msgstr "Error a l'escoltar!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Error al descarregar codis." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Error a l' extreure a %s!" @@ -2620,18 +2700,28 @@ msgstr "No s'ha pogut escriure la capçalera per %s" msgid "Failed to write header for file %d" msgstr "No s'ha pogut escriure la capçalera pel fitxer% d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Ràpid" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Mipmaps ràpids" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Jugador fifo" @@ -2640,7 +2730,7 @@ msgstr "Jugador fifo" msgid "File Info" msgstr "informació del fitxer" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "L'arxiu no conté codis." @@ -2673,16 +2763,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:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Mode d'obertura desconegut: 0x% 02x " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Sistema d'arxius" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "'ini' Tipus de fitxer és desconegut! no s'obre!" @@ -2690,7 +2780,7 @@ msgstr "'ini' Tipus de fitxer és desconegut! no s'obre!" msgid "First Block" msgstr "Primer Bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Arregla les sumes de comprovació" @@ -2702,7 +2792,7 @@ msgstr "Forçar 16:9" msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Força la consola com NTSC-J" @@ -2735,7 +2825,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2771,7 +2861,7 @@ msgstr "Imatge" msgid "Frame Advance" msgstr "Avançar imatges" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Bolcat d'imatges utilitzant FFV1" @@ -2783,7 +2873,7 @@ msgstr "Rang d'imatges" msgid "Frame S&kipping" msgstr "Salta imatge&s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limit d'imatges/s:" @@ -2791,10 +2881,11 @@ msgstr "Limit d'imatges/s:" msgid "Frames To Record" msgstr "Imatges a Enregistrar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Visió lliure" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2810,6 +2901,11 @@ msgstr "Visió lliure" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francès" @@ -2843,7 +2939,7 @@ msgstr "Configuració de gràfics" msgid "GCPad" msgstr "Control GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID del Joc:" @@ -2859,15 +2955,15 @@ msgstr "El joc no està funcionant!" msgid "Game not found!!" msgstr "Joc no trobat!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Configuració de jocs específics" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configuració de joc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2878,6 +2974,7 @@ msgstr "Configuració control «&Gamecube»" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2885,6 +2982,9 @@ msgstr "Configuració control «&Gamecube»" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" @@ -2893,15 +2993,17 @@ msgid "Gamecube Pad settings" msgstr "Configuració control Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Codis Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Codi Gecko ha fallat a executar (CT%i CST%i) (%s) \n" "(Pot ser un codi incorrecte o el tipus de codi encara no està suportat.)" @@ -2910,6 +3012,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2918,6 +3021,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2926,6 +3032,7 @@ msgstr "General" msgid "General Settings" msgstr "Configuració General" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2941,6 +3048,11 @@ msgstr "Configuració General" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemany" @@ -2981,7 +3093,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grec" @@ -3013,7 +3125,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:303 msgid "Hebrew" msgstr "Hebreu" @@ -3083,12 +3195,16 @@ msgstr "Tecla d'accés de configuració" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tecles d'accés" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hongarès" @@ -3096,14 +3212,14 @@ msgstr "Hongarès" msgid "Hybrid Wiimote" msgstr "Wiimote Híbrid" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3116,11 +3232,11 @@ msgstr "" "TitleID %016llx. \n" "Probablement Dolphin es penjarà ara." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destinació dolenta" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Configuració de IPL" @@ -3136,15 +3252,15 @@ msgstr "Punter IR" msgid "IR Sensitivity:" msgstr "Sensibilitat d'IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Detalls d'ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Directoris ISO:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITÀLIA" @@ -3152,23 +3268,25 @@ msgstr "ITÀLIA" msgid "Icon" msgstr "Icona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 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)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "Si heu establert límit al nombre d'imatges per segon major que la velocitat " "del joc complet (NTSC: 60, PAL: 50), també cal deshabilitar la regulació de " @@ -3206,7 +3324,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Desar importació" @@ -3257,7 +3375,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "En Joc" @@ -3266,7 +3384,7 @@ msgid "In-Game" msgstr "En-joc" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3286,7 +3404,7 @@ msgstr "Insereix" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inseriu el codi xifrat o desxifrat aquí ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Inserir la targeta SD" @@ -3298,7 +3416,7 @@ msgstr "Introduïu un nom aquí .." msgid "Install WAD" msgstr "Instal·lar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Instal·lar al Menú de Wii" @@ -3309,6 +3427,7 @@ msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3318,14 +3437,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instal·lant WAD ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interfície" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Configuració d'interfície" @@ -3350,11 +3472,11 @@ msgstr "Error intern LZO - lzo_init () ha fallat" msgid "Internal Resolution:" msgstr "Resolució Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Intèrpret (molt lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Introducció" @@ -3371,7 +3493,7 @@ msgstr "Valor invàlid!" msgid "Invalid bat.map or dir entry" msgstr "Invàlid bat.map o entrada al directori" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Tipus d'esdeveniment invàlid %i" @@ -3391,14 +3513,15 @@ msgstr "" "% s\n" "És possible que necessiti re-descarregar aquest joc." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Enregistrament de fitxer invàlid" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Estat invàlid" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3414,27 +3537,32 @@ msgstr "Estat invàlid" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italià" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPÓ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomanat)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Recompilador JITIL experimental" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonès" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "COREA" @@ -3443,8 +3571,8 @@ msgstr "COREA" msgid "Key" msgstr "Clau" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Corea" @@ -3462,7 +3590,7 @@ msgstr "Botó L" msgid "L-Analog" msgstr "L-Analògic" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Idioma:" @@ -3515,7 +3643,7 @@ msgstr "" msgid "Less Than" msgstr "Menys de" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limitar per FPS " @@ -3523,7 +3651,7 @@ msgstr "Limitar per FPS " msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Carrega textures personalitzades" @@ -3571,6 +3699,7 @@ msgstr "Carregar ranura d'estat 8" msgid "Load State..." msgstr "Carregar Estat..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3592,6 +3721,13 @@ msgstr "Carregar el menú del sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Carregar el menú del sistema Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar menú del sistema Wii %d%c" @@ -3618,7 +3754,7 @@ msgstr "Carrega els fitxer especificats (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Bloca els fils d'execució als nuclis" @@ -3630,11 +3766,11 @@ msgstr "Registre Log" msgid "Log Configuration" msgstr "Configuració del registre Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipus de registre Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Sortides del registrador Log" @@ -3664,7 +3800,7 @@ msgstr "" "desajust MD5 \n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Modificació de velocitat MMU" @@ -3686,11 +3822,11 @@ msgstr "Arxius MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Palanca principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID Fabricant:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Fabricant:" @@ -3714,6 +3850,7 @@ msgstr "Byte de memòria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3721,6 +3858,9 @@ msgstr "Byte de memòria" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Targeta de memòria" @@ -3758,7 +3898,7 @@ msgstr "" msgid "Menu" msgstr "Menú" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Micròfon" @@ -3767,11 +3907,11 @@ msgstr "Micròfon" msgid "Min" msgstr "Mínim" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Altres" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Altres Configuracions" @@ -3792,7 +3932,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Fonts d'espiat simple" @@ -3805,7 +3945,7 @@ msgstr "Motion Plus®" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3828,7 +3968,7 @@ msgstr "" msgid "Multiply" msgstr "Múltiple" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3920,6 +4060,7 @@ msgstr "NP Tabulador" msgid "NP Up" msgstr "NP Amunt" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3929,6 +4070,9 @@ msgstr "NP Amunt" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3937,7 +4081,7 @@ msgstr "Nom:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nom:" @@ -3951,7 +4095,7 @@ msgid "New Scan" msgstr "Nou escaneig" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Pàgina següent" @@ -3963,7 +4107,7 @@ msgstr "Següent escaneig" msgid "Nickname :" msgstr "Sobrenom:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "No país (SDK)" @@ -4002,7 +4146,7 @@ msgstr "No s'ha trobat la carpeta de partides desades per el joc %s" msgid "None" msgstr "Cap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Noruega Bokmaal" @@ -4010,8 +4154,8 @@ msgstr "Noruega Bokmaal" msgid "Not Equal" msgstr "No igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Sense establir" @@ -4031,7 +4175,7 @@ msgstr "No està connectat" msgid "Notes" msgstr "Notes" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notes:" @@ -4069,7 +4213,7 @@ msgstr "Objecte" msgid "Object Range" msgstr "Rang d'objecte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Apagar" @@ -4095,11 +4239,11 @@ msgstr "Només queden %d blocs disponibles" msgid "Open" msgstr "Obrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Obrir directori &contingut" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Obrir la carpeta de partide&s desades" @@ -4121,11 +4265,11 @@ msgstr "OpenAL: no es poden trobar dispositius de so" msgid "OpenAL: can't open device %s" msgstr "OpenAL: no es pot obrir el dispositiu %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "Descodificador de textura OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "Activar descodificador de textura OpenMP" @@ -4157,7 +4301,7 @@ msgstr "" "i importeu les partides desades una targeta de memòria nova\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Altres" @@ -4209,19 +4353,20 @@ msgstr "Paràgraf" msgid "Parameters" msgstr "Paràmetres" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partició %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Pegats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Camins" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4234,6 +4379,10 @@ msgstr "Camins" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4242,7 +4391,7 @@ msgstr "Pausa" msgid "Per-Pixel Lighting" msgstr "Il·luminació per píxel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfecte" @@ -4255,6 +4404,7 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4265,6 +4415,10 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Executar" @@ -4278,7 +4432,7 @@ msgstr "Reproduir enregistrament" msgid "Play/Pause" msgstr "Reproduir/Pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Jugable" @@ -4290,6 +4444,7 @@ msgstr "Opcions de reproducció" msgid "Players" msgstr "Jugadors" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4299,6 +4454,9 @@ msgstr "Jugadors" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Confirmeu ..." @@ -4310,23 +4468,23 @@ 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:309 msgid "Polish" msgstr "Polonès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4335,11 +4493,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portuguès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portuguès (Brasil)" @@ -4347,17 +4505,17 @@ msgstr "Portuguès (Brasil)" msgid "Post-Processing Effect:" msgstr "Efectes de post-procés:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4370,7 +4528,7 @@ msgstr "Preestablerts:" msgid "Prev Page" msgstr "Pàgina anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Pàgina anterior" @@ -4421,7 +4579,7 @@ msgstr "R-Analògic" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RÚSSIA" @@ -4434,7 +4592,7 @@ msgstr "Rang" msgid "Read-only mode" msgstr "Només lectura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Real" @@ -4510,6 +4668,7 @@ msgstr "Actualitzar llista" msgid "Refresh game list" msgstr "Actualitza la llista de jocs" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4528,6 +4687,12 @@ msgstr "Actualitza la llista de jocs" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Treure" @@ -4580,11 +4745,11 @@ msgstr "Palanca dreta" msgid "Rumble" msgstr "Vibració" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Executar DSP LLE en un fil d'execució dedicat (no recomanat)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Rússia" @@ -4592,10 +4757,11 @@ msgstr "Rússia" msgid "Sa&ve State" msgstr "&Desa l'estat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Segur" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4605,6 +4771,9 @@ msgstr "Segur" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Freqüència de mostreig:" @@ -4662,12 +4831,12 @@ msgstr "Desar ranura estat 8" msgid "Save State..." msgstr "Desar Estat ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Desar com ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Desar GCM/ISO comprimit" @@ -4675,11 +4844,11 @@ msgstr "Desar GCM/ISO comprimit" msgid "Save current perspective" msgstr "Desar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Desar GCM/ISO descomprimit" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." @@ -4688,6 +4857,7 @@ msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." msgid "Scaled EFB Copy" msgstr "Copia EFB escalada" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4697,15 +4867,18 @@ msgstr "Copia EFB escalada" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Escanejant %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Cercant ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Cercant ..." @@ -4721,12 +4894,12 @@ msgstr "Bloc desplaçament" msgid "Search Filter" msgstr "Filtre de cerca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Cercar en subcarpetes" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "La secció %s no trobada a SYSCONF" @@ -4736,6 +4909,7 @@ msgstr "La secció %s no trobada a SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4760,6 +4934,14 @@ msgstr "Seleccionar el fitxer de gravació" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Seleccionar el fitxer de gravació" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleccionar un fitxer WAD de Wii per instal·lar" @@ -4784,6 +4966,7 @@ msgstr "Seleccioneu finestres flotants" msgid "Select the file to load" msgstr "Seleccioneu el fitxer a carregar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4800,19 +4983,26 @@ msgstr "Seleccioneu l'estat a carregar" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Seleccioneu el fitxer de partida desada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Seleccioneu l'estat a carregar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Seleccioneu l'estat a desar" @@ -4834,7 +5024,7 @@ msgstr "" "\n" "Si no n'esteu segurs, seleccioneu Automàtic" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Font seleccionada" @@ -4882,11 +5072,11 @@ msgstr "Barra de sensors de posició" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4897,11 +5087,11 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Definir la imatge ISO per &defecte" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Definir com a targeta de memòria predeterminada %c" @@ -4913,7 +5103,7 @@ msgstr "" "SetARCode_IsActive: L'índex és major que la grandària de la llista de codis " "AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Configuració ..." @@ -4925,7 +5115,7 @@ msgstr "SetupWiiMem: No es troba el fitxer de configuració" msgid "Shake" msgstr "Sacsejar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Nom curt:" @@ -4953,7 +5143,7 @@ msgstr "Mostrar Barra d'&eines" msgid "Show Drives" msgstr "Mostrar unitats" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Mostrar regions de copia EFB" @@ -4969,7 +5159,7 @@ msgstr "Mostrar França" msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Mostrar entrada" @@ -4985,7 +5175,7 @@ msgstr "Mostrar Japó" msgid "Show Korea" msgstr "Mostrar Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Mostrar Idioma:" @@ -5005,7 +5195,7 @@ msgstr "Mostrar Plataformes" msgid "Show Regions" msgstr "Mostrar Regions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Mostrar estadístiques" @@ -5025,11 +5215,11 @@ msgstr "Mostrar Wad" msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -5039,23 +5229,23 @@ msgstr "" "Deshabilitar d'això pot evitar els missatges molestos i no crítics, però " "també pot significar que Dolphin de sobte es pengi sense cap explicació." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Mostra primer bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Mostra blocs de partida desada" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Mostra desar un comentari" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Mostra icona de desar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Mostra títol desat" @@ -5093,7 +5283,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote horitzontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Xinès simplificat" @@ -5101,11 +5291,11 @@ msgstr "Xinès simplificat" msgid "Size" msgstr "Mida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Saltar BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Salta pas Dest. Alpha" @@ -5148,11 +5338,11 @@ msgstr "" msgid "Slot %i" msgstr "Ranura %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Ranura A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Ranura B" @@ -5177,7 +5367,7 @@ msgstr "" "Realment voleu activar el renderitzat per software? Si no n'esteu segurs, " "seleccioneu 'No'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Configuració de so" @@ -5195,6 +5385,7 @@ msgstr "Ha fallat la creació del buffer de so: %s" msgid "Space" msgstr "Espai" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5210,6 +5401,11 @@ msgstr "Espai" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espanyol" @@ -5242,7 +5438,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Especifiqueu un suport de vídeo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Accelerar la tassa de transferència de Disc" @@ -5250,7 +5446,7 @@ msgstr "Accelerar la tassa de transferència de Disc" msgid "Square Stick" msgstr "Palanca quadrada" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Control estàndard" @@ -5348,12 +5544,12 @@ msgstr "Arxius de partides desades importats correctament" msgid "Swing" msgstr "Oscil·lació" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Idioma del sistema:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5392,7 +5588,7 @@ msgstr "Taula dreta" msgid "Take Screenshot" msgstr "Capturar pantalla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5408,7 +5604,7 @@ msgstr "Textura" msgid "Texture Cache" msgstr "Memòria cau de textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Superposició del format de textura" @@ -5424,13 +5620,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "El directori triat ja és a la llista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5453,7 +5649,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "El fitxer %s ja estava oberta, la capçalera de l'arxiu no s'escriurà." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "L'arxiu especificat (%s) no existeix" @@ -5471,11 +5667,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "El resultat del desxifratge el codi AR no conté cap línia." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "Quant més segura ajusteu això, més probablement l'emulador no es saltarà " "actualitzacions de textura de la RAM.\n" @@ -5520,7 +5717,7 @@ msgstr "L'arxiu especificat \"%s\" no existeix" msgid "The value is invalid" msgstr "El valor és invàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema visual" @@ -5528,7 +5725,7 @@ msgstr "Tema visual" msgid "Theme selection went wrong" msgstr "Hi ha hagut un error a la selecció del tema visual." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5536,7 +5733,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:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5552,7 +5749,7 @@ msgstr "" "Aquest simulador «ActionReplay» no és compatible amb els codis que " "modifiquen «ActionReplay»." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Pot causar alentiment al Menú Wii i alguns jocs." @@ -5575,25 +5772,11 @@ msgstr "" "Si no n'esteu segur, deixeu-ho desactivat." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"S'utilitza per controlar la velocitat del joc per la de so. \n" -"Desactivar-ho pot causar una velocitat anormal, pot ser massa ràpida.\n" -"Però de vegades activant-ho pot causar soroll constant.\n" -"\n" -"Drecera de teclat : Arpeta per desactivar-ho." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" "Això s'utilitza per reproduir pistes de música, com BGM (música de fons)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5605,7 +5788,7 @@ msgstr "" "Causa millores importants de velocitat en ordinadors amb més d'un nucli, " "però també poden causar interferències/fallades." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Li permetrà editar manualment el fitxer de configuració INI" @@ -5628,7 +5811,7 @@ msgstr "Títol" msgid "To" msgstr "a" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Activar tots els tipus de registre de Log" @@ -5648,6 +5831,7 @@ msgstr "Activar pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5655,14 +5839,17 @@ msgstr "Activar pantalla completa" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Dalt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Xinés tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "S'ha intentat de carregar un tipus de fitxer desconegut." @@ -5670,7 +5857,7 @@ msgstr "S'ha intentat de carregar un tipus de fitxer desconegut." msgid "Triggers" msgstr "Gatells" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Provant de llegir des d'un SYSCONF invàlid" @@ -5682,7 +5869,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:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turc" @@ -5703,11 +5890,11 @@ msgstr "Port UDP:" msgid "UDP Wiimote" msgstr "Wiimote UDP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "DESCONEGUT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "EUA" @@ -5793,7 +5980,7 @@ msgstr "Actualitzar" msgid "Upright Wiimote" msgstr "Wiimote vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilitzar mode EuRGB60 (PAL60)" @@ -5805,7 +5992,7 @@ msgstr "Utilitzar pantalla completa" msgid "Use Hex" msgstr "Utilitzeu hexagonal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Utilitzar advertències" @@ -5837,7 +6024,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Utilitat" @@ -5861,25 +6048,29 @@ msgstr "Valor:" msgid "Verbosity" msgstr "Verbositat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volum" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, 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:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "instal·lació del WAD ha fallat: Error en crear %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5898,15 +6089,15 @@ msgstr "" msgid "Warning" msgstr "Advertència" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Advertència - Inicialitzant DOL en mode de consola incorrecte!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Advertència - Inicialitzant ELF en mode de consola incorrecte!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Advertència - Inicialitzant ISO en mode de consola incorrecte!" @@ -5936,7 +6127,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:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5944,7 +6135,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5952,7 +6143,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5980,7 +6171,7 @@ msgstr "WaveFileWriter - Fitxer no obert." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Modificació de pantalla panoràmica" @@ -5988,15 +6179,15 @@ msgstr "Modificació de pantalla panoràmica" msgid "Width" msgstr "Ample" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Arrel de la NAND:" @@ -6004,6 +6195,7 @@ msgstr "Arrel de la NAND:" msgid "Wii Save Import" msgstr "Importar partida guardada Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6013,6 +6205,9 @@ msgstr "Importar partida guardada Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -6079,10 +6274,11 @@ msgstr "Finestra menú" msgid "Windows Right" msgstr "Finestra dreta" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Envoltant de paraula" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6098,6 +6294,11 @@ msgstr "Envoltant de paraula" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Treballant ..." @@ -6105,6 +6306,11 @@ msgstr "Treballant ..." msgid "Write to Console" msgstr "Escriu a consola" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Escriu en un Fitxer" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Escriu en un Fitxer" @@ -6160,7 +6366,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Ha de reiniciar Dolphin perquè el canvi tingui efecte." @@ -6183,7 +6389,7 @@ msgstr "" "Hauria de ser 0x%04x (però és 0x%04llx) \n" "Vol generar un de nou?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "Modificador ZTP" @@ -6255,7 +6461,7 @@ msgstr "" msgid "^ ADD" msgstr "^ Afegir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6288,12 +6494,12 @@ msgstr "" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "Comanda desconeguda 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute Ha retornat -1 en l'execució de l'aplicació!" @@ -6437,6 +6643,9 @@ msgstr "| O" #~ msgid "Emulator Display Settings" #~ msgstr "Configuració de pantalla de l'emulador" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Habilitar la regulació de so" + #~ msgid "Enable CPU Access" #~ msgstr "Habilitar l'accés a CPU" @@ -6673,6 +6882,19 @@ msgstr "| O" <<<<<<< HEAD ======= >>>>>>> Update from master branch. +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "S'utilitza per controlar la velocitat del joc per la de so. \n" +#~ "Desactivar-ho pot causar una velocitat anormal, pot ser massa ràpida.\n" +#~ "Però de vegades activant-ho pot causar soroll constant.\n" +#~ "\n" +#~ "Drecera de teclat : Arpeta per desactivar-ho." + #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index b561011572..d9d24e6b40 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -11,6 +11,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" <<<<<<< HEAD "PO-Revision-Date: 2011-10-15 14:50+0100\n" @@ -26,6 +27,9 @@ msgstr "" "PO-Revision-Date: 2011-10-15 14:50+0100\n" >>>>>>> Update Greek and Czech translations ======= +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-19 07:39+0100\n" >>>>>>> Update Czeck translation. ======= @@ -72,9 +76,9 @@ msgstr "\"%s\" je neplatný soubor GCM/ISO, nebo není GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sKopírovat%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -120,7 +124,8 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s nelze naÄíst jako paměťovou kartu\n" -"soubor není dostateÄnÄ› velký, aby byl platným souborem paměťové karty (0x%x bajtů)" +"soubor není dostateÄnÄ› velký, aby byl platným souborem paměťové karty (0x%x " +"bajtů)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -168,7 +173,7 @@ msgstr "%sExportovat GCI%s" msgid "%sImport GCI%s" msgstr "%sImportovat GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Volných Bloků; %u Volných Záznamů Adr" @@ -201,11 +206,11 @@ msgstr "Správce &Cheatů" msgid "&DSP Settings" msgstr "&DSP Nastavení" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Smazat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Smazat vybraná ISO..." @@ -269,7 +274,7 @@ msgstr "&Pauza" msgid "&Play" msgstr "&PÅ™ehrát" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Vlastnosti" @@ -313,7 +318,7 @@ msgstr "&Zobrazit" msgid "&Wiimote Settings" msgstr "&Wiimote Nastavení" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -357,7 +362,7 @@ msgstr "" msgid "" msgstr "<Žádné rozliÅ¡ení nenalezeno>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -366,7 +371,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -392,11 +397,13 @@ msgstr "" msgid "" "ALERT:\n" "\n" -"NetPlay will currently only work properly when using the following settings:\n" +"NetPlay will currently only work properly when using the following " +"settings:\n" " - Dual Core [OFF]\n" " - Audio Throttle [OFF]\n" " - DSP-HLE with \"Null Audio\" or DSP-LLE\n" -" - Manually set the exact number of controllers that will be used to [Standard Controller]\n" +" - Manually set the exact number of controllers that will be used to " +"[Standard Controller]\n" "\n" "All players should try to use the same Dolphin version and settings.\n" "Disable all memory cards or send them to all players before starting.\n" @@ -406,11 +413,13 @@ 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 v souÄasnosti 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" +" - RuÄnÄ› nastavit pÅ™esné Äíslo ovladaÄů, které budou použity na [Standardní " +"OvladaÄ]\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" @@ -418,13 +427,13 @@ msgstr "" "\n" "Musíte pÅ™esmÄ›rovat Váš TCP port na hostitele!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM Základní Deska" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Kódy AR" @@ -436,11 +445,11 @@ msgstr "O Dolphinu" msgid "Acceleration" msgstr "Zrychlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "PÅ™esnost:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" @@ -459,7 +468,8 @@ msgstr "Precizní emulace VBeam" >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" "Accurately emulate EFB copies.\n" -"Some games depend on this for certain graphical effects or gameplay functionality.\n" +"Some games depend on this for certain graphical effects or gameplay " +"functionality.\n" "\n" "If unsure, check EFB to Texture instead." msgstr "" @@ -490,23 +500,38 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Kódu PÅ™idat (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "" +"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Kódu PÅ™idat " +"(%s)" #: Source/Core/Core/Src/ActionReplay.cpp:756 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" -msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Naplnit a Sesunout (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " +"(%s)" +msgstr "" +"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Naplnit a " +"Sesunout (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:549 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" -msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Ram Zápisu A NaplnÄ›ní (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " +"Fill (%s)" +msgstr "" +"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Ram Zápisu A " +"NaplnÄ›ní (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:609 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" -msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Zápisu Do Ukazatele (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " +"Pointer (%s)" +msgstr "" +"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Zápisu Do " +"Ukazatele (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -515,8 +540,10 @@ msgstr "Chyba Action Replay: Neplatná hodnota (%08x) v Kopii PamÄ›ti (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "Chyba Action Replay: Hlavní Kód a Zápis do CCXXXXXX nejsou zavedeny (%s)" +msgid "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "" +"Chyba Action Replay: Hlavní Kód a Zápis do CCXXXXXX nejsou zavedeny (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -552,11 +579,11 @@ msgstr "Adaptér:" msgid "Add" msgstr "PÅ™idat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "PÅ™idat kód ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "PÅ™idat Záplatu" @@ -568,6 +595,7 @@ msgstr "PÅ™idat nový panel" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 @@ -591,6 +619,11 @@ msgstr "PÅ™idat nový panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "PÅ™idat..." @@ -602,14 +635,16 @@ msgstr "Adresa :" msgid "" "Adds the specified value to zFar Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " +"the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" "PÅ™idá zadanou hodnotu do Parametru ZFar.\n" "Dva způsoby jak vyjádÅ™it hodnoty v plovoucí desetinné Äárce.\n" -"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný úÄinek, získaná hodnota bude \"0.0002\".\n" +"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný úÄinek, získaná " +"hodnota bude \"0.0002\".\n" "Hodnoty: (0->+/-Celé Äíslo) nebo (0->+/-PDÄŒ[6 desetinných míst])\n" "\n" "Poznámka: Zkontrolujte Konzoli/Okno protokolu pro získané hodnoty" @@ -618,14 +653,16 @@ msgstr "" msgid "" "Adds the specified value to zNear Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " +"the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" "PÅ™idá zadanou hodnotu do Parametru zNear.\n" "Dva způsoby jak vyjádÅ™it hodnoty v plovoucí desetinné Äárce.\n" -"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný úÄinek, získaná hodnota bude \"0.0002\".\n" +"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný úÄinek, získaná " +"hodnota bude \"0.0002\".\n" "Hodnoty: (0->+/-Celé Äíslo) nebo (0->+/-PDÄŒ[6 desetinných míst])\n" "\n" "Poznámka: Zkontrolujte Konzoli/Okno protokolu pro získané hodnoty\"" @@ -634,11 +671,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Upravte tlak analogového ovládání potÅ™ebný k aktivaci tlaÄítek." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "PokroÄilé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "PokroÄilá Nastavení" @@ -646,11 +683,11 @@ msgstr "PokroÄilá Nastavení" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "VÅ¡echny soubory GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" @@ -658,6 +695,7 @@ msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ======= @@ -676,35 +714,45 @@ msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "VÅ¡echny soubory Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "VÅ¡echny komprimované soubory GC/WII ISO (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "VÅ¡echny soubory (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Umožní pÅ™epínání jistých možností pomocí horkých kláves 3, 4, 5, 6 a 7 uvnitÅ™ okna emulace.\n" +"Umožní pÅ™epínání jistých možností pomocí horkých kláves 3, 4, 5, 6 a 7 " +"uvnitÅ™ okna emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Střídat Äasování Wiimote" ======= @@ -739,7 +787,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "ZavadÄ›Ä aplikace:" @@ -757,7 +805,7 @@ msgstr "" "\n" " Pokud si nejste jisti, zvolte (vypnuto)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "ArabÅ¡tina" @@ -766,7 +814,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -774,10 +822,11 @@ msgstr "" "Jste si jisti, že chcete tyto soubory smazat?\n" "Budou navždy ztraceny!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -794,6 +843,9 @@ msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" @@ -803,18 +855,20 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Backend Zvuku:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Chyba pÅ™i otevírání zařízení zvukového výstupu.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -831,6 +885,9 @@ msgstr "AudioCommon: Chyba pÅ™i otevírání zařízení zvukového výstupu.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" @@ -874,7 +931,7 @@ msgstr "" msgid "Back" msgstr "ZpÄ›t" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Nastavení Backendu" @@ -901,11 +958,11 @@ msgstr "Å patná hlaviÄka souboru" msgid "Banner" msgstr "Plakát" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Detaily Plakátu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Plakát:" @@ -917,7 +974,7 @@ msgstr "Vibráto" msgid "Basic" msgstr "Základní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Základní nastavení" @@ -950,6 +1007,7 @@ msgstr "Modrá vpravo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -965,6 +1023,9 @@ msgstr "Modrá vpravo" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Dole" @@ -973,7 +1034,7 @@ msgstr "Dole" msgid "Bound Controls: %lu" msgstr "Spojené ovladaÄe: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Rozbité" @@ -989,7 +1050,7 @@ msgstr "Procházet pro pÅ™idání adresáře" msgid "Browse for an ISO directory..." msgstr "Procházet pro adresář ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Procházet pro výstupní adresář" @@ -1029,23 +1090,26 @@ msgstr "Kr Stick" msgid "C-Stick" msgstr "Kr-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Jádro Emulátoru Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Ukládat pÅ™edvyt. obj. do vyr. pam." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel depth calculations are necessary to properly emulate a small number of games.\n" +"In contrast to pixel lighting (which is merely an enhancement), per-pixel " +"depth calculations are necessary to properly emulate a small number of " +"games.\n" "\n" "If unsure, leave this checked." msgstr "" "VypoÄítat hodnoty hloubky 3D grafiky podle pixelu, radÄ›ji než podle bodu.\n" -"Na rozdíl od osvÄ›tlení pixelu (což je pouze vylepÅ¡en), výpoÄty hloubky podle pixelu jsou potÅ™ebné ke správné emulaci malého poÄtu her.\n" +"Na rozdíl od osvÄ›tlení pixelu (což je pouze vylepÅ¡en), výpoÄty hloubky podle " +"pixelu jsou potÅ™ebné ke správné emulaci malého poÄtu her.\n" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." @@ -1058,7 +1122,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "VypoÄítat osvÄ›tlení 3D grafiky podle pixelu, radÄ›ji než podle bodu.\n" -"Sníží rychlost emulace o nÄ›jaké procento (záleží na VaÅ¡em grafikém procesoru).\n" +"Sníží rychlost emulace o nÄ›jaké procento (záleží na VaÅ¡em grafikém " +"procesoru).\n" "Toto je vÄ›tÅ¡inou bezpeÄné vylepÅ¡ení, ale může nÄ›kdy způsobit problémy.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -1079,7 +1144,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1090,7 +1155,7 @@ msgstr "" "%s\n" "není platný soubor paměťové karty gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1108,8 +1173,6 @@ msgstr "Nelze najít Wiimote podle bz: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Nelze najít Wiimote pomocí obslužné rutiny spojení %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1119,7 +1182,7 @@ msgstr "Nelze Äíst ze zásuvného modulu DVD - DVD-Rozhraní: Závažná chyba msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "KatalánÅ¡tina" @@ -1144,7 +1207,7 @@ msgstr "VymÄ›nit Disk" msgid "Change Game" msgstr "ZmÄ›nit hru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1160,8 +1223,8 @@ 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 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "ZmÄ›na tohoto se neprojeví, pokud emulátor běží!" @@ -1181,31 +1244,31 @@ msgstr "Hledání Cheatů" msgid "Cheats Manager" msgstr "Správce Cheatů" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "ČínÅ¡tina (ZjednoduÅ¡ená)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "ČínÅ¡tina (TradiÄní)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Zvolte koÅ™enový adresář DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Zvolte koÅ™enový adresář NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Zvolte výchozí ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Zvolte adresář k pÅ™idání" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Zvolte soubor k otevÅ™ení" @@ -1213,12 +1276,16 @@ msgstr "Zvolte soubor k otevÅ™ení" msgid "Choose a memory card:" msgstr "Zvolte paměťovou kartu:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" -msgstr "Zvolte soubor, který má být použit jako zavadÄ›Ä aplikace: (platí pouze pro disky sestavené z adresářů)" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +msgid "" +"Choose file to use as apploader: (applies to discs constructed from " +"directories only)" +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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Zvolte adresář pro umístÄ›ní extrakce" @@ -1230,25 +1297,29 @@ msgstr "Kruhový Stick" msgid "Classic" msgstr "Klasické" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "VyÄistit" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "VyÄiÅ¡tÄ›ní selhalo" #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." -msgstr "Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit ruÄnÄ›." +msgid "" +"Client disconnect while game is running!! NetPlay is disabled. You must " +"manually stop the game." +msgstr "" +"Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit ruÄnÄ›." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1265,6 +1336,10 @@ msgstr "Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Zavřít" @@ -1288,20 +1363,20 @@ msgstr "Příkaz" msgid "Comment" msgstr "Komentář" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Komentář:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Komprimovat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Komprimovat vybraná ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Komprimuji ISO" @@ -1328,13 +1403,13 @@ msgstr "Nastavit Pady" msgid "Configure..." msgstr "Nastavit..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Potvrdit PÅ™epsání Souboru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "PÅ™i zastavení Potvrdit" @@ -1343,7 +1418,7 @@ msgstr "PÅ™i zastavení Potvrdit" msgid "Connect" msgstr "PÅ™ipojit" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "PÅ™ipojit USB Klávesnici" @@ -1408,12 +1483,12 @@ msgstr "PÅ™evést na GCI" msgid "Copy failed" msgstr "Kopírování selhalo" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Kopírovat na Paměťovou kartu %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Jádro" @@ -1429,15 +1504,21 @@ msgstr "Nezle spustit backend %s." #: 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 backup. Please note that original Gamecube and Wii discs cannot be read by most PC DVD drives." -msgstr "\"%s\" nelze Äíst. BuÄ není v mechanice žádný disk, nebo toto není záloha GC/Wii. Nezapomeňte, že původní disky GameCube a Wii nepÅ™eÄte vÄ›tÅ¡ina PC DVD mechanik." +msgid "" +"Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " +"backup. Please note that original Gamecube and Wii discs cannot be read by " +"most PC DVD drives." +msgstr "" +"\"%s\" nelze Äíst. BuÄ není v mechanice žádný disk, nebo toto není záloha GC/" +"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:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "Nelze rozpoznat ISO soubor %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Nelze uložit %s" @@ -1450,18 +1531,20 @@ 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 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" "\n" -"Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?" +"Are you running Dolphin from a CD/DVD, or is the save file maybe write " +"protected?" msgstr "" "Nelze zapsat soubor paměťové karty %s.\n" "\n" -"SpouÅ¡títe Dolphina z CD/DVD, nebo je snad soubor s uložením chránÄ›ný proti zápisu?" +"SpouÅ¡títe Dolphina z CD/DVD, nebo je snad soubor s uložením chránÄ›ný proti " +"zápisu?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Nelze najít příkaz pro otevÅ™ení přípony 'ini'!" @@ -1478,7 +1561,7 @@ msgstr "" msgid "Count:" msgstr "PoÄet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "ZemÄ›:" @@ -1492,23 +1575,25 @@ msgstr "VytvoÅ™it AR kód" msgid "Create new perspective" msgstr "VytvoÅ™it novou perspektivu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "VytvoÅ™il KDE-look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "VytvoÅ™il Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +msgid "" +"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +msgstr "" +"VytvoÅ™il Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "VytvoÅ™il VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "VytvoÅ™il black_rider a publikováno na ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Tvůrce:" @@ -1516,7 +1601,7 @@ msgstr "Tvůrce:" msgid "Critical" msgstr "Kritické" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Oříznout" @@ -1539,7 +1624,7 @@ msgstr "Crossfade" msgid "Current dir 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Vlastní Hack Projekce" @@ -1547,11 +1632,11 @@ msgstr "Vlastní Hack Projekce" msgid "Custom Projection Hack Settings" msgstr "Nastavení Vlastního Hacku Projekce" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "PÅ™izpůsobte nÄ›které Ortografické parametry Projekce" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "ÄŒeÅ¡tina" @@ -1563,10 +1648,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 @@ -1587,18 +1673,22 @@ msgstr "Jádro Emulátoru DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE pÅ™evadÄ›Ä (pomalé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE ve VláknÄ›" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE rekompilátor" @@ -1606,15 +1696,23 @@ msgstr "DSP LLE rekompilátor" msgid "DSP settings" msgstr "Nastavení DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "KoÅ™en DVD:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Velikost data" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Datum:" @@ -1635,7 +1733,7 @@ msgstr "Mrtvá Zóna" msgid "Debug" msgstr "LadÄ›ní" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "LadÄ›ní" @@ -1643,16 +1741,16 @@ msgstr "LadÄ›ní" msgid "Decimal" msgstr "Desetinné" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Dekomprimovat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Dekomprimovat vybraná ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Dekomprimuji ISO" @@ -1660,11 +1758,11 @@ msgstr "Dekomprimuji ISO" msgid "Default" msgstr "Výchozí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Výchozí ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Výchozí typ písma" @@ -1673,7 +1771,7 @@ msgstr "Výchozí typ písma" msgid "Delete" msgstr "Smazat" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Smazat Uloženou Hru" @@ -1682,7 +1780,7 @@ msgstr "Smazat Uloženou Hru" msgid "Delete the existing file '%s'?" msgstr "Vymazat existující soubor '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Popis" @@ -1690,18 +1788,22 @@ msgstr "Popis" msgid "Detect" msgstr "Zjistit" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." -msgstr "ZjiÅ¡tÄ›n pokus o pÅ™eÄtení více dat z DVD, než se vejde do výstupní pamÄ›ti. Zásek." +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 +msgid "" +"Detected attempt to read more data from the DVD than fit inside the out " +"buffer. Clamp." +msgstr "" +"ZjiÅ¡tÄ›n pokus o pÅ™eÄtení více dat z DVD, než se vejde do výstupní pamÄ›ti. " +"Zásek." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 msgid "Device" msgstr "Zařízení" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Nastavení Zařízení" @@ -1726,47 +1828,53 @@ msgstr "" "i záložní kontrolní souÄet Adresáře selhal" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Zakázat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Zakázat Mlhu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Zakázat OsvÄ›tlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Zakázat Hloubku Podle Pixelu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Zakázat Textury" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" -"Speeds up emulation a lot but causes heavy glitches in many games which rely on them (especially homebrew applications).\n" +"Speeds up emulation a lot but causes heavy glitches in many games which rely " +"on them (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Zakázat jakoukoli emulaci XFB.\n" -"Velmi zrychluje emulaci, ale způsobuje hodnÄ› chyb v mnoha hrách, které na nich závisejí (zvláštÄ› po domácku vyrobené aplikace).\n" +"Velmi zrychluje emulaci, ale způsobuje hodnÄ› chyb v mnoha hrách, které na " +"nich závisejí (zvláštÄ› po domácku vyrobené aplikace).\n" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" -"These are often used for post-processing or render-to-texture effects, so while checking this setting gives a great speedup it almost always also causes issues.\n" +"These are often used for post-processing or render-to-texture effects, so " +"while checking this setting gives a great speedup it almost always also " +"causes issues.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Zakázat emulaci EFB kopií.\n" -"Tyto jsou Äasto používány pro efekty následného zpracování nebo vykreslení do textur, takže když toto zaÅ¡krtnete, dostanete velké zrychlení, ale toto také skoro vždy způsobuje problémy.\n" +"Tyto jsou Äasto používány pro efekty následného zpracování nebo vykreslení " +"do textur, takže když toto zaÅ¡krtnete, dostanete velké zrychlení, ale toto " +"také skoro vždy způsobuje problémy.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -1780,7 +1888,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disk" @@ -1811,6 +1919,7 @@ msgstr "RozdÄ›lit" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 @@ -1824,10 +1933,13 @@ msgstr "RozdÄ›lit" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1856,6 +1968,7 @@ msgstr "Dolphin FIFO" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" @@ -1892,6 +2005,14 @@ msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Nastavení" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1904,23 +2025,31 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." -msgstr "Dolphin nemohl nalézt žádná GX/Wii ISO. KliknÄ›te zde dvakrát k prohledání souborů..." +msgid "" +"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " +"files..." +msgstr "" +"Dolphin nemohl nalézt žádná GX/Wii ISO. KliknÄ›te zde dvakrát k prohledání " +"souborů..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." -msgstr "Dolphin je v souÄasnosti nastaven na skrytí vÅ¡ech her. KliknÄ›te zde dvakrát pro zobrazení vÅ¡ech her..." +msgid "" +"Dolphin is currently set to hide all games. Doubleclick here to show all " +"games..." +msgstr "" +"Dolphin je v souÄasnosti nastaven na skrytí vÅ¡ech her. KliknÄ›te zde dvakrát " +"pro zobrazení vÅ¡ech her..." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Dolů" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Stáhnout kódy (Databáze WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Stáhnuto %lu kódů. (přídáno %lu)" @@ -1929,23 +2058,23 @@ msgstr "Stáhnuto %lu kódů. (přídáno %lu)" msgid "Drums" msgstr "Bubny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Atrapa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Vypsat Zvuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Vypsat Cíl EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Vypsat Snímky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Vypsat Textury" @@ -1983,6 +2112,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 @@ -2006,6 +2136,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "NizozemÅ¡tina" @@ -2019,10 +2154,17 @@ msgstr "EFB Kopie" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, c-format -msgid "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least version %d.%d -- If you recently upgraded your Dolphin distribution, a reboot is probably required at this point to get Windows to see the new driver." -msgstr "CHYBA: Tato verze Dolphinu vyžaduje ovladaÄ TAP-Win32 verze alespoň %d.%d -- Pokud jste nedávno VaÅ¡i instalaci Dolphin aktualizovali, je zapotÅ™ebí v tomto bodÄ› restartovat, aby Windows uvidÄ›l nový ovladaÄ." +msgid "" +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"version %d.%d -- If you recently upgraded your Dolphin distribution, a " +"reboot is probably required at this point to get Windows to see the new " +"driver." +msgstr "" +"CHYBA: Tato verze Dolphinu vyžaduje ovladaÄ TAP-Win32 verze alespoň %d.%d -- " +"Pokud jste nedávno VaÅ¡i instalaci Dolphin aktualizovali, je zapotÅ™ebí v " +"tomto bodÄ› restartovat, aby Windows uvidÄ›l nový ovladaÄ." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EVROPA" @@ -2038,7 +2180,7 @@ msgstr "Upravit" msgid "Edit ActionReplay Code" msgstr "Upravit kód ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Upravit nastavení" @@ -2050,8 +2192,8 @@ msgstr "Upravit záplatu" msgid "Edit current perspective" msgstr "Upravit souÄasnou perspektivu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Upravit" @@ -2070,24 +2212,30 @@ msgstr "Vlákno Emulace již běží" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" -"Slows down emulation a lot and prohibits high-resolution rendering but is necessary to emulate a number of games properly.\n" +"Slows down emulation a lot and prohibits high-resolution rendering but is " +"necessary to emulate a number of games properly.\n" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" "PÅ™esnÄ› Emulovat XFB.\n" -"Velmi zpomaluje emulaci a brání vykreslování ve vysokém rozliÅ¡ení, ale je nutná k řádné emulaci jistého poÄtu her.\n" +"Velmi zpomaluje emulaci a brání vykreslování ve vysokém rozliÅ¡ení, ale je " +"nutná k řádné emulaci jistého poÄtu her.\n" "\n" "Pokud si nejste jisti, zaÅ¡krtnÄ›te místo tohoto virtuální emulaci XFB." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" -"Fixes many games which don't work without XFB emulation while not being as slow as real XFB emulation. However, it may still fail for a lot of other games (especially homebrew applications).\n" +"Fixes many games which don't work without XFB emulation while not being as " +"slow as real XFB emulation. However, it may still fail for a lot of other " +"games (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Emulovat XFB pomocí objektů textury grafického procesoru.\n" -"Spraví mnoho her, které nefungují bez emulace EFB, aniž by byla tak pomalá jako opravdová emulace EFB. NicménÄ› stále může selhat v mnoha jiných hrách (zvláštÄ› po domácku vyrobené aplikace).\n" +"Spraví mnoho her, které nefungují bez emulace EFB, aniž by byla tak pomalá " +"jako opravdová emulace EFB. NicménÄ› stále může selhat v mnoha jiných hrách " +"(zvláštÄ› po domácku vyrobené aplikace).\n" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." @@ -2095,7 +2243,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulovaný Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Stav Emulace:" @@ -2105,13 +2253,15 @@ msgstr "Povolit" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" -"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\n" +"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " +"supported by your GPU.\n" "Possibly causes issues.\n" "Requires fullscreen to work.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Zapnout 3D efekty pomocí stereoskopie použitím technologie Nvidia 3D Vision, pokud je podporována Vaším grafickým procesorem.\n" +"Zapnout 3D efekty pomocí stereoskopie použitím technologie Nvidia 3D Vision, " +"pokud je podporována Vaším grafickým procesorem.\n" "Může způsobovat problémy.\n" "Pro fungování vyžaduje režim celé obrazovky.\n" "\n" @@ -2121,15 +2271,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "Povolit protokolování AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Zapnout PÅ™iÅ¡krcení Zvuku" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Zapnout BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Zapnout SluÄování Bloků" @@ -2137,9 +2283,13 @@ msgstr "Zapnout SluÄování Bloků" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Povolit výpoÄet ohraniÄujícího rámeÄku" @@ -2157,6 +2307,7 @@ msgstr "Povolit vyrovnávací paměť" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= ======= @@ -2168,51 +2319,54 @@ msgstr "Povolit vyrovnávací paměť" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Povolit Cheaty" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Zapnout DTK Hudbu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Povolit dvojité jádro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Zapnout dvojité jádro (zrychlení)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Povolit klávesové zkratky" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Povolit PÅ™eskakování NeÄinných Příkazů" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Povolit PÅ™eskakování NeÄinných Příkazů (zrychlení)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Zapnout MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Povolit Progresivní Skenování" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Povolit SpoÅ™iÄ Obrazovky" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Povolit Å irokoúhlou obrazovku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Povolit DrátÄ›ný Model" @@ -2230,11 +2384,15 @@ msgstr "" "\n" "Pokud si nejste jisti, zvolte 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" -msgstr "Zapnout rychlý přístup k disku. NÄ›které hry to potÅ™ebují. (ZAPNUTO = rychlé, VYPNUTO = Kompatibilní)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +msgid "" +"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " +"Compatible)" +msgstr "" +"Zapnout rychlý přístup k disku. NÄ›které hry to potÅ™ebují. (ZAPNUTO = rychlé, " +"VYPNUTO = Kompatibilní)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Zapnout stránky" @@ -2245,30 +2403,43 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Toto povolte, pokud chcete, aby celá obrazovka byla použita pro vykreslování.\n" +"Toto povolte, pokud chcete, aby celá obrazovka byla použita pro " +"vykreslování.\n" "Pokud je toto zakázáno, bude místo toho vytvoÅ™eno vykreslovací okno.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" -"Enable this if you want to use the main Dolphin window for rendering rather than a separate render window.\n" +"Enable this if you want to use the main Dolphin window for rendering rather " +"than a separate render window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Toto zapnÄ›te, pokud chcete použít hlavní okno Dolphin pro vykreslování radÄ›ji, než oddÄ›lené vykreslovací okno.\n" +"Toto zapnÄ›te, pokud chcete použít hlavní okno Dolphin pro vykreslování " +"radÄ›ji, než oddÄ›lené vykreslovací okno.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." -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 +msgid "" +"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " +"ANY other game." +msgstr "" +"Povolte toto pro zrychlení The Legend of Zelda: Twilight Princess. Zakažte " +"pro VÅ ECHNY ostatní hry." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 -msgid "Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)" -msgstr "Povolit PÅ™eklad Adres Bloků (BAT); funkce Jednotky Správy PamÄ›ti. PÅ™esnÄ› napodobuje hardware, ale je emulován pomalu. (ZAPNUTO = Kompatibilní, VYPNUTO = Rychlé)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +msgid "" +"Enables Block Address Translation (BAT); a function of the Memory Management " +"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " +"Fast)" +msgstr "" +"Povolit PÅ™eklad Adres Bloků (BAT); funkce Jednotky Správy PamÄ›ti. PÅ™esnÄ› " +"napodobuje hardware, ale je emulován pomalu. (ZAPNUTO = Kompatibilní, " +"VYPNUTO = Rychlé)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Povolit Vlastní Hack Projekce" @@ -2284,9 +2455,13 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" -msgstr "Povolí Jednotku Správy PamÄ›ti, potÅ™ebnou v nÄ›jakých hrách. (ZAPNUTO = Kompatibilní, VYPNUTO = Rychlé)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +msgid "" +"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " +"OFF = Fast)" +msgstr "" +"Povolí Jednotku Správy PamÄ›ti, potÅ™ebnou v nÄ›jakých hrách. (ZAPNUTO = " +"Kompatibilní, VYPNUTO = Rychlé)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" @@ -2306,6 +2481,7 @@ msgstr "End" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 @@ -2329,6 +2505,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "AngliÄtina" @@ -2360,6 +2541,7 @@ msgstr "Rovná se" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Chyba" @@ -2406,20 +2588,35 @@ msgstr "" #: Source/Core/DolphinWX/Src/Main.cpp:356 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Chyba" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 >>>>>>> The actual update of the Greek and Czech translations. The last commit 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." +msgstr "" +"Chyba pÅ™i nahrávání zvoleného jazyka. Vracím se na výchozí jazyk systému." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format -msgid "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load..." -msgstr "Chyba: Po \"%s\", nalezeno %d (0x%X) místo znaÄky uložení %d (0x%X). UkonÄuji naÄtení uloženého stavu..." +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" +"Chyba: Po \"%s\", nalezeno %d (0x%X) místo znaÄky uložení %d (0x%X). " +"UkonÄuji naÄtení uloženého stavu..." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format -msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." -msgstr "Chyba: Pokus o přístup k písmům %s, ale ty nejsou naÄtena. Hry nemusí zobrazit písma správnÄ›, nebo se můžou zhroutit" +msgid "" +"Error: Trying to access %s fonts but they are not loaded. Games may not show " +"fonts correctly, or crash." +msgstr "" +"Chyba: Pokus o přístup k písmům %s, ale ty nejsou naÄtena. Hry nemusí " +"zobrazit písma správnÄ›, nebo se můžou zhroutit" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2446,7 +2643,7 @@ msgstr "UkonÄit Dolphin s emulátorem" msgid "Export Failed" msgstr "Export Selhal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exportovat Soubor" @@ -2459,15 +2656,15 @@ msgstr "Exportovat Nahrávku" msgid "Export Recording..." msgstr "Exportovat Nahrávku..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exportovat Uloženou hru" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exportovat uloženou hru Wii (Experimentální)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exportovat vÅ¡echny Uložené hry" @@ -2483,7 +2680,7 @@ msgstr "Exportovat Uloženou hru jako..." msgid "Extension" msgstr "Rozšíření" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "VnÄ›jší Vyr. Paměť Snímků" @@ -2495,44 +2692,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Extrahovat VÅ¡echny Soubory..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Extrahovat ZavadÄ›Ä Aplikace..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Extrahovat DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Extrahovat Adresář..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Extrahovat Soubor..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Extrahovat Oddíl..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Extrahuji %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Extrahuji VÅ¡echny Soubory" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Extrahuji Adresář" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Extrahuji..." @@ -2544,11 +2741,11 @@ msgstr "FIFO Bajt" msgid "FIFO Player" msgstr "PÅ™ehrávaÄ FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANCIE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Velikost FST:" @@ -2560,11 +2757,11 @@ msgstr "PÅ™ipojení Selhalo!" msgid "Failed to Listen!!" msgstr "Naslouchání Selhalo!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Stahování kódů selhalo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Nelze extrahovat do %s!" @@ -2584,7 +2781,8 @@ msgstr "" "Nelze naÄíst ROM DSP:\t%s\n" "\n" "Tento soubor je vyžadován pÅ™i použití DSP LLE.\n" -"Není distribuován s Dolphinem, protože obsahuje data chránÄ›ná autorským právem.\n" +"Není distribuován s Dolphinem, protože obsahuje data chránÄ›ná autorským " +"právem.\n" "Použijte DSPSpy k výpisu soubor z Vaší skuteÄné konzole.\n" "\n" "Můžete použít jádro DSP HLE, které nevyžaduje výpisy ROM.\n" @@ -2681,18 +2879,28 @@ msgstr "Zápis hlaviÄky selhal pro %s" msgid "Failed to write header for file %d" msgstr "Selhal zápis hlaviÄky souboru %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Rychlá" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Rychlé Mipmapy" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "PÅ™ehrávaÄ Fifo" @@ -2701,7 +2909,7 @@ msgstr "PÅ™ehrávaÄ Fifo" msgid "File Info" msgstr "Informace o souboru" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Soubor neobsahoval žádné kódy" @@ -2734,16 +2942,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:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, 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:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Souborový systém" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Typ souboru 'ini' je neznámý! Nelze otevřít!" @@ -2751,7 +2959,7 @@ msgstr "Typ souboru 'ini' je neznámý! Nelze otevřít!" msgid "First Block" msgstr "První blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Spravit Kontrolní SouÄty" @@ -2763,7 +2971,7 @@ msgstr "Vynutit 16:9" msgid "Force 4:3" msgstr "Vynutit 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Donutit konzoli být jako NTSC-J" @@ -2795,13 +3003,15 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" -"Left unchecked, dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games." +"Left unchecked, dolphin defaults to NTSC-U and automatically enables this " +"setting when playing Japanese games." msgstr "" "Donutí použít režim NTSC-J pro použití Japonského písma ROMu.\n" -"Pokud není zaÅ¡krtnuto, Dolphin standardnÄ› pÅ™ejde na NTSC-U a automaticky zapne toto nastavení pÅ™i hraní Japonských her." +"Pokud není zaÅ¡krtnuto, Dolphin standardnÄ› pÅ™ejde na NTSC-U a automaticky " +"zapne toto nastavení pÅ™i hraní Japonských her." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -2829,7 +3039,7 @@ msgstr "Snímek" msgid "Frame Advance" msgstr "Postup Snímkem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Uložení snímků použije FFV1" @@ -2841,7 +3051,7 @@ msgstr "Rozsah Snímku" msgid "Frame S&kipping" msgstr "PÅ™es&kakování snímků:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limit Snímků:" @@ -2849,7 +3059,7 @@ msgstr "Limit Snímků:" msgid "Frames To Record" msgstr "Snímky k Nahrání" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Rozhlížení pomocí myÅ¡i" @@ -2857,6 +3067,7 @@ msgstr "Rozhlížení pomocí myÅ¡i" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 @@ -2880,6 +3091,11 @@ msgstr "Rozhlížení pomocí myÅ¡i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "FrancouzÅ¡tina" @@ -2912,7 +3128,7 @@ msgstr "Nastavení GCMic" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID Hry:" @@ -2928,15 +3144,15 @@ msgstr "Hra neběží!" msgid "Game not found!!" msgstr "Hra nenalezena!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Nastavení Konkrétní Hry" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Nastavení Hry" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2955,6 +3171,7 @@ msgstr "Nastavení Gamecube &Pad" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 @@ -2964,6 +3181,9 @@ msgstr "Nastavení Gamecube &Pad" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2972,15 +3192,17 @@ msgid "Gamecube Pad settings" msgstr "Gamecube Pad nastavení" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Kódy Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n" "(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován.)" @@ -2990,10 +3212,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -3017,6 +3243,7 @@ msgstr "Obecná Nastavení" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 @@ -3040,6 +3267,11 @@ msgstr "Obecná Nastavení" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "NÄ›mÄina" @@ -3074,19 +3306,22 @@ msgstr "VÄ›tší než" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" -"Greatly increases quality of textures generated using render to texture effects.\n" +"Greatly increases quality of textures generated using render to texture " +"effects.\n" "Raising the internal resolution will improve the effect of this setting.\n" -"Slightly decreases performance and possibly causes issues (although unlikely).\n" +"Slightly decreases performance and possibly causes issues (although " +"unlikely).\n" "\n" "If unsure, leave this checked." msgstr "" -"Velmi zvýší kvalitu vytvářených textur použitím efektů vykreslení do textury.\n" +"Velmi zvýší kvalitu vytvářených textur použitím efektů vykreslení do " +"textury.\n" "Zvýšení vnitÅ™ního rozliÅ¡ení zlepší úÄinnek tohoto nastavení.\n" "TroÅ¡ku sníží výkon a možná způsobí problémy (i když to je nepravdÄ›podobné).\n" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "ŘeÄtina" @@ -3118,7 +3353,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:303 msgid "Hebrew" msgstr "HebrejÅ¡tina" @@ -3183,6 +3418,7 @@ msgstr "Nastavení klávesových zkratek" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 @@ -3199,10 +3435,13 @@ msgstr "Nastavení klávesových zkratek" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Klávesové zkratky" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "MaÄarÅ¡tina" @@ -3210,27 +3449,29 @@ msgstr "MaÄarÅ¡tina" msgid "Hybrid Wiimote" msgstr "Hybridní Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" -"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available in your nand dump\n" +"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " +"in your nand dump\n" "TitleID %016llx.\n" " Dolphin will likely hang now" msgstr "" -"IOCTL_ES_LAUNCH: Hra se pokusila znovu naÄíst ios nebo název, který není dostupný ve VaÅ¡em nand výpisu\n" +"IOCTL_ES_LAUNCH: Hra se pokusila znovu naÄíst ios nebo název, který není " +"dostupný ve VaÅ¡em nand výpisu\n" "IDNázvu %016llx.\n" "Dolphin se teÄ pravdÄ›podobnÄ› zasekne" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Å¡patný cíl" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Nastavení IPL" @@ -3246,15 +3487,15 @@ msgstr "InfraÄer. Ukazovátko" msgid "IR Sensitivity:" msgstr "Citlivost InfraÄer.:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Detaily ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Adresáře ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITÃLIE" @@ -3262,17 +3503,30 @@ msgstr "ITÃLIE" msgid "Icon" msgstr "Ikona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -msgid "If checked, the bounding box registers will be updated. Used by the Paper Mario games." -msgstr "Pokud je zaÅ¡krtnuto, registry ohraniÄujícího rámeÄku budou aktualizovány. Používáno v hrách Paper Mario." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" +"Pokud je zaÅ¡krtnuto, registry ohraniÄujícího rámeÄku budou aktualizovány. " +"Používáno v hrách Paper Mario." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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é)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +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é)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -msgid "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you also have to disable Audio Throttle in DSP to make it effective." -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, aby to bylo úÄinné." +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy +msgid "" +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). 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, aby to bylo úÄinné." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3281,28 +3535,32 @@ msgstr "Ignorovat ZmÄ›ny Formátu" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" -"Improves performance in many games without any negative effect. Causes graphical defects in a small number of other games though.\n" +"Improves performance in many games without any negative effect. Causes " +"graphical defects in a small number of other games though.\n" "\n" "If unsure, leave this checked." msgstr "" "Ignorovat vÅ¡echny zmÄ›ny formátu EFB.\n" -"Zlepší výkon v mnoha hrách, bez žádného negativního efektu. PÅ™esto způsobuje grafické chyby v malém poÄtu jiných her.\n" +"Zlepší výkon v mnoha hrách, bez žádného negativního efektu. PÅ™esto způsobuje " +"grafické chyby v malém poÄtu jiných her.\n" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" -"Improves performance in some games, but might disable some gameplay-related features or graphical effects.\n" +"Improves performance in some games, but might disable some gameplay-related " +"features or graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Ignorovat vÅ¡echny požadavky procesoru pro Ätení a zápis do EFB.\n" -"Zvýší výkon v nÄ›kterých hrách, ale může vypnout nÄ›které funkce související s hraním a grafické efekty.\n" +"Zvýší výkon v nÄ›kterých hrách, ale může vypnout nÄ›které funkce související s " +"hraním a grafické efekty.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importovat Uloženou hru" @@ -3332,11 +3590,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" -"Improves performance but causes glitches in most games which rely on proper fog emulation.\n" +"Improves performance but causes glitches in most games which rely on proper " +"fog emulation.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Zlepší výkon, ale způsobuje chyby ve vÄ›tÅ¡inÄ› her, které závisejí na správné emulaci mlhy.\n" +"Zlepší výkon, ale způsobuje chyby ve vÄ›tÅ¡inÄ› her, které závisejí na správné " +"emulaci mlhy.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -3350,7 +3610,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Ve HÅ™e" @@ -3359,7 +3619,7 @@ msgid "In-Game" msgstr "Ve HÅ™e" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3379,7 +3639,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:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Vložit SD Kartu" @@ -3391,18 +3651,22 @@ msgstr "Zde vložte jméno..." msgid "Install WAD" msgstr "Instalovat WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Instalovat do Wii Menu" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "InstallExceptionHandler called, but this platform does not yet support it." -msgstr "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› nepodporuje." +msgid "" +"InstallExceptionHandler called, but this platform does not yet support it." +msgstr "" +"Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " +"nepodporuje." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 @@ -3416,14 +3680,17 @@ msgstr "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› ne ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instaluji WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Rozhraní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Nastavení Rozhraní" @@ -3448,11 +3715,11 @@ msgstr "VnitÅ™ní chyba LZO - lzo_init() selhalo" msgid "Internal Resolution:" msgstr "VnitÅ™ní RozliÅ¡ení:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "PÅ™evadÄ›Ä (VELMI pomalé)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3469,7 +3736,7 @@ msgstr "Neplatná Hodnota!" msgid "Invalid bat.map or dir entry" msgstr "Neplatný bat.map nebo záznam adr." -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Neplatná událost typu %i" @@ -3489,11 +3756,11 @@ msgstr "" "%s\n" "Možná budete muset hru znovu vypsat." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Neplatný soubor s nahrávkou" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Neplatný stav" @@ -3501,6 +3768,7 @@ msgstr "Neplatný stav" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 @@ -3524,27 +3792,32 @@ msgstr "Neplatný stav" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "ItalÅ¡tina" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPONSKO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Rekompilátor (doporuÄeno)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL experimentální rekompilátor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "JaponÅ¡tina" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3553,8 +3826,8 @@ msgstr "KOREA" msgid "Key" msgstr "Klávesa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "KorejÅ¡tina" @@ -3572,7 +3845,7 @@ msgstr "TlaÄítko L" msgid "L-Analog" msgstr "Levý Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Jazyk:" @@ -3625,7 +3898,7 @@ msgstr "" msgid "Less Than" msgstr "Menší než" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limitovat podle SzS" @@ -3633,7 +3906,7 @@ msgstr "Limitovat podle SzS" msgid "Load" msgstr "Nahrát" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Nahrát Vlastní Textury" @@ -3685,6 +3958,7 @@ msgstr "Nahrát Stav..." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" @@ -3718,6 +3992,13 @@ msgstr "Nahrát Systémové Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Nahrát Systémové Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" @@ -3744,7 +4025,7 @@ msgstr "Nahraje urÄený soubor (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Místní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Uzamknout Vlákna do Jader" @@ -3756,11 +4037,11 @@ msgstr "Záznam" msgid "Log Configuration" msgstr "Nastavení Záznamu" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Typy Záznamu" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Výstup ZapisovaÄe" @@ -3790,7 +4071,7 @@ msgstr "" "MD5 se neshoduje\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Hack Rychlosti" @@ -3820,11 +4101,11 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Hlavní Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID Výrobce:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Výrobce:" @@ -3850,6 +4131,7 @@ msgstr "Bajt PamÄ›ti" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3865,12 +4147,19 @@ msgstr "Bajt PamÄ›ti" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Paměťová karta" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" -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!" +msgid "" +"Memory Card Manager WARNING-Make backups before using, should be fixed but " +"could mangle stuff!" +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:369 #, c-format @@ -3897,7 +4186,7 @@ msgstr "Velikost paměťové karty se neshoduje s velikosti hlaviÄky" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mikrofon" @@ -3906,11 +4195,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Ostatní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Ostatní Nastavení" @@ -3921,15 +4210,17 @@ msgstr "Modifikátor" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" -"Modify textures to show the format they're encoded in. Needs an emulation reset in most cases.\n" +"Modify textures to show the format they're encoded in. Needs an emulation " +"reset in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ZmÄ›nit textury, aby zobrazovali formát, v kterém jsou zakódovány. Ve vÄ›tÅ¡inÄ› případů vyžaduje resetovaní emulace.\n" +"ZmÄ›nit textury, aby zobrazovali formát, v kterém jsou zakódovány. Ve vÄ›tÅ¡inÄ› " +"případů vyžaduje resetovaní emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Písmo se stejnou rozteÄí" @@ -3942,7 +4233,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3964,9 +4255,13 @@ msgstr "" msgid "Multiply" msgstr "Násobit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." -msgstr "Ztlumí reproduktor Wiimote. Spravuje náhodná odpojování u opravdových Wiimote. Žádný efekt na emulovaná Wiimote." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +msgid "" +"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " +"effect on emulated wiimotes." +msgstr "" +"Ztlumí reproduktor Wiimote. Spravuje náhodná odpojování u opravdových " +"Wiimote. Žádný efekt na emulovaná Wiimote." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Add" @@ -4056,6 +4351,7 @@ msgstr "NK Nahoru" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 @@ -4068,6 +4364,9 @@ msgstr "NK Nahoru" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4076,7 +4375,7 @@ msgstr "Jméno:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Jméno: " @@ -4090,7 +4389,7 @@ msgid "New Scan" msgstr "Nové Skenování" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Další Stránka" @@ -4102,7 +4401,7 @@ msgstr "Další Skenování" msgid "Nickname :" msgstr "PÅ™ezdívka :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Žádná ZemÄ› (SDK)" @@ -4141,7 +4440,7 @@ msgstr "Nebyl nalezen žádný ukládací adresář pro název %s" msgid "None" msgstr "Žádný" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norský BokmÃ¥l" @@ -4149,8 +4448,8 @@ msgstr "Norský BokmÃ¥l" msgid "Not Equal" msgstr "Nerovná se" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Nenastaven" @@ -4178,7 +4477,7 @@ msgstr "NepÅ™ipojen" msgid "Notes" msgstr "Poznámky" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Poznámky:" @@ -4216,7 +4515,7 @@ msgstr "Objekt" msgid "Object Range" msgstr "Rozsah Objektu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Vypnuto" @@ -4250,11 +4549,11 @@ msgstr "Pouze bloky %d jsou dostupné" msgid "Open" msgstr "Otevřít" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Otevřít &adresář umístÄ›ní" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Otevřít Wii adre&sář uložení" @@ -4276,11 +4575,11 @@ msgstr "OpenAL: nelze nalézt zvuková zařízení" msgid "OpenAL: can't open device %s" msgstr "OpenAL: nelze otevřít zařízení %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Dekodér Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Dekodér Textury" @@ -4312,13 +4611,16 @@ msgstr "" "a importujte je do nové paměťové karty\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Jiné" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." -msgstr "Jiný klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru ukonÄete ruÄnÄ›." +msgid "" +"Other client disconnected while game is running!! NetPlay is disabled. You " +"manually stop the game." +msgstr "" +"Jiný klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru ukonÄete ruÄnÄ›." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4360,16 +4662,16 @@ msgstr "Odstavec" msgid "Parameters" msgstr "Parametry" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Oddíl %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Záplaty" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Cesty" @@ -4377,6 +4679,7 @@ msgstr "Cesty" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ======= @@ -4393,6 +4696,10 @@ msgstr "Cesty" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pozastavit" @@ -4401,7 +4708,7 @@ msgstr "Pozastavit" msgid "Per-Pixel Lighting" msgstr "OsvÄ›tlení Podle Pixelu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Dokonalá" @@ -4429,6 +4736,7 @@ msgstr "Perspektiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> The actual update of the Greek and Czech translations. The last commit @@ -4436,6 +4744,10 @@ msgstr "Perspektiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Spustit" @@ -4449,7 +4761,7 @@ msgstr "PÅ™ehrát nahrávku" msgid "Play/Pause" msgstr "PÅ™ehrát/Pozastavit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Hratelné" @@ -4465,6 +4777,7 @@ msgstr "HráÄi" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 @@ -4478,6 +4791,9 @@ msgstr "HráÄi" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -4489,23 +4805,23 @@ 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:309 msgid "Polish" msgstr "PolÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4514,11 +4830,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "PortugalÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "PortugalÅ¡tina (Brazilská)" @@ -4526,17 +4842,17 @@ msgstr "PortugalÅ¡tina (Brazilská)" msgid "Post-Processing Effect:" msgstr "Efekt Následného Zpracování:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, 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:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, 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:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PÅ™edÄasný konec filmu v PlayWiimote. %u > %u" @@ -4549,7 +4865,7 @@ msgstr "PÅ™edvolby:" msgid "Prev Page" msgstr "PÅ™ed. stránka" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "PÅ™edchozí Stránka" @@ -4600,7 +4916,7 @@ msgstr "Pravý Analog" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSKO" @@ -4613,7 +4929,7 @@ msgstr "Rozsah" msgid "Read-only mode" msgstr "Režim pouze pro Ätení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Opravdová" @@ -4692,6 +5008,7 @@ msgstr "Obnovit seznam her" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 @@ -4720,6 +5037,12 @@ msgstr "Obnovit seznam her" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Odstranit" @@ -4777,11 +5100,11 @@ msgstr "Pravý Stick" msgid "Rumble" msgstr "Vibrace" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Spustit DSP LLE na samostatném vláknÄ› (nedoporuÄeno)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "RuÅ¡tina" @@ -4789,6 +5112,7 @@ msgstr "RuÅ¡tina" msgid "Sa&ve State" msgstr "Uložit Sta&v" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -4811,6 +5135,13 @@ msgstr "BezpeÄná" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +msgid "Safe" +msgstr "BezpeÄná" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" @@ -4868,12 +5199,12 @@ msgstr "Uložit do Slotu Stavu 8" msgid "Save State..." msgstr "Uložit Stav..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Uložit jako" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Uložit komprimované GCM/ISO" @@ -4881,11 +5212,11 @@ msgstr "Uložit komprimované GCM/ISO" msgid "Save current perspective" msgstr "Uložit souÄasnou perspektivu" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Uložit dekomprimované GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, 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..." @@ -4901,6 +5232,7 @@ msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= ======= @@ -4912,15 +5244,18 @@ msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Skenuji %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Skenuji pro ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Skenuji..." @@ -4936,14 +5271,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Hledat Filtr" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Hledat Podadresáře" -#: Source/Core/Common/Src/SysConf.h:104 -#: Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 -#: Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Sekce %s nebyla v SYSCONF nalezena" @@ -4953,6 +5286,7 @@ msgstr "Sekce %s nebyla v SYSCONF nalezena" msgid "Select" msgstr "Vybrat" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4985,6 +5319,14 @@ msgstr "Vyberte Soubor s Nahrávkou" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Vyberte Soubor s Nahrávkou" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -5014,6 +5356,7 @@ msgstr "Vyberte soubor k nahrání" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" @@ -5034,16 +5377,20 @@ msgstr "Vyberte stav k nahrání" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= @@ -5055,6 +5402,9 @@ msgstr "Vyberte stav k nahrání" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -5074,34 +5424,39 @@ msgstr "" "Vynutit 4:3: Roztáhne obraz na pomÄ›r4:3.\n" "Roztáhnout do okna: Roztáhne obraz do velikosti okna." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Vybraný typ písma" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Selects the display resolution used in fullscreen mode.\n" -"This should always be bigger than or equal to the internal resolution. Performance impact is negligible.\n" +"This should always be bigger than or equal to the internal resolution. " +"Performance impact is negligible.\n" "\n" "If unsure, use your desktop resolution.\n" "If still unsure, use the highest resolution which works for you." msgstr "" "Vybere rozliÅ¡ení obrazovky použité v režimu celé obrazovky.\n" -"To by mÄ›lo být vždycky vÄ›tší než nebo rovno vnitÅ™nímu rozliÅ¡ení. Dopad na výkon je zanedbatelný.\n" +"To by mÄ›lo být vždycky vÄ›tší než nebo rovno vnitÅ™nímu rozliÅ¡ení. Dopad na " +"výkon je zanedbatelný.\n" "\n" "Pokud si nejste jisti, použijte VaÅ¡e rozliÅ¡ení obrazovky.\n" -"Pokud si stále nejste jisti, použijte takové nejvyšší rozliÅ¡ení, které Vám funguje." +"Pokud si stále nejste jisti, použijte takové nejvyšší rozliÅ¡ení, které Vám " +"funguje." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects what graphics API to use internally.\n" -"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. Direct3D 11 is somewhere between the two.\n" +"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " +"Direct3D 11 is somewhere between the two.\n" "Note that the Direct3D backends are only available on Windows.\n" "\n" "If unsure, use Direct3D 9." msgstr "" "Zvolí jaké bude vnitÅ™nÄ› grafické API použito.\n" -"Direct3D 9 je vÄ›tÅ¡inou nejrychlejší. OpenGL je ale nejpÅ™esnÄ›jší. Direct3D 11 je nÄ›kde mezi nimi.\n" +"Direct3D 9 je vÄ›tÅ¡inou nejrychlejší. OpenGL je ale nejpÅ™esnÄ›jší. Direct3D 11 " +"je nÄ›kde mezi nimi.\n" "Nezapomeňte, že backendy Direct3D jsou dostupné pouze ve Windows.\n" "\n" "Pokud si nejste jisti, použijte Direct3D 9" @@ -5118,23 +5473,26 @@ 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:313 msgid "Serbian" msgstr "SrbÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -msgid "Serial Port 1 - This is the port which devices such as the net adapter use" -msgstr "Sériový port 1 - Tito je port, který používají zařízení jako internetový adaptér" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +msgid "" +"Serial Port 1 - This is the port which devices such as the net adapter use" +msgstr "" +"Sériový port 1 - Tito je port, který používají zařízení jako internetový " +"adaptér" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" msgstr "Nastavit" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Nastavit jako &výchozí ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Nastavit jako výchozí paměťovou kartu %c" @@ -5144,7 +5502,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/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Nastavení..." @@ -5156,7 +5514,7 @@ msgstr "SetupWiiMem: Nelze najít soubor s nastavením" msgid "Shake" msgstr "TÅ™es" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Krátké Jméno:" @@ -5184,7 +5542,7 @@ msgstr "Zobrazit Panel Nás&trojů" msgid "Show Drives" msgstr "Zobrazit Disky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Zobrazit EFB Regiony Kopie" @@ -5200,7 +5558,7 @@ msgstr "Zobrazit Francii" msgid "Show GameCube" msgstr "Zobrazit GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Zobrazit Obrazovku Vstupu" @@ -5216,7 +5574,7 @@ msgstr "Zobrazit JAP" msgid "Show Korea" msgstr "Zobrazit Koreu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Jazyk Zobrazení:" @@ -5236,7 +5594,7 @@ msgstr "Zobrazit Platformy" msgid "Show Regions" msgstr "Zobrazit Regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Zobrazit Statistiky" @@ -5256,45 +5614,49 @@ msgstr "Zobrazit Wad" msgid "Show Wii" msgstr "Zobrazit Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" -"Disabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all." +"Disabling this may avoid annoying and non-fatal messages, but it may also " +"mean that Dolphin suddenly crashes without any explanation at all." msgstr "" "Zobrazit rámeÄek se zprávou, pÅ™i zjiÅ¡tÄ›ní potenciálnÄ› závažné chyby.\n" -"Vypnutím tohoto se můžete vyhnout otravným a nezávažným zprávám, ale Dolphin může také být náhle ukonÄen bez jakéhokoliv vysvÄ›tlení." +"Vypnutím tohoto se můžete vyhnout otravným a nezávažným zprávám, ale Dolphin " +"může také být náhle ukonÄen bez jakéhokoliv vysvÄ›tlení." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Zobrazit první blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Zobrazit uložené bloky" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Zobrazit komentář uložení" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Zobrazit ikonu uložení" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Zobrazit název uložení" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" -"Show the number of frames rendered per second as a measure of emulation speed.\n" +"Show the number of frames rendered per second as a measure of emulation " +"speed.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Zobrazí poÄet snímků vykreslených za sekundu jako měřítko rychlosti emulace.\n" +"Zobrazí poÄet snímků vykreslených za sekundu jako měřítko rychlosti " +"emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -5320,7 +5682,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Å ikmý Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "ZjednoduÅ¡ená ÄínÅ¡tina" @@ -5328,11 +5690,11 @@ msgstr "ZjednoduÅ¡ená ÄínÅ¡tina" msgid "Size" msgstr "Velikost" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "PÅ™eskoÄit BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Vypnout Průchod Cíl. Průhl." @@ -5342,11 +5704,13 @@ msgstr "PÅ™eskoÄit EFB Přístup z Procesoru" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" -"Skip the destination alpha pass used in many games for various graphical effects.\n" +"Skip the destination alpha pass 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" +"PÅ™eskoÄit průchod cílové průhlednosti používaný ve vÄ›tÅ¡inÄ› her pro různé " +"grafické efekty.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -5354,13 +5718,15 @@ msgstr "" msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" -"If you're experiencing any issues, try raising texture cache accuracy or disable this option.\n" +"If you're experiencing any issues, try raising texture cache accuracy or " +"disable this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Lehce zrychlí kopie EFB do RAM obÄ›továním pÅ™esnosti emulace.\n" "NÄ›kdy také zvýší kvalitu obrazu.\n" -"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost textury, nebo tuto možnost vypnout.\n" +"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost textury, " +"nebo tuto možnost vypnout.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -5370,11 +5736,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5388,15 +5754,18 @@ msgstr "Softwarový VykreslovaÄ" #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:83 msgid "" -"Software rendering is an order of magnitude slower than using the other backends.\n" +"Software rendering is an order of magnitude slower than using the other " +"backends.\n" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -"Softwarové vykreslování je řádovÄ› pomalejší, než pÅ™i použití ostatních backendů.\n" +"Softwarové vykreslování je řádovÄ› pomalejší, než pÅ™i použití ostatních " +"backendů.\n" "Je užiteÄné pouze pro úÄely ladÄ›ní.\n" -"Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, zvolte 'Ne'." +"Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, " +"zvolte 'Ne'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Nastavení Zvuku" @@ -5418,6 +5787,7 @@ msgstr "Mezerník" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 @@ -5441,6 +5811,11 @@ msgstr "Mezerník" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" @@ -5450,13 +5825,21 @@ msgstr "Hlasitost Reproduktoru:" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" -"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.\n" -"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n" +"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.\n" +"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less " +"issues. Generally speaking, the lower the internal resolution is, the better " +"your performance will be.\n" "\n" "If unsure, select 640x528." msgstr "" -"UrÄuje rozliÅ¡ení, v kterém bude vykresleno. Vysoké rozliÅ¡ení vlemi zvýší kvalitu obrazu, ale je také o dost nároÄnÄ›jší na výkon a může způsobovat v nÄ›kterých hrách chyby.\n" -"\"Násobek 640x528\" je o trochu pomalejší než \"Velikost Okna\", ale také nezpůsobuje tolik problémů. ObecnÄ› Å™eÄeno, Äím nižší je vnitÅ™ní rozliÅ¡ení, tím lepší výkon bude.\n" +"UrÄuje rozliÅ¡ení, v kterém bude vykresleno. Vysoké rozliÅ¡ení vlemi zvýší " +"kvalitu obrazu, ale je také o dost nároÄnÄ›jší na výkon a může způsobovat v " +"nÄ›kterých hrách chyby.\n" +"\"Násobek 640x528\" je o trochu pomalejší než \"Velikost Okna\", ale také " +"nezpůsobuje tolik problémů. ObecnÄ› Å™eÄeno, Äím nižší je vnitÅ™ní rozliÅ¡ení, " +"tím lepší výkon bude.\n" "\n" "Pokud si nejste jisti, zvolte 640x528." @@ -5464,7 +5847,7 @@ msgstr "" msgid "Specify a video backend" msgstr "UrÄit backend videa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Zvýšit rychlost pÅ™enosu Disku" @@ -5472,7 +5855,7 @@ msgstr "Zvýšit rychlost pÅ™enosu Disku" msgid "Square Stick" msgstr "ÄŒtvercový Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Standardní OvladaÄ" @@ -5550,12 +5933,14 @@ msgstr "Zastavit" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Store EFB copies in GPU texture objects.\n" -"This is not so accurate, but it works well enough for most games and gives a great speedup over EFB to RAM.\n" +"This is not so accurate, but it works well enough for most games and gives a " +"great speedup over EFB to RAM.\n" "\n" "If unsure, leave this checked." msgstr "" "Ukládat EFB kopie do objektů textury grafického procesoru.\n" -"Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává vÄ›tší zrychlení než EFB do RAM.\n" +"Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává vÄ›tší " +"zrychlení než EFB do RAM.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -5584,12 +5969,12 @@ msgstr "Uložení byly úspěšnÄ› importovány" msgid "Swing" msgstr "Å vihnutí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Jazyk Systému:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TCHAJ-WAN" @@ -5635,7 +6020,7 @@ msgstr "Deska vpravo" msgid "Take Screenshot" msgstr "VytvoÅ™it Snímek Obrazovky" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bonga)" @@ -5651,7 +6036,7 @@ msgstr "Textura" msgid "Texture Cache" msgstr "Vyrovnávací Paměť Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "PÅ™ekryv Formátu Textury" @@ -5667,13 +6052,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Zvolený adresář je už v seznamu" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5684,15 +6069,19 @@ msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:51 #, c-format -msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." -msgstr "Soubor %s nemohl být otevÅ™en pro zápis. Zkontrolujte, prosím, je-li už otevÅ™en jiným programem." +msgid "" +"The file %s could not be opened for writing. Please check if it's already " +"opened by another program." +msgstr "" +"Soubor %s nemohl být otevÅ™en pro zápis. Zkontrolujte, prosím, je-li už " +"otevÅ™en jiným programem." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format msgid "The file %s was already open, the file header will not be written." msgstr "Soubor %s je už otevÅ™en, hlaviÄka souboru nebude zapsána." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Zadaný soubor (%s) neexistuje" @@ -5710,12 +6099,15 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Výsledný rozÅ¡ifrovaný kód AR neobsahuje žádné řádky." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" -"The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" -"Čím bezpeÄnÄ›jší toto bude, tím bude ménÄ› pravdÄ›podobné, že emulátoru budou chybÄ›t jakékoliv aktualizace textur z RAM.\n" +"Čím bezpeÄnÄ›jší toto bude, tím bude ménÄ› pravdÄ›podobné, že emulátoru budou " +"chybÄ›t jakékoliv aktualizace textur z RAM.\n" "\n" "Pokud si nejste jisti, použijte druhou nejrychlejší hodnotu zprava." @@ -5724,8 +6116,12 @@ 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:353 -msgid "The selected language is not supported by your system. Falling back to system default." -msgstr "Zvolený jazyk není VaÅ¡im systémem podporován. Vracím se na výchozí jazyk systému." +msgid "" +"The selected language is not supported by your system. Falling back to " +"system default." +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:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5752,7 +6148,7 @@ msgstr "Zadaný soubor \"%s\" neexistuje" msgid "The value is invalid" msgstr "Hodnota je neplatná" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Vzhled" @@ -5760,11 +6156,15 @@ msgstr "Vzhled" msgid "Theme selection went wrong" msgstr "VýbÄ›r vzhledu se zvrtl" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 -msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." -msgstr "Musí existovat lístek pro 00000001/00000002. VaÅ¡e NAND vypsání je pravdÄ›podobnÄ› neúplné" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 +msgid "" +"There must be a ticket for 00000001/00000002. Your NAND dump is probably " +"incomplete." +msgstr "" +"Musí existovat lístek pro 00000001/00000002. VaÅ¡e NAND vypsání je " +"pravdÄ›podobnÄ› neúplné" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5773,52 +6173,52 @@ msgstr "" "NeurÄený znamená, že hra použije nastavení Dolphin." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "This action replay simulator does not support codes that modify Action Replay itself." -msgstr "Tento simulátor action replay nepodporuje kód, který mÄ›ní samotný Action Replay." +msgid "" +"This action replay simulator does not support codes that modify Action " +"Replay itself." +msgstr "" +"Tento simulátor action replay nepodporuje kód, který mÄ›ní samotný Action " +"Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 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." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. Hold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n" +"Hold the right mouse button and move the mouse to pan the camera around. " +"Hold SHIFT and press one of the WASD keys to move the camera by a certain " +"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " +"SHIFT+R to reset the camera.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Tato funkce Vám umožňuje si pohrát s herní kamerou.\n" -"Podržte pravé tlaÄítko myÅ¡i a pohybujte s ní pro zmÄ›nu pohledu kamery. Podržte SHIFT a zmáÄknÄ›te jednu z kláves WASD, abyste kamerou pohnuli v urÄité vzdálenosti kroku (SHIFT+0 pro rychlejší pohyb a SHIFT+9 pro pomalejší). StisknÄ›te SHIFT+R k resetu kamery.\n" +"Podržte pravé tlaÄítko myÅ¡i a pohybujte s ní pro zmÄ›nu pohledu kamery. " +"Podržte SHIFT a zmáÄknÄ›te jednu z kláves WASD, abyste kamerou pohnuli v " +"urÄité vzdálenosti kroku (SHIFT+0 pro rychlejší pohyb a SHIFT+9 pro " +"pomalejší). StisknÄ›te SHIFT+R k resetu kamery.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Toto je použito pro kontrolu rychlosti hry pomocí pÅ™iÅ¡krcení zvuku.\n" -"Vypnutí tohoto může způsobit nesprávnou rychlost hry, napÅ™. příliÅ¡ rychle.\n" -"Ale nÄ›kdy zapnutím můžete způsobit nepÅ™etržitý hluk.\n" -"\n" -"Klávesová Zkratka : Podržte pro okamžité vypnutí ZaÅ¡krcení." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." -msgstr "Toto se používá pro pÅ™ehrávání hudebních stop, jako napÅ™. hudba v pozadí." +msgstr "" +"Toto se používá pro pÅ™ehrávání hudebních stop, jako napÅ™. hudba v pozadí." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" -"This splits the Video and CPU threads, so they can be run on separate cores.\n" -"Causes major speed improvements on PCs with more than one core, but can also cause occasional crashes/glitches." +"This splits the Video and CPU threads, so they can be run on separate " +"cores.\n" +"Causes major speed improvements on PCs with more than one core, but can also " +"cause occasional crashes/glitches." msgstr "" "Toto rozdÄ›lí vlákna Obrazu a Procesoru, takže běží na oddÄ›lených jádrech.\n" -"Způsobí výrazné zvýšení rychlosti na PC s více než jedním jádrem, ale také může způsobovat obÄasné chyby/pády." +"Způsobí výrazné zvýšení rychlosti na PC s více než jedním jádrem, ale také " +"může způsobovat obÄasné chyby/pády." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Tohle Vám umožní RuÄnÄ› Upravovat konfiguraÄní soubory INI" @@ -5841,7 +6241,7 @@ msgstr "Název" msgid "To" msgstr "Do" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Zapnout VÅ¡echny Typy Záznamů" @@ -5873,6 +6273,7 @@ msgstr "PÅ™epnout na Celou Obrazovku" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5880,14 +6281,17 @@ msgstr "PÅ™epnout na Celou Obrazovku" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "NahoÅ™e" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "TradiÄní ČínÅ¡tina" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Pokus o naÄtení souboru neznámého typu." @@ -5895,8 +6299,7 @@ msgstr "Pokus o naÄtení souboru neznámého typu." msgid "Triggers" msgstr "SpínaÄe" -#: Source/Core/Common/Src/SysConf.h:92 -#: Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Pokus o Ätení z neplatného SYSCONF" @@ -5908,7 +6311,7 @@ msgstr "" "Pokus o Ätení z neplatného SYSCONF\n" "ID bt wiimote nejsou dostupné" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "TureÄtina" @@ -5929,11 +6332,11 @@ msgstr "UDP Port:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "NEZNÃMÃ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5948,10 +6351,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format msgid "" -"Unable to parse line %lu of the entered AR code as a valid encrypted or decrypted code. Make sure you typed it correctly.\n" +"Unable to parse line %lu of the entered AR code as a valid encrypted or " +"decrypted code. Make sure you typed it correctly.\n" "Would you like to ignore this line and continue parsing?" msgstr "" -"Nelze analyzovat řádek %lu zadaného kódu AR jako platný zaÅ¡ifrovaný nebo rozÅ¡ifrovaný kód. UjistÄ›te se, že jste ho správnÄ› zadali.\n" +"Nelze analyzovat řádek %lu zadaného kódu AR jako platný zaÅ¡ifrovaný nebo " +"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:404 @@ -6024,7 +6429,7 @@ msgstr "Aktualizovat" msgid "Upright Wiimote" msgstr "Svislý Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Použít režim EuRGB60 (PAL60)" @@ -6036,7 +6441,7 @@ msgstr "Použít Celou Obrazovku" msgid "Use Hex" msgstr "Použít Å estnáctkovou soustavu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Použít Obslužné Rutiny Paniky" @@ -6048,23 +6453,26 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Použít více vláken k dekódování textur.\n" -"Může vést ke zrychlení (zvláštÄ› u procesorů, která mají více než dvÄ› jádra).\n" +"Může vést ke zrychlení (zvláštÄ› u procesorů, která mají více než dvÄ› " +"jádra).\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" -"However, one may skip the popups to allow interruption free gameplay by checking this option.\n" +"However, one may skip the popups to allow interruption free gameplay by " +"checking this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" "NormálnÄ› pokud kompilace shadera selže, je zobrazena chybová zpráva.\n" -"NicménÄ›, zaÅ¡krtnutím této možnosti tyto vyskakovací okna pÅ™eskoÄíte, což Vám umožní nepÅ™eruÅ¡ované hraní.\n" +"NicménÄ›, zaÅ¡krtnutím této možnosti tyto vyskakovací okna pÅ™eskoÄíte, což Vám " +"umožní nepÅ™eruÅ¡ované hraní.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Pomůcky" @@ -6088,25 +6496,29 @@ msgstr "Hodnota:" msgid "Verbosity" msgstr "Úroveň" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtuální" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Hlasitost" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, 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:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Instalace WAD selhala: chyba pÅ™i vytváření %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -6125,15 +6537,15 @@ msgstr "" msgid "Warning" msgstr "Varování" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Varování - DOL se spouÅ¡tí ve Å¡patném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Varování - ELF se spouÅ¡tí ve Å¡patném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Varování - ISO se spouÅ¡tí ve Å¡patném režimu konzole!" @@ -6161,37 +6573,62 @@ msgstr "" "a mají stejný název jako soubor na VaÅ¡i paměťové kartÄ›\n" "PokraÄovat?" -#: Source/Core/Core/Src/Movie.cpp:629 -#, c-format -msgid "Warning: You loaded a save that's after the end of the current movie. (byte %u > %u) (frame %u > %u). You should load another save before continuing, or load this state with read-only mode off." -msgstr "Varování: NaÄetli jste uloženou pozici, která je umístÄ›na po skonÄení souÄasného filmu. (bajt %u > %u) (snímek %u > %u). PÅ™ed pokraÄováním byste 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:646 -#, c-format -msgid "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync." -msgstr "Varování: NaÄetli jste uloženou pozici, jejíž film má neshodu v bajtu %d (0x%X). PÅ™ed pokraÄováním byste mÄ›li naÄíst jinou pozici, nebo tento stav naÄíst bez zapnutého režimu pouze pro Ätení. Jinak pravdÄ›podobnÄ› dojde k desynchronizaci." - -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" -"Warning: You loaded a save whose movie mismatches on frame %d. You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync.\n" +"Warning: You loaded a save that's after the end of the current movie. (byte " +"%u > %u) (frame %u > %u). You should load another save before continuing, or " +"load this state with read-only mode off." +msgstr "" +"Varování: NaÄetli jste uloženou pozici, která je umístÄ›na po skonÄení " +"souÄasného filmu. (bajt %u > %u) (snímek %u > %u). PÅ™ed pokraÄováním byste " +"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:684 +#, c-format +msgid "" +"Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " +"should load another save before continuing, or load this state with read-" +"only mode off. Otherwise you'll probably get a desync." +msgstr "" +"Varování: NaÄetli jste uloženou pozici, jejíž film má neshodu v bajtu %d (0x" +"%X). PÅ™ed pokraÄováním byste mÄ›li naÄíst jinou pozici, nebo tento stav " +"naÄíst bez zapnutého režimu pouze pro Ätení. Jinak pravdÄ›podobnÄ› dojde k " +"desynchronizaci." + +#: Source/Core/Core/Src/Movie.cpp:693 +#, c-format +msgid "" +"Warning: You loaded a save whose movie mismatches on frame %d. You should " +"load another save before continuing, or load this state with read-only mode " +"off. Otherwise you'll probably get a desync.\n" "\n" -"More information: The current movie is %d frames long and the savestate's movie is %d frames long.\n" +"More information: The current movie is %d frames long and the savestate's " +"movie is %d frames long.\n" "\n" "On frame %d, the current movie presses:\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" +"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" "On frame %d, the savestate's movie presses:\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" +"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 "" -"Varování: NaÄetli jste uloženou pozici, jejíž film má neshodu ve snímku %d. PÅ™ed pokraÄováním byste mÄ›li naÄíst jinou pozici, nebo tento stav naÄíst bez zapnutého režimu pouze pro Ätení. Jinak pravdÄ›podobnÄ› dojde k desynchronizaci.\n" +"Varování: NaÄetli jste uloženou pozici, jejíž film má neshodu ve snímku %d. " +"PÅ™ed pokraÄováním byste mÄ›li naÄíst jinou pozici, nebo tento stav naÄíst bez " +"zapnutého režimu pouze pro Ätení. Jinak pravdÄ›podobnÄ› dojde k " +"desynchronizaci.\n" "\n" -"Další informace: SouÄasný film je dlouhý %d snímků a uložený stav filmu je dlouhý %d snímků.\n" +"Další informace: SouÄasný film je dlouhý %d snímků a uložený stav filmu je " +"dlouhý %d snímků.\n" "\n" "Ve snímku %d souÄasný film stiskává:\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" +"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" "Na snímku %d, film uloženého stavu stiskává:\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" +"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:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -6202,7 +6639,7 @@ msgstr "WaveFileWriter - soubor není otevÅ™en." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack Å irokoúhlého obrazu" @@ -6210,15 +6647,15 @@ msgstr "Hack Å irokoúhlého obrazu" msgid "Width" msgstr "Šířka" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Konzole Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii KoÅ™en NAND:" @@ -6230,6 +6667,7 @@ msgstr "Import uložených pozic Wii" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 @@ -6243,6 +6681,9 @@ msgstr "Import uložených pozic Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -6317,7 +6758,7 @@ msgstr "Klávesa Windows Menu" msgid "Windows Right" msgstr "Klávesa Windows Vpravo" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Zalamování textu" @@ -6325,6 +6766,7 @@ msgstr "Zalamování textu" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 @@ -6344,6 +6786,11 @@ msgstr "Zalamování textu" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Pracuji..." @@ -6351,6 +6798,11 @@ msgstr "Pracuji..." msgid "Write to Console" msgstr "Zapsat do Konzole" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Zapsat do Souboru" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Zapsat do Souboru" @@ -6400,13 +6852,15 @@ msgstr "Musíte zadat jméno!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 msgid "You must enter a valid decimal, hexadecimal or octal value." -msgstr "Musíte zadat platnou hodnotu v desítkové, Å¡estnáctkové nebo osmiÄkové soustavÄ›." +msgstr "" +"Musíte zadat platnou hodnotu v desítkové, Å¡estnáctkové nebo osmiÄkové " +"soustavÄ›." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 msgid "You must enter a valid profile name." msgstr "Musíte zadat platné jméno profilu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Pro uplatnÄ›ní zmÄ›n musíte Dolphin restartovat." @@ -6429,7 +6883,7 @@ msgstr "" "MÄ›l by být 0x%04x (ale je 0x%04llx)\n" "Chcete vytvoÅ™it nový?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6466,14 +6920,19 @@ msgstr "[Vlastní]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" -"Aims to speed up emulation by offloading texture decoding to the GPU using the OpenCL framework.\n" -"However, right now it's known to cause texture defects in various games. Also it's slower than regular CPU texture decoding in most cases.\n" +"Aims to speed up emulation by offloading texture decoding to the GPU using " +"the OpenCL framework.\n" +"However, right now it's known to cause texture defects in various games. " +"Also it's slower than regular CPU texture decoding in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" "[EXPERIMENTÃLNÃ]\n" -"Usiluje o zrychlení emulace tím, že dekódování textury pÅ™enechá grafickému procesoru použitím struktury OpenCL.\n" -"NicménÄ› v tuto dobu je známo, že způsobuje vady textur v různých hrách. Také je ve vÄ›tÅ¡inÄ› případů pomalejší, než normální dekódování textur pÅ™es procesor.\n" +"Usiluje o zrychlení emulace tím, že dekódování textury pÅ™enechá grafickému " +"procesoru použitím struktury OpenCL.\n" +"NicménÄ› v tuto dobu je známo, že způsobuje vady textur v různých hrách. Také " +"je ve vÄ›tÅ¡inÄ› případů pomalejší, než normální dekódování textur pÅ™es " +"procesor.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -6486,7 +6945,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "[EXPERIMENTÃLNÃ]\n" -"Trochu zrychlí emulaci ukládáním pÅ™edvytvoÅ™ených objektů do vyrovnávací pamÄ›ti\n" +"Trochu zrychlí emulaci ukládáním pÅ™edvytvoÅ™ených objektů do vyrovnávací " +"pamÄ›ti\n" "Může ale také způsobovat problémy\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -6495,7 +6955,7 @@ msgstr "" msgid "^ ADD" msgstr "^ PŘIDAT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "zavadÄ›Ä aplikace (.img)" @@ -6526,12 +6986,12 @@ msgstr "není uložená hra wii nebo nelze Äíst z hlaviÄky souboru o velikost msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "neznámý příkaz 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute pÅ™i bÄ›hu aplikace vrátil -1!" @@ -6695,6 +7155,9 @@ msgstr "| NEBO" #~ msgid "Emulator Display Settings" #~ msgstr "Obrazová Nastavení Emulátoru" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Zapnout PÅ™iÅ¡krcení Zvuku" + #~ msgid "Enable CPU Access" #~ msgstr "Povolit Přístup k Procesoru" @@ -6738,6 +7201,13 @@ msgstr "| NEBO" #~ msgid "Error allocating buffer" #~ msgstr "Chyba pÅ™i alokaci vyrovnávací pamÄ›ti" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "Chyba v PlayWiimote. %u != %u, bajt %d.\n" +#~ "Je nám líto, nahrávání Wii je doÄasnÄ› nefunkÄní." + #~ msgid "Error opening file %s for recording" #~ msgstr "Chyba pÅ™i otevírání souboru %s pro nahrávání" @@ -6955,6 +7425,20 @@ msgstr "| NEBO" <<<<<<< HEAD ======= >>>>>>> Update from master branch. +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Toto je použito pro kontrolu rychlosti hry pomocí pÅ™iÅ¡krcení zvuku.\n" +#~ "Vypnutí tohoto může způsobit nesprávnou rychlost hry, napÅ™. příliÅ¡ " +#~ "rychle.\n" +#~ "Ale nÄ›kdy zapnutím můžete způsobit nepÅ™etržitý hluk.\n" +#~ "\n" +#~ "Klávesová Zkratka : Podržte pro okamžité vypnutí ZaÅ¡krcení." + #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" diff --git a/Languages/po/de.po b/Languages/po/de.po index 52e4251e01..6ed4fa1ca7 100644 --- a/Languages/po/de.po +++ b/Languages/po/de.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-02-17 01:23+0100\n" "Last-Translator: LucasX \n" "Language-Team: \n" @@ -57,9 +61,9 @@ msgstr "\"%s\" ist ein ungültiges GC/Wii-Image, oder kein GC/Wii-Image." msgid "%1$sCopy%1$s" msgstr "%1$sKopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -154,7 +158,7 @@ msgstr "%sGCI exportieren%s" msgid "%sImport GCI%s" msgstr "%sGCI importieren%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u freie Blöcke; %u freie Verzeichniseinträge" @@ -187,11 +191,11 @@ msgstr "&Cheat Manager" msgid "&DSP Settings" msgstr "&DSP Einstellungen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "ISO &löschen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "Ausgewählte ISOs &löschen" @@ -255,7 +259,7 @@ msgstr "Pau&se" msgid "&Play" msgstr "&Start" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Eigenschaften" @@ -299,7 +303,7 @@ msgstr "&Ansicht" msgid "&Wiimote Settings" msgstr "&Wiimote Einstellungen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -343,7 +347,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -352,7 +356,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -409,13 +413,13 @@ msgstr "" "\n" "TCP Port zum Hoster muss geöffnet sein!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Codes" @@ -427,11 +431,11 @@ msgstr "Ãœber Dolphin" msgid "Acceleration" msgstr "Beschleunigung" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Genaue VBeam Emulation" @@ -547,11 +551,11 @@ msgstr "Grafikkarte:" msgid "Add" msgstr "Hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "ActionReplay Code hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Patch hinzufügen" @@ -559,6 +563,7 @@ msgstr "Patch hinzufügen" msgid "Add new pane" msgstr "Neue Palette hinzufügen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -574,6 +579,11 @@ msgstr "Neue Palette hinzufügen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Hinzufügen..." @@ -621,11 +631,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Einstellung des benötigten Drucks um Analoge Tasten zu aktivieren." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Erweitert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Erweiterte Einstellungen" @@ -634,14 +644,15 @@ msgstr "Erweiterte Einstellungen" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Alle GC/Wii Dateien (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM Dateien (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -654,18 +665,22 @@ msgstr "Alle Gamecube GCM Dateien (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO Dateien (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle komprimierten GC/Wii ISO Dateien (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Alle Dateien (*.*)|*.*" @@ -677,7 +692,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Emulierte Wiimote" @@ -699,7 +714,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Kann Apploader aus dieser Datei nicht laden." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -714,7 +729,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -723,7 +738,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "Sind Sie sicher, dass Sie \"%s\" löschen möchten?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -731,11 +746,12 @@ msgstr "" "Sollen diese Dateien wirklich gelöscht werden?\n" "Löschen kann nicht rückgängig gemacht werden!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -745,6 +761,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -753,18 +772,20 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Audio Backend:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -774,6 +795,9 @@ msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisch" @@ -814,7 +838,7 @@ msgstr "" msgid "Back" msgstr "Zurück" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Backend Einstellungen" @@ -842,11 +866,11 @@ msgstr "Ungültige Header-Datei" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Banner Details" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -858,7 +882,7 @@ msgstr "Leiste" msgid "Basic" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Grundeinstellungen" @@ -889,6 +913,7 @@ msgstr "Blau rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -896,6 +921,9 @@ msgstr "Blau rechts" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Unten" @@ -904,7 +932,7 @@ msgstr "Unten" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Defekt" @@ -920,7 +948,7 @@ msgstr "Ordner suchen und hinzufügen" msgid "Browse for an ISO directory..." msgstr "ISO-Verzeichnis hinzufügen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Ausgabeverzeichnis auswählen" @@ -951,11 +979,11 @@ msgstr "C-Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU Emulator Engine" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 #, fuzzy msgid "Cache Display Lists" msgstr "Anzeigeliste zwischenspeichern" @@ -996,7 +1024,7 @@ msgstr "Kann %s nicht öffnen" msgid "Cannot unregister events with events pending" msgstr "Kann Ereignisse mit Ereignis-_Pending_ nicht unregistrieren." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1006,7 +1034,7 @@ msgstr "" "Diese Datei kann nicht als Memorycard verwendet werden.\n" "Versuchen Sie die gleiche Datei zugleich in _both_ Slots zu verwenden?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 #, fuzzy msgid "" "Cannot use that file as a memory card.\n" @@ -1025,8 +1053,6 @@ msgstr "Kann WiiMote bei BD: %02x:%02x:%02x:%02x:%02x:%02x nicht finden." msgid "Cant find WiiMote by connection handle %02x" msgstr "Kann Wiimote bei Verbindungs-Handle %02x nicht finden." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1036,7 +1062,7 @@ msgstr "Kann von DVD_Plugin/DVD-Schnittstelle nicht lesen: Fataler Fehler" msgid "Caps Lock" msgstr "Feststellen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -1061,7 +1087,7 @@ msgstr "Disc wechseln" msgid "Change Game" msgstr "Spiel wechseln" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1079,8 +1105,8 @@ 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 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Änderung dieser Option zeigt keine Auswirkung, solange die Emulation läuft." @@ -1101,32 +1127,32 @@ msgstr "Cheat Suche" msgid "Cheats Manager" msgstr "Cheat Manager" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinesisch (Vereinfacht)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinesisch (Traditionell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Wähle ein Standard DVD-Verzeichnis:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Wähle ein Standard DVD-Verzeichnis:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Standard ISO auswählen:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Ordner zum Hinzufügen auswählen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Datei zum Öffnen auswählen" @@ -1134,15 +1160,15 @@ msgstr "Datei zum Öffnen auswählen" msgid "Choose a memory card:" msgstr "Wähle eine Memory Card:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Ordner zum Extrahieren auswählen" @@ -1154,14 +1180,14 @@ msgstr "" msgid "Classic" msgstr "Klassik" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Löschen" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Löschen fehlgeschlagen." @@ -1177,6 +1203,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1185,6 +1212,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Schließen" @@ -1208,20 +1239,20 @@ msgstr "Befehl" msgid "Comment" msgstr "Kommentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Kommentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "ISO komprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Ausgewählte ISOs komprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Komprimiere ISO" @@ -1248,13 +1279,13 @@ msgstr "Pads konfigurieren" msgid "Configure..." msgstr "Konfigurieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Ãœberschreiben Bestätigen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "Bestätigung beim Beenden" @@ -1264,7 +1295,7 @@ msgstr "Bestätigung beim Beenden" msgid "Connect" msgstr "Verbinden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USB-Keyboard anschließen" @@ -1321,12 +1352,12 @@ msgstr "Zu GCI konvertieren" msgid "Copy failed" msgstr "Kopieren fehlgeschlagen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Auf Memcard %c kopieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Kern" @@ -1356,7 +1387,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Konnte ISO-Datei %s nicht erkennen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Konnte %s nicht speichern." @@ -1371,7 +1402,7 @@ msgstr "" "derzeit!\n" "(Pads während der Emulation einzustellen, wird noch nicht unterstützt.)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1384,7 +1415,7 @@ msgstr "" "Führen Sie Dolphin von einer CD/DVD aus, oder ist die Speicherdatei " "vielleicht schreibgeschützt?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Konnte denn Befehl zum öffnen der Dateierweiterung 'ini' nicht finden!" @@ -1402,7 +1433,7 @@ msgstr "" msgid "Count:" msgstr "Anzahl:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Land:" @@ -1416,26 +1447,26 @@ msgstr "AR-Code erstellen" msgid "Create new perspective" msgstr "Neue Perspektive erstellen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Erstellt von KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Erstellt von Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Erstellt von VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "Erstellt von black_rider und veröffentlicht auf ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Ersteller: " @@ -1443,7 +1474,7 @@ msgstr "Ersteller: " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Abschneiden" @@ -1464,7 +1495,7 @@ msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" "Aktuelles Verzeichnis wird gemäß wxFileSelector von %s nach %s geändert!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Benutzerdefinierter Projection-Hack" @@ -1472,11 +1503,11 @@ msgstr "Benutzerdefinierter Projection-Hack" msgid "Custom Projection Hack Settings" msgstr "Benutzerdefinierter Projection-Hack Einstellungen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Einige orthographische Projection Parameter anpassen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tschechisch" @@ -1488,10 +1519,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1502,19 +1534,23 @@ msgstr "DSP Emulator Engine" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emulation (schnell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Interpreter (langsam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE in eigenem Thread ausführen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE Recompiler" @@ -1522,15 +1558,23 @@ msgstr "DSP LLE Recompiler" msgid "DSP settings" msgstr "DSP Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD Laufwerk:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Datengröße" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Datum:" @@ -1551,7 +1595,7 @@ msgstr "Tote Zone" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1560,16 +1604,16 @@ msgstr "Debug" msgid "Decimal" msgstr "Dezimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "ISO dekomprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Ausgewählte ISOs dekomprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Dekomprimiere ISO" @@ -1577,11 +1621,11 @@ msgstr "Dekomprimiere ISO" msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Standard ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Standard Schriftart" @@ -1590,7 +1634,7 @@ msgstr "Standard Schriftart" msgid "Delete" msgstr "Löschen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Spielstand löschen" @@ -1599,7 +1643,7 @@ msgstr "Spielstand löschen" msgid "Delete the existing file '%s'?" msgstr "Wollen Sie die vorhandende Datei '%s' löschen?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 #, fuzzy msgid "Description" msgstr "Frage" @@ -1608,8 +1652,8 @@ msgstr "Frage" msgid "Detect" msgstr "Erkenne" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1620,8 +1664,8 @@ msgstr "" msgid "Device" msgstr "Gerät" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Geräteeinstellungen" @@ -1646,25 +1690,25 @@ msgstr "" "und ebenfalls die Backup-Verzeichnis-Prüfsumme." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "kein Nebel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "kein Nebel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "keine Beleuchtung" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "Farbtiefe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "keine Texturen" @@ -1694,7 +1738,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disc" @@ -1718,6 +1762,7 @@ msgstr "" msgid "Divide" msgstr "Dividieren" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1727,10 +1772,13 @@ msgstr "Dividieren" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1756,6 +1804,7 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1780,6 +1829,14 @@ msgstr "Dolphin GCPad Konfiguration" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Konfiguration" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" @@ -1812,11 +1869,11 @@ msgstr "" msgid "Down" msgstr "Runter" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Codes Herunterladen (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu Codes heruntergeladen. (%lu hinzugefügt)" @@ -1825,23 +1882,23 @@ msgstr "%lu Codes heruntergeladen. (%lu hinzugefügt)" msgid "Drums" msgstr "Trommeln" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Audio dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "EFB-Target dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Frames dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Texturen dumpen" @@ -1867,6 +1924,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1882,6 +1940,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holländisch" @@ -1907,7 +1970,7 @@ msgstr "" "aktualisiert haben, wird jezt wahrscheinlich ein Neustart benötigt, damit " "Windows denn neuen Treiber ladet." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1923,7 +1986,7 @@ msgstr "Bearbeiten" msgid "Edit ActionReplay Code" msgstr "ActionReplay Code bearbeiten" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Einstellungen bearbeiten" @@ -1935,8 +1998,8 @@ msgstr "Patch bearbeiten" msgid "Edit current perspective" msgstr "Aktuelle Ansicht ändern" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Bearbeiten..." @@ -1975,7 +2038,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulierte Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Emulierbarkeit:" @@ -1997,23 +2060,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR Logging aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Audio-Throttle aktivieren" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Blockvereinigung aktivieren" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2027,6 +2090,7 @@ msgstr "" msgid "Enable Cache" msgstr "Cache verwenden" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2036,52 +2100,55 @@ msgstr "Cache verwenden" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Cheats aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "DTK Musik aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Dual Core aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Dual Core aktivieren (Beschleunigung)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Tastenkürzel aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Idle-Skipping aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Idle-Skipping aktivieren (Beschleunigung)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Vollbildverfahren aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "Breitbildmodus" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Breitbildmodus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Drahtgitter aktivieren" @@ -2097,7 +2164,7 @@ msgstr "" "Anisotropische Filterung aktivieren.\n" "Verbessert die Grafikqualität bei schrägen Blickwinkeln." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2105,7 +2172,7 @@ msgstr "" "Aktiviert schnellen Zugriff auf die Disc. Wird für einige Spiele benötigt. " "(ON = Schnell, OFF = Kompatibel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Blättern verwenden" @@ -2125,7 +2192,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2133,7 +2200,7 @@ 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:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2143,7 +2210,7 @@ msgstr "" "Speicherverwaltungs-Einheit. Präzise für die Hardware, aber langsamer zu " "Emulieren. (ON = Kompatibel, OFF = Schnell)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Benutzerdefinierten Projection-Hack aktivieren" @@ -2155,7 +2222,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2174,6 +2241,7 @@ msgstr "" msgid "End" msgstr "Ende" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2189,6 +2257,11 @@ msgstr "Ende" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Englisch" @@ -2219,6 +2292,7 @@ msgstr "Gleich" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Fehler" @@ -2249,20 +2323,26 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Fehler" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fehler beim Laden der ausgewählten Sprache. Kehre nun zu dem Systemstandart " "zurück." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2298,7 +2378,7 @@ msgstr "Dolphin mit Emulator beenden." msgid "Export Failed" msgstr "Exportieren fehlgeschlagen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Datei exportieren" @@ -2311,15 +2391,15 @@ msgstr "Aufnahme exportieren" msgid "Export Recording..." msgstr "Aufnahme exportieren..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Spielstand exportieren" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Wii Spielstand exportieren (Experimentell)..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Alle Spielstände exportieren" @@ -2335,7 +2415,7 @@ msgstr "Spielstand exportieren als..." msgid "Extension" msgstr "Erweiterung" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 #, fuzzy msgid "External Frame Buffer" msgstr "Extra Parameter" @@ -2348,44 +2428,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Alle Dateien extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Apploader extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "DOL extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Ordner extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Datei extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Partition extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Extrahiere %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Alle Dateien extrahieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Ordner extrahieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Extrahieren..." @@ -2398,11 +2478,11 @@ msgstr "" msgid "FIFO Player" msgstr "Spieler" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANKREICH" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST Größe:" @@ -2415,11 +2495,11 @@ msgstr "Verbindungsaufbau fehlgeschlagen!" msgid "Failed to Listen!!" msgstr "_Listen_ Fehlgeschlagen!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Download von Codes ist Fehlgeschlagen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Entpacken nach %s ist Fehlgeschlagen!" @@ -2529,19 +2609,29 @@ msgstr "Fehler beim Schreiben eines Header für %s" msgid "Failed to write header for file %d" msgstr "Fehler beim Schreiben eines Header für Datei %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Schnell" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "Fast Mipmaps" msgstr "Native Mipmaps laden" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 #, fuzzy msgid "Fifo Player" @@ -2552,7 +2642,7 @@ msgstr "Spieler" msgid "File Info" msgstr "Code Info" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Datei enthielt keine Codes." @@ -2585,16 +2675,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:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Unbekanter Open-Modus : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Dateisystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Der Datentyp 'ini' ist unbekannt! Wird nicht geöffnet!" @@ -2602,7 +2692,7 @@ msgstr "Der Datentyp 'ini' ist unbekannt! Wird nicht geöffnet!" msgid "First Block" msgstr "Erster Block" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Prüfsummen korrigieren" @@ -2614,7 +2704,7 @@ msgstr "16:9 erzwingen" msgid "Force 4:3" msgstr "4:3 erzwingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Konsole auf NTSC-J umschalten" @@ -2648,7 +2738,7 @@ msgstr "" "Zwingt das Spiel, Grafiken für Breitbild-Auflösungen auszugeben.\n" "Dies kann Grafikfehler verursachen!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2683,7 +2773,7 @@ msgstr "Einzelbildwiedergabe" msgid "Frame Advance" msgstr "Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "Frame-Dumps verwenden FFV1" @@ -2697,7 +2787,7 @@ msgstr "Einzelbildwiedergabe" msgid "Frame S&kipping" msgstr "Frames ü&berspringen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Framelimit:" @@ -2705,10 +2795,11 @@ msgstr "Framelimit:" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Frei Umsehen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2724,6 +2815,11 @@ msgstr "Frei Umsehen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Französisch" @@ -2758,7 +2854,7 @@ msgstr "Tastenkürzel Einstellungen" msgid "GCPad" msgstr "GC-Pad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "Spiel ID:" @@ -2774,15 +2870,15 @@ msgstr "Spiel wird nicht emuliert!" msgid "Game not found!!" msgstr "Spiel nicht gefunden!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Spiel-Spezifische Einstellungen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Spieleinstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2794,6 +2890,7 @@ msgstr "Gamecube-&Pad Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2801,6 +2898,9 @@ msgstr "Gamecube-&Pad Einstellungen" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Cards (*.raw,*.gcp)" @@ -2809,15 +2909,17 @@ msgid "Gamecube Pad settings" msgstr "Gamecube Pad Einstellungen" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko Codes" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Fehler beim Starten des GeckoCode (CT%i CST%i) (%s)\n" "(Entweder ist der Code Fehlerhafter oder der Code-Typ wird noch nicht " @@ -2833,8 +2935,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Allgemein" @@ -2844,6 +2950,7 @@ msgstr "Allgemein" msgid "General Settings" msgstr "Interface Einstellungen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2859,6 +2966,11 @@ msgstr "Interface Einstellungen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Deutsch" @@ -2890,7 +3002,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Griechisch" @@ -2922,7 +3034,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Header-Prüfsumme fehlerhaft" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebräisch" @@ -2992,12 +3104,16 @@ msgstr "Tastenkürzel Einstellungen" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tastenkürzel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Ungarisch" @@ -3005,14 +3121,14 @@ msgstr "Ungarisch" msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3025,11 +3141,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin wird wahrscheinlich jetzt hängen bleiben." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Fehlerhafte Beschreibung" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL Einstellungen" @@ -3045,15 +3161,15 @@ msgstr "IR-Zeiger" msgid "IR Sensitivity:" msgstr "IR-Empfindlichkeit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO Details" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO Verzeichnisse" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITALIEN" @@ -3061,23 +3177,25 @@ msgstr "ITALIEN" msgid "Icon" msgstr "Symbol" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 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)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "Wenn das Framelimit höher als die Maximalgeschwindigkeit des Spiels " "(NTSC:60, PAL:50) eingestellt ist, muss Audio Throttle in den DSP-" @@ -3106,7 +3224,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Spielstand importieren" @@ -3155,7 +3273,7 @@ msgstr "" "Beleuchtung Deaktivieren. Verbessert die Performance, aber schaltet " "Beleuchtung in Spielen ab, die sie benutzen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Ingame" @@ -3164,7 +3282,7 @@ msgid "In-Game" msgstr "In-Game" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3184,7 +3302,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:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD-Karte einlegen" @@ -3197,7 +3315,7 @@ msgstr "Namen hier eingeben.." msgid "Install WAD" msgstr "Wii-Menü installieren" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Zum Wii-Menü hinzufügen" @@ -3208,6 +3326,7 @@ msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3217,16 +3336,19 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "WAD ins Wii-Menü installieren..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "Interface Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Interface Einstellungen" @@ -3253,11 +3375,11 @@ msgstr "Internationaler LZO-Fehler - lzo_init() fehlerhaft" msgid "Internal Resolution:" msgstr "Vollbildauflösung:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (SEHR langsam)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3274,7 +3396,7 @@ msgstr "Ungültigen Wert!" msgid "Invalid bat.map or dir entry" msgstr "Ungültige bat.map oder Verzeichnis-Eintrag" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Ungültiger Ereignis-Typ %i" @@ -3294,14 +3416,15 @@ msgstr "" "%s\n" " Möglicherweise müssen Sie dieses Spiel neu dumpen." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Ungültige Aufnahmedatei" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Ungültiger Status" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3317,27 +3440,32 @@ msgstr "Ungültiger Status" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italienisch" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (empfohlen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL experimenteller Recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japanisch" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3346,8 +3474,8 @@ msgstr "KOREA" msgid "Key" msgstr "Taste" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Koreanisch" @@ -3365,7 +3493,7 @@ msgstr "L Taste" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Sprache:" @@ -3418,7 +3546,7 @@ msgstr "" msgid "Less Than" msgstr "Kleiner als" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3426,7 +3554,7 @@ msgstr "" msgid "Load" msgstr "Laden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 #, fuzzy msgid "Load Custom Textures" msgstr "Hochauflösende Texturen laden" @@ -3475,6 +3603,7 @@ msgstr "Status aus Slot 8 laden" msgid "Load State..." msgstr "Status laden..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3484,10 +3613,14 @@ msgstr "Status laden..." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Wii-Menü laden (%d %c)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3497,6 +3630,9 @@ msgstr "Wii-Menü laden (%d %c)" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii-Menü laden (%d %c)" @@ -3522,7 +3658,7 @@ msgstr "Lade die ausgewählte Datei (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Lokal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "Threads an Cores binden" @@ -3536,12 +3672,12 @@ msgstr "Log" msgid "Log Configuration" msgstr "Tastenkürzel Einstellungen" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 #, fuzzy msgid "Log Types" msgstr "Typ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 #, fuzzy msgid "Logger Outputs" msgstr "Ausgabe" @@ -3572,7 +3708,7 @@ msgstr "" "MD5 Konflikt\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3594,11 +3730,11 @@ msgstr "MadCatz Gameshark Dateien(*.gcs)" msgid "Main Stick" msgstr "Main Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "Hersteller ID" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Hersteller:" @@ -3623,6 +3759,7 @@ msgstr "Speicher" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3630,6 +3767,9 @@ msgstr "Speicher" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Memory Card" @@ -3666,7 +3806,7 @@ msgstr "" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mikrofon" @@ -3676,11 +3816,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "Mikrofon" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Sonstiges" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Sonstige Einstellungen" @@ -3697,7 +3837,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Monospaced Schriftart" @@ -3710,7 +3850,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3725,7 +3865,7 @@ msgstr "" msgid "Multiply" msgstr "Stern" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3816,6 +3956,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Hoch" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3825,6 +3966,9 @@ msgstr "NP Hoch" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3833,7 +3977,7 @@ msgstr "Name:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Name: " @@ -3847,7 +3991,7 @@ msgid "New Scan" msgstr "Neuer Scan" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Nächste Seite" @@ -3859,7 +4003,7 @@ msgstr "Nächster Scan" msgid "Nickname :" msgstr "Nickname:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Kein Land (SDK)" @@ -3899,7 +4043,7 @@ msgstr "Keinen Spielstand-Ordner für Tittel %s gefunden." msgid "None" msgstr "Keine" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norwegisch" @@ -3907,8 +4051,8 @@ msgstr "Norwegisch" msgid "Not Equal" msgstr "Ungleich" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Nicht Festgelegt" @@ -3928,7 +4072,7 @@ msgstr "Nicht Verbunden" msgid "Notes" msgstr "Notizen" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notizen: " @@ -3966,7 +4110,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Aus" @@ -3992,11 +4136,11 @@ msgstr "Nur %d Blöcke verfügbar" msgid "Open" msgstr "Öffnen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Beinhaltenden &Ordner öffnen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "&Wii Spielstand-Ordner öffnen..." @@ -4018,11 +4162,11 @@ msgstr "OpenAL: Kann kein Sound-Gerät finden" msgid "OpenAL: can't open device %s" msgstr "OpenAL: Kann Gerät %s nicht öffnen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -4055,7 +4199,7 @@ msgstr "" "und importiere die Spielstände auf eine neue Memorycard.\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -4107,19 +4251,20 @@ msgstr "Paragraph" msgid "Parameters" msgstr "Parameter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partition %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Pfade" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4132,6 +4277,10 @@ msgstr "Pfade" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4141,7 +4290,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Pixel Beleuchtung" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfekt" @@ -4154,6 +4303,7 @@ msgstr "Perspektive %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4164,6 +4314,10 @@ msgstr "Perspektive %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Start" @@ -4177,7 +4331,7 @@ msgstr "Aufnahme abspielen" msgid "Play/Pause" msgstr "Start/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Spielbar" @@ -4190,6 +4344,7 @@ msgstr "Optionen" msgid "Players" msgstr "Spieler" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4199,6 +4354,9 @@ msgstr "Spieler" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -4210,23 +4368,23 @@ 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:309 msgid "Polish" msgstr "Polnisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4235,11 +4393,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugiesisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugiesisch (Brasilianisch)" @@ -4248,17 +4406,17 @@ msgstr "Portugiesisch (Brasilianisch)" msgid "Post-Processing Effect:" msgstr "Post-Processing Shader:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4271,7 +4429,7 @@ msgstr "" msgid "Prev Page" msgstr "Vorh. Seite" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Vorherige Seite" @@ -4322,7 +4480,7 @@ msgstr "R-Analog" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSSLAND" @@ -4335,7 +4493,7 @@ msgstr "Weite" msgid "Read-only mode" msgstr "Nur-Lese-Modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Echt" @@ -4414,6 +4572,7 @@ msgstr "Liste aktualisieren" msgid "Refresh game list" msgstr "Spieleliste aktualisieren" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4432,6 +4591,12 @@ msgstr "Spieleliste aktualisieren" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Entfernen" @@ -4484,11 +4649,11 @@ msgstr "Stick rechts" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Führt DSP LLE in einem eigenen Thread aus (nicht empfohlen)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russisch" @@ -4496,10 +4661,11 @@ msgstr "Russisch" msgid "Sa&ve State" msgstr "S&tatus speichern" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Sicher" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4509,6 +4675,9 @@ msgstr "Sicher" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Abtastrate:" @@ -4566,12 +4735,12 @@ msgstr "Status in Slot 8 speichern" msgid "Save State..." msgstr "Status speichern..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Speichern unter..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Komprimierte GCM/ISO speichern" @@ -4579,11 +4748,11 @@ msgstr "Komprimierte GCM/ISO speichern" msgid "Save current perspective" msgstr "Aktuelle Perspektive speichern" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Dekomprimierte GCM/ISO speichern" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." @@ -4593,6 +4762,7 @@ msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." msgid "Scaled EFB Copy" msgstr "EFB Scaled Copy" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4602,15 +4772,18 @@ msgstr "EFB Scaled Copy" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Suche..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Suche nach ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Suche..." @@ -4626,12 +4799,12 @@ msgstr "Rollen Feststell" msgid "Search Filter" msgstr "Suchfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Unterordner durchsuchen" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" @@ -4641,6 +4814,7 @@ msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" msgid "Select" msgstr "Auswählen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4665,6 +4839,14 @@ msgstr "Aufnahmedatei auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Aufnahmedatei auswählen" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Speicherdatei zum Importieren auswählen" @@ -4691,16 +4873,21 @@ msgstr "Wähle unverankerte Fenster" msgid "Select the file to load" msgstr "Datei zum Laden auswählen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Wii-Spielstand auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Status zum Laden auswählen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4720,6 +4907,9 @@ msgstr "Status zum Laden auswählen" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Status zum Speichern auswählen" @@ -4740,7 +4930,7 @@ msgstr "" "Erzwinge 4:3: Bild auf das Verhältnis 4:3 strecken.\n" "An Fenster anpassen: Bild auf Fenstergröße strecken." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Ausgewählte Schriftart" @@ -4776,11 +4966,11 @@ msgstr "Position der Sensorleiste:" msgid "Separator" msgstr "Trennzeichen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4791,11 +4981,11 @@ msgstr "" msgid "Set" msgstr "Zuweisen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Als &Standard-ISO festlegen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Als Standard-Speicherkarte %c auswählen" @@ -4806,7 +4996,7 @@ 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/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Einstellungen..." @@ -4818,7 +5008,7 @@ msgstr "SetupWiiMem: Kann die Einstellungsdatei nicht finden" msgid "Shake" msgstr "Schütteln" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Kurzer Name:" @@ -4847,7 +5037,7 @@ msgstr "&Werkzeugleiste anzeigen" msgid "Show Drives" msgstr "Laufwerke anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB Kopie-Regionen" @@ -4864,7 +5054,7 @@ msgstr "Frankreich anzeigen" msgid "Show GameCube" msgstr "GameCube anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 #, fuzzy msgid "Show Input Display" msgstr "Italien anzeigen" @@ -4881,7 +5071,7 @@ msgstr "JAP anzeigen" msgid "Show Korea" msgstr "Korea anzeigen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Sprache anzeigen:" @@ -4902,7 +5092,7 @@ msgstr "Plattformen anzeigen" msgid "Show Regions" msgstr "Regionen anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Show Statistics" msgstr "Statistiken" @@ -4923,11 +5113,11 @@ msgstr "Wad anzeigen" msgid "Show Wii" msgstr "Wii anzeigen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Hinweisfenster anzeigen, bevor die Emulation beendet wird." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4939,23 +5129,23 @@ msgstr "" "aber es kann dann vorkommen, dass Dolphin plötzlich ohne eine Warnung " "abstürzt." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Ersten Block anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Blöcke anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Kommentar anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Symbol anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Namen anzeigen" @@ -4987,7 +5177,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "_Seitwärts_ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Vereinfachtes Chinesisch" @@ -4995,12 +5185,12 @@ msgstr "Vereinfachtes Chinesisch" msgid "Size" msgstr "Größe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "GC-BIOS überspringen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Dest. Alpha Pass ausschalten" @@ -5033,11 +5223,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5057,7 +5247,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Sound Einstelungen" @@ -5075,6 +5265,7 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s" msgid "Space" msgstr "Leertaste" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5090,6 +5281,11 @@ msgstr "Leertaste" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanisch" @@ -5113,7 +5309,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Wähle ein Video-Backend" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Disc-Ãœbertragungsrate beschleunigen" @@ -5121,7 +5317,7 @@ msgstr "Disc-Ãœbertragungsrate beschleunigen" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Standard-Controller" @@ -5214,12 +5410,12 @@ msgstr "Die gespeicherte Datei wurde erfolgreich importiert" msgid "Swing" msgstr "Schwenken" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Systemsprache:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5259,7 +5455,7 @@ msgstr "" msgid "Take Screenshot" msgstr "Screenshot erstellen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5276,7 +5472,7 @@ msgstr "Textur" msgid "Texture Cache" msgstr "Cache löschen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 #, fuzzy msgid "Texture Format Overlay" msgstr "Texturformat" @@ -5293,13 +5489,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 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:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5324,7 +5520,7 @@ msgstr "" "Die Datei %s wurde bereits geöffnet, der Header für die Datei wird nicht " "geschrieben." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Die angegebene Datei (%s) existiert nicht" @@ -5346,7 +5542,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5389,7 +5585,7 @@ msgstr "Die ausgewählte Datei \"%s\" existiert nicht" msgid "The value is invalid" msgstr "Dieser Wert ist ungültig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Theme" @@ -5397,7 +5593,7 @@ msgstr "Theme" msgid "Theme selection went wrong" msgstr "Theme-Auswahl schiefgelaufen" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5405,7 +5601,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:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5422,7 +5618,7 @@ msgstr "" "Dieser Action-Replay-Simulator unterstützt keine Codes, die sich selber " "verändern können." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 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." @@ -5438,26 +5634,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Wird verwendet, um die Spielgeschwindigkeit anhand der Audio-Drossel zu " -"steuern.\n" -"Deaktivieren kann zu unnormaler (z.B. zu schneller) Spielgeschwindigkeit " -"führen. \n" -"Aber manchmal kann das Aktivieren dauerhafte Störgeräusche verursachen.\n" -"\n" -"Tastaturkürzel : Zur Deaktivierung der Drossel gedrückt halten." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Wird zur Wiedergabe von Musik (z.B. Hintergrundmusik) benutzt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5470,7 +5650,7 @@ msgstr "" "als einem Kern,\n" "kann aber gelegentlich Abstürze/Fehler verursachen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Erlaubt manuelles editieren der INI Konfigurationsdatei" @@ -5494,7 +5674,7 @@ msgstr "Titel" msgid "To" msgstr "Oben" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 #, fuzzy msgid "Toggle All Log Types" msgstr "Alle umschalten" @@ -5515,6 +5695,7 @@ msgstr "Vollbildmodus wechseln" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5522,14 +5703,17 @@ msgstr "Vollbildmodus wechseln" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Oben" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Traditionelles Chinesisch" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Versuche gerade einen unbekannten Dateityp zu Laden." @@ -5537,7 +5721,7 @@ msgstr "Versuche gerade einen unbekannten Dateityp zu Laden." msgid "Triggers" msgstr "Schultertasten" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Versuche gerade eine ungültige SYSCONF zu Lesen" @@ -5549,7 +5733,7 @@ msgstr "" "Versuche gerade eine ungültige SYSCONF zu Lesen\n" "Wiimote BT-IDs sind nicht verfügbar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Türkisch" @@ -5570,11 +5754,11 @@ msgstr "UDP Port:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "UNBEKANNT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5655,7 +5839,7 @@ msgstr "Update" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modus (PAL60) verwenden" @@ -5668,7 +5852,7 @@ msgstr "&Vollbild" msgid "Use Hex" msgstr "Hex verwenden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Warnmeldungen anzeigen" @@ -5689,7 +5873,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Hilfsmittel" @@ -5713,25 +5897,29 @@ msgstr "Wert: " msgid "Verbosity" msgstr "Ausführung" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Lautstärke" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, fuzzy, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD-Installation fehlgeschlagen: _Fehler erstellt_ %S" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD-Installation fehlgeschlagen: _Fehler erstellt_ %S" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5746,15 +5934,15 @@ msgstr "" msgid "Warning" msgstr "Warnungen" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Warnung - Starte DOL im falschen Consolen-Modus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Warnung - Starte ELF im falschen Consolen-Modus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Warnung - Starte ISO im falschen Consolen-Modus!" @@ -5782,7 +5970,7 @@ msgstr "" "und hat den gleichen Namen wie die Datei auf Ihrer Memory-Card\n" "Fortfahren?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5790,7 +5978,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5798,7 +5986,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5826,7 +6014,7 @@ msgstr "WaveFileWriter - Konnte Datei nicht öffnen." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Breitbild Hack" @@ -5834,15 +6022,15 @@ msgstr "Breitbild Hack" msgid "Width" msgstr "Weite" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii Konsole" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD Laufwerk:" @@ -5851,6 +6039,7 @@ msgstr "DVD Laufwerk:" msgid "Wii Save Import" msgstr "Wii Spielstand importieren" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5860,6 +6049,9 @@ msgstr "Wii Spielstand importieren" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii Speicherdateien (*.bin)|*.bin" @@ -5927,10 +6119,11 @@ msgstr "Windows Menü" msgid "Windows Right" msgstr "Windows Rechts" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Zeilenumbruch" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5946,6 +6139,11 @@ msgstr "Zeilenumbruch" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Arbeite..." @@ -5953,6 +6151,11 @@ msgstr "Arbeite..." msgid "Write to Console" msgstr "In Konsole ausgeben" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "In Datei ausgeben" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "In Datei ausgeben" @@ -6008,7 +6211,7 @@ msgstr "Sie müssen eine gültige Dezimalzahl oder gültigen Hex-Wert eingeben!" msgid "You must enter a valid profile name." msgstr "Sie müssen einen gültigen Profilamen eingeben!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 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." @@ -6029,7 +6232,7 @@ msgid "" msgstr "" "Ihre SYSCONF-Datei hat eine falsche Größe - Sollte 0x%04x (Aber ist 0x%04llx)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP Hack" @@ -6083,7 +6286,7 @@ msgstr "" msgid "^ ADD" msgstr "^ HINZUF." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "Apploader (.img)" @@ -6114,12 +6317,12 @@ msgstr "Dies ist kein Wii-Spielstand oder Lesefehler in Datei-Header-Größe %x" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "Unbekanter CMD 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute meldet -1 beim Start der Anwendung!" @@ -6405,6 +6608,9 @@ msgstr "| ODER" #~ msgid "Emulator Display Settings" #~ msgstr "Anzeige Einstellungen" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Audio-Throttle aktivieren" + #~ msgid "Enable CPU Access" #~ msgstr "CPU-Zugriff aktivieren" @@ -6788,6 +6994,21 @@ msgstr "| ODER" #~ msgid "The file " #~ msgstr "Die Datei " +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Wird verwendet, um die Spielgeschwindigkeit anhand der Audio-Drossel zu " +#~ "steuern.\n" +#~ "Deaktivieren kann zu unnormaler (z.B. zu schneller) Spielgeschwindigkeit " +#~ "führen. \n" +#~ "Aber manchmal kann das Aktivieren dauerhafte Störgeräusche verursachen.\n" +#~ "\n" +#~ "Tastaturkürzel : Zur Deaktivierung der Drossel gedrückt halten." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Wird zur Wiedergabe für Sprach- und Soundeffekten verwendet" diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index 271f6d526b..0f5636c238 100644 --- a/Languages/po/dolphin-emu.pot +++ b/Languages/po/dolphin-emu.pot @@ -10,6 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -17,6 +18,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:56-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -56,9 +60,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -143,7 +147,7 @@ msgstr "" msgid "%sImport GCI%s" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -176,11 +180,11 @@ msgstr "" msgid "&DSP Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "" @@ -244,7 +248,7 @@ msgstr "" msgid "&Play" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "" @@ -288,7 +292,7 @@ msgstr "" msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -332,7 +336,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -341,7 +345,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -380,13 +384,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -398,11 +402,11 @@ msgstr "" msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" @@ -502,11 +506,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "" @@ -514,6 +518,7 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -529,6 +534,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "" @@ -562,11 +572,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "" @@ -574,14 +584,15 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -594,18 +605,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "" @@ -617,7 +632,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "" @@ -637,7 +652,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" @@ -652,7 +667,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -661,16 +676,17 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -680,6 +696,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -688,18 +707,20 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -709,6 +730,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -744,7 +768,7 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "" @@ -771,11 +795,11 @@ msgstr "" msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "" @@ -787,7 +811,7 @@ msgstr "" msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "" @@ -818,6 +842,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -825,6 +850,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "" @@ -833,7 +861,7 @@ msgstr "" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "" @@ -849,7 +877,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "" @@ -879,11 +907,11 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "" @@ -922,7 +950,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -930,7 +958,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -946,8 +974,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -957,7 +983,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -982,7 +1008,7 @@ msgstr "" msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -996,8 +1022,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" @@ -1017,31 +1043,31 @@ msgstr "" msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "" @@ -1049,14 +1075,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "" @@ -1068,14 +1094,14 @@ msgstr "" msgid "Classic" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "" @@ -1089,6 +1115,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1097,6 +1124,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "" @@ -1120,20 +1151,20 @@ msgstr "" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "" @@ -1160,13 +1191,13 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "" @@ -1175,7 +1206,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "" @@ -1232,12 +1263,12 @@ msgstr "" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "" @@ -1264,7 +1295,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "" @@ -1275,7 +1306,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1284,7 +1315,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1299,7 +1330,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "" @@ -1313,24 +1344,24 @@ msgstr "" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "" @@ -1338,7 +1369,7 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "" @@ -1358,7 +1389,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "" @@ -1366,11 +1397,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" @@ -1382,10 +1413,11 @@ msgstr "" msgid "DSP" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1396,18 +1428,22 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" @@ -1415,15 +1451,23 @@ msgstr "" msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "" @@ -1444,7 +1488,7 @@ msgstr "" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "" @@ -1452,16 +1496,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "" @@ -1469,11 +1513,11 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "" @@ -1482,7 +1526,7 @@ msgstr "" msgid "Delete" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "" @@ -1491,7 +1535,7 @@ msgstr "" msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "" @@ -1499,8 +1543,8 @@ msgstr "" msgid "Detect" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1511,8 +1555,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "" @@ -1535,23 +1579,23 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "" @@ -1581,7 +1625,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "" @@ -1605,6 +1649,7 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1614,10 +1659,13 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "" @@ -1642,6 +1690,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1666,6 +1715,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1694,11 +1751,11 @@ msgstr "" msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1707,23 +1764,23 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "" @@ -1748,6 +1805,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1763,6 +1821,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1783,7 +1846,7 @@ msgid "" "driver." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "" @@ -1799,7 +1862,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1811,8 +1874,8 @@ msgstr "" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "" @@ -1851,7 +1914,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "" @@ -1873,23 +1936,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1902,6 +1965,7 @@ msgstr "" msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1911,51 +1975,54 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "" @@ -1968,13 +2035,13 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "" @@ -1994,20 +2061,20 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "" @@ -2019,7 +2086,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2036,6 +2103,7 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2051,6 +2119,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2081,6 +2154,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -2111,18 +2185,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2154,7 +2234,7 @@ msgstr "" msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "" @@ -2167,15 +2247,15 @@ msgstr "" msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "" @@ -2191,7 +2271,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "" @@ -2203,44 +2283,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "" @@ -2252,11 +2332,11 @@ msgstr "" msgid "FIFO Player" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "" @@ -2268,11 +2348,11 @@ msgstr "" msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2368,18 +2448,28 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "" +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "" @@ -2388,7 +2478,7 @@ msgstr "" msgid "File Info" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "" @@ -2417,16 +2507,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2434,7 +2524,7 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "" @@ -2446,7 +2536,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" @@ -2470,7 +2560,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2501,7 +2591,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "" @@ -2513,7 +2603,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" @@ -2521,10 +2611,11 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2540,6 +2631,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2572,7 +2668,7 @@ msgstr "" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "" @@ -2588,15 +2684,15 @@ msgstr "" msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "" @@ -2607,6 +2703,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2614,6 +2711,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2622,21 +2722,24 @@ msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" -#: Source/Core/Core/Src/GeckoCode.cpp:139 +#: Source/Core/Core/Src/GeckoCode.cpp:222 #, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2645,6 +2748,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2653,6 +2759,7 @@ msgstr "" msgid "General Settings" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2668,6 +2775,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "" @@ -2699,7 +2811,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "" @@ -2731,7 +2843,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2791,12 +2903,16 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "" @@ -2804,12 +2920,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2818,11 +2934,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2838,15 +2954,15 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "" @@ -2854,21 +2970,22 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 @@ -2893,7 +3010,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "" @@ -2932,7 +3049,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "" @@ -2941,7 +3058,7 @@ msgid "In-Game" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "" @@ -2961,7 +3078,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "" @@ -2973,7 +3090,7 @@ msgstr "" msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "" @@ -2982,6 +3099,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -2991,14 +3109,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "" @@ -3021,11 +3142,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "" @@ -3042,7 +3163,7 @@ msgstr "" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "" @@ -3059,14 +3180,15 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3082,27 +3204,32 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "" @@ -3111,8 +3238,8 @@ msgstr "" msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "" @@ -3130,7 +3257,7 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "" @@ -3176,7 +3303,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3184,7 +3311,7 @@ msgstr "" msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "" @@ -3232,6 +3359,7 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3253,6 +3381,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3276,7 +3411,7 @@ msgstr "" msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3288,11 +3423,11 @@ msgstr "" msgid "Log Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" @@ -3320,7 +3455,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3342,11 +3477,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "" @@ -3370,6 +3505,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3377,6 +3513,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3405,7 +3544,7 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "" @@ -3414,11 +3553,11 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "" @@ -3435,7 +3574,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "" @@ -3448,7 +3587,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3463,7 +3602,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3553,6 +3692,7 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3562,6 +3702,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3570,7 +3713,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "" @@ -3584,7 +3727,7 @@ msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "" @@ -3596,7 +3739,7 @@ msgstr "" msgid "Nickname :" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "" @@ -3635,7 +3778,7 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" @@ -3643,8 +3786,8 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "" @@ -3664,7 +3807,7 @@ msgstr "" msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "" @@ -3702,7 +3845,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "" @@ -3728,11 +3871,11 @@ msgstr "" msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "" @@ -3754,11 +3897,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3787,7 +3930,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -3837,19 +3980,20 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -3862,6 +4006,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3870,7 +4018,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "" @@ -3883,6 +4031,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -3893,6 +4042,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "" @@ -3906,7 +4059,7 @@ msgstr "" msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "" @@ -3918,6 +4071,7 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -3927,6 +4081,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3938,23 +4095,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "" @@ -3963,11 +4120,11 @@ msgstr "" msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "" @@ -3975,17 +4132,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3998,7 +4155,7 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "" @@ -4049,7 +4206,7 @@ msgstr "" msgid "RAM" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "" @@ -4062,7 +4219,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "" @@ -4132,6 +4289,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4150,6 +4308,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4199,11 +4363,11 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "" @@ -4211,10 +4375,11 @@ msgstr "" msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4224,6 +4389,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4281,12 +4449,12 @@ msgstr "" msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "" @@ -4294,11 +4462,11 @@ msgstr "" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4307,6 +4475,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4316,15 +4485,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "" @@ -4340,12 +4512,12 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "" @@ -4355,6 +4527,7 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4379,6 +4552,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4401,6 +4582,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4417,19 +4599,26 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4444,7 +4633,7 @@ msgid "" "If unsure, select Auto." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "" @@ -4480,11 +4669,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4493,11 +4682,11 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4507,7 +4696,7 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "" @@ -4519,7 +4708,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "" @@ -4547,7 +4736,7 @@ msgstr "" msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "" @@ -4563,7 +4752,7 @@ msgstr "" msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "" @@ -4579,7 +4768,7 @@ msgstr "" msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "" @@ -4599,7 +4788,7 @@ msgstr "" msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "" @@ -4619,34 +4808,34 @@ msgstr "" msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "" @@ -4677,7 +4866,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "" @@ -4685,11 +4874,11 @@ msgstr "" msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4721,11 +4910,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "" @@ -4745,7 +4934,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "" @@ -4763,6 +4952,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -4778,6 +4968,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -4801,7 +4996,7 @@ msgstr "" msgid "Specify a video backend" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4809,7 +5004,7 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -4902,12 +5097,12 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "" @@ -4946,7 +5141,7 @@ msgstr "" msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -4962,7 +5157,7 @@ msgstr "" msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "" @@ -4978,13 +5173,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5003,7 +5198,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -5025,7 +5220,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5063,7 +5258,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" @@ -5071,13 +5266,13 @@ msgstr "" msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5089,7 +5284,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -5105,19 +5300,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5125,7 +5311,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -5148,7 +5334,7 @@ msgstr "" msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "" @@ -5168,6 +5354,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5175,14 +5362,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "" @@ -5190,7 +5380,7 @@ msgstr "" msgid "Triggers" msgstr "" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "" @@ -5200,7 +5390,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "" @@ -5221,11 +5411,11 @@ msgstr "" msgid "UDP Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "" @@ -5303,7 +5493,7 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5315,7 +5505,7 @@ msgstr "" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" @@ -5336,7 +5526,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "" @@ -5360,25 +5550,28 @@ msgstr "" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +msgid "WAD installation failed: error creating ticket" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5393,15 +5586,15 @@ msgstr "" msgid "Warning" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "" @@ -5422,7 +5615,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5430,7 +5623,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5438,7 +5631,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5466,7 +5659,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "" @@ -5474,15 +5667,15 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "" @@ -5490,6 +5683,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5499,6 +5693,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5561,10 +5758,11 @@ msgstr "" msgid "Windows Right" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5580,6 +5778,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "" @@ -5587,6 +5790,10 @@ msgstr "" msgid "Write to Console" msgstr "" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +msgid "Write to Debugger" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "" @@ -5640,7 +5847,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5658,7 +5865,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "" @@ -5712,7 +5919,7 @@ msgstr "" msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5743,12 +5950,12 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/el.po b/Languages/po/el.po index f5da4c8403..74d89374e1 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -11,7 +11,11 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -71,9 +75,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sΑντιγÏαφή%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -171,7 +175,7 @@ msgstr "%sΕξαγωγή GCI%s" msgid "%sImport GCI%s" msgstr "%sΕισαγωγή GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u ΕλεÏθεÏα μπλοκ; %u ΕλεÏθεÏες Θέσεις Φακέλων" @@ -204,11 +208,11 @@ msgstr "&ΔιαχειÏιστής Cheat" msgid "&DSP Settings" msgstr "&Ρυθμίσεις DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&ΔιαγÏαφή ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&ΔιαγÏαφή επιλεγμένων ISO..." @@ -272,7 +276,7 @@ msgstr "&ΠαÏση" msgid "&Play" msgstr "&ΑναπαÏαγωγή" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Ιδιότητες" @@ -316,7 +320,7 @@ msgstr "&ΠÏοβολή" msgid "&Wiimote Settings" msgstr "&Ρυθμίσεις Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -360,7 +364,7 @@ msgstr "<Εισάγετε όνομα εδώ>" msgid "" msgstr "<Δε βÏέθηκαν αναλÏσεις>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<Τίποτα>" @@ -369,7 +373,7 @@ msgstr "<Τίποτα>" msgid "" msgstr "<Πατήστε ΠλήκτÏο>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<Συστήματος>" @@ -425,13 +429,13 @@ msgstr "" "\n" "Θα Ï€Ïέπει να έχετε κάνει Ï€Ïοώθηση της πόÏτας TCP στον host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Κωδικοί AR" @@ -443,6 +447,7 @@ msgstr "Σχετικά με το Dolphin" msgid "Acceleration" msgstr "Επιτάχυνση" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 @@ -462,6 +467,13 @@ msgstr "ΑκÏίβεια:" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +msgid "Accuracy:" +msgstr "ΑκÏίβεια:" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Accurate VBeam emulation" msgstr "ΑκÏιβής VBeam εξομοίωση" @@ -593,11 +605,11 @@ msgstr "ΠÏοσαÏμογέας:" msgid "Add" msgstr "ΠÏοσθήκη" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "ΠÏοσθήκη ÎšÏ‰Î´Î¹ÎºÎ¿Ï ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "ΠÏοσθήκη Patch" @@ -609,6 +621,7 @@ msgstr "ΠÏοσθήκη νέου pane" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 @@ -632,6 +645,11 @@ msgstr "ΠÏοσθήκη νέου pane" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "ΠÏοσθήκη..." @@ -667,11 +685,11 @@ msgstr "" "ΡÏθμιση της απαιτοÏμενης πίεσης του Î±Î½Î±Î»Î¿Î³Î¹ÎºÎ¿Ï Ï‡ÎµÎ¹ÏιστηÏίου για την " "ενεÏγοποίηση των κουμπιών." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Για Ï€ÏοχωÏημένους" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Ρυθμίσεις για ΠÏοχωÏημένους" @@ -679,11 +697,11 @@ msgstr "Ρυθμίσεις για ΠÏοχωÏημένους" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Όλα τα αÏχεία GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" @@ -691,6 +709,7 @@ msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ======= @@ -709,18 +728,22 @@ msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Όλα τα αÏχεία Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Όλα τα συμπιεσμένα αÏχεία GC/Wii ISO (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Όλα τα αÏχεία (*.*)|*.*" @@ -736,6 +759,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 @@ -754,6 +778,9 @@ msgstr "Εξομοιωμένο Wiimote" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Εναλλακτικός ΧÏονισμός Wiimote" @@ -774,7 +801,7 @@ msgstr "Ο Apploader έχει λάθος μέγεθος... είναι Ï€Ïάγμ msgid "Apploader unable to load from file" msgstr "Ο Apploader απέτυχε να φοÏτωθεί από αÏχείο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -792,7 +819,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε (ανενεÏγό)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "ΑÏαβικά" @@ -801,7 +828,7 @@ msgstr "ΑÏαβικά" msgid "Are you sure you want to delete \"%s\"?" msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε το \"%s\";" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -809,12 +836,13 @@ msgstr "" "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτά τα αÏχεία;\n" "Θα εξαφανιστοÏν για πάντα!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " "πάντα!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -823,6 +851,9 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 @@ -840,18 +871,20 @@ msgstr "Αναλογία Οθόνης:" msgid "At least one pane must remain open." msgstr "Τουλάχιστον ένα pane Ï€Ïέπει να μένει ανοιχτό." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Ήχος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Backend Ήχου:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -860,6 +893,9 @@ msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" <<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 @@ -931,7 +967,7 @@ msgstr "" msgid "Back" msgstr "Πίσω" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Backend Ρυθμίσεις" @@ -958,11 +994,11 @@ msgstr "Μη ΈγκυÏη Κεφαλίδα ΑÏχείου" msgid "Banner" msgstr "Εικονίδιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "ΛεπτομέÏειες Εικονιδίου:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Εικονίδιο:" @@ -974,7 +1010,7 @@ msgstr "Bar" msgid "Basic" msgstr "Βασικές" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Βασικές Ρυθμίσεις" @@ -1006,6 +1042,7 @@ msgstr "Δεξί Μπλε" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -1022,6 +1059,9 @@ msgstr "Δεξί Μπλε" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Βάση" @@ -1030,7 +1070,7 @@ msgstr "Βάση" msgid "Bound Controls: %lu" msgstr "Δεσμευμένοι ΧειÏισμοί: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Χαλασμένο" @@ -1046,7 +1086,7 @@ msgstr "ΕÏÏεση φακέλου για Ï€Ïοσθήκη" msgid "Browse for an ISO directory..." msgstr "ΕÏÏεση φακέλου ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" @@ -1086,11 +1126,11 @@ msgstr "Stick ΚάμεÏας " msgid "C-Stick" msgstr "Stick ΚάμεÏας" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Μηχανή Εξομοίωσης CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cache Display Lists" @@ -1141,7 +1181,7 @@ msgstr "Αποτυχία ανοίγματος %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1152,7 +1192,7 @@ msgstr "" "%s\n" "δεν είναι έγκυÏο αÏχείο κάÏτας μνήμης gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1170,8 +1210,6 @@ msgstr "Αποτυχία εÏÏεσης WiiMote με bd: %02x:%02x:%02x:%02x:%02 msgid "Cant find WiiMote by connection handle %02x" msgstr "Αδυναμία εÏÏεσης του WiiMote με handle σÏνδεσης %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1181,7 +1219,7 @@ msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interfa msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Καταλανικά" @@ -1206,7 +1244,7 @@ msgstr "Αλλαγή Δίσκου" msgid "Change Game" msgstr "Αλλαγή ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1222,8 +1260,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Αυτή η αλλαγή δε θα έχει επίπτωση όσο ο εξομοιωτής εκτελείται!" @@ -1243,31 +1281,31 @@ msgstr "Αναζήτηση Cheat" msgid "Cheats Manager" msgstr "ΔιαχείÏιση Cheat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Κινέζικα (Απλοποιημένα)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Κινέζικα (ΠαÏαδοσιακά)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Επιλέξτε έναν φάκελο Ïίζας DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Επιλέξτε έναν φάκελο Ïίζας NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Επιλέξτε ένα Ï€Ïοεπιλεγμένο ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Επιλέξτε έναν φάκελο για Ï€Ïοσθήκη" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" @@ -1275,6 +1313,7 @@ msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάÏτα μνήμης:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 @@ -1285,6 +1324,9 @@ msgstr "Επιλέξτε μια κάÏτα μνήμης:" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1299,8 +1341,8 @@ msgstr "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: ( ======= >>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Επιλέξτε τον φάκελο Ï€Ïος αποσυμπίεση" @@ -1312,14 +1354,14 @@ msgstr "Κυκλικό Stick" msgid "Classic" msgstr "Κλασικό ΧειÏιστήÏιο" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "ΚαθάÏισ." -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Το καθάÏισμα απέτυχε." @@ -1335,6 +1377,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1351,6 +1394,10 @@ msgstr "" >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Κλείσιμο" @@ -1374,20 +1421,20 @@ msgstr "Εντολή" msgid "Comment" msgstr "Σχόλιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Σχόλιο:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Συμπίεση ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Συμπίεση επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Συμπίεση ISO" @@ -1414,13 +1461,13 @@ msgstr "Ρυθμίσεις ΧειÏιστηÏίων" msgid "Configure..." msgstr "Γενικές Ρυθμίσεις..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Επιβεβαίωση Αντικατάστασης ΑÏχείου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Επιβεβαίωση Διακοπής" @@ -1429,7 +1476,7 @@ msgstr "Επιβεβαίωση Διακοπής" msgid "Connect" msgstr "ΣÏνδεση" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "ΣÏνδεση ΠληκτÏολογίου USB" @@ -1494,12 +1541,12 @@ msgstr "ΜετατÏοπή σε GCI" msgid "Copy failed" msgstr "Η αντιγÏαφή απέτυχε" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "ΑντιγÏαφή στην κάÏτα μνήμης %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "ΠυÏήνας" @@ -1530,7 +1577,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Αποτυχία αναγνώÏισης του αÏχείου ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Αποτυχία αποθήκευσης του %s" @@ -1545,7 +1592,7 @@ msgstr "" "(ο καθοÏισμός των χειÏιστηÏίων ενώ το παιχνίδι Ï„Ïέχει δεν υποστηÏίζεται Ï€Ïος " "το παÏόν)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1558,7 +1605,7 @@ msgstr "" "Μήπως εκτελείτε το Dolphin από CD/DVD, ή το αποθηκευόμενο αÏχείο έχει " "Ï€Ïοστασία εγγÏαφής;" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Αδυναμία εÏÏεσης εντολής ανοίγματος για την επέκταση 'ini'!" @@ -1575,7 +1622,7 @@ msgstr "" msgid "Count:" msgstr "Πλήθος:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "ΧώÏα:" @@ -1589,10 +1636,11 @@ msgstr "ΔημιουÏγία ÎšÏ‰Î´Î¹ÎºÎ¿Ï AR" msgid "Create new perspective" msgstr "ΔημιουÏγία νέας οπτικής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "ΔημιουÏγήθηκε από KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 @@ -1603,6 +1651,9 @@ msgstr "ΔημιουÏγήθηκε από KDE-Look.org" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1616,17 +1667,17 @@ msgstr "ΔημιουÏγήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, ======= >>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "ΔημιουÏγήθηκε από VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "ΔημιουÏγήθηκε από black_rider και δημοσιεÏθηκε στο ForumW.org > Web " "Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "ΔημιουÏγός: " @@ -1634,7 +1685,7 @@ msgstr "ΔημιουÏγός: " msgid "Critical" msgstr "ΚÏίσιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Κόψιμο" @@ -1657,7 +1708,7 @@ msgstr "Crossfade" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Ο Ï„Ïέχων φάκελος άλλαξε από %s σε %s μετά από τον wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "ΠÏοσαÏμοζόμενο Projection Hack" @@ -1665,11 +1716,11 @@ msgstr "ΠÏοσαÏμοζόμενο Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Ρυθμίσεις ΠÏοσαÏμοζόμενου Projection Hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Τσέχικα" @@ -1681,10 +1732,11 @@ msgstr "Ψηφιακό Pad" msgid "DSP" msgstr "Ήχος (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 @@ -1705,18 +1757,22 @@ msgstr "Μηχανή Εξομοίωσης DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (αÏγή)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE σε ΞεχωÏιστό Îήμα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" @@ -1724,15 +1780,23 @@ msgstr "DSP LLE recompiler" msgid "DSP settings" msgstr "Ρυθμίσεις ήχου (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Ρίζα DVD:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Μέγεθος Δεδομένων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "ΗμεÏομηνία:" @@ -1753,7 +1817,7 @@ msgstr "ÎεκÏή Ζώνη" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Debugging" @@ -1761,16 +1825,16 @@ msgstr "Debugging" msgid "Decimal" msgstr "Δεκαδικός" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Αποσυμπίεση ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Αποσυμπίεση επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Γίνεται αποσυμπίεση ISO" @@ -1778,11 +1842,11 @@ msgstr "Γίνεται αποσυμπίεση ISO" msgid "Default" msgstr "ΠÏοεπιλ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ΠÏοεπιλεγμένο ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "ΠÏοεπιλεγμένη γÏαμματοσειÏά" @@ -1791,7 +1855,7 @@ msgstr "ΠÏοεπιλεγμένη γÏαμματοσειÏά" msgid "Delete" msgstr "ΔιαγÏαφή" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "ΔιαγÏαφή Αποθήκευσης" @@ -1800,7 +1864,7 @@ msgstr "ΔιαγÏαφή Αποθήκευσης" msgid "Delete the existing file '%s'?" msgstr "ΔιαγÏαφή του υπάÏχοντος αÏχείου '%s';" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "ΠεÏιγÏαφή" @@ -1808,8 +1872,8 @@ msgstr "ΠεÏιγÏαφή" msgid "Detect" msgstr "Ανίχνευση" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1822,8 +1886,8 @@ msgstr "" msgid "Device" msgstr "Συσκευή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Ρυθμίσεις Συσκευής" @@ -1848,23 +1912,23 @@ msgstr "" " καθώς και το checksum του εφεδÏÎ¹ÎºÎ¿Ï ÎšÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… απέτυχε" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "ΑπενεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "ΑπενεÏγοποίηση Ομίχλης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "ΑπενεÏγοποίηση ΦωτισμοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "ΑπενεÏγοποίηση Βάθους ανά Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "ΑπενεÏγοποίηση Υφών" @@ -1908,7 +1972,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Δίσκος" @@ -1939,6 +2003,7 @@ msgstr "Divide" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 @@ -1952,10 +2017,13 @@ msgstr "Divide" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1984,6 +2052,7 @@ msgstr "Dolphin FIFO" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" @@ -2020,6 +2089,14 @@ msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Ρυθμίσεις Dolphin GCPad" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -2082,11 +2159,11 @@ msgstr "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει msgid "Down" msgstr "Κάτω" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "ΜεταφόÏτωση Κωδικών (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "ΜεταφοÏτώθηκαν %lu κωδικοί. (Ï€Ïοστέθηκαν %lu)" @@ -2095,23 +2172,23 @@ msgstr "ΜεταφοÏτώθηκαν %lu κωδικοί. (Ï€Ïοστέθηκαν msgid "Drums" msgstr "ΤÏμπανα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Εξαγωγή Ήχου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Εξαγωγή EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Εξαγωγή ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Εξαγωγή Υφών" @@ -2151,6 +2228,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 @@ -2174,6 +2252,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Ολλανδικά" @@ -2198,7 +2281,7 @@ msgstr "" "Dolphin σας, μία επανεκκίνηση απαιτείται για να κάνει τα Windows να δοÏνε " "τους νέους οδηγοÏÏ‚." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "ΕΥΡΩΠΗ" @@ -2214,7 +2297,7 @@ msgstr "ΕπεξεÏγασία" msgid "Edit ActionReplay Code" msgstr "ΕπεξεÏγασία ÎšÏ‰Î´Î¹ÎºÎ¿Ï ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "ΕπεξεÏγασία Ρυθμίσεων" @@ -2226,8 +2309,8 @@ msgstr "ΕπεξεÏγασία Patch" msgid "Edit current perspective" msgstr "ΕπεξεÏγασία Ï„Ïέχουσας οπτικής" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "ΕπεξεÏγασία..." @@ -2278,7 +2361,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Εξομοιωμένο Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Κατάσταση ΛειτουÏγίας:" @@ -2306,15 +2389,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "ΕνεÏγοποίηση ΚαταγÏαφής AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "ΕνεÏγοποίηση Throttle Ήχου" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "ΕνεÏγοποίηση BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "ΕνεÏγοποίηση Block Merging" @@ -2322,9 +2401,13 @@ msgstr "ΕνεÏγοποίηση Block Merging" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2337,6 +2420,7 @@ msgstr "" msgid "Enable Cache" msgstr "ΕνεÏγοποίηση Cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2355,51 +2439,54 @@ msgstr "ΕνεÏγοποίηση Cheat" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "ΕνεÏγοποίηση Cheat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "ΕνεÏγοποίηση Μουσικής DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "ΕνεÏγοποίηση ΣυντομεÏσεων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "ΕνεÏγοποίηση Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "ΕνεÏγοποίηση Idle Skipping (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "ΕνεÏγοποίηση MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "ΕνεÏγοποίηση ΠÏοοδευτικής ΣάÏωσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "ΕνεÏγοποίηση ΠÏοφÏλαξης Οθόνης" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "ΕνεÏγοποίηση ΕυÏείας Οθόνης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "ΕνεÏγοποίηση Wireframe" @@ -2418,7 +2505,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2426,7 +2513,7 @@ msgstr "" "ΕνεÏγοποιεί τη γÏήγοÏη Ï€Ïόσβαση δίσκου. ΑπαÏαίτητο για μεÏικά παιχνίδια. " "(ΕÎΕΡΓΟ = ΓÏήγοÏο, ΑÎΕÎΕΡΓΟ = Συμβατό)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "ΕνεÏγοποίηση σελίδων" @@ -2455,6 +2542,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 @@ -2465,6 +2553,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2479,7 +2570,7 @@ msgstr "ΕνεÏγοποιήστε το για να επιταχÏνετε το ======= >>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2489,7 +2580,7 @@ msgstr "" "ΔιαχείÏισης Μνήμης. ΑκÏιβές ως Ï€Ïος το υλικό, αλλά αÏγό στην εξομοίωση. " "(ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "ΕνεÏγοποιεί το ΠÏοσαÏμοζόμενο Projection Hack" @@ -2505,7 +2596,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2531,6 +2622,7 @@ msgstr "Τέλος" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 @@ -2554,6 +2646,11 @@ msgstr "Τέλος" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Αγγλικά" @@ -2585,6 +2682,7 @@ msgstr "Ίσο" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Σφάλμα" @@ -2646,21 +2744,31 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Σφάλμα" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " "συστήματος." +<<<<<<< HEAD #: Source/Core/Common/Src/ChunkFile.h:180 >>>>>>> Update from master branch. +======= +#: Source/Core/Common/Src/ChunkFile.h:194 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2696,7 +2804,7 @@ msgstr "Έξοδος από το Dolphin με τον εξομοιωτή" msgid "Export Failed" msgstr "Αποτυχία Εξαγωγής" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Εξαγωγή ΑÏχείου" @@ -2709,15 +2817,15 @@ msgstr "Εξαγωγή ΕγγÏαφής" msgid "Export Recording..." msgstr "Εξαγωγή ΕγγÏαφής..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Εξαγωγή Αποθήκευσης" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Εξαγωγή Αποθήκευσης Wii (ΠειÏαματικό)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Εξαγωγή όλων των αποθηκεÏσεων" @@ -2733,7 +2841,7 @@ msgstr "Εξαγωγή αποθήκευσης ως..." msgid "Extension" msgstr "Επέκταση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "ΕξωτεÏικό Frame Buffer" @@ -2745,44 +2853,44 @@ msgstr "Επιπλέον ΠαÏάμετÏος" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Η Επιπλέον ΠαÏάμετÏος είναι χÏήσιμη μόνο στο ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Εξαγωγή όλων των αÏχείων..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Εξαγωγή Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Εξαγωγή DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Εξαγωγή Φακέλου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Εξαγωγή ΑÏχείου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Εξαγωγή Κατάτμησης..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Γίνεται εξαγωγή %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Γίνεται εξαγωγή όλων των αÏχείων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Γίνεται εξαγωγή φακέλου" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Γίνεται εξαγωγή..." @@ -2794,11 +2902,11 @@ msgstr "FIFO Byte" msgid "FIFO Player" msgstr "ΑναπαÏαγωγή FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "ΓΑΛΛΙΑ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Μέγεθος FST:" @@ -2810,11 +2918,11 @@ msgstr "Αποτυχία σÏνδεσης!" msgid "Failed to Listen!!" msgstr "Αποτυχία ακÏόασης!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Αποτυχία μεταφόÏτωσης κωδικών." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Αποτυχία εξαγωγής στο %s!" @@ -2930,6 +3038,7 @@ msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το msgid "Failed to write header for file %d" msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το αÏχείο %d" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 @@ -2937,17 +3046,25 @@ msgid "Fast" <<<<<<< HEAD ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Fast" >>>>>>> The actual update of the Greek and Czech translations. The last commit msgstr "ΓÏήγοÏη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "ΓÏήγοÏα Mipmaps" <<<<<<< HEAD ======= msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Fast Mipmaps" msgstr "" @@ -2959,9 +3076,18 @@ msgstr "" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Fast version of the MMU. Does not work for every game." msgstr "ΓÏήγοÏη έκδοση του MMU. Δε δουλεÏει για όλα τα παιχνίδια." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "ΑναπαÏαγωγή Fifo" @@ -2970,7 +3096,7 @@ msgstr "ΑναπαÏαγωγή Fifo" msgid "File Info" msgstr "ΠληÏοφοÏίες ΑÏχείου" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Το αÏχείο δεν πεÏιείχε κωδικοÏÏ‚." @@ -3003,16 +3129,16 @@ msgstr "Το αÏχείο δεν αναγνωÏίζεται σαν κάÏτα μ msgid "File not compressed" msgstr "Το αÏχείο δεν είναι συμπιεσμένο" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Άγνωστη λειτουÏγία ανοίγματος : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "ΑÏχεία δίσκου" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Ο Ï„Ïπος αÏχείου 'ini' είναι άγνωστος! Δε θα γίνει άνοιγμα!" @@ -3020,7 +3146,7 @@ msgstr "Ο Ï„Ïπος αÏχείου 'ini' είναι άγνωστος! Δε θ msgid "First Block" msgstr "ΠÏώτο Μπλοκ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "ΕπιδιόÏθωση Checksum" @@ -3032,7 +3158,7 @@ msgstr "Επιβολή 16:9" msgid "Force 4:3" msgstr "Επιβολή 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Επιβολή της Κονσόλας ως NTSC-J" @@ -3065,7 +3191,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -3102,7 +3228,7 @@ msgstr "ΚαÏέ" msgid "Frame Advance" msgstr "ΠÏοώθηση ανά ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "FFV1 Για Τα Εξαγώμενα ΚαÏέ" @@ -3114,7 +3240,7 @@ msgstr "ΕÏÏος ΚαÏέ" msgid "Frame S&kipping" msgstr "ΠαÏάλειψη Κ&αÏέ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "ΠεÏιοÏισμός ΚαÏέ:" @@ -3122,7 +3248,7 @@ msgstr "ΠεÏιοÏισμός ΚαÏέ:" msgid "Frames To Record" msgstr "ΚαÏέ ΠÏος ΕγγÏαφή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "ΕλεÏθεÏη Ματιά" @@ -3130,6 +3256,7 @@ msgstr "ΕλεÏθεÏη Ματιά" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 @@ -3153,6 +3280,11 @@ msgstr "ΕλεÏθεÏη Ματιά" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Γαλλικά" @@ -3186,7 +3318,7 @@ msgstr "Ρυθμίσεις ΚαταγÏαφής" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID ΠαιχνιδιοÏ:" @@ -3202,15 +3334,15 @@ msgstr "Το παιχνίδι δεν εκτελείται!" msgid "Game not found!!" msgstr "Το παιχνίδι δε βÏέθηκε!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Ρυθμίσεις ΣυγκεκÏιμένου ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Ρυθμίσεις ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -3230,6 +3362,7 @@ msgstr "Ρυθμίσεις Gamecube &Pad" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 @@ -3238,6 +3371,9 @@ msgstr "Ρυθμίσεις Gamecube &Pad" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -3246,15 +3382,17 @@ msgid "Gamecube Pad settings" msgstr "Ρυθμίσεις ΧειÏιστηÏίου Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Κωδικοί Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Ο Κωδικός Gecko απέτυχε να εκτελεστεί (CT%i CST%i) (%s)\n" "(ή είναι ένας κακός κωδικός ή ο Ï„Ïπος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζεται.)" @@ -3264,10 +3402,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -3291,6 +3433,7 @@ msgstr "Γενικές Ρυθμίσεις" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 @@ -3314,6 +3457,11 @@ msgstr "Γενικές Ρυθμίσεις" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "ΓεÏμανικά" @@ -3366,7 +3514,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Ελληνικά" @@ -3398,7 +3546,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Αποτυχία ελέγχου κεφαλίδας" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "ΕβÏαϊκά" @@ -3478,12 +3626,16 @@ msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" >>>>>>> The actual update of the Greek and Czech translations. The last commit ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "ΟυγγÏικά" @@ -3491,14 +3643,14 @@ msgstr "ΟυγγÏικά" msgid "Hybrid Wiimote" msgstr "ΥβÏιδικό Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3511,11 +3663,11 @@ msgstr "" "TitleID %016llx.\n" "Το Dolphin πιθανότατα θα κολλήσει Ï„ÏŽÏα." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - μη έγκυÏος Ï€ÏοοÏισμός" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Ρυθμίσεις IPL" @@ -3531,15 +3683,15 @@ msgstr "Δείκτης IR" msgid "IR Sensitivity:" msgstr "Ευαισθησία IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ΛεπτομέÏειες ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Φάκελοι ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ΙΤΑΛΙΑ" @@ -3547,19 +3699,20 @@ msgstr "ΙΤΑΛΙΑ" msgid "Icon" msgstr "Εικονίδιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = " "Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 @@ -3579,6 +3732,14 @@ msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy +msgid "" +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." +>>>>>>> Update the pot file to reflect recent changes in the code. msgstr "" "Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, " "PAL:50),\n" @@ -3618,7 +3779,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Εισαγωγή Αποθήκευσης" @@ -3669,7 +3830,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Εντός ΠαιχνιδιοÏ" @@ -3678,7 +3839,7 @@ msgid "In-Game" msgstr "Εντός ΠαιχνιδιοÏ" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "ΠληÏοφοÏίες" @@ -3698,7 +3859,7 @@ msgstr "Εισάγετε" msgid "Insert Encrypted or Decrypted code here..." msgstr "Εισάγετε Κωδικοποιημένο ή μη Κωδικό εδώ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Εισαγωγή ΚάÏτας SD" @@ -3710,7 +3871,7 @@ msgstr "Εισάγετε όνομα εδώ..." msgid "Install WAD" msgstr "Εγκατάσταση WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Εγκατάσταση στο ÎœÎµÎ½Î¿Ï Wii" @@ -3725,6 +3886,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 @@ -3738,14 +3900,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Διεπαφή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Ρυθμίσεις Διεπαφής" @@ -3770,11 +3935,11 @@ msgstr "ΕσωτεÏικό Σφάλμα LZO - αποτυχία lzo_init()" msgid "Internal Resolution:" msgstr "ΕσωτεÏική Ανάλυση:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (ΠΟΛΥ αÏγός)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Εισαγωγή" @@ -3791,7 +3956,7 @@ msgstr "Μη έγκυÏη τιμή!" msgid "Invalid bat.map or dir entry" msgstr "Μη έγκυÏο bat.map ή εγγÏαφή φακέλου" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Μη έγκυÏος Ï„Ïπος συμβάντος %i" @@ -3811,11 +3976,11 @@ msgstr "" "%s\n" " Ίσως χÏειαστεί να ξαναεξάγετε την εικόνα Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î±Ï€ÏŒ τον δίσκο." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Μη έγκυÏο κατάσταση" @@ -3823,6 +3988,7 @@ msgstr "Μη έγκυÏο κατάσταση" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 @@ -3846,27 +4012,32 @@ msgstr "Μη έγκυÏο κατάσταση" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Ιταλικά" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "ΙΑΠΩÎΙΑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (Ï€Ïοτείνεται)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL δοκιμαστικός recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Ιαπωνικά" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "ΚΟΡΕΑ" @@ -3875,8 +4046,8 @@ msgstr "ΚΟΡΕΑ" msgid "Key" msgstr "ΠλήκτÏο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "ΚοÏεάτικα" @@ -3894,7 +4065,7 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Αναλογική" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Γλώσσα:" @@ -3947,7 +4118,7 @@ msgstr "" msgid "Less Than" msgstr "ΜικÏότεÏο από" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "ΠεÏιοÏισμός με βάση τα ΚαÏέ" @@ -3955,7 +4126,7 @@ msgstr "ΠεÏιοÏισμός με βάση τα ΚαÏέ" msgid "Load" msgstr "ΦόÏτωσ." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "ΦόÏτωση ΤÏοποποιημένων Υφών" @@ -4007,6 +4178,7 @@ msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" @@ -4040,6 +4212,13 @@ msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii %d%c" @@ -4066,7 +4245,7 @@ msgstr "ΦοÏτώνει το καθοÏισμένο αÏχείο (DOL,ELF,GCM,I msgid "Local" msgstr "Τοπικό" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Κλείδωμα Îημάτων στους ΠυÏήνες " @@ -4078,11 +4257,11 @@ msgstr "ΚαταγÏαφή" msgid "Log Configuration" msgstr "Ρυθμίσεις ΚαταγÏαφής" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "ΤÏποι ΚαταγÏαφής" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Έξοδοι ΚαταγÏαφής" @@ -4112,7 +4291,7 @@ msgstr "" "Ασυμφωνία MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -4142,11 +4321,11 @@ msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "ΚÏÏιο Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID ΔημιουÏγοÏ:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "ΔημιουÏγός:" @@ -4182,11 +4361,15 @@ msgstr "Memory Byte" ======= #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> The actual update of the Greek and Czech translations. The last commit ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "ΚάÏτα Μνήμης" @@ -4225,7 +4408,7 @@ msgstr "" msgid "Menu" msgstr "ΜενοÏ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "ΜικÏόφωνο" @@ -4234,11 +4417,11 @@ msgstr "ΜικÏόφωνο" msgid "Min" msgstr "Ελάχιστη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "ΔιάφοÏα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "ΔιάφοÏες Ρυθμίσεις" @@ -4260,7 +4443,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Ισοπλατής γÏαμματοσειÏά" @@ -4273,7 +4456,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "ΜοτέÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -4294,7 +4477,7 @@ msgstr "" msgid "Multiply" msgstr "Multiply" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -4390,6 +4573,7 @@ msgstr "NP Up" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 @@ -4402,6 +4586,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4410,7 +4597,7 @@ msgstr "Όνομα:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Όνομα: " @@ -4424,7 +4611,7 @@ msgid "New Scan" msgstr "Îέα Ανίχνευση" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Επόμενη Σελίδα" @@ -4436,7 +4623,7 @@ msgstr "Επόμενη Ανίχνευση" msgid "Nickname :" msgstr "Ψευδώνυμο :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Καμία ΧώÏα (SDK)" @@ -4475,7 +4662,7 @@ msgstr "Δε βÏέθηκε φάκελος αποθήκευσης για τον msgid "None" msgstr "Καμία" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "ÎοÏβηγικά Bokmaal" @@ -4483,8 +4670,8 @@ msgstr "ÎοÏβηγικά Bokmaal" msgid "Not Equal" msgstr "Όχι ίσο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Μη ΟÏισμένο" @@ -4512,7 +4699,7 @@ msgstr "Μη Συνδεδεμένο" msgid "Notes" msgstr "Σημειώσεις" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Σημειώσεις: " @@ -4550,7 +4737,7 @@ msgstr "Αντικείμενο" msgid "Object Range" msgstr "ΕÏÏος Αντικειμένου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "ΑνενεÏγός" @@ -4584,11 +4771,11 @@ msgstr "Διαθέσιμα μόνο %d μπλοκ" msgid "Open" msgstr "Άνοιγμα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Άνοιγμα &τοποθεσίας αÏχείου" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Άνοιγμα φακέλου αποθήκευσης Wii" @@ -4610,11 +4797,11 @@ msgstr "OpenAL: αδυναμία εÏÏεσης συσκευών ήχου" msgid "OpenAL: can't open device %s" msgstr "OpenAL: αδυναμία ανοίγματος της συσκευής %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Αποκωδικοποιητής Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Αποκωδικοποιητής Υφών" @@ -4647,7 +4834,7 @@ msgstr "" "και εισάγετέ τα σε μία νέα κάÏτα μνήμης.\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Άλλα" @@ -4699,16 +4886,16 @@ msgstr "ΠαÏάγÏαφος" msgid "Parameters" msgstr "ΠαÏάμετÏοι" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Κατάτμηση %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Φάκελοι" @@ -4716,6 +4903,7 @@ msgstr "Φάκελοι" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ======= @@ -4732,6 +4920,10 @@ msgstr "Φάκελοι" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "ΠαÏση" @@ -4740,7 +4932,7 @@ msgstr "ΠαÏση" msgid "Per-Pixel Lighting" msgstr "Φωτισμός ανά Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Τέλειο" @@ -4768,6 +4960,7 @@ msgstr "Οπτική %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> The actual update of the Greek and Czech translations. The last commit @@ -4775,6 +4968,10 @@ msgstr "Οπτική %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "ΑναπαÏαγωγή" @@ -4788,7 +4985,7 @@ msgstr "ΑναπαÏαγωγή ΕγγÏαφής" msgid "Play/Pause" msgstr "ΑναπαÏαγωγή/ΠαÏση" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Παίζεται" @@ -4804,6 +5001,7 @@ msgstr "Παίχτες" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 @@ -4817,6 +5015,9 @@ msgstr "Παίχτες" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -4828,23 +5029,23 @@ msgstr "ΠαÏακαλώ δημιουÏγήστε μια οπτική Ï€Ïιν msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Πολωνέζικα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "ΘÏÏα 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "ΘÏÏα 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "ΘÏÏα 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "ΘÏÏα 4" @@ -4853,11 +5054,11 @@ msgstr "ΘÏÏα 4" msgid "Port :" msgstr "ΘÏÏα :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "ΠοÏτογαλικά" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "ΠοÏτογαλικά (Î’Ïαζιλιάνικα)" @@ -4865,17 +5066,17 @@ msgstr "ΠοÏτογαλικά (Î’Ïαζιλιάνικα)" msgid "Post-Processing Effect:" msgstr "Post-Processing Εφέ:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4888,7 +5089,7 @@ msgstr "ΠÏοεπιλογές: " msgid "Prev Page" msgstr "ΠÏοηγοÏμενη Σελίδα" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "ΠÏοηγοÏμενη Σελίδα" @@ -4939,7 +5140,7 @@ msgstr "R-Αναλογική" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "ΡΩΣΙΑ" @@ -4952,7 +5153,7 @@ msgstr "ΕÏÏος" msgid "Read-only mode" msgstr "Μόνο Για Ανάγνωση (ΕγγÏαφής)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "ΠÏαγματικό" @@ -5031,6 +5232,7 @@ msgstr "Ανανέωση λίστας παιχνιδιών" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 @@ -5059,6 +5261,12 @@ msgstr "Ανανέωση λίστας παιχνιδιών" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "ΑφαίÏεση" @@ -5116,11 +5324,11 @@ msgstr "Δεξί Stick" msgid "Rumble" msgstr "Δόνηση" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Εκτέλεση DSP LLE σε ξεχωÏιστό νήμα (δεν Ï€Ïοτείνεται)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Ρώσικα" @@ -5128,13 +5336,18 @@ msgstr "Ρώσικα" msgid "Sa&ve State" msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Safe" <<<<<<< HEAD msgstr "Ασφαλής" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 <<<<<<< HEAD ======= @@ -5152,6 +5365,9 @@ msgstr "Ασφαλής" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" @@ -5209,12 +5425,12 @@ msgstr "Αποθήκευση Σημείου Αποθήκευσης 8" msgid "Save State..." msgstr "Αποθήκευση Σημείου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Αποθήκευση ως..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Αποθήκευση συμπιεσμένου GCM/ISO" @@ -5222,11 +5438,11 @@ msgstr "Αποθήκευση συμπιεσμένου GCM/ISO" msgid "Save current perspective" msgstr "Αποθήκευση Ï„Ïέχουσας οπτικής" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -5237,6 +5453,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 @@ -5254,15 +5471,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Ανίχνευση %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Αναζήτηση για ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Ανίχνευση..." @@ -5278,12 +5498,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "ΦίλτÏο Αναζήτησης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Αναζήτηση σε Υποφακέλους" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" @@ -5293,6 +5513,7 @@ msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" msgid "Select" msgstr "Επιλογή" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -5325,6 +5546,14 @@ msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" @@ -5354,14 +5583,19 @@ msgstr "Επιλέξτε το αÏχείο για φόÏτωση" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -5395,6 +5629,9 @@ msgstr "Επιλέξτε το σημείο φόÏτωσης" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -5417,7 +5654,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι επιλέξτε Αυτόματα." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Επιλεγμένη γÏαμματοσειÏά" @@ -5466,10 +5703,11 @@ msgstr "Θέση Sensor Bar:" msgid "Separator" msgstr "ΔιαχωÏιστής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "ΣεÏβικά" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 @@ -5480,6 +5718,9 @@ msgstr "ΣεÏβικά" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5497,11 +5738,11 @@ msgstr "ΣειÏιακή ΘÏÏα 1 - Αυτή είναι η θÏÏα που χ msgid "Set" msgstr "ΟÏισμός" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένο &ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένη ΚάÏτα Μνήμης %c" @@ -5513,7 +5754,7 @@ msgstr "" "SetARCode_IsActive: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος λίστας των " "κωδικών ar %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Ρυθμίσεις..." @@ -5525,7 +5766,7 @@ msgstr "SetupWiiMem:Αδυναμία εÏÏεσης αÏχείου Ïυθμίσ msgid "Shake" msgstr "ΚοÏνημα" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "ΣÏντομο Όνομα:" @@ -5553,7 +5794,7 @@ msgstr "Εμφάνιση ΓÏαμμής &ΕÏγαλείων" msgid "Show Drives" msgstr "Εμφάνιση Οδηγών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Εμφάνιση ΠεÏιοχών EFB ΑντιγÏαφών" @@ -5569,7 +5810,7 @@ msgstr "Εμφάνιση Γαλλίας" msgid "Show GameCube" msgstr "Εμφάνιση GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Εμφάνιση ΠÏοβολής ΧειÏισμών" @@ -5585,7 +5826,7 @@ msgstr "Εμφάνιση JAP" msgid "Show Korea" msgstr "Εμφάνιση ΚοÏέας" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Εμφάνιση Γλώσσας:" @@ -5605,7 +5846,7 @@ msgstr "Εμφάνιση ΠλατφόÏμας" msgid "Show Regions" msgstr "Εμφάνιση ΠεÏιοχών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Εμφάνιση Στατιστικών" @@ -5625,11 +5866,11 @@ msgstr "Εμφάνιση Wad" msgid "Show Wii" msgstr "Εμφάνιση Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Εμφάνιση επιβεβαίωσης Ï€Ïιν τη διακοπή ενός παιχνιδιοÏ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -5640,23 +5881,23 @@ msgstr "" "κÏίσιμα σφάλματα, αλλά \n" "το Dolphin μποÏεί να κÏασάÏει ξαφνικά χωÏίς καμία εξήγηση. " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Εμφάνιση Ï€Ïώτου μπλοκ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Εμφάνιση μπλοκ αποθήκευσης" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Εμφάνιση αποθηκευμένου σχολίου" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Εμφάνιση αποθηκευμένου εικονιδίου" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Εμφάνιση αποθηκευμένου τίτλου" @@ -5694,7 +5935,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "ΟÏιζόντια Θέση Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Κινέζικα Απλοποιημένα" @@ -5702,11 +5943,11 @@ msgstr "Κινέζικα Απλοποιημένα" msgid "Size" msgstr "Μέγεθος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "ΠαÏάλειψη BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "ΠαÏάλειψη Dest. Alpha Pass" @@ -5798,11 +6039,11 @@ msgstr "" msgid "Slot %i" msgstr "Θέση %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Θέση Α" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Θέση Î’" @@ -5827,7 +6068,7 @@ msgstr "" "Θέλετε όντως να χÏησιμοποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε " "σίγουÏοι, επιλέξτε 'Όχι'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Ρυθμίσεις Ήχου" @@ -5849,6 +6090,7 @@ msgstr "Space" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 @@ -5872,6 +6114,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Ισπανικά" @@ -5904,7 +6151,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Επιλέξτε ένα backend βίντεο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Επιτάχυνση του Î¡Ï…Î¸Î¼Î¿Ï ÎœÎµÏ„Î±Ï†Î¿Ïάς από τον Δίσκο" @@ -5912,7 +6159,7 @@ msgstr "Επιτάχυνση του Î¡Ï…Î¸Î¼Î¿Ï ÎœÎµÏ„Î±Ï†Î¿Ïάς από το msgid "Square Stick" msgstr "ΤετÏάγωνο Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Τυπικός Controller" @@ -6051,12 +6298,12 @@ msgstr "Επιτυχής εισαγωγή σημείων αποθήκευσης" msgid "Swing" msgstr "Swing" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Γλώσσα Συστήματος:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "ΤΑΪΒΑÎ" @@ -6102,7 +6349,7 @@ msgstr "Δεξί Table" msgid "Take Screenshot" msgstr "ΔημιουÏγία Στιγμιότυπου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -6135,6 +6382,7 @@ msgid "Texture Cache" msgstr "ΚαθαÏισμός Cache" >>>>>>> Update translation files for recent changes in the code. +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 @@ -6143,6 +6391,9 @@ msgstr "ΚαθαÏισμός Cache" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" @@ -6158,13 +6409,13 @@ msgstr "Η διεÏθυνση είναι άκυÏη" msgid "The checksum was successfully fixed" msgstr "Το checksum διοÏθώθηκε με επιτυχία" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Ο επιλεγμένος φάκελος βÏίσκεται ήδη στη λίστα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -6187,7 +6438,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Το αÏχείο %s ήταν ήδη ανοιχτό, η κεφαλίδα του αÏχείου δε θα γÏαφεί." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Το αÏχείο που επιλέξατε (%s) δεν υπάÏχει" @@ -6206,11 +6457,12 @@ msgstr "" "Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να " "χάσει ανανεώσεις των υφών από την RAM.\n" @@ -6273,7 +6525,7 @@ msgstr "Το επιλεγμένο αÏχείο \"%s\" δεν υπάÏχει" msgid "The value is invalid" msgstr "Η τιμή είναι άκυÏη" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Θέμα" @@ -6281,7 +6533,7 @@ msgstr "Θέμα" msgid "Theme selection went wrong" msgstr "Η επιλογή θέματος απέτυχε" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -6289,7 +6541,7 @@ msgstr "" "ΠÏέπει να υπάÏχει εισητήÏιο για 00000001/00000002. Το NAND dump σας είναι " "πιθανότατα ημιτελές." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -6306,7 +6558,7 @@ msgstr "" "Αυτός ο Ï€Ïοσομοιωτής action replay δεν υποστηÏίζει κωδικοÏÏ‚ που αλλάζουν το " "ίδιο το Action Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Αυτό μποÏεί να Ï€Ïοκαλέσει καθυστεÏήσεις στο ÎœÎµÎ½Î¿Ï Wii και σε μεÏικά " @@ -6333,27 +6585,10 @@ msgstr "" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle " -"ήχου.\n" -"ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€.χ. " -"Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" -"Όμως οÏισμένες φοÏές η ενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μόνιμο θόÏυβο.\n" -"\n" -"Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί " -"η λειτουÏγία Throttle." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "ΧÏησιμοποιείται για την αναπαÏαγωγή μουσικών κομματιών, όπως BGM." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -6365,7 +6600,7 @@ msgstr "" "ΠÏοκαλεί μεγάλη επιτάχυνση σε PC με πεÏισσότεÏους από έναν πυÏήνες,\n" "αλλά μποÏεί να Ï€Ïοκαλέσει κÏασαÏίσματα ή άλλα Ï€Ïοβλήματα. " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" "Αυτό σας επιτÏέπει την χειÏοκίνητη επεξεÏγασία του αÏχείου Ïυθμίσεων INI" @@ -6389,7 +6624,7 @@ msgstr "Τίτλος" msgid "To" msgstr "Εώς" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Εναλλαγή Όλων ΤÏπων ΚαταγÏαφής " @@ -6421,6 +6656,7 @@ msgstr "Εναλλαγή ΠλήÏους Οθόνης" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -6428,14 +6664,17 @@ msgstr "Εναλλαγή ΠλήÏους Οθόνης" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "ΚοÏυφή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Κινέζικα ΠαÏαδοσιακά " -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπου αÏχείο." @@ -6443,7 +6682,7 @@ msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπο msgid "Triggers" msgstr "Σκανδάλες" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "ΠÏοσπάθεια ανάγνωσης από ένα μη έγκυÏο SYSCONF" @@ -6455,7 +6694,7 @@ msgstr "" "ΠÏοσπάθεια ανάγνωσης από ένα μη έγκυÏο SYSCONF\n" "Τα Wiimote bt ids δεν είναι διαθέσιμα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "ΤουÏκικά" @@ -6476,11 +6715,11 @@ msgstr "ΠόÏτα UDP:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "ΑΓÎΩΣΤΟ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "ΗΠΑ" @@ -6574,7 +6813,7 @@ msgstr "ΕνημέÏωση" msgid "Upright Wiimote" msgstr "Κάθετη Θέση Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "ΧÏήση ΛειτουÏγίας EuRGB60 (PAL60)" @@ -6586,7 +6825,7 @@ msgstr "ΧÏήση ΠλήÏους Οθόνης" msgid "Use Hex" msgstr "ΧÏήση Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "ΧÏήση Οθονών ΠανικοÏ" @@ -6618,7 +6857,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "ΕÏγαλεία" @@ -6642,25 +6881,29 @@ msgstr "Τιμή: " msgid "Verbosity" msgstr "Αναλυτικότητα" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Βίντεο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Εικονικό" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Ένταση" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Αποτυχία εγκατάστασης WAD: σφάλμα κατά τη δημιουÏγία του %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Αποτυχία εγκατάστασης WAD: σφάλμα κατά τη δημιουÏγία του %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -6680,15 +6923,15 @@ msgstr "" msgid "Warning" msgstr "ΠÏοειδοποίηση" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση DOL σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ELF σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ISO σε λάθος λειτουÏγία κονσόλας!" @@ -6718,7 +6961,7 @@ msgstr "" "και έχουν το ίδιο όνομα με αÏχεία στη memcard\n" "Συνέχεια;" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -6726,7 +6969,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -6734,7 +6977,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -6762,7 +7005,7 @@ msgstr "WaveFileWriter - το αÏχείο δεν είναι ανοιχτό." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack ΕυÏείας Οθόνης" @@ -6770,15 +7013,15 @@ msgstr "Hack ΕυÏείας Οθόνης" msgid "Width" msgstr "Πλάτος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii Κονσόλα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND Ρίζα:" @@ -6790,6 +7033,7 @@ msgstr "Εισαγωγή Αποθήκευσης Wii" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 @@ -6803,6 +7047,9 @@ msgstr "Εισαγωγή Αποθήκευσης Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -6877,7 +7124,7 @@ msgstr "Windows Menu" msgid "Windows Right" msgstr "Windows Right" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" @@ -6885,6 +7132,7 @@ msgstr "Αναδίπλωση Λέξεων" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 @@ -6904,6 +7152,11 @@ msgstr "Αναδίπλωση Λέξεων" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Σε εÏγασία..." @@ -6911,6 +7164,11 @@ msgstr "Σε εÏγασία..." msgid "Write to Console" msgstr "ΕγγÏαφή στην Κονσόλα" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "ΕγγÏαφή σε ΑÏχείο" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "ΕγγÏαφή σε ΑÏχείο" @@ -6966,7 +7224,7 @@ msgstr "ΠÏέπει να εισάγετε μία έγκυÏη οκταδική msgid "You must enter a valid profile name." msgstr "ΠÏέπει να εισάγετε ένα έγκυÏο όνομα Ï€Ïοφίλ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "ΠÏέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή." @@ -6990,7 +7248,7 @@ msgstr "" "Θα έπÏεπε να είναι 0x%04x (αλλά είναι 0x%04llx)\n" "Θέλετε να δημιουÏγηθεί ένα καινοÏÏιο;" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -7061,7 +7319,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -7094,12 +7352,12 @@ msgstr "" msgid "s" msgstr "." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "άγνωστη εντολή 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "Το wxExecute επέστÏεψε -1 κατά την εκκίνηση της εφαÏμογής!" @@ -7125,6 +7383,26 @@ msgstr "| OR" #~ msgstr "" #~ "Δεν μποÏεί να γίνει εγγÏαφή ταινιών σε λειτουÏγία μόνο για ανάγνωση." +#~ msgid "Enable Audio Throttle" +#~ msgstr "ΕνεÏγοποίηση Throttle Ήχου" + +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle " +#~ "ήχου.\n" +#~ "ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€." +#~ "χ. Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" +#~ "Όμως οÏισμένες φοÏές η ενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μόνιμο " +#~ "θόÏυβο.\n" +#~ "\n" +#~ "Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να " +#~ "απενεÏγοποιηθεί η λειτουÏγία Throttle." + #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" diff --git a/Languages/po/en.po b/Languages/po/en.po index 0667cfbf71..a5b3cab7a4 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -55,9 +59,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -142,7 +146,7 @@ msgstr "" msgid "%sImport GCI%s" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -175,11 +179,11 @@ msgstr "" msgid "&DSP Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "" @@ -243,7 +247,7 @@ msgstr "" msgid "&Play" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "" @@ -287,7 +291,7 @@ msgstr "" msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -331,7 +335,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -340,7 +344,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -379,13 +383,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -397,11 +401,11 @@ msgstr "" msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" @@ -501,11 +505,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "" @@ -513,6 +517,7 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -528,6 +533,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "" @@ -561,11 +571,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "" @@ -573,14 +583,15 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -593,18 +604,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "" @@ -616,7 +631,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "" @@ -636,7 +651,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" @@ -651,7 +666,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -660,16 +675,17 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -679,6 +695,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -687,18 +706,20 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -708,6 +729,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -743,7 +767,7 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "" @@ -770,11 +794,11 @@ msgstr "" msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "" @@ -786,7 +810,7 @@ msgstr "" msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "" @@ -817,6 +841,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -824,6 +849,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "" @@ -832,7 +860,7 @@ msgstr "" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "" @@ -848,7 +876,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "" @@ -878,11 +906,11 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "" @@ -921,7 +949,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -929,7 +957,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -945,8 +973,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -956,7 +982,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -981,7 +1007,7 @@ msgstr "" msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -995,8 +1021,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" @@ -1016,31 +1042,31 @@ msgstr "" msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "" @@ -1048,14 +1074,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "" @@ -1067,14 +1093,14 @@ msgstr "" msgid "Classic" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "" @@ -1088,6 +1114,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1096,6 +1123,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "" @@ -1119,20 +1150,20 @@ msgstr "" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "" @@ -1159,13 +1190,13 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "" @@ -1174,7 +1205,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "" @@ -1231,12 +1262,12 @@ msgstr "" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "" @@ -1263,7 +1294,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "" @@ -1274,7 +1305,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1283,7 +1314,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1298,7 +1329,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "" @@ -1312,24 +1343,24 @@ msgstr "" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "" @@ -1337,7 +1368,7 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "" @@ -1357,7 +1388,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "" @@ -1365,11 +1396,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" @@ -1381,10 +1412,11 @@ msgstr "" msgid "DSP" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1395,18 +1427,22 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" @@ -1414,15 +1450,23 @@ msgstr "" msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "" @@ -1443,7 +1487,7 @@ msgstr "" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "" @@ -1451,16 +1495,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "" @@ -1468,11 +1512,11 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "" @@ -1481,7 +1525,7 @@ msgstr "" msgid "Delete" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "" @@ -1490,7 +1534,7 @@ msgstr "" msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "" @@ -1498,8 +1542,8 @@ msgstr "" msgid "Detect" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1510,8 +1554,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "" @@ -1534,23 +1578,23 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "" @@ -1580,7 +1624,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "" @@ -1604,6 +1648,7 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1613,10 +1658,13 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "" @@ -1641,6 +1689,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1665,6 +1714,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1693,11 +1750,11 @@ msgstr "" msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1706,23 +1763,23 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "" @@ -1747,6 +1804,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1762,6 +1820,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1782,7 +1845,7 @@ msgid "" "driver." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "" @@ -1798,7 +1861,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1810,8 +1873,8 @@ msgstr "" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "" @@ -1850,7 +1913,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "" @@ -1872,23 +1935,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1901,6 +1964,7 @@ msgstr "" msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1910,51 +1974,54 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "" @@ -1967,13 +2034,13 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "" @@ -1993,20 +2060,20 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "" @@ -2018,7 +2085,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2035,6 +2102,7 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2050,6 +2118,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2080,6 +2153,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -2110,18 +2184,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2153,7 +2233,7 @@ msgstr "" msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "" @@ -2166,15 +2246,15 @@ msgstr "" msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "" @@ -2190,7 +2270,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "" @@ -2202,44 +2282,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "" @@ -2251,11 +2331,11 @@ msgstr "" msgid "FIFO Player" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "" @@ -2267,11 +2347,11 @@ msgstr "" msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2367,18 +2447,28 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "" +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "" @@ -2387,7 +2477,7 @@ msgstr "" msgid "File Info" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "" @@ -2416,16 +2506,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2433,7 +2523,7 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "" @@ -2445,7 +2535,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" @@ -2469,7 +2559,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2500,7 +2590,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "" @@ -2512,7 +2602,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" @@ -2520,10 +2610,11 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2539,6 +2630,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2571,7 +2667,7 @@ msgstr "" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "" @@ -2587,15 +2683,15 @@ msgstr "" msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "" @@ -2606,6 +2702,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2613,6 +2710,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2621,21 +2721,24 @@ msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" -#: Source/Core/Core/Src/GeckoCode.cpp:139 +#: Source/Core/Core/Src/GeckoCode.cpp:222 #, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2644,6 +2747,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2652,6 +2758,7 @@ msgstr "" msgid "General Settings" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2667,6 +2774,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "" @@ -2698,7 +2810,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "" @@ -2730,7 +2842,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2790,12 +2902,16 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "" @@ -2803,12 +2919,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2817,11 +2933,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2837,15 +2953,15 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "" @@ -2853,21 +2969,22 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 @@ -2892,7 +3009,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "" @@ -2931,7 +3048,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "" @@ -2940,7 +3057,7 @@ msgid "In-Game" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "" @@ -2960,7 +3077,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "" @@ -2972,7 +3089,7 @@ msgstr "" msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "" @@ -2981,6 +3098,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -2990,14 +3108,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "" @@ -3020,11 +3141,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "" @@ -3041,7 +3162,7 @@ msgstr "" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "" @@ -3058,14 +3179,15 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3081,27 +3203,32 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "" @@ -3110,8 +3237,8 @@ msgstr "" msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "" @@ -3129,7 +3256,7 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "" @@ -3175,7 +3302,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3183,7 +3310,7 @@ msgstr "" msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "" @@ -3231,6 +3358,7 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3252,6 +3380,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3275,7 +3410,7 @@ msgstr "" msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3287,11 +3422,11 @@ msgstr "" msgid "Log Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" @@ -3319,7 +3454,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3341,11 +3476,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "" @@ -3369,6 +3504,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3376,6 +3512,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3404,7 +3543,7 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "" @@ -3413,11 +3552,11 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "" @@ -3434,7 +3573,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "" @@ -3447,7 +3586,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3462,7 +3601,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3552,6 +3691,7 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3561,6 +3701,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3569,7 +3712,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "" @@ -3583,7 +3726,7 @@ msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "" @@ -3595,7 +3738,7 @@ msgstr "" msgid "Nickname :" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "" @@ -3634,7 +3777,7 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" @@ -3642,8 +3785,8 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "" @@ -3663,7 +3806,7 @@ msgstr "" msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "" @@ -3701,7 +3844,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "" @@ -3727,11 +3870,11 @@ msgstr "" msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "" @@ -3753,11 +3896,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3786,7 +3929,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -3836,19 +3979,20 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -3861,6 +4005,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3869,7 +4017,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "" @@ -3882,6 +4030,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -3892,6 +4041,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "" @@ -3905,7 +4058,7 @@ msgstr "" msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "" @@ -3917,6 +4070,7 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -3926,6 +4080,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3937,23 +4094,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "" @@ -3962,11 +4119,11 @@ msgstr "" msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "" @@ -3974,17 +4131,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3997,7 +4154,7 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "" @@ -4048,7 +4205,7 @@ msgstr "" msgid "RAM" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "" @@ -4061,7 +4218,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "" @@ -4131,6 +4288,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4149,6 +4307,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4198,11 +4362,11 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "" @@ -4210,10 +4374,11 @@ msgstr "" msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4223,6 +4388,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4280,12 +4448,12 @@ msgstr "" msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "" @@ -4293,11 +4461,11 @@ msgstr "" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4306,6 +4474,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4315,15 +4484,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "" @@ -4339,12 +4511,12 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "" @@ -4354,6 +4526,7 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4378,6 +4551,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4400,6 +4581,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4416,19 +4598,26 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4443,7 +4632,7 @@ msgid "" "If unsure, select Auto." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "" @@ -4479,11 +4668,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4492,11 +4681,11 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4506,7 +4695,7 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "" @@ -4518,7 +4707,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "" @@ -4546,7 +4735,7 @@ msgstr "" msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "" @@ -4562,7 +4751,7 @@ msgstr "" msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "" @@ -4578,7 +4767,7 @@ msgstr "" msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "" @@ -4598,7 +4787,7 @@ msgstr "" msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "" @@ -4618,34 +4807,34 @@ msgstr "" msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "" @@ -4676,7 +4865,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "" @@ -4684,11 +4873,11 @@ msgstr "" msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4720,11 +4909,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "" @@ -4744,7 +4933,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "" @@ -4762,6 +4951,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -4777,6 +4967,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -4800,7 +4995,7 @@ msgstr "" msgid "Specify a video backend" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4808,7 +5003,7 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -4901,12 +5096,12 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "" @@ -4945,7 +5140,7 @@ msgstr "" msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -4961,7 +5156,7 @@ msgstr "" msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "" @@ -4977,13 +5172,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5002,7 +5197,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -5024,7 +5219,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5062,7 +5257,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" @@ -5070,13 +5265,13 @@ msgstr "" msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5088,7 +5283,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -5104,19 +5299,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5124,7 +5310,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -5147,7 +5333,7 @@ msgstr "" msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "" @@ -5167,6 +5353,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5174,14 +5361,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "" @@ -5189,7 +5379,7 @@ msgstr "" msgid "Triggers" msgstr "" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "" @@ -5199,7 +5389,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "" @@ -5220,11 +5410,11 @@ msgstr "" msgid "UDP Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "" @@ -5302,7 +5492,7 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5314,7 +5504,7 @@ msgstr "" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" @@ -5335,7 +5525,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "" @@ -5359,25 +5549,28 @@ msgstr "" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +msgid "WAD installation failed: error creating ticket" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5392,15 +5585,15 @@ msgstr "" msgid "Warning" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "" @@ -5421,7 +5614,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5429,7 +5622,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5437,7 +5630,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5465,7 +5658,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "" @@ -5473,15 +5666,15 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "" @@ -5489,6 +5682,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5498,6 +5692,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5560,10 +5757,11 @@ msgstr "" msgid "Windows Right" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5579,6 +5777,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "" @@ -5586,6 +5789,10 @@ msgstr "" msgid "Write to Console" msgstr "" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +msgid "Write to Debugger" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "" @@ -5639,7 +5846,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5657,7 +5864,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "" @@ -5711,7 +5918,7 @@ msgstr "" msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5742,12 +5949,12 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/es.po b/Languages/po/es.po index 5b7d2b9a35..3e31ea03ed 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-09 00:28+0100\n" ======= @@ -21,6 +22,9 @@ msgstr "" >>>>>>> Updated Spanish translation ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-23 16:03+0100\n" >>>>>>> Update from master branch. "Last-Translator: Petiso Carambanal \n" @@ -64,9 +68,9 @@ msgstr "\"%s\" no es un archivo GCM/ISO válido, o no es una ISO GC/Wii." msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -163,7 +167,7 @@ msgstr "%sExportar GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Bloques libres; %u entradas de dir. libres" @@ -196,11 +200,11 @@ msgstr "Administrador de &trucos" msgid "&DSP Settings" msgstr "&Configuración DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Borrar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Borrar ISO seleccionadas..." @@ -264,7 +268,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Jugar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Propiedades" @@ -308,7 +312,7 @@ msgstr "&Vista" msgid "&Wiimote Settings" msgstr "&Configuración de wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -352,7 +356,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -361,7 +365,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -418,13 +422,13 @@ msgstr "" "\n" "¡¡Debe redireccionar el puerto TCP para hostear!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "Placa base AM" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Códigos AR" @@ -436,11 +440,11 @@ msgstr "Acerca de Dolphin" msgid "Acceleration" msgstr "Aceleración" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Exactitud:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulación de VBeam Precisa" @@ -568,11 +572,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Añadir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Añadir código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Añadir Parche" @@ -580,6 +584,7 @@ msgstr "Añadir Parche" msgid "Add new pane" msgstr "Añadir nueva ventana" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -595,6 +600,11 @@ msgstr "Añadir nueva ventana" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Añadir..." @@ -643,11 +653,11 @@ msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Ajusta la presión requerida del control analógico para activar los botones." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avanzado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Configuración avanzada" @@ -655,14 +665,15 @@ msgstr "Configuración avanzada" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Todos los archivos GC/Wii (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Todas las imágenes GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Todos los archivos Gamecube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -675,18 +686,22 @@ msgstr "Todos los archivos Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Todos los archivos ISO de Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos los archivos ISO comprimidos de GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Todos los archivos (*.*)|*.*" @@ -702,6 +717,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD <<<<<<< HEAD @@ -713,6 +729,9 @@ msgid "Alternate Wiimote Timing" msgstr "Wiimote emulado" >>>>>>> Update translation files for recent changes in the code. ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Sincronización alternativa del Wiimote" >>>>>>> Updated Spanish translation @@ -733,7 +752,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -751,7 +770,7 @@ msgstr "" "\n" "Si no está seguro, seleccione (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Ãrabe" @@ -760,7 +779,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -768,10 +787,11 @@ msgstr "" "¿Seguro que quieres borrar estos archivos?\n" "¡Desaparecerán para siempre!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -781,6 +801,9 @@ msgstr "¿Seguro que quieres borrar este archivo? ¡Desaparecerá para siempre!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -789,18 +812,20 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Motor de Audio:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error al abrir dispositivo AO.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -810,6 +835,9 @@ msgstr "AudioCommon: Error al abrir dispositivo AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -853,7 +881,7 @@ msgstr "" msgid "Back" msgstr "Atrás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Configuración del motor" @@ -880,11 +908,11 @@ msgstr "Cabecera de archivo incorrecta" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Detalles del banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -896,7 +924,7 @@ msgstr "Barra" msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Configuración básica" @@ -927,6 +955,7 @@ msgstr "Azul derecha" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -934,6 +963,9 @@ msgstr "Azul derecha" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Inferior" @@ -942,7 +974,7 @@ msgstr "Inferior" msgid "Bound Controls: %lu" msgstr "Controles asignados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Quebrado" @@ -958,7 +990,7 @@ msgstr "Busca un directorio para añadir" msgid "Browse for an ISO directory..." msgstr "Buscar un directorio de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Busca un directorio de salida" @@ -988,11 +1020,11 @@ msgstr "Stick C" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Emulador de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Caché de listas de visualización" @@ -1046,7 +1078,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1057,7 +1089,7 @@ msgstr "" "%s\n" "no es un fichero válido de tarjeta de memoria de Gamecube." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1075,8 +1107,6 @@ msgstr "No se puede encontrar el WiiMote por bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "No se puede encontrar un WiiMote por el título de conexión %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1086,7 +1116,7 @@ msgstr "No se puede leer del DVD_Plugin - DVD-Interface: Error Fatal" msgid "Caps Lock" msgstr "Bloq Mayús" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalán" @@ -1111,7 +1141,7 @@ msgstr "Cambiar disco" msgid "Change Game" msgstr "Cambiar Juego" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1127,8 +1157,8 @@ 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 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 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!" @@ -1149,31 +1179,31 @@ msgstr "Búscar trucos" msgid "Cheats Manager" msgstr "Administrador de trucos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chino Simplificado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chino (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Escoge un directorio raíz de DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Escoge un directorio raíz para la NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Escoge una ISO por defecto:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Escoge un directorio para añadir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Escoge un archivo a abrir" @@ -1181,6 +1211,7 @@ msgstr "Escoge un archivo a abrir" msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 @@ -1190,6 +1221,9 @@ msgstr "Escoge una tarjeta de memoria:" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1197,8 +1231,8 @@ msgstr "" "Escoge el archivo que usar como apploader (se aplica a los discos armados a " "partir de directorios solamente):" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Escoge la carpeta de destino" @@ -1210,14 +1244,14 @@ msgstr "Circle Stick" msgid "Classic" msgstr "Clásico" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Limpiar" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Fallo al borrar." @@ -1233,6 +1267,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1241,6 +1276,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Cerrar" @@ -1264,20 +1303,20 @@ msgstr "Comando" msgid "Comment" msgstr "Comentario" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Comentario:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Comprimir ISO seleccionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Comprimiendo ISO" @@ -1304,13 +1343,13 @@ msgstr "Configurar mandos" msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Confirmar sobrescritura de archivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmar al detenerse" @@ -1319,7 +1358,7 @@ msgstr "Confirmar al detenerse" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" @@ -1376,12 +1415,12 @@ msgstr "Convertir a GCI" msgid "Copy failed" msgstr "Fallo al copiar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar a tarjeta de memoria %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Núcleo" @@ -1411,7 +1450,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "No se pudo reconocer el archivo ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "No se pudo guardar %s" @@ -1426,7 +1465,7 @@ msgstr "" "(definir los pads mientras el juego está ejecutándose no está permitido " "todavía)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1439,7 +1478,7 @@ msgstr "" "¿Está ejecutando Dolphin desde un CD/DVD, o el archivo de guardado está " "protegido contra escritura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "No se pudo hallar el comando para abrir la extension 'ini'!" @@ -1456,7 +1495,7 @@ msgstr "" msgid "Count:" msgstr "Cuenta:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "País:" @@ -1470,10 +1509,11 @@ msgstr "Crear Código AR" msgid "Create new perspective" msgstr "Crear nueva perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Creado por KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 @@ -1483,20 +1523,23 @@ msgstr "Creado por KDE-Look.org" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Creado por Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Creado por VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Creado por black_rider y publicado en ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Creador:" @@ -1504,7 +1547,7 @@ msgstr "Creador:" msgid "Critical" msgstr "Critico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Cortar" @@ -1527,7 +1570,7 @@ msgstr "Fundido" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "El directorio actual cambio de %s a %s luego de wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Hack de proyección personalizado" @@ -1535,11 +1578,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:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizar algunos párametros de la proyección ortográfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Checo" @@ -1551,10 +1594,11 @@ msgstr "Pad direccional" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Motor de emulación DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1565,18 +1609,22 @@ msgstr "Motor de emulación DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulación DSP HLE (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Intérprete DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE en un proceso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilador DSP LLE" @@ -1584,15 +1632,23 @@ msgstr "Recompilador DSP LLE" msgid "DSP settings" msgstr "Configuración DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Raíz DVD:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Tamaño de datos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Fecha:" @@ -1613,7 +1669,7 @@ msgstr "Zona muerta" msgid "Debug" msgstr "Depurar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Depurarando" @@ -1621,16 +1677,16 @@ msgstr "Depurarando" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISO seleccionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Descomprimir ISO" @@ -1638,11 +1694,11 @@ msgstr "Descomprimir ISO" msgid "Default" msgstr "Defecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO por defecto:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Fuente por defecto" @@ -1651,7 +1707,7 @@ msgstr "Fuente por defecto" msgid "Delete" msgstr "Borrar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Borrar guardado" @@ -1660,7 +1716,7 @@ msgstr "Borrar guardado" msgid "Delete the existing file '%s'?" msgstr "¿Borrar el archivo existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Descripción" @@ -1668,8 +1724,8 @@ msgstr "Descripción" msgid "Detect" msgstr "Detectar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1682,8 +1738,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Configuración del dispositivo" @@ -1708,23 +1764,23 @@ msgstr "" " y falló la suma de verificación del directorio backup" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Deshabilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Deshabilitar niebla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Deshabilitar iluminación" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Desactivar profundidad por píxel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Deshabilitar texturas" @@ -1768,7 +1824,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disco" @@ -1795,6 +1851,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1804,10 +1861,13 @@ msgstr "Dividir" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1832,6 +1892,7 @@ msgstr "Configuración de wiimote emulado de Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1856,6 +1917,14 @@ msgstr "Configuración de GCPad Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Configuración de GCPad Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" @@ -1904,11 +1973,11 @@ msgstr "" msgid "Down" msgstr "Abajo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Descargar códigos (base de datos de WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Se descargaron %lu códigos. (%lu añadidos)" @@ -1917,23 +1986,23 @@ msgstr "Se descargaron %lu códigos. (%lu añadidos)" msgid "Drums" msgstr "Tambores" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Depósito de audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Volcar objetivo EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Volcar frames" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Volcar texturas" @@ -1967,6 +2036,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1982,6 +2052,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandés" @@ -2006,7 +2081,7 @@ msgstr "" "Dolphin, puede que se necesite reiniciar para que Windows reconozca el nuevo " "controlador." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -2022,7 +2097,7 @@ msgstr "Editar" msgid "Edit ActionReplay Code" msgstr "Editar código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editar configuración" @@ -2034,8 +2109,8 @@ msgstr "Editar parche" msgid "Edit current perspective" msgstr "Editar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Editar..." @@ -2080,7 +2155,7 @@ msgstr "Emular XFB usando texturas de objetos de la GPU" msgid "Emulated Wiimote" msgstr "Wiimote emulado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Estado de emulación:" @@ -2108,18 +2183,15 @@ msgstr "" msgid "Enable AR Logging" msgstr "Habilitar Registro de AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Habilitar aceleración de audio" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Habilitar BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Habilitar asociación de bloques" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 @@ -2130,6 +2202,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Permitir el cálculo del cuadro delimitador" @@ -2138,6 +2213,7 @@ msgstr "Permitir el cálculo del cuadro delimitador" msgid "Enable Cache" msgstr "Habilitar caché" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2147,51 +2223,54 @@ msgstr "Habilitar caché" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Habilitar trucos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Habilitar música DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Habilitar doble núcleo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Habilitar doble núcleo (mejora)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Habilitar atajos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Habilitar salto de fotogramas inactivos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Habilitar salto de fotogramas inactivos (mejora)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Habilitar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Habilitar escaneado progresivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Habilitar salvapantallas" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Habilitar pantalla panorámica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Habilitar \"alambrado\" (wireframe)" @@ -2209,7 +2288,7 @@ msgstr "" "\n" "Si estás inseguro, déjalo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2217,7 +2296,7 @@ msgstr "" "Habilitar acceso rápido al disco. Es necesario para algunos juegos. (ON = " "Rápido, OFF=Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Habilitar páginas" @@ -2246,6 +2325,7 @@ msgstr "" "\n" "Si no estás seguro, déjalo sin marcar." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 @@ -2255,6 +2335,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2262,7 +2345,7 @@ msgstr "" "Habilitar esto para acelerar The Legend of Zelda: Twilight Princess. " "Deshabilitar para CUALQUIER OTRO juego." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2272,7 +2355,7 @@ msgstr "" "unidad de administración de memoria (MMU). Es preciso al hardware original, " "pero es lento para emular. (ON = compatible, OFF = rápido)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Habilta un hack de proyección personalizado" @@ -2288,7 +2371,7 @@ msgstr "" "\n" "Si no estás seguro, déjalo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2310,6 +2393,7 @@ msgstr "" msgid "End" msgstr "Fin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2325,6 +2409,11 @@ msgstr "Fin" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglés" @@ -2355,6 +2444,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2387,14 +2477,24 @@ msgstr "" "Disculpa, la grabación de Wii no funciona temporalmente." >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Error" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error al cargar el idioma seleccionado. Volviendo al defecto del sistema." +<<<<<<< HEAD #: Source/Core/Common/Src/ChunkFile.h:180 <<<<<<< HEAD ======= +======= +#: Source/Core/Common/Src/ChunkFile.h:194 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " @@ -2403,8 +2503,12 @@ msgstr "" "Error: Después de \"%s\", se ha encontrado %d (0x%X) en vezde la marca de " "guardado %d (0x%X). Cancelando carga del guardado..." +<<<<<<< HEAD #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 >>>>>>> Update from master branch. +======= +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" <<<<<<< HEAD @@ -2448,7 +2552,7 @@ msgstr "Cerrar Dolphin con el emulador" msgid "Export Failed" msgstr "Fallo al exportar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exportar archivo" @@ -2461,15 +2565,15 @@ msgstr "Exportar grabación..." msgid "Export Recording..." msgstr "Exportar grabación..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exportar guardado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exportar guardado de Wii (experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exportar todos los guardados" @@ -2485,7 +2589,7 @@ msgstr "Exportar guardado como..." msgid "Extension" msgstr "Extensión" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Buffer de frames externo" @@ -2497,44 +2601,44 @@ msgstr "Parámetro extra" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parámetro extra solo útil en ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Extraer todos los archivos..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Extraer Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Extraer DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Extraer directorio..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Extraer archivo..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Extraer partición" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Extrayendo %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Extrayendo todos los archivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Extraer directorio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Extrayendo..." @@ -2546,11 +2650,11 @@ msgstr "Byte de FIFO" msgid "FIFO Player" msgstr "Jugador FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANCIA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Tamaño del FST:" @@ -2562,11 +2666,11 @@ msgstr "¡Fallo al conectar!" msgid "Failed to Listen!!" msgstr "¡Fallo al escuchar!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Fallo al descargar los códigos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Falló al extraer a %s!" @@ -2683,18 +2787,28 @@ msgstr "Falló al escribir la cabecera para %s" msgid "Failed to write header for file %d" msgstr "Falló al escribir la cabecera para el archivo %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Mipmaps rápidos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Jugador Fifo" @@ -2703,7 +2817,7 @@ msgstr "Jugador Fifo" msgid "File Info" msgstr "Información del fichero" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "El archivo no contenía códigos." @@ -2736,16 +2850,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:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modo desconocido de apertura : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Sistema de archivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "¡Tipo de archivo INI desconocido: no se abrirá!" @@ -2753,7 +2867,7 @@ msgstr "¡Tipo de archivo INI desconocido: no se abrirá!" msgid "First Block" msgstr "Primer bloque" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Reparar sumas de verificación" @@ -2765,7 +2879,7 @@ msgstr "Forzar 16:9" msgid "Force 4:3" msgstr "Forzar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Forzar consola como NTSC-J" @@ -2800,7 +2914,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2836,7 +2950,7 @@ msgstr "Frame " msgid "Frame Advance" msgstr "Avanzar &fotogramas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Volcado de fotogramas usa FFV1" @@ -2848,7 +2962,7 @@ msgstr "Información de la grabación" msgid "Frame S&kipping" msgstr "Salto de &fotogramas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Límite de fotogramas:" @@ -2856,10 +2970,11 @@ msgstr "Límite de fotogramas:" msgid "Frames To Record" msgstr "Frames a grabar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Cámara libre" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2875,6 +2990,11 @@ msgstr "Cámara libre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francés" @@ -2913,7 +3033,7 @@ msgstr "Configuración del micro de GC" msgid "GCPad" msgstr "Pad GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID del juego:" @@ -2929,15 +3049,15 @@ msgstr "¡El juego no está ejecutándose!" msgid "Game not found!!" msgstr "¡¡Juego no encontrado!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Configuración específica del juego" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configurar Juego" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2948,6 +3068,7 @@ msgstr "&Configuración del mando Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2955,6 +3076,9 @@ msgstr "&Configuración del mando Gamecube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" @@ -2963,15 +3087,17 @@ msgid "Gamecube Pad settings" msgstr "Configuración del Pad de Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Códigos Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "GeckoCode falló al ejecutarse (CT%i CST%i) (%s)\n" "(puede ser un código incorrecto o su tipo no es soportado todavía.)" @@ -2986,8 +3112,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2996,6 +3126,7 @@ msgstr "General" msgid "General Settings" msgstr "Ajustes generales" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -3011,6 +3142,11 @@ msgstr "Ajustes generales" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemán" @@ -3076,7 +3212,7 @@ msgstr "" "\n" "Si está inseguro, déjelo marcado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Griego" @@ -3108,7 +3244,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:303 msgid "Hebrew" msgstr "Hebreo" @@ -3172,6 +3308,7 @@ msgstr "Configuración de atajos" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 @@ -3180,10 +3317,13 @@ msgstr "Configuración de atajos" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Atajos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Húngaro" @@ -3191,14 +3331,14 @@ msgstr "Húngaro" msgid "Hybrid Wiimote" msgstr "Wiimote híbrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3211,11 +3351,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin probablemente se bloqueará ahora" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destino incorrecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Configuración IPL" @@ -3231,15 +3371,15 @@ msgstr "Puntero IR" msgid "IR Sensitivity:" msgstr "Sensibilidad IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Detalles del ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Directorios de ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITALIA" @@ -3247,7 +3387,7 @@ msgstr "ITALIA" msgid "Icon" msgstr "Icono" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3258,13 +3398,14 @@ msgstr "" "usado por los juegos de Paper Mario." >>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 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)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 @@ -3274,9 +3415,14 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "Si define un límite de fotogramas por segunda mayor que la velocidad de " "juego completa (NTSC: 60, PAL: 50), también debe deshabilitar la regulación " @@ -3314,7 +3460,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importar Guardado" @@ -3365,7 +3511,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "En juego" @@ -3374,7 +3520,7 @@ msgid "In-Game" msgstr "En juego" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Información" @@ -3394,7 +3540,7 @@ msgstr "Insertar" msgid "Insert Encrypted or Decrypted code here..." msgstr "Insertar código encriptado o desencriptado aquí..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Insertar tarjeta SD" @@ -3406,7 +3552,7 @@ msgstr "Insertar un nombre aquí.." msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Instalar al menú de la Wii" @@ -3417,6 +3563,7 @@ msgstr "" "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " "todavía." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3426,14 +3573,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instalando WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interfaz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Configuración de la interfaz" @@ -3458,11 +3608,11 @@ msgstr "Error Interno de LZO - lzo_init() falló" msgid "Internal Resolution:" msgstr "Resolución interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Intérprete (MUY lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3479,7 +3629,7 @@ msgstr "¡Valor no válido!" msgid "Invalid bat.map or dir entry" msgstr "bat.map o entrada de directorio no válido" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Evento de tipo %i no válido" @@ -3499,14 +3649,15 @@ msgstr "" "%s\n" " Puede que necesitas volcar este juego de nuevo." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Archivo de grabación no válido" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Estado no válido" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3522,27 +3673,32 @@ msgstr "Estado no válido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPÓN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Recompilador experimental JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonés" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "COREA" @@ -3551,8 +3707,8 @@ msgstr "COREA" msgid "Key" msgstr "Clave" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coreano" @@ -3570,7 +3726,7 @@ msgstr "Botón L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Idioma:" @@ -3623,7 +3779,7 @@ msgstr "" msgid "Less Than" msgstr "Menor que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Usar FPS para limitar" @@ -3631,7 +3787,7 @@ msgstr "Usar FPS para limitar" msgid "Load" msgstr "Cargar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Cargar texturas personalizadas" @@ -3679,6 +3835,7 @@ msgstr "&Cargar estado 8" msgid "Load State..." msgstr "Cargar estado..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3700,6 +3857,13 @@ msgstr "Cargar Menú de sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Cargar Menú de sistema Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Cargar Menú de sistema Wii %d %c" @@ -3726,7 +3890,7 @@ msgstr "Carga el archivo especificado (DOL, ELF, WAD, GCM, ISO)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Fijar procesos en núcleos" @@ -3738,11 +3902,11 @@ msgstr "Registrar" msgid "Log Configuration" msgstr "Configuración de registro" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipos de registro" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Salida de registro" @@ -3772,7 +3936,7 @@ msgstr "" "MD5 no coinciden\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Hack de velocidad MMU" @@ -3794,11 +3958,11 @@ msgstr "Archivos MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID del fabricante:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Fabricante:" @@ -3822,6 +3986,7 @@ msgstr "Byte de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3829,6 +3994,9 @@ msgstr "Byte de memoria" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Tarjeta de memoria" @@ -3867,7 +4035,7 @@ msgstr "" msgid "Menu" msgstr "Menú" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mic" @@ -3876,11 +4044,11 @@ msgstr "Mic" msgid "Min" msgstr "Mín." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Varios" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Configuraciones varias" @@ -3901,7 +4069,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Fuente monoespaciada" @@ -3914,7 +4082,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3943,7 +4111,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplicar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -4035,6 +4203,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Arriba" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -4044,6 +4213,9 @@ msgstr "NP Arriba" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4052,7 +4224,7 @@ msgstr "Nombre:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nombre:" @@ -4066,7 +4238,7 @@ msgid "New Scan" msgstr "Nuevo escaneado" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Próxima página" @@ -4078,7 +4250,7 @@ msgstr "Próximo escaneado" msgid "Nickname :" msgstr "Apodo:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Ningún país (SDK)" @@ -4117,7 +4289,7 @@ msgstr "No se encontró carpeta de guardado para el juego %s" msgid "None" msgstr "Ninguno" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Noruego Bokmal" @@ -4125,8 +4297,8 @@ msgstr "Noruego Bokmal" msgid "Not Equal" msgstr "No igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "No definido" @@ -4146,7 +4318,7 @@ msgstr "Sin conectar" msgid "Notes" msgstr "Notas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notas:" @@ -4184,7 +4356,7 @@ msgstr "Objeto" msgid "Object Range" msgstr "Rango de objeto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Off" @@ -4210,11 +4382,11 @@ msgstr "Solo %d bloques disponibles" msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Abrir directorio &contenedor" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Abrir carpeta de guardado&s de Wii" @@ -4236,11 +4408,11 @@ msgstr "OpenAL: no se encuentran dispositivos de sonido" msgid "OpenAL: can't open device %s" msgstr "OpenAL: no se puede abrir el dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "Descodificador de texturas OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "Descodificador de texturas OpenMP" @@ -4273,7 +4445,7 @@ msgstr "" "e impórtalos a una nueva tarjeta de memoria\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Otros" @@ -4325,19 +4497,20 @@ msgstr "Párrafo" msgid "Parameters" msgstr "Parámetros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partición %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Parches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Directorios" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4350,6 +4523,10 @@ msgstr "Directorios" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4358,7 +4535,7 @@ msgstr "Pausa" msgid "Per-Pixel Lighting" msgstr "Iluminación por píxel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfecto" @@ -4371,6 +4548,7 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4381,6 +4559,10 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Reproducir" @@ -4394,7 +4576,7 @@ msgstr "Reproducir grabación" msgid "Play/Pause" msgstr "Reproducir/pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Jugable" @@ -4406,6 +4588,7 @@ msgstr "Opciones de reproducción" msgid "Players" msgstr "Jugadores" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4415,6 +4598,9 @@ msgstr "Jugadores" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Confirma, por favor..." @@ -4426,23 +4612,23 @@ 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:309 msgid "Polish" msgstr "Polaco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Puerto 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Puerto 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Puerto 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Puerto 4" @@ -4451,11 +4637,11 @@ msgstr "Puerto 4" msgid "Port :" msgstr "Puerto:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugués" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugués (Brasil)" @@ -4463,7 +4649,7 @@ msgstr "Portugués (Brasil)" msgid "Post-Processing Effect:" msgstr "Efecto de posprocesado:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" <<<<<<< HEAD @@ -4472,7 +4658,7 @@ msgstr "" msgstr "Final prematuro de la película en PlayController. %u + 8 > %u" >>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" <<<<<<< HEAD @@ -4481,7 +4667,7 @@ msgstr "" msgstr "Final prematuro de la película en PlayWiimote. %u + %d > %u" >>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" <<<<<<< HEAD @@ -4498,7 +4684,7 @@ msgstr "Predefinidos:" msgid "Prev Page" msgstr "Página previa" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Página previa" @@ -4549,7 +4735,7 @@ msgstr "R-Analógico" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSIA" @@ -4562,7 +4748,7 @@ msgstr "Rango" msgid "Read-only mode" msgstr "Solo lectura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Real" @@ -4637,6 +4823,7 @@ msgstr "Actualizar lista" msgid "Refresh game list" msgstr "Actualizar lista de juegos" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4655,6 +4842,12 @@ msgstr "Actualizar lista de juegos" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Eliminar" @@ -4707,11 +4900,11 @@ msgstr "Stick Derecho" msgid "Rumble" msgstr "Vibración" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Arranca DSPLLE en un proceso dedicado (no recomendado)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Ruso" @@ -4719,10 +4912,11 @@ msgstr "Ruso" msgid "Sa&ve State" msgstr "Guardar estado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4732,6 +4926,9 @@ msgstr "Seguro" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Frecuencia del sonido:" @@ -4789,12 +4986,12 @@ msgstr "Guardar estado 8" msgid "Save State..." msgstr "Guardar estado..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Guardar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Guardar GCM/ISO comprimido" @@ -4802,11 +4999,11 @@ msgstr "Guardar GCM/ISO comprimido" msgid "Save current perspective" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Guardar GCM/ISO descomprimido" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4817,16 +5014,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "EFB Copia a escala" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 #, c-format msgid "Scanning %s" msgstr "Escaneando %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Buscando ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Escaneando..." @@ -4842,12 +5039,12 @@ msgstr "Bloq. desplazamiento" msgid "Search Filter" msgstr "Filtro de búsqueda" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Buscar en subcarpetas" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "No se ha encontrado la sección %s en SYSCONF" @@ -4857,6 +5054,7 @@ msgstr "No se ha encontrado la sección %s en SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4881,6 +5079,14 @@ msgstr "Seleccionar archivo de grabación" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Seleccionar archivo de grabación" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" @@ -4906,16 +5112,21 @@ msgstr "Selecciona las ventanas flotantes" msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Selecciona el archivo de guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Selecciona el estado para cargar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4935,6 +5146,9 @@ msgstr "Selecciona el estado para cargar" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Selecciona el estado para guardar" @@ -4956,7 +5170,7 @@ msgstr "" "\n" "Si está inseguro, elija Automático." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Fuente seleccionada" @@ -5005,10 +5219,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:313 msgid "Serbian" msgstr "Serbio" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 @@ -5018,6 +5233,9 @@ msgstr "Serbio" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5028,11 +5246,11 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Definir como ISO por &defecto" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Definir como Memory Card por defecto %c" @@ -5044,7 +5262,7 @@ msgstr "" "SetARCode_IsActive: El índice es mayor que el tamaño de la lista de códigos " "AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Configuración..." @@ -5056,7 +5274,7 @@ msgstr "SetupWiiMem: No se puede encontrar el archivo de configuración" msgid "Shake" msgstr "Sacudir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Nombre corto:" @@ -5084,7 +5302,7 @@ msgstr "Mostrar barra de herramien&tas" msgid "Show Drives" msgstr "Mostrar unidades" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Mostrar regiones de copiado de EFB" @@ -5100,7 +5318,7 @@ msgstr "Mostrar Francia" msgid "Show GameCube" msgstr "Mostrar Gamecube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Mostrar entrada" @@ -5116,7 +5334,7 @@ msgstr "Mostrar JAP" msgid "Show Korea" msgstr "Mostrar Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Mostrar idioma:" @@ -5136,7 +5354,7 @@ msgstr "Mostrar plataformas" msgid "Show Regions" msgstr "Mostrar regiones" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Mostar estadísticas" @@ -5156,11 +5374,11 @@ msgstr "Mostrar WAD" msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -5171,23 +5389,23 @@ msgstr "" "pero también significa que Dolphin puede cerrarse ante un error sin ninguna " "explicación." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Mostrar primer bloque" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Mostrar bloques de guardado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Mostrar comentario del guardado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Mostrar icono del guardado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Mostrar título del guardado" @@ -5225,7 +5443,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote de costado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Chino simplificado" @@ -5233,11 +5451,11 @@ msgstr "Chino simplificado" msgid "Size" msgstr "Tamaño" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Saltar BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Saltar pase de alpha en dest." @@ -5303,11 +5521,11 @@ msgstr "" msgid "Slot %i" msgstr "Ranura %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Ranura A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Ranura B" @@ -5331,7 +5549,7 @@ msgstr "" "¿Realmente quieres activar renderizado por software? Si está inseguro, " "escoja No." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Configuración de sonido" @@ -5349,6 +5567,7 @@ msgstr "Falló la creación del búfer de sonido: %s" msgid "Space" msgstr "Espacio" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5364,6 +5583,11 @@ msgstr "Espacio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Español" @@ -5395,7 +5619,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Especifica un motor de vídeo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Acelerar la transferencia de disco" @@ -5403,7 +5627,7 @@ msgstr "Acelerar la transferencia de disco" msgid "Square Stick" msgstr "Stick cuadrado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Control estándar" @@ -5504,12 +5728,12 @@ msgstr "Los archivos de guardado se han importado con éxito." msgid "Swing" msgstr "Oscilar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Idioma del sistema:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWÃN" @@ -5548,7 +5772,7 @@ msgstr "Tabla derecha" msgid "Take Screenshot" msgstr "Captura de pantalla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" <<<<<<< HEAD msgstr "" @@ -5568,7 +5792,7 @@ msgstr "Textura" msgid "Texture Cache" msgstr "Caché de texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Superposición del formato de la textura" @@ -5584,13 +5808,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 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:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5614,7 +5838,7 @@ msgid "The file %s was already open, the file header will not be written." msgstr "" "El archivo %s ya estaba abierto, la cabecera de archivo no será escrita." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "El archivo especificado (%s) no existe" @@ -5632,11 +5856,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "El código AR descifrado que se ha obtenido no contiene ninguna línea." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "Cuanto más seguro ajuste esto, es menos probable que el emulador se pierda " "las actualizaciones de la textura de la memoria RAM.\n" @@ -5681,7 +5906,7 @@ 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:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema visual" @@ -5689,7 +5914,7 @@ msgstr "Tema visual" msgid "Theme selection went wrong" msgstr "Hubo un error al seleccionar el tema" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5697,7 +5922,7 @@ msgstr "" "Debe haber un ticket para 00000001/00000002. Probablemente su volcado de " "NAND esté incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5713,7 +5938,7 @@ msgstr "" "El simulador de Action Replay no soporta códigos que modifiquen al Action " "Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 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." @@ -5739,26 +5964,11 @@ msgstr "" "Si no está seguro, deje esta casilla sin marcar." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Esto es utilizado para controlar la velocidad del juego por la del audio.\n" -"Deshabilitar esto puede causar velocidad de juego anormal, como muy rápido.\n" -"Pero a veces puede provocar ruido constante.\n" -"\n" -"Atajo de Teclado : Mantén la tecla presionada para desabilitar la " -"regulación instantáneamente." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" "Esto es usado para reproducir pistas de música, como música de fondo (BGM)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5770,7 +5980,7 @@ msgstr "" "Provoca mejoras de velocidad muy grandes en PC con mas de un núcleo, pero " "puede ocasionar errores gráficos o del programa." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Esto te permitirá editar manualmente el archivo de configuración INI" @@ -5793,7 +6003,7 @@ msgstr "Título" msgid "To" msgstr "A" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Alternar todos los tipos de registro" @@ -5813,6 +6023,7 @@ msgstr "Cambiar a pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5820,14 +6031,17 @@ msgstr "Cambiar a pantalla completa" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Superior" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chino tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Se trató de cargar un archivo de tipo desconocido." @@ -5835,7 +6049,7 @@ msgstr "Se trató de cargar un archivo de tipo desconocido." msgid "Triggers" msgstr "Gatillos" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Intentando leer de un SYSCONF no válido" @@ -5847,7 +6061,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:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turco" @@ -5868,11 +6082,11 @@ msgstr "Puerto UDP:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "DESCONOCIDO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "EUA" @@ -5957,7 +6171,7 @@ msgstr "Actualizar" msgid "Upright Wiimote" msgstr "Wiimote parado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar Modo EuRGB60 (PAL60)" @@ -5969,7 +6183,7 @@ msgstr "Usar pantalla completa" msgid "Use Hex" msgstr "Usar hexadecimal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Usar advertencias" @@ -6001,7 +6215,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Utilidad" @@ -6025,25 +6239,29 @@ msgstr "Valor:" msgid "Verbosity" msgstr "Verbosidad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volumen" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, 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:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "La instalación del WAD falló: error al crear %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -6063,15 +6281,15 @@ msgstr "" msgid "Warning" msgstr "Advertencia" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Advertencia - arrancando un DOL en un modo de consola incorrecto!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Advertencia - arrancando un ELF en un modo de consola incorrecto!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Advertencia - arrancando un ISO en un modo de consola incorrecto!" @@ -6101,7 +6319,7 @@ msgstr "" "y tienen el mismo nombre que el archivo en tu memcard\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -6115,7 +6333,7 @@ msgstr "" "de continuar, o cargar éste sin el modo de solo lectura." >>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -6130,7 +6348,7 @@ msgstr "" "obtenga una desincronización." >>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -6176,7 +6394,7 @@ msgstr "WaveFileWriter - el archivo no está abierto." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack de pantalla ancha (widescreen)" @@ -6184,15 +6402,15 @@ msgstr "Hack de pantalla ancha (widescreen)" msgid "Width" msgstr "Ancho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Raíz de la NAND de Wii:" @@ -6200,6 +6418,7 @@ msgstr "Raíz de la NAND de Wii:" msgid "Wii Save Import" msgstr "Importar guardado de Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6209,6 +6428,9 @@ msgstr "Importar guardado de Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -6275,10 +6497,11 @@ msgstr "Windows Menú" msgid "Windows Right" msgstr "Windows Derecha" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6294,6 +6517,11 @@ msgstr "Word Wrap" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Trabajando..." @@ -6301,6 +6529,11 @@ msgstr "Trabajando..." msgid "Write to Console" msgstr "Escribir a la consola" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Escribir a archivo" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Escribir a archivo" @@ -6356,7 +6589,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Debes reiniciar Dolphin para que el cambio tenga efecto." @@ -6379,7 +6612,7 @@ msgstr "" "Debería ser 0x%04x (pero es 0x%04llx)\n" "¿Quiere crear uno nuevo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "Zelda TP hack" @@ -6450,7 +6683,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6483,12 +6716,12 @@ msgstr "" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "cmd 0x%08x desconocido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute dio un -1 al arrancar la aplicación!" @@ -6697,6 +6930,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Configuración de la visualización del Emulador" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Habilitar aceleración de audio" + #~ msgid "Enable CPU Access" #~ msgstr "Habilitar acceso a la CPU" @@ -6754,6 +6990,13 @@ msgstr "| OR" #~ msgid "Error allocating buffer" #~ msgstr "Error al asignar el búfer" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "Error en PlayWiimote. %u != %u, byte %d.\n" +#~ "Disculpa, la grabación de Wii no funciona temporalmente." + #~ msgid "Error loading %s: can't read info" #~ msgstr "Error al cargar %s: no se puede leer la información" @@ -7035,6 +7278,22 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "El archivo " +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Esto es utilizado para controlar la velocidad del juego por la del " +#~ "audio.\n" +#~ "Deshabilitar esto puede causar velocidad de juego anormal, como muy " +#~ "rápido.\n" +#~ "Pero a veces puede provocar ruido constante.\n" +#~ "\n" +#~ "Atajo de Teclado : Mantén la tecla presionada para desabilitar la " +#~ "regulación instantáneamente." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Esto es usado comunmente para reproducir voces y efectos de sonido." diff --git a/Languages/po/fa.po b/Languages/po/fa.po index e73a5c95ba..f643a327a3 100644 --- a/Languages/po/fa.po +++ b/Languages/po/fa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"POT-Creation-Date: 2012-03-09 16:54-0600\n" "PO-Revision-Date: 2011-12-18 14:00-0600\n" "Last-Translator: Hamed Khakbiz \n" "Language-Team: Hamed Khakbiz \n" @@ -49,9 +49,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -136,7 +136,7 @@ msgstr "%sصادر کردن GCI%s" msgid "%sImport GCI%s" msgstr "%sوارد کردن GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -169,11 +169,11 @@ msgstr "&مدریت کدهای تقلب" msgid "&DSP Settings" msgstr "&تنظیمات صدا DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&پاک کردن Ùایل ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&پاک کردن Ùایل ISO انطخاب شده" @@ -237,7 +237,7 @@ msgstr "Ù…Ú©Ø«" msgid "&Play" msgstr "&شروع بازی" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "خواص" @@ -281,7 +281,7 @@ msgstr "&دیدن" msgid "&Wiimote Settings" msgstr "&تنظیمات Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&ویکی" @@ -325,7 +325,7 @@ msgstr "<اسم را اینجا وارد کنید>" msgid "" msgstr "<سایز تصویر پیدا نشد>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<هیچ>" @@ -334,7 +334,7 @@ msgstr "<هیچ>" msgid "" msgstr "<Ùشار کلید>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<سیستم>" @@ -373,13 +373,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "کدهای اکشن ریپلی" @@ -391,11 +391,11 @@ msgstr "درباره دلÙین" msgid "Acceleration" msgstr "شتاب دهنده" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "دقت" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" @@ -495,11 +495,11 @@ msgstr "آداپتور" msgid "Add" msgstr "اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "اضاÙÙ‡ کردن کد اکشن ریپلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "اضاÙÙ‡ کردن وصله" @@ -507,9 +507,9 @@ msgstr "اضاÙÙ‡ کردن وصله" msgid "Add new pane" msgstr "اضاÙÙ‡ کردن تکه جدید" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "اضاÙÙ‡ کردن..." @@ -543,11 +543,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "پیشرÙته" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "تنظیمات پیشرÙته" @@ -555,28 +555,28 @@ msgstr "تنظیمات پیشرÙته" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "تمام اسناد Wii ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "تمام اسناد Ùشرده شده GC/Wii ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "تمام اسناد (*.*)|*.*" @@ -588,7 +588,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "" @@ -608,7 +608,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" @@ -623,7 +623,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "عربی" @@ -632,17 +632,17 @@ msgstr "عربی" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "نصبت طول به عرض تصویر:" @@ -651,19 +651,20 @@ msgstr "نصبت طول به عرض تصویر:" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "صدا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "پشتوانه صدا" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "اتوماتیک" @@ -699,7 +700,7 @@ msgstr "" msgid "Back" msgstr "برگشت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "تنضیمات پشتوانه" @@ -726,11 +727,11 @@ msgstr "" msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "" @@ -742,7 +743,7 @@ msgstr "نوار" msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "" @@ -771,7 +772,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "پائین" @@ -780,7 +781,7 @@ msgstr "پائین" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "خراب" @@ -796,7 +797,7 @@ msgstr "جوستجو پوشه برای اضاÙÙ‡ کردن" msgid "Browse for an ISO directory..." msgstr "جوستجو برای پوشه ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "جوستجو برای پوشه خروجی" @@ -818,11 +819,11 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "موتور جوستجو پردازشگر" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "" @@ -861,7 +862,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -869,7 +870,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -885,8 +886,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -896,7 +895,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -921,7 +920,7 @@ msgstr "تغییر دیسک" msgid "Change Game" msgstr "تغییر بازی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -937,8 +936,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "این تغییر در زمانی Ú©Ù‡ شبیه ساز در حال کار Ù…ÛŒ باشد اثری نخواهد داشت!" @@ -958,31 +957,31 @@ msgstr "جوستجو برای کد تقلب" msgid "Cheats Manager" msgstr "مدریت کدهای تقلب" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "چینی (ساده شده)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "چینی (سنتی)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "انتخاب پوشه برای DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "انتخاب پوشه برای NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "انتخاب ISO پیش Ùرز:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "انتخاب پوشه برای اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "انتخاب سند برای باز کردن" @@ -990,14 +989,14 @@ msgstr "انتخاب سند برای باز کردن" msgid "Choose a memory card:" msgstr "انتخاب کارت حاÙظه:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "انتخاب پوشه برای استخراج در آن" @@ -1009,14 +1008,14 @@ msgstr "" msgid "Classic" msgstr "کلاسیک" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "پاک کردن" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "پاک کردن با شکست مواجه شد." @@ -1028,8 +1027,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 msgid "Close" msgstr "بستن" @@ -1053,20 +1052,20 @@ msgstr "دستور" msgid "Comment" msgstr "توضیح" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "توضیح:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Ùشرده کردن ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Ùشرده کردن ISO انتخاب شده..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "در حال Ùشرده کردن ISO" @@ -1093,13 +1092,13 @@ msgstr "پیکربندی گیم پدها" msgid "Configure..." msgstr "پیکربندی..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "تائید بازنویسی سند" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "تائید برای توقÙ" @@ -1108,7 +1107,7 @@ msgstr "تائید برای توقÙ" msgid "Connect" msgstr "اتصال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "اتصال کیبورد USB" @@ -1157,12 +1156,12 @@ msgstr "تبدیل به GCI" msgid "Copy failed" msgstr "Ú©Ù¾ÛŒ با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Ú©Ù¾ÛŒ به کارت حاÙظه %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "هسته" @@ -1189,7 +1188,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "" @@ -1200,7 +1199,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1209,7 +1208,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1224,7 +1223,7 @@ msgstr "" msgid "Count:" msgstr "شماردن:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "کشور:" @@ -1238,24 +1237,24 @@ msgstr "ساخت کد اکشن ریپلی" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "سازنده:" @@ -1263,7 +1262,7 @@ msgstr "سازنده:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "حذ٠قسمتى تصوير" @@ -1283,7 +1282,7 @@ msgstr "ضرب دری" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "" @@ -1291,11 +1290,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "چکوسلواکی" @@ -1307,24 +1306,24 @@ msgstr "" msgid "DSP" msgstr "صدا DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "موتور شبیه ساز صدا DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" @@ -1332,15 +1331,23 @@ msgstr "" msgid "DSP settings" msgstr "تنظیمات صدا DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "ریشه DVD:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "سایزه داده" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "تاریخ:" @@ -1361,7 +1368,7 @@ msgstr "" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "" @@ -1369,16 +1376,16 @@ msgstr "" msgid "Decimal" msgstr "دسیمال" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "ناهمÙشرده کردن ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "ناهمÙشرده کردن ISO انتخاب شده..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "در حال ناهمÙشرده کردن ISO" @@ -1386,11 +1393,11 @@ msgstr "در حال ناهمÙشرده کردن ISO" msgid "Default" msgstr "پیش Ùرز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr ":ISO پیش Ùرز" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "دست خط پیش Ùرز" @@ -1399,7 +1406,7 @@ msgstr "دست خط پیش Ùرز" msgid "Delete" msgstr "پاک کردن" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "پاک کردن Save" @@ -1408,7 +1415,7 @@ msgstr "پاک کردن Save" msgid "Delete the existing file '%s'?" msgstr "آیا سند موجود پاک شود '%s'ØŸ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "شرح" @@ -1416,8 +1423,8 @@ msgstr "شرح" msgid "Detect" msgstr "شناسایی" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1428,8 +1435,8 @@ msgstr "" msgid "Device" msgstr "دستگاه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "تنظیمات دستگاه" @@ -1452,23 +1459,23 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "غیر Ùعال" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "" @@ -1498,7 +1505,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "دیسک" @@ -1522,11 +1529,11 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "دلÙین" @@ -1551,12 +1558,12 @@ msgstr "پیکربندی Wiimote شبیه سازی شده دلÙین" msgid "Dolphin FIFO" msgstr "دلÙین FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "پیکربندی GCPad دلÙین" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 msgid "Dolphin TAS Movies (*.dtm)" msgstr "دلÙین TAS Movies (*.dtm)" @@ -1589,11 +1596,11 @@ msgstr "" msgid "Down" msgstr "پائین" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "دانلود کدها (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "کدهای %lu دانلود شده. (added %lu)" @@ -1602,23 +1609,23 @@ msgstr "کدهای %lu دانلود شده. (added %lu)" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "نسخه بردارى صدا" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "نسخه بردارى Ùریم" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "" @@ -1643,9 +1650,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "هلندی" @@ -1666,7 +1673,7 @@ msgid "" "driver." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "اوروپا" @@ -1682,7 +1689,7 @@ msgstr "ویرایش" msgid "Edit ActionReplay Code" msgstr "ویریش کدهای اکشن ریپلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "ویرایش پيکربندى" @@ -1694,8 +1701,8 @@ msgstr "ویرایش وصله" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "ویرایش..." @@ -1734,7 +1741,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "" @@ -1756,19 +1763,15 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable Bounding Box Calculation" msgstr "" @@ -1776,52 +1779,52 @@ msgstr "" msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "Ùعال کردن کدهای تقلب" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Ùعال کردن موزیک DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Ùعال کردن پردانده با دو هسته یا بیشتر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Ùعال کردن پردانده با دو هسته یا بیشتر (بالا بردن سرعت)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Ùعال کردن شرت کاتها" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "" @@ -1834,13 +1837,13 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "" @@ -1860,20 +1863,20 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "" @@ -1885,7 +1888,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -1902,9 +1905,9 @@ msgstr "" msgid "End" msgstr "پایان" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "انگلیسی" @@ -1933,29 +1936,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "خطا" -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -1987,7 +1983,7 @@ msgstr "خروج دلÙین با شبیه ساز" msgid "Export Failed" msgstr "صادر کردن با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "صادر کردن سند" @@ -2000,15 +1996,15 @@ msgstr "صادر کردن ضبط" msgid "Export Recording..." msgstr "صادر کردن ضبط..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "صادر کردن Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "صادر کردن Wii save (آزمایشی)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "صادر کردن تمام Save ها" @@ -2024,7 +2020,7 @@ msgstr "صادر کردن Save با عنوان..." msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "" @@ -2036,44 +2032,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "استخراج کردن تمامی اسناد..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "استخراج کردن Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "استخراج کردن DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "استخراج کردن پوشه..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "استخراج کردن سند..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "استخراج کردن پارتیشن..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "استخراج کردن %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "استخراج کردن تمامی اسناد" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "استخراج کردن پوشه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "استخراج کردن..." @@ -2085,11 +2081,11 @@ msgstr "" msgid "FIFO Player" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "Ùرانسه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "" @@ -2101,11 +2097,11 @@ msgstr "اتصال با شکست مواجه شد!" msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "دانلود کدها با شکست مواجه شد." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2201,18 +2197,28 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "سریع" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "" +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "" @@ -2221,7 +2227,7 @@ msgstr "" msgid "File Info" msgstr "مشخصات سند" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "" @@ -2250,16 +2256,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2267,7 +2273,7 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "" @@ -2279,7 +2285,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" @@ -2303,7 +2309,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2334,7 +2340,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "" @@ -2346,7 +2352,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" @@ -2354,13 +2360,13 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "Ùرانسوی" @@ -2394,7 +2400,7 @@ msgstr "تنضیمات ثبت وقايع" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "" @@ -2410,15 +2416,15 @@ msgstr "" msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "" @@ -2427,7 +2433,7 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2436,20 +2442,22 @@ msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" -#: Source/Core/Core/Src/GeckoCode.cpp:139 +#: Source/Core/Core/Src/GeckoCode.cpp:222 #, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Ú©Ù„ÛŒ" @@ -2458,9 +2466,9 @@ msgstr "Ú©Ù„ÛŒ" msgid "General Settings" msgstr "تنظیمات Ú©Ù„ÛŒ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "" @@ -2492,7 +2500,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "یونانی" @@ -2524,7 +2532,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2576,11 +2584,11 @@ msgstr "پیگربندی شرت کات" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "کاتها" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "مجارستانی" @@ -2588,12 +2596,12 @@ msgstr "مجارستانی" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2602,11 +2610,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2622,15 +2630,15 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "جزئیات ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "پوشه های ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ايتاليا" @@ -2638,21 +2646,22 @@ msgstr "ايتاليا" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 @@ -2677,7 +2686,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr " وارد کردن Save" @@ -2716,7 +2725,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "در بازی" @@ -2725,7 +2734,7 @@ msgid "In-Game" msgstr "در-بازی" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "مشخصات" @@ -2745,7 +2754,7 @@ msgstr "درج" msgid "Insert Encrypted or Decrypted code here..." msgstr "درج کد رمز شده Ùˆ یا کش٠رمز..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "درج کارت SD" @@ -2757,7 +2766,7 @@ msgstr "درج اسم..." msgid "Install WAD" msgstr "نصب WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "نصب به منوی Wii" @@ -2766,15 +2775,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 msgid "Installing WAD..." msgstr "در حال نصب WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "" @@ -2797,11 +2806,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "" @@ -2818,7 +2827,7 @@ msgstr "مقدار نا معتبر" msgid "Invalid bat.map or dir entry" msgstr "bat.map نا معتبر یا ورودی پوشه" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "واقعه نا معتبر %i" @@ -2835,38 +2844,38 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "سند ضبط نا معتبر" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "وضیعت نا معتبر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "ایتالیائی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "ژاپن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "ژاپنی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "کره" @@ -2875,8 +2884,8 @@ msgstr "کره" msgid "Key" msgstr "کلید" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "کره ای" @@ -2894,7 +2903,7 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "زبان:" @@ -2940,7 +2949,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -2948,7 +2957,7 @@ msgstr "" msgid "Load" msgstr "بارگیری" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "بارگیری Texture دلخواه" @@ -2996,11 +3005,11 @@ msgstr "بارگیری State شکا٠۸" msgid "Load State..." msgstr "بارگیری State..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3024,7 +3033,7 @@ msgstr "" msgid "Local" msgstr "محلی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3036,11 +3045,11 @@ msgstr "ثبت وقايع" msgid "Log Configuration" msgstr "تنضیمات ثبت وقايع" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "نوع ثبت وقايع" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "خروجی ثبت وقايع" @@ -3068,7 +3077,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3082,11 +3091,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "" @@ -3108,7 +3117,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Memory Card" msgstr "کارت حاÙظه" @@ -3137,7 +3146,7 @@ msgstr "" msgid "Menu" msgstr "Ùهرست انتخاب" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "میکروÙÙ†" @@ -3146,11 +3155,11 @@ msgstr "میکروÙÙ†" msgid "Min" msgstr "حداقل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "متÙرقه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "تنظیمات متÙرقه" @@ -3167,7 +3176,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "" @@ -3180,7 +3189,7 @@ msgstr "" msgid "Motor" msgstr "موتور" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3195,7 +3204,7 @@ msgstr "" msgid "Multiply" msgstr "ضریب" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3285,7 +3294,7 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3294,7 +3303,7 @@ msgstr "اسم:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "اسم:" @@ -3308,7 +3317,7 @@ msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "صÙحه بعد" @@ -3320,7 +3329,7 @@ msgstr "" msgid "Nickname :" msgstr "اسم مستعار" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "" @@ -3359,7 +3368,7 @@ msgstr "" msgid "None" msgstr "هیچکدام" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" @@ -3367,8 +3376,8 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "" @@ -3380,7 +3389,7 @@ msgstr "" msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "" @@ -3418,7 +3427,7 @@ msgstr "شیی" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "خاموش" @@ -3437,11 +3446,11 @@ msgstr "" msgid "Open" msgstr "گشودن" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "" @@ -3463,11 +3472,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3496,7 +3505,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "غیره" @@ -3546,21 +3555,21 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "وصله ها" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "مسیرها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Ù…Ú©Ø«" @@ -3569,7 +3578,7 @@ msgstr "Ù…Ú©Ø«" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "کامل" @@ -3580,8 +3589,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 msgid "Play" msgstr "شروع بازی" @@ -3595,7 +3604,7 @@ msgstr "شروع ضبط" msgid "Play/Pause" msgstr "شروع بازی/Ù…Ú©Ø«" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "قابل بازی" @@ -3607,7 +3616,7 @@ msgstr "" msgid "Players" msgstr "بازی کنان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 msgid "Please confirm..." msgstr "لطÙا تایید کنید..." @@ -3619,23 +3628,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "لهستانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "درگاه Û±" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "درگاه Û²" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "درگاه Û³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "درگاه Û´" @@ -3644,11 +3653,11 @@ msgstr "درگاه Û´" msgid "Port :" msgstr "درگاه :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "پرتقال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "پرتقال" @@ -3656,17 +3665,17 @@ msgstr "پرتقال" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3679,7 +3688,7 @@ msgstr "حالت های از پيش تنظيم شده" msgid "Prev Page" msgstr "صÙحه قبلی" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "صÙحه قبلی" @@ -3730,7 +3739,7 @@ msgstr "" msgid "RAM" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "روسیه" @@ -3743,7 +3752,7 @@ msgstr "محدوده" msgid "Read-only mode" msgstr "حالت Ùقط خواندنی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "واقعی" @@ -3814,10 +3823,10 @@ msgstr "به روز کردن لیست" msgid "Refresh game list" msgstr "به روز کردن لیست بازی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "پاک کردن" @@ -3860,11 +3869,11 @@ msgstr "" msgid "Rumble" msgstr "شوک" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "روسی" @@ -3872,11 +3881,11 @@ msgstr "روسی" msgid "Sa&ve State" msgstr "ذخ&یره State" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "بی خطر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "نرخ نمونه برداری صدا" @@ -3934,12 +3943,12 @@ msgstr "ذخیره State شکا٠۸" msgid "Save State..." msgstr "ذخیره State..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "ذخیره با عنوان" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "ذخیره GCM/ISO Ùشرده" @@ -3947,11 +3956,11 @@ msgstr "ذخیره GCM/ISO Ùشرده" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "ذخیره GCM/ISO ناهمÙشرده" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -3960,16 +3969,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "" @@ -3985,12 +3994,12 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "" @@ -4000,12 +4009,12 @@ msgstr "" msgid "Select" msgstr "انتخاب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "انتخاب سند ضبط شده" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 msgid "Select a Wii WAD file to install" msgstr "انتخاب سند Wii WAD برای نصب" @@ -4028,15 +4037,15 @@ msgstr "انتخاب پنجره شناور" msgid "Select the file to load" msgstr "انتخاب سند برای بارگیری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 msgid "Select the save file" msgstr "انتخاب سند Save" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "انتخاب State برای بارگیری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 msgid "Select the state to save" msgstr "انتخاب State برای ذخیره" @@ -4051,7 +4060,7 @@ msgid "" "If unsure, select Auto." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "دست خط انتخاب شده" @@ -4087,11 +4096,11 @@ msgstr "" msgid "Separator" msgstr "جدا کننده" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "صربستانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4100,11 +4109,11 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4114,7 +4123,7 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "تنظیمات" @@ -4126,7 +4135,7 @@ msgstr "" msgid "Shake" msgstr "لرزش" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "اسم کوتاه:" @@ -4155,7 +4164,7 @@ msgstr "نمایش &نوار ابزار" msgid "Show Drives" msgstr "نمایش درایوها" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "نمایش منطقه Ú©Ù¾ÛŒ EFB" @@ -4171,7 +4180,7 @@ msgstr "نمایش Ùرانسه" msgid "Show GameCube" msgstr "نمایش GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "نمایش ورودی تصویر" @@ -4187,7 +4196,7 @@ msgstr "نمایش ژاپن" msgid "Show Korea" msgstr "نمایش کره" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "نمایش زبان:" @@ -4207,7 +4216,7 @@ msgstr "نمایش پایگاه" msgid "Show Regions" msgstr "نمایش منطقه" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "نمایش آمار" @@ -4227,34 +4236,34 @@ msgstr "نمایش Wad" msgid "Show Wii" msgstr "نمایش Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "نمایش پنجره تعید قبل از متوق٠کردن بازی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "" @@ -4285,7 +4294,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "چینی ساده شده" @@ -4293,11 +4302,11 @@ msgstr "چینی ساده شده" msgid "Size" msgstr "سایز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4329,11 +4338,11 @@ msgstr "" msgid "Slot %i" msgstr "شکا٠%i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "شکا٠A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "شکا٠B" @@ -4353,7 +4362,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "تنضیمات صدا" @@ -4371,9 +4380,9 @@ msgstr "" msgid "Space" msgstr "Ùضا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "اسپانیائی" @@ -4397,7 +4406,7 @@ msgstr "" msgid "Specify a video backend" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4405,7 +4414,7 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -4483,12 +4492,12 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "" @@ -4521,7 +4530,7 @@ msgstr "" msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -4537,7 +4546,7 @@ msgstr "" msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "" @@ -4553,13 +4562,13 @@ msgstr "آدرس بی اعتبار است" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -4578,7 +4587,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -4600,7 +4609,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -4638,7 +4647,7 @@ msgstr "" msgid "The value is invalid" msgstr "مقدار بی اعتبار است" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" @@ -4646,13 +4655,13 @@ msgstr "" msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -4664,7 +4673,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -4680,19 +4689,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4700,7 +4700,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -4723,7 +4723,7 @@ msgstr "عنوان" msgid "To" msgstr "به" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "" @@ -4734,15 +4734,15 @@ msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "اوج" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "چینی سنتی" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "" @@ -4750,7 +4750,7 @@ msgstr "" msgid "Triggers" msgstr "" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "" @@ -4760,7 +4760,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "ترکی" @@ -4781,11 +4781,11 @@ msgstr "" msgid "UDP Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "ناشناخته" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "آمریکا" @@ -4850,7 +4850,7 @@ msgstr "به روز کردن" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -4862,7 +4862,7 @@ msgstr "" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" @@ -4883,7 +4883,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "کاربردی" @@ -4907,25 +4907,28 @@ msgstr "مقدار:" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "ویدیو" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "مجازی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "حجم صدا" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +msgid "WAD installation failed: error creating ticket" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -4940,15 +4943,15 @@ msgstr "" msgid "Warning" msgstr "اختار" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "" @@ -4969,7 +4972,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -4977,7 +4980,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -4985,7 +4988,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5013,7 +5016,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "" @@ -5021,15 +5024,15 @@ msgstr "" msgid "Width" msgstr "عرض" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "ميز Ùرمان Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "ریشه Wii NAND:" @@ -5037,7 +5040,7 @@ msgstr "ریشه Wii NAND:" msgid "Wii Save Import" msgstr "وارد کردن Wii Save" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 msgid "Wii save files (*.bin)|*.bin" msgstr "سند Wii save (*.bin)|*.bin" @@ -5093,13 +5096,13 @@ msgstr "" msgid "Windows Right" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 msgid "Working..." msgstr "در حال کار کردن..." @@ -5107,6 +5110,10 @@ msgstr "در حال کار کردن..." msgid "Write to Console" msgstr "" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +msgid "Write to Debugger" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "" @@ -5160,7 +5167,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5178,7 +5185,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "" @@ -5232,7 +5239,7 @@ msgstr "" msgid "^ ADD" msgstr "^ اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5263,12 +5270,12 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/fr.po b/Languages/po/fr.po index d5f462ae2c..f50163bd39 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -10,7 +10,11 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-10-28 23:40+0100\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -69,9 +73,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sCopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -166,7 +170,7 @@ msgstr "%sExporter GCI%s" msgid "%sImport GCI%s" msgstr "%sImporter GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u blocs libres, %u entrées de rép. libres" @@ -199,11 +203,11 @@ msgstr "Gestionnaire de &cheats" msgid "&DSP Settings" msgstr "Paramètres &DSP (audio)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Supprimer l'ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Supprimer les ISO sélectionnés" @@ -267,7 +271,7 @@ msgstr "&Pause" msgid "&Play" msgstr "&Démarrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Propriétés" @@ -311,7 +315,7 @@ msgstr "&Affichage" msgid "&Wiimote Settings" msgstr "Paramètres de la &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -355,7 +359,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -364,7 +368,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -421,13 +425,13 @@ msgstr "" "\n" "Vous devez indiquer le port TCP à l'hôte !!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Codes AR" @@ -439,11 +443,11 @@ msgstr "A propos de Dolphin" msgid "Acceleration" msgstr "Accéleration" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Précision :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulation fidèle VBeam" @@ -570,11 +574,11 @@ msgstr "Carte :" msgid "Add" msgstr "Ajouter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Ajouter un code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Ajouter un patch" @@ -585,6 +589,7 @@ msgstr "Ajouter un nouveau panneau" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 @@ -603,6 +608,11 @@ msgstr "Ajouter un nouveau panneau" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Ajouter..." @@ -651,11 +661,11 @@ msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Ajuste le contrôle analogique de pression requise pour activer les boutons." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avancé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Paramètres avancés" @@ -663,17 +673,18 @@ msgstr "Paramètres avancés" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tous les fichiers GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Toutes les images GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ======= @@ -688,18 +699,22 @@ msgstr "Tous les fichiers GameCube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Tous les fichiers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Tous les fichiers (*.*)|*.*" @@ -715,6 +730,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD <<<<<<< HEAD @@ -726,6 +742,9 @@ msgid "Alternate Wiimote Timing" msgstr "Wiimote émulée" >>>>>>> Update translation files for recent changes in the code. ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Délai alternatif de communication avec la Wiimote" >>>>>>> Update french translation. @@ -746,7 +765,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader :" @@ -765,7 +784,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez (aucun)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabe" @@ -774,7 +793,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -782,7 +801,7 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ces fichiers ?\n" "Ils seront définitivement supprimés !" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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é " @@ -791,6 +810,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 @@ -801,6 +821,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -809,21 +832,23 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Moteur audio :" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 @@ -834,6 +859,9 @@ msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -878,7 +906,7 @@ msgstr "" msgid "Back" msgstr "Retour" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Paramètres de l'interface audio" @@ -905,11 +933,11 @@ msgstr "Mauvaise entête de fichier" msgid "Banner" msgstr "Bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Détails de la bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Bannière :" @@ -921,7 +949,7 @@ msgstr "Barre" msgid "Basic" msgstr "Paramètres de base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Paramètres de base" @@ -955,6 +983,7 @@ msgstr "Bleu Droite" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -965,6 +994,9 @@ msgstr "Bleu Droite" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Bas" @@ -973,7 +1005,7 @@ msgstr "Bas" msgid "Bound Controls: %lu" msgstr "Contrôles liés : %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Corrompu" @@ -989,7 +1021,7 @@ msgstr "Choisir un dossier à ajouter" msgid "Browse for an ISO directory..." msgstr "Rechercher un dossier contenant des ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Parcourir un dossier de destination" @@ -1023,11 +1055,11 @@ msgstr "Stick-C" msgid "C-Stick" msgstr "Stick-C" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Moteur d'émulation du CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cache des listes d'affichage" @@ -1081,7 +1113,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1092,7 +1124,7 @@ msgstr "" "%s\n" "n'est pas un fichier de carte mémoire GameCube valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1111,8 +1143,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "Impossible de trouver la Wiimote par le gestionnaire de connexion %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1123,7 +1153,7 @@ msgstr "" msgid "Caps Lock" msgstr "Verr Maj" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalan" @@ -1148,7 +1178,7 @@ msgstr "Changer de disque" msgid "Change Game" msgstr "Changer de Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1164,8 +1194,8 @@ 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 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Changer ceci n'aura aucun effet durant l'émulation !" @@ -1185,31 +1215,31 @@ msgstr "Rechercher un cheat" msgid "Cheats Manager" msgstr "Gestionnaire de Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinois (simplifié)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinois (traditionnel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Choisir un dossier racine pour le DVD :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Choisir un dossier racine pour la NAND :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Choisir un ISO par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Choisir un fichier à ouvrir" @@ -1220,6 +1250,7 @@ msgstr "Choisir une carte mémoire :" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 @@ -1231,6 +1262,9 @@ msgstr "Choisir une carte mémoire :" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1245,8 +1279,8 @@ msgstr "Choisir un fichier comme apploader : (uniquement pour les disques créé ======= >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Choisir le dossier de destination de l'extraction" @@ -1258,14 +1292,14 @@ msgstr "Stick circulaire" msgid "Classic" msgstr "Classique" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Effacer" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Echec de l'éffacement" @@ -1282,6 +1316,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1293,6 +1328,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Fermer" @@ -1316,20 +1355,20 @@ msgstr "Commande" msgid "Comment" msgstr "Commentaire" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Commentaire :" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Compresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Compresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Compression de l'ISO" @@ -1356,13 +1395,13 @@ msgstr "Configurer les manettes" msgid "Configure..." msgstr "Configurer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Confirmer l'écrasement du fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmer l'arrêt de l'émulation" @@ -1371,7 +1410,7 @@ msgstr "Confirmer l'arrêt de l'émulation" msgid "Connect" msgstr "Connecter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Connecter le clavier USB" @@ -1432,12 +1471,12 @@ msgstr "Convertir en GCI" msgid "Copy failed" msgstr "Echec de la copie" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Copier vers la carte mémoire %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Core" @@ -1468,7 +1507,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Impossible de reconnaître le fichier ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Impossible de sauvegarder %s" @@ -1483,7 +1522,7 @@ msgstr "" "(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 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1496,7 +1535,7 @@ msgstr "" "Exécutez-vous Dolpin à partir d'un CD/DVD, ou le fichier de sauvegarde est " "peut-être protégé contré l'écriture ?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossible de trouver la commande d'ouverture pour l'extension 'ini' !" @@ -1513,7 +1552,7 @@ msgstr "" msgid "Count:" msgstr "Nombre :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Pays :" @@ -1527,13 +1566,14 @@ msgstr "Créer un code AR" msgid "Create new perspective" msgstr "Créer une nouvelle perspective" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Créé par KDE-Look.org" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 @@ -1545,6 +1585,9 @@ msgstr "Créé par KDE-Look.org" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1557,15 +1600,15 @@ msgstr "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com ======= >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Créé par VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Créé par black_rider et publié sur ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Créateur :" @@ -1573,7 +1616,7 @@ msgstr "Créateur :" msgid "Critical" msgstr "Critique" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Couper" @@ -1596,7 +1639,7 @@ msgstr "Crossfade" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Le dossier actuel a été changé de %s en %s après wxFileSelector !" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Hack de projection personnalisé" @@ -1604,11 +1647,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:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Personnalise certains paramètres de projection orthographique." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tchèque" @@ -1620,10 +1663,11 @@ msgstr "Pad numérique" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1638,18 +1682,22 @@ msgstr "Moteur d'émulation du DSP (Audio)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Interpréteur du DSP en LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE sur thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilateur du DSP en LLE" @@ -1657,15 +1705,23 @@ msgstr "Recompilateur du DSP en LLE" msgid "DSP settings" msgstr "Paramètres DSP (audio)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Racine du DVD :" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Taille des données" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Date :" @@ -1686,7 +1742,7 @@ msgstr "Zone morte" msgid "Debug" msgstr "Débug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Débug" @@ -1694,16 +1750,16 @@ msgstr "Débug" msgid "Decimal" msgstr "Décimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Décompresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Décompresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Décompression de l'ISO" @@ -1711,11 +1767,11 @@ msgstr "Décompression de l'ISO" msgid "Default" msgstr "Par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO par défaut :" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Police par défaut" @@ -1724,7 +1780,7 @@ msgstr "Police par défaut" msgid "Delete" msgstr "Supprimer" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Supprimer la sauvegarde" @@ -1733,7 +1789,7 @@ msgstr "Supprimer la sauvegarde" msgid "Delete the existing file '%s'?" msgstr "Supprimer le fichier '%s' ?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Description" @@ -1741,8 +1797,8 @@ msgstr "Description" msgid "Detect" msgstr "Détecter" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1755,8 +1811,8 @@ msgstr "" msgid "Device" msgstr "Appareil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Paramètres de la console virtuelle" @@ -1781,23 +1837,23 @@ msgstr "" " et la vérification de la somme de contrôle du dossier de sauvegarde a échoué" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Désactiver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Désactiver la fumée" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Désactiver l'éclairage" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Désactiver la profondeur / pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Désactiver les textures" @@ -1841,7 +1897,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disque" @@ -1871,6 +1927,7 @@ msgstr "Diviser" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 @@ -1881,10 +1938,13 @@ msgstr "Diviser" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1912,6 +1972,7 @@ msgstr "Dolphin FIFO" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Configuration de la manette GC pour Dolphin" @@ -1942,6 +2003,14 @@ msgstr "Configuration de la manette GC pour Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Configuration de la manette GC pour Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -2012,11 +2081,11 @@ msgstr "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici po msgid "Down" msgstr "Bas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Télécharger des codes (base de données WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu codes ont été téléchargés. (%lu ajoutés)" @@ -2025,23 +2094,23 @@ msgstr "%lu codes ont été téléchargés. (%lu ajoutés)" msgid "Drums" msgstr "Percussions" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Factice" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Enregistrer le son" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Copier l'EFB cible" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Copier les images" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Copier les textures" @@ -2079,6 +2148,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 @@ -2097,6 +2167,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Néerlandais" @@ -2121,7 +2196,7 @@ msgstr "" "distribution de Dolphin, un redémarrage est probablement nécessaire pour que " "Windows charge le nouveau pilote." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "Europe" @@ -2137,7 +2212,7 @@ msgstr "Editer" msgid "Edit ActionReplay Code" msgstr "Editer le code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editer la configuration" @@ -2149,8 +2224,8 @@ msgstr "Editer le patch" msgid "Edit current perspective" msgstr "Modifier la perspective actuelle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Editer..." @@ -2200,7 +2275,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote émulée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Etat de l'émulation :" @@ -2228,24 +2303,24 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activer la journalisation AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Activer le contrôle audio" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Activer BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Activer l'assemblage de blocs" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2263,6 +2338,7 @@ msgstr "Activer le cache" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 @@ -2273,51 +2349,54 @@ msgstr "Activer le cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activer les Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Activer la musique DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Activer le Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Activer le Dual Core (plus rapide)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Activer les touches de raccourci" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Activer le saut d'inactivité" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Activer le saut d'inactivité (plus rapide)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Activer le MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Activer le Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Activer l'économiseur d'écran" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Activer l'écran large (16/9è)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Activer le rendu en fil de fer" @@ -2336,7 +2415,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2344,7 +2423,7 @@ msgstr "" "Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, " "ARRÊT = Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Activer les appels" @@ -2376,6 +2455,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 @@ -2387,6 +2467,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2401,7 +2484,7 @@ msgstr "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. ======= >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2411,7 +2494,7 @@ msgstr "" "de gesiton de mémoire. Fidèle au matériel de la console, mais lent à émuler. " "(ON = Compatible, OFF = Rapide)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Active un hack de projection personnalisé" @@ -2427,7 +2510,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2452,6 +2535,7 @@ msgstr "Fin" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 @@ -2470,6 +2554,11 @@ msgstr "Fin" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Anglais" @@ -2501,6 +2590,7 @@ msgstr "Egal" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erreur" @@ -2544,6 +2634,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Erreur" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2551,14 +2647,14 @@ msgstr "" "défaut du système." >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format <<<<<<< HEAD <<<<<<< HEAD @@ -2607,7 +2703,7 @@ msgstr "Quitter Dolphin avec l'émulateur" msgid "Export Failed" msgstr "Echec de l'exportation" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exporter un fichier" @@ -2620,15 +2716,15 @@ msgstr "Exporter l'enregistrement..." msgid "Export Recording..." msgstr "Exporter l'enregistrement..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exporter une sauvegarde" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exporter une sauvegarde Wii (expérimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exporter toutes les sauvegardes" @@ -2644,7 +2740,7 @@ msgstr "Exporter l'enregistrement sous..." msgid "Extension" msgstr "Extension" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Buffer d'image externe" @@ -2656,44 +2752,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Extraire tous les fichiers..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Extraire l'Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Extraire le DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Extraire un dossier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Extraire un fichier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Extraire une partition..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Extraction de %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Extraction de tous les fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Extraction du dossier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Extraction..." @@ -2705,11 +2801,11 @@ msgstr "Octet FIFO" msgid "FIFO Player" msgstr "Lecteur FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "France" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Taille FST :" @@ -2721,11 +2817,11 @@ msgstr "Connexion impossible !" msgid "Failed to Listen!!" msgstr "Ecoute impossible !" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Impossible de télécharger les codes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Impossible d'extraire vers %s !" @@ -2844,18 +2940,28 @@ msgstr "Impossible d'écrire l'entête de %s" msgid "Failed to write header for file %d" msgstr "Impossible d'écire l'entête du fichier %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Rapide" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Mipmaps rapides" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Lecteur FIFO" @@ -2864,7 +2970,7 @@ msgstr "Lecteur FIFO" msgid "File Info" msgstr "Infos du fichier" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Le fichier ne contient pas de code." @@ -2897,16 +3003,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:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO : mode d'ouverture inconnu : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Système de fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !" @@ -2914,7 +3020,7 @@ msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !" msgid "First Block" msgstr "Premier bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Corriger les sommes de contôle" @@ -2926,7 +3032,7 @@ msgstr "Forcer 16/9è" msgid "Force 4:3" msgstr "Forcer 4/3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Forcer la console comme NTSC-J" @@ -2960,7 +3066,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2996,7 +3102,7 @@ msgstr "Image " msgid "Frame Advance" msgstr "Avancement d'image" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "L'enregistrement d'images utilise FFV1" @@ -3008,7 +3114,7 @@ msgstr "Plage d'images :" msgid "Frame S&kipping" msgstr "Saut d'&image :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Image/s max :" @@ -3016,13 +3122,14 @@ msgstr "Image/s max :" msgid "Frames To Record" msgstr "Images à enregistrer :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Vue libre" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 @@ -3041,6 +3148,11 @@ msgstr "Vue libre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Français" @@ -3083,7 +3195,7 @@ msgstr "Configuration de la journalisation" msgid "GCPad" msgstr "Manette GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID du jeu :" @@ -3099,15 +3211,15 @@ msgstr "Le jeu n'est pas en cours d'émulation !" msgid "Game not found!!" msgstr "Jeu non trouvé !!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Paramètres spécifiques au jeu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Config du Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "GameCube" @@ -3119,6 +3231,7 @@ msgstr "Paramètres de la &manette GameCube" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -3129,6 +3242,9 @@ msgstr "Paramètres de la &manette GameCube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" @@ -3137,15 +3253,17 @@ msgid "Gamecube Pad settings" msgstr "Paramètres de la manette GameCube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Codes Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Echec de l'exécution dy GeckoCode (CT%i CST%i) (%s)\n" "(ou c'est un mauvais code, ou il n'est pas encore pris en charge.)" @@ -3164,8 +3282,12 @@ msgstr "" >>>>>>> Update Hungarian and Turkish translations. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Général" @@ -3177,6 +3299,7 @@ msgstr "Paramètres généraux" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 @@ -3195,6 +3318,11 @@ msgstr "Paramètres généraux" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Allemand" @@ -3259,7 +3387,7 @@ msgstr "" "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grèque" @@ -3291,7 +3419,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:303 msgid "Hebrew" msgstr "Hébreu" @@ -3358,6 +3486,7 @@ msgstr "Configuration des raccourcis clavier" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 @@ -3369,10 +3498,13 @@ msgstr "Configuration des raccourcis clavier" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Raccourcis clavier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hongrois" @@ -3380,14 +3512,14 @@ msgstr "Hongrois" msgid "Hybrid Wiimote" msgstr "Wiimote hybride" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3400,11 +3532,11 @@ msgstr "" "ID du titre : %016llx.\n" " Dolphin va probablement figer maintenant" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - mauvaise destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Paramètres IPL" @@ -3420,15 +3552,15 @@ msgstr "Pointeur IR" msgid "IR Sensitivity:" msgstr "Sensibilité de l'IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Détails de l'ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Dossiers des ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "Italie" @@ -3436,22 +3568,30 @@ msgstr "Italie" msgid "Icon" msgstr "Icône" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update Hungarian and Turkish translations. ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" @@ -3461,6 +3601,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 @@ -3472,9 +3613,14 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). 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), vous devez aussi désactiver " @@ -3519,7 +3665,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importer une sauvegarde" @@ -3570,7 +3716,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Dans le jeu" @@ -3579,7 +3725,7 @@ msgid "In-Game" msgstr "Dans le jeu" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3599,7 +3745,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:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Insérer une carte SD" @@ -3611,7 +3757,7 @@ msgstr "Indiquer un nom ici..." msgid "Install WAD" msgstr "Installer un WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Installer dans le menu Wii" @@ -3625,6 +3771,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 @@ -3635,14 +3782,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Installation du WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Paramètres de l'interface" @@ -3667,11 +3817,11 @@ msgstr "Erreur interne LZO - échec de lzo_init()" msgid "Internal Resolution:" msgstr "Résolution interne :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpréteur (TRES lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3688,7 +3838,7 @@ msgstr "Valeur non valide !" msgid "Invalid bat.map or dir entry" msgstr "bar.map ou entrée dir non valide" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Type d'évènement non valide : %i" @@ -3708,17 +3858,18 @@ msgstr "" "%s\n" "Vous devriez copier à nouveau ce jeu." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Fichier d'enregitrement non valide" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Etat non valide" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 @@ -3737,27 +3888,32 @@ msgstr "Etat non valide" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italien" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "Japon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Recompilateur JIT (recommandé) " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Recompilateur expérimental JIT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonais" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "Corée" @@ -3766,8 +3922,8 @@ msgstr "Corée" msgid "Key" msgstr "Touche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coréen" @@ -3785,7 +3941,7 @@ msgstr "Bouton L" msgid "L-Analog" msgstr "L Analog." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Langue :" @@ -3838,7 +3994,7 @@ msgstr "" msgid "Less Than" msgstr "Plus petit que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Nb de FPS comme limite" @@ -3846,7 +4002,7 @@ msgstr "Nb de FPS comme limite" msgid "Load" msgstr "Charger" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Charger textures personnalisées" @@ -3897,6 +4053,7 @@ msgstr "Charger un état..." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Charger le Menu Système Wii" @@ -3923,6 +4080,13 @@ msgstr "Charger le Menu Système Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Charger le Menu Système Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" @@ -3951,7 +4115,7 @@ msgstr "Charge le fichier spécifié (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Verrouiller les threads aux coeurs" @@ -3963,11 +4127,11 @@ msgstr "Journal" msgid "Log Configuration" msgstr "Configuration de la journalisation" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Types de journaux" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Sorties des journalisations" @@ -3997,7 +4161,7 @@ msgstr "" "MD5 non concordant\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Hack de vitesse pour le MMU" @@ -4023,11 +4187,11 @@ msgstr "Fichiers MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID concepteur :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Concepteur :" @@ -4052,6 +4216,7 @@ msgstr "Octet mémoire" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -4062,6 +4227,9 @@ msgstr "Octet mémoire" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Carte mémoire" @@ -4100,7 +4268,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Micro" @@ -4109,11 +4277,11 @@ msgstr "Micro" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Divers" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Paramètres divers" @@ -4135,7 +4303,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Police mono-espacée." @@ -4148,7 +4316,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Vibreur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -4170,7 +4338,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -4265,6 +4433,7 @@ msgstr "NP Haut" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 @@ -4275,6 +4444,9 @@ msgstr "NP Haut" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4283,7 +4455,7 @@ msgstr "Nom :" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nom :" @@ -4297,7 +4469,7 @@ msgid "New Scan" msgstr "Nouvelle recherche" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Page suivante" @@ -4309,7 +4481,7 @@ msgstr "Recherche suivante" msgid "Nickname :" msgstr "Pseudo :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Pas de pays (SDK)" @@ -4348,7 +4520,7 @@ msgstr "Aucun dossier de sauvegarde trouvé pour le titre %s" msgid "None" msgstr "Aucune" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norvégien BokmÃ¥l" @@ -4356,8 +4528,8 @@ msgstr "Norvégien BokmÃ¥l" msgid "Not Equal" msgstr "Différent" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Non défini" @@ -4381,7 +4553,7 @@ msgstr "Non connectée" msgid "Notes" msgstr "Notes" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notes :" @@ -4419,7 +4591,7 @@ msgstr "Objet" msgid "Object Range" msgstr "Plage d'objets :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Arrêt" @@ -4448,11 +4620,11 @@ msgstr "%d blocs disponibles seulement" msgid "Open" msgstr "Ouvrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Ouvrir l'emplacement du fichier" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Ouvrir le dossier de &sauvegarde Wii" @@ -4474,11 +4646,11 @@ msgstr "OpenAL : impossible de trouver des périphériques audio" msgid "OpenAL: can't open device %s" msgstr "OpenAL : impossible d'ouvrir le périphérique %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "Décodeur de texture OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "Décodeur de texture OpenMP" @@ -4511,7 +4683,7 @@ msgstr "" "et importez les sauvegardes vers une nouvelle carte mémoire\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Autres" @@ -4563,22 +4735,23 @@ msgstr "Paragraphe" msgid "Parameters" msgstr "Paramètres" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partition %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patchs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Chemins" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ======= @@ -4593,6 +4766,10 @@ msgstr "Chemins" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4601,7 +4778,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Eclairage par pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Parfait" @@ -4615,6 +4792,7 @@ msgstr "Perspective %d" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4629,6 +4807,10 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Démarrer" @@ -4642,7 +4824,7 @@ msgstr "Jouer l'enregistrement..." msgid "Play/Pause" msgstr "Démarrer/Arrêter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Jouable" @@ -4657,6 +4839,7 @@ msgstr "Joueurs" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 @@ -4667,6 +4850,9 @@ msgstr "Joueurs" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4678,23 +4864,23 @@ 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:309 msgid "Polish" msgstr "Polonais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4703,11 +4889,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugais (brésilien)" @@ -4715,21 +4901,25 @@ msgstr "Portugais (brésilien)" msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:735 +======= +#: Source/Core/Core/Src/Movie.cpp:759 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4747,7 +4937,7 @@ msgstr "Pré-réglages :" msgid "Prev Page" msgstr "Page préc." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Page précédente" @@ -4798,7 +4988,7 @@ msgstr "R Analog." msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "Russie" @@ -4811,7 +5001,7 @@ msgstr "Etendue" msgid "Read-only mode" msgstr "Mode Lecture seule" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Réel" @@ -4890,6 +5080,7 @@ msgstr "Rafraîchir la liste des jeux" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 @@ -4912,6 +5103,12 @@ msgstr "Rafraîchir la liste des jeux" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Retirer" @@ -4967,11 +5164,11 @@ msgstr "Stick Droit" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Exécuter DSP LLE sur un thread dédié (non recommandé)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russe" @@ -4979,13 +5176,14 @@ msgstr "Russe" msgid "Sa&ve State" msgstr "Sau&vegarder l'état" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Sûr " <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 @@ -4996,6 +5194,9 @@ msgstr "Sûr " ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Echantillonnage :" @@ -5053,12 +5254,12 @@ msgstr "Sauvegarder l'état vers le Slot 8" msgid "Save State..." msgstr "Enregistrer l'état" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Enregistrer sous..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Sauver le fichier compressé GCM/ISO" @@ -5066,11 +5267,11 @@ msgstr "Sauver le fichier compressé GCM/ISO" msgid "Save current perspective" msgstr "Sauvegarder la perspective actuelle" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Sauvegarder le fichier GCM/ISO décompressé" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -5081,16 +5282,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "Copie à l'échelle de l'EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 #, c-format msgid "Scanning %s" msgstr "Analyse de %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Recherche d'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Recherche..." @@ -5106,12 +5307,12 @@ msgstr "Arrêt défil." msgid "Search Filter" msgstr "Fitre de recherche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "La section %s n'a pas été trouvée dans SYSCONF" @@ -5124,6 +5325,7 @@ msgstr "Select" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" @@ -5154,6 +5356,14 @@ msgstr "Sélectionner le fichier d'enregistrement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Sélectionner le fichier d'enregistrement" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -5182,6 +5392,7 @@ msgstr "Sélectionner le fichier à charger" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -5200,13 +5411,17 @@ msgstr "Sélectionner l'état à charger" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Sélectionner l'état à charger" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. @@ -5216,6 +5431,9 @@ msgstr "Sélectionner l'état à charger" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -5238,7 +5456,7 @@ msgstr "" "\n" "Dans le doute, choisissez Auto." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Police sélectionnée" @@ -5287,13 +5505,14 @@ msgstr "Position de la Sensor Bar :" msgid "Separator" msgstr "Séparateur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbe" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 @@ -5305,6 +5524,9 @@ msgstr "Serbe" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5322,11 +5544,11 @@ msgstr "Port série 1 - C'est le port que les périphériques tels que l'adaptat msgid "Set" msgstr "Paramétrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Définir comme l'ISO par &défaut" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Définir comme carte mémoire par défaut : %c" @@ -5338,7 +5560,7 @@ msgstr "" "SetARCode_IsActive : L'index est plus grand que la taille de la liste des " "codes AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Configurer..." @@ -5350,7 +5572,7 @@ msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" msgid "Shake" msgstr "Secouement" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Nom court :" @@ -5378,7 +5600,7 @@ msgstr "Afficher la barre d'&outils" msgid "Show Drives" msgstr "Afficher les lecteurs" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Afficher les régions copiées d'EFB" @@ -5394,7 +5616,7 @@ msgstr "Afficher France" msgid "Show GameCube" msgstr "Afficher GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Afficher le graphisme en entrée" @@ -5410,7 +5632,7 @@ msgstr "Afficher Japon" msgid "Show Korea" msgstr "Afficher Corée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Afficher la langue :" @@ -5430,7 +5652,7 @@ msgstr "Afficher les plateformes" msgid "Show Regions" msgstr "Afficher les régions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Afficher les statistiques" @@ -5450,11 +5672,11 @@ msgstr "Afficher WAD" msgid "Show Wii" msgstr "Afficher Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Demande confirmation avant d'arrêter le jeu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -5465,23 +5687,23 @@ msgstr "" "mais cela peut aussi signifier que Dolphin plante soudainement sans aucune " "explication." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Afficher le premier bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Afficher les blocs de sauvegarde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Afficher le commentaire de sauvegarde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Afficher l'icône de la sauvegarde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Afficher le titre de sauvegarde" @@ -5519,7 +5741,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote à l'horizontale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Chinois simplifié" @@ -5527,11 +5749,11 @@ msgstr "Chinois simplifié" msgid "Size" msgstr "Taille" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Ne pas exécuter le BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Ignorer Passe Alpha de dest." @@ -5606,11 +5828,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5635,7 +5857,7 @@ msgstr "" "Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez " "'Non'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Paramètres audio" @@ -5656,6 +5878,7 @@ msgstr "Espace" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 @@ -5674,6 +5897,11 @@ msgstr "Espace" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espagnol" @@ -5705,7 +5933,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Sélectionner une interface pour les graphismes" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Accélerer le taux de transfert du disque" @@ -5713,7 +5941,7 @@ msgstr "Accélerer le taux de transfert du disque" msgid "Square Stick" msgstr "Stick carré" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Contrôleur standard" @@ -5818,12 +6046,12 @@ msgstr "Fichiers de sauvegarde importés avec succès" msgid "Swing" msgstr "Balancement" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Langue du système :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "Taïwan" @@ -5860,7 +6088,7 @@ msgstr "Table Droite" msgid "Take Screenshot" msgstr "Capture d'écran" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5891,7 +6119,7 @@ msgstr "Texture" msgid "Texture Cache" msgstr "Cache de texture" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Infos de format de texture" @@ -5907,13 +6135,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 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:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5936,7 +6164,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Le fichier %s a déjà été ouvert, son entête n'a pas pu être écrite." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Le fichier que vous avez spécifié (%s) n'existe pas" @@ -5954,11 +6182,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Le code AR décrypté ne contient aucune ligne." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "Plus vous allez vers Sûr, moins l'émulateur manquera les mises à jour de " "texture depuis la RAM.\n" @@ -6003,7 +6232,7 @@ 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:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Thème" @@ -6011,7 +6240,7 @@ msgstr "Thème" msgid "Theme selection went wrong" msgstr "La sélection du thème a rencontré un problème" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -6019,7 +6248,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:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -6035,7 +6264,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:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Ceci peut ralentir le Menu Wii et quelques jeux." @@ -6059,26 +6288,10 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Ceci est utiliser pour contrôler la vitesse du jeu par la constance du son.\n" -"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple " -"trop rapide.\n" -"Mais il se peut parfois qu'activer cette option produise un bruit constant.\n" -"\n" -"Raccourci clavier : Appuyer pour instantanément désactiver cette " -"option." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Ceci est utilisé pour lire les pistes de musique, comme les BGM." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -6091,7 +6304,7 @@ msgstr "" "qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou " "des plantages." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" "Ceci vous permettra de modifier manuellement le fichier de configuration INI" @@ -6115,7 +6328,7 @@ msgstr "Titre" msgid "To" msgstr "A" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Activer tous les types de journaux" @@ -6139,6 +6352,7 @@ msgstr "Activer le plein écran" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -6149,14 +6363,17 @@ msgstr "Activer le plein écran" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Haut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chinois traditionnel" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Echec de chargement d'un type de fichier inconnu." @@ -6164,7 +6381,7 @@ msgstr "Echec de chargement d'un type de fichier inconnu." msgid "Triggers" msgstr "Déclencheurs" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Essai de lecture d'un fichier SYSCONF non valide" @@ -6176,7 +6393,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:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turque" @@ -6197,11 +6414,11 @@ msgstr "Port UDP :" msgid "UDP Wiimote" msgstr "Wiimote UDP :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "Inconnu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -6301,7 +6518,7 @@ msgstr "Mettre à jour" msgid "Upright Wiimote" msgstr "Wiimote debout" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utiliser le mode EuRGB60 (PAL60)" @@ -6313,7 +6530,7 @@ msgstr "&Plein écran" msgid "Use Hex" msgstr "Utiliser Hexa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Utiliser les gestionnaires de panique" @@ -6345,7 +6562,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Utilitaires" @@ -6369,25 +6586,29 @@ msgstr "Valeur" msgid "Verbosity" msgstr "Verbosité" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Vidéo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtuel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, 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:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Echec de l'installation du WAD : erreur lors de la création de %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -6406,15 +6627,15 @@ msgstr "" msgid "Warning" msgstr "Attention" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Attention : démarrage du DOL dans un mauvais mode de console !" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Attention : démarrage de l'ELF dans un mauvais mode de console !" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Attention : démarrage d\" l'ISO dans un mauvais mode de console !" @@ -6444,11 +6665,15 @@ msgstr "" "et vont avoir le même nom que le fichier sur votre carte mémoire\n" "Continuer ?" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:629 +======= +#: Source/Core/Core/Src/Movie.cpp:667 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -6456,7 +6681,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -6464,7 +6689,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -6497,7 +6722,7 @@ msgstr "WaveFileWriter - fichier non ouvert." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack écran large (16/9è)" @@ -6505,15 +6730,15 @@ msgstr "Hack écran large (16/9è)" msgid "Width" msgstr "Largeur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Racine de la NAND (Wii) :" @@ -6524,6 +6749,7 @@ msgstr "Importer une sauvegarde Wii" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 @@ -6534,6 +6760,9 @@ msgstr "Importer une sauvegarde Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -6604,13 +6833,14 @@ msgstr "Windows Menu" msgid "Windows Right" msgstr "Windows Droit" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Casse" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 @@ -6629,6 +6859,11 @@ msgstr "Casse" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Travail..." @@ -6636,6 +6871,11 @@ msgstr "Travail..." msgid "Write to Console" msgstr "Ecrire dans la console" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Ecrire dans le fichier" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Ecrire dans le fichier" @@ -6692,7 +6932,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 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." @@ -6715,7 +6955,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:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6786,7 +7026,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6819,12 +7059,12 @@ msgstr "" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "Commande inconnue 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute a retourné -1 sur l'exécution de l'application !" @@ -7038,6 +7278,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Paramètres graphiques de l'émulateur" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Activer le contrôle audio" + #~ msgid "Enable CPU Access" #~ msgstr "Activer l'accès CPU" @@ -7385,6 +7628,23 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "Le fichier " +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Ceci est utiliser pour contrôler la vitesse du jeu par la constance du " +#~ "son.\n" +#~ "Désactiver cette option peut causer une vitesse anormale du jeu, par " +#~ "exemple trop rapide.\n" +#~ "Mais il se peut parfois qu'activer cette option produise un bruit " +#~ "constant.\n" +#~ "\n" +#~ "Raccourci clavier : Appuyer pour instantanément désactiver cette " +#~ "option." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "" #~ "Ceci est habituellement utilisé pour lire la voix et les effets sonores." diff --git a/Languages/po/he.po b/Languages/po/he.po index ea10f8cea4..51453ebfe0 100644 --- a/Languages/po/he.po +++ b/Languages/po/he.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-08 20:50+0200\n" "Last-Translator: Ely \n" "Language-Team: \n" @@ -55,9 +59,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sהעתק%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -142,7 +146,7 @@ msgstr "" msgid "%sImport GCI%s" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, fuzzy, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%d ×‘×œ×•×§×™× ×—×•×¤×©×™×™×; %d רשומות תיקייה חופשיות" @@ -175,11 +179,11 @@ msgstr "" msgid "&DSP Settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "" @@ -244,7 +248,7 @@ msgstr "" msgid "&Play" msgstr "&שחק" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "" @@ -288,7 +292,7 @@ msgstr "" msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -332,7 +336,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -341,7 +345,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -380,13 +384,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -398,11 +402,11 @@ msgstr "" msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" @@ -502,11 +506,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "" @@ -514,6 +518,7 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -529,6 +534,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "" @@ -562,11 +572,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "" @@ -574,14 +584,15 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -594,18 +605,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "" @@ -617,7 +632,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "" @@ -637,7 +652,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" @@ -652,7 +667,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -661,16 +676,17 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -680,6 +696,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -688,18 +707,20 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -709,6 +730,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -744,7 +768,7 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 #, fuzzy msgid "Backend Settings" msgstr "הגדרות קול" @@ -772,11 +796,11 @@ msgstr "" msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "" @@ -788,7 +812,7 @@ msgstr "" msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "" @@ -819,6 +843,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -826,6 +851,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "" @@ -834,7 +862,7 @@ msgstr "" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "" @@ -850,7 +878,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "" @@ -880,11 +908,11 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "" @@ -923,7 +951,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -931,7 +959,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -947,8 +975,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -958,7 +984,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -983,7 +1009,7 @@ msgstr "" msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -997,8 +1023,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" @@ -1018,31 +1044,31 @@ msgstr "" msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "" @@ -1050,14 +1076,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "" @@ -1069,14 +1095,14 @@ msgstr "" msgid "Classic" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "" @@ -1090,6 +1116,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1098,6 +1125,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "" @@ -1121,20 +1152,20 @@ msgstr "" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "" @@ -1161,13 +1192,13 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "" @@ -1176,7 +1207,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "" @@ -1233,12 +1264,12 @@ msgstr "" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "" @@ -1265,7 +1296,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "" @@ -1276,7 +1307,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1285,7 +1316,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1300,7 +1331,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "" @@ -1314,24 +1345,24 @@ msgstr "" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "" @@ -1339,7 +1370,7 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "" @@ -1359,7 +1390,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "" @@ -1367,11 +1398,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" @@ -1383,10 +1414,11 @@ msgstr "" msgid "DSP" msgstr "קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1397,18 +1429,22 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" @@ -1416,15 +1452,23 @@ msgstr "" msgid "DSP settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "" @@ -1445,7 +1489,7 @@ msgstr "" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "" @@ -1453,16 +1497,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "" @@ -1470,11 +1514,11 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "" @@ -1483,7 +1527,7 @@ msgstr "" msgid "Delete" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "" @@ -1492,7 +1536,7 @@ msgstr "" msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "" @@ -1500,8 +1544,8 @@ msgstr "" msgid "Detect" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1512,8 +1556,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "" @@ -1536,23 +1580,23 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "" @@ -1582,7 +1626,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "" @@ -1606,6 +1650,7 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1615,10 +1660,13 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "" @@ -1643,6 +1691,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1652,10 +1701,14 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Dolphin GCPad Configuration" msgstr "הגדרות גרפיקה" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 @@ -1668,6 +1721,10 @@ msgstr "הגדרות גרפיקה" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1696,11 +1753,11 @@ msgstr "" msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1709,23 +1766,23 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "" @@ -1750,6 +1807,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1765,6 +1823,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1785,7 +1848,7 @@ msgid "" "driver." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "" @@ -1801,7 +1864,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1813,8 +1876,8 @@ msgstr "" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "" @@ -1853,7 +1916,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "" @@ -1875,23 +1938,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1904,6 +1967,7 @@ msgstr "" msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1913,51 +1977,54 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "" @@ -1970,13 +2037,13 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "" @@ -1996,20 +2063,20 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "" @@ -2021,7 +2088,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2038,6 +2105,7 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2053,6 +2121,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2083,6 +2156,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -2113,18 +2187,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2156,7 +2236,7 @@ msgstr "" msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "" @@ -2169,15 +2249,15 @@ msgstr "" msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "" @@ -2193,7 +2273,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "" @@ -2205,44 +2285,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "" @@ -2254,11 +2334,11 @@ msgstr "" msgid "FIFO Player" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "" @@ -2270,11 +2350,11 @@ msgstr "" msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2370,18 +2450,28 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "" +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "" @@ -2390,7 +2480,7 @@ msgstr "" msgid "File Info" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "" @@ -2419,16 +2509,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2436,7 +2526,7 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "" @@ -2448,7 +2538,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" @@ -2472,7 +2562,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2503,7 +2593,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "" @@ -2515,7 +2605,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" @@ -2523,10 +2613,11 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2542,6 +2633,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2576,7 +2672,7 @@ msgstr "הגדרות גרפיקה" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "" @@ -2592,15 +2688,15 @@ msgstr "" msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "" @@ -2612,6 +2708,7 @@ msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2619,6 +2716,9 @@ msgstr "הגדרות קול" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2627,21 +2727,24 @@ msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" -#: Source/Core/Core/Src/GeckoCode.cpp:139 +#: Source/Core/Core/Src/GeckoCode.cpp:222 #, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2650,6 +2753,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2659,6 +2765,7 @@ msgstr "" msgid "General Settings" msgstr "הגדרות קול" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2674,6 +2781,11 @@ msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "" @@ -2705,7 +2817,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "" @@ -2737,7 +2849,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2791,6 +2903,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 @@ -2799,10 +2912,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "" @@ -2810,12 +2926,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2824,11 +2940,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2844,15 +2960,15 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "" @@ -2860,21 +2976,22 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 @@ -2899,7 +3016,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "" @@ -2938,7 +3055,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "" @@ -2947,7 +3064,7 @@ msgid "In-Game" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "" @@ -2967,7 +3084,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "" @@ -2979,7 +3096,7 @@ msgstr "" msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "" @@ -2988,6 +3105,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -2997,14 +3115,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "" @@ -3027,11 +3148,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "" @@ -3048,7 +3169,7 @@ msgstr "" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "" @@ -3065,14 +3186,15 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3088,27 +3210,32 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "" @@ -3117,8 +3244,8 @@ msgstr "" msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "" @@ -3136,7 +3263,7 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "" @@ -3182,7 +3309,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3190,7 +3317,7 @@ msgstr "" msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "" @@ -3238,6 +3365,7 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3259,6 +3387,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3282,7 +3417,7 @@ msgstr "" msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3295,11 +3430,11 @@ msgstr "" msgid "Log Configuration" msgstr "הגדרות גרפיקה" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" @@ -3327,7 +3462,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3349,11 +3484,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "" @@ -3377,6 +3512,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3384,6 +3520,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3412,7 +3551,7 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "" @@ -3421,11 +3560,11 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "" @@ -3442,7 +3581,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "" @@ -3455,7 +3594,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3470,7 +3609,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3560,6 +3699,7 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3569,6 +3709,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3577,7 +3720,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "" @@ -3591,7 +3734,7 @@ msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "" @@ -3603,7 +3746,7 @@ msgstr "" msgid "Nickname :" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "" @@ -3642,7 +3785,7 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" @@ -3650,8 +3793,8 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "" @@ -3671,7 +3814,7 @@ msgstr "" msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "" @@ -3709,7 +3852,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "" @@ -3735,11 +3878,11 @@ msgstr "" msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "" @@ -3761,11 +3904,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3794,7 +3937,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -3844,19 +3987,20 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -3869,6 +4013,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3877,7 +4025,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "" @@ -3890,6 +4038,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -3900,6 +4049,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "" @@ -3913,7 +4066,7 @@ msgstr "" msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "" @@ -3925,6 +4078,7 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -3934,6 +4088,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3945,23 +4102,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "" @@ -3970,11 +4127,11 @@ msgstr "" msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "" @@ -3982,17 +4139,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4005,7 +4162,7 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "" @@ -4056,7 +4213,7 @@ msgstr "" msgid "RAM" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "" @@ -4069,7 +4226,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "" @@ -4139,6 +4296,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4157,6 +4315,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4206,11 +4370,11 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "" @@ -4218,10 +4382,11 @@ msgstr "" msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4231,6 +4396,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4288,12 +4456,12 @@ msgstr "" msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "" @@ -4301,11 +4469,11 @@ msgstr "" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4314,6 +4482,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4323,15 +4492,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "" @@ -4347,12 +4519,12 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "" @@ -4362,6 +4534,7 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4386,6 +4559,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4408,16 +4589,21 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4437,6 +4623,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4451,7 +4640,7 @@ msgid "" "If unsure, select Auto." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "" @@ -4487,11 +4676,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4500,11 +4689,11 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4514,7 +4703,7 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 #, fuzzy msgid "Settings..." msgstr "הגדרות קול" @@ -4527,7 +4716,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "" @@ -4555,7 +4744,7 @@ msgstr "" msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "" @@ -4571,7 +4760,7 @@ msgstr "" msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "" @@ -4587,7 +4776,7 @@ msgstr "" msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "" @@ -4608,7 +4797,7 @@ msgstr "" msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "" @@ -4628,34 +4817,34 @@ msgstr "" msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "" @@ -4686,7 +4875,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "" @@ -4694,11 +4883,11 @@ msgstr "" msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4730,11 +4919,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "" @@ -4754,7 +4943,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "" @@ -4772,6 +4961,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -4787,6 +4977,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -4810,7 +5005,7 @@ msgstr "" msgid "Specify a video backend" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4818,7 +5013,7 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -4911,12 +5106,12 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "" @@ -4955,7 +5150,7 @@ msgstr "" msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -4971,7 +5166,7 @@ msgstr "" msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "" @@ -4987,13 +5182,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, fuzzy, c-format msgid "" "The file %s already exists.\n" @@ -5012,7 +5207,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -5034,7 +5229,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5072,7 +5267,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" @@ -5080,13 +5275,13 @@ msgstr "" msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5098,7 +5293,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -5114,19 +5309,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5134,7 +5320,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -5157,7 +5343,7 @@ msgstr "" msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "" @@ -5177,6 +5363,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5184,14 +5371,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "" @@ -5199,7 +5389,7 @@ msgstr "" msgid "Triggers" msgstr "" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "" @@ -5209,7 +5399,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "" @@ -5230,11 +5420,11 @@ msgstr "" msgid "UDP Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "" @@ -5312,7 +5502,7 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5325,7 +5515,7 @@ msgstr "&מסך מל×" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" @@ -5346,7 +5536,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "" @@ -5370,25 +5560,28 @@ msgstr "" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +msgid "WAD installation failed: error creating ticket" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5403,15 +5596,15 @@ msgstr "" msgid "Warning" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "" @@ -5432,7 +5625,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5440,7 +5633,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5448,7 +5641,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5476,7 +5669,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "" @@ -5484,15 +5677,15 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "" @@ -5500,6 +5693,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5509,6 +5703,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5571,10 +5768,11 @@ msgstr "" msgid "Windows Right" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5590,6 +5788,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "" @@ -5597,6 +5800,10 @@ msgstr "" msgid "Write to Console" msgstr "" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +msgid "Write to Debugger" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "" @@ -5650,7 +5857,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5668,7 +5875,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "" @@ -5722,7 +5929,7 @@ msgstr "" msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5753,12 +5960,12 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index 7bdf045357..fb426b13e9 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:41-0600\n" ======= @@ -25,6 +26,9 @@ msgstr "" "PO-Revision-Date: 2011-12-27 08:22-0600\n" >>>>>>> Update from master branch. ======= +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-28 09:44+0100\n" >>>>>>> Update Hungarian translation. "Last-Translator: Delirious \n" @@ -68,9 +72,9 @@ msgstr "\"%s\" egy érvénytelen GCM/ISO fájl, vagy nem GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sMásolás%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -132,7 +136,8 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s memóriakártyakénti betöltése sikertelen\n" -"a fájl nem elég nagy ahhoz, hogy megfelelÅ‘ memóriakártya fájl lehessen (0x%x bájt)" +"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:367 #, c-format @@ -180,7 +185,7 @@ msgstr "%sGCI exportálás%s" msgid "%sImport GCI%s" msgstr "%sGCI importálás%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u szabad blokk; %u szabad könyvtár bejegyzés" @@ -213,11 +218,11 @@ msgstr "&Csalás kezelÅ‘" msgid "&DSP Settings" msgstr "&Hang beállítások" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&ISO törlése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&A kiválasztott ISO fájlok törlése..." @@ -281,7 +286,7 @@ msgstr "&Szünet" msgid "&Play" msgstr "&Indítás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Tulajdonságok" @@ -325,7 +330,7 @@ msgstr "&Nézet" msgid "&Wiimote Settings" msgstr "&Wiimote beállítások" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -369,7 +374,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -378,7 +383,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -404,11 +409,13 @@ msgstr "" msgid "" "ALERT:\n" "\n" -"NetPlay will currently only work properly when using the following settings:\n" +"NetPlay will currently only work properly when using the following " +"settings:\n" " - Dual Core [OFF]\n" " - Audio Throttle [OFF]\n" " - DSP-HLE with \"Null Audio\" or DSP-LLE\n" -" - Manually set the exact number of controllers that will be used to [Standard Controller]\n" +" - Manually set the exact number of controllers that will be used to " +"[Standard Controller]\n" "\n" "All players should try to use the same Dolphin version and settings.\n" "Disable all memory cards or send them to all players before starting.\n" @@ -418,25 +425,28 @@ msgid "" msgstr "" "FIGYELEM:\n" "\n" -"A NetPlay jelenleg csak a következÅ‘ beállítások használatával működik megfelelÅ‘en:\n" +"A NetPlay jelenleg csak a következÅ‘ beállítások használatával működik " +"megfelelÅ‘en:\n" " - Dual Core [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" +" - 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" +"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:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM alaplap" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR kódok" @@ -448,11 +458,11 @@ msgstr "A Dolphin névjegye" msgid "Acceleration" msgstr "Gyorsítás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Pontosság:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Pontos VBeam emuláció" @@ -466,12 +476,14 @@ msgstr "Pontos VBeam emuláció" >>>>>>> Update Hungarian and Turkish translations. msgid "" "Accurately emulate EFB copies.\n" -"Some games depend on this for certain graphical effects or gameplay functionality.\n" +"Some games depend on this for certain graphical effects or gameplay " +"functionality.\n" "\n" "If unsure, check EFB to Texture instead." msgstr "" "EFB másolatok pontos emulációja.\n" -"Néhány játék számára elengedhetetlen bizonyos grafikai effektushoz vagy a játszhatóság végett.\n" +"Néhány játék számára elengedhetetlen bizonyos grafikai effektushoz vagy a " +"játszhatóság végett.\n" "\n" "Ha bizonytalan vagy, válaszd az EFB textúrába másolása lehetÅ‘séget." @@ -497,23 +509,38 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kód hozzáadásban (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "" +"Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kód " +"hozzáadásban (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:756 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" -msgstr "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kitöltésben és regiszterben (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " +"(%s)" +msgstr "" +"Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kitöltésben " +"és regiszterben (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:549 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" -msgstr "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a RAM írásban és kitöltésben (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " +"Fill (%s)" +msgstr "" +"Action Replay hiba: érvénytelen méret (%08x : address = %08x) a RAM írásban " +"és kitöltésben (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:609 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" -msgstr "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a mutató írásában (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " +"Pointer (%s)" +msgstr "" +"Action Replay hiba: érvénytelen méret (%08x : address = %08x) a mutató " +"írásában (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -522,7 +549,8 @@ msgstr "Action Replay hiba: érvénytelen érték (%08x) a memória másolásban #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgid "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" msgstr "Action Replay hiba: Mester kód és CCXXXXXX írása nincs beépítve (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -559,11 +587,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Hozzáadás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "ActionReplay kód hozzáadása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Patch hozzáadása" @@ -571,6 +599,7 @@ msgstr "Patch hozzáadása" msgid "Add new pane" msgstr "Új mezÅ‘ hozzáadása" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -586,6 +615,11 @@ msgstr "Új mezÅ‘ hozzáadása" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Hozzáadás..." @@ -597,14 +631,16 @@ msgstr "Cím:" msgid "" "Adds the specified value to zFar Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " +"the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" "Meghatározott értéket ad a zFar paraméterhez.\n" "Két módja a lebegÅ‘pontos értékek kifejezésének.\n" -"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" +"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos " +"hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" "Értékek: (0->+/-egész szám) vagy (0->+/-FP[6 számjegyes pontosság])\n" "\n" "MEGJEGYZÉS: EllenÅ‘rizd a napló ablakot/konzolt a kapott értékekhez." @@ -613,27 +649,31 @@ msgstr "" msgid "" "Adds the specified value to zNear Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " +"the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" "Meghatározott értéket ad a zNear paraméterhez.\n" "Két módja a lebegÅ‘pontos értékek kifejezésének.\n" -"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" +"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos " +"hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" "Értékek: (0->+/-egész szám) vagy (0->+/-FP[6 számjegyes pontosság])\n" "\n" "MEGJEGYZÉS: EllenÅ‘rizd a napló ablakot/konzolt a kapott értékekhez." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "Az analóg irányító gombok aktiválásához szükséges lenyomás érzékenységének beállítása." +msgstr "" +"Az analóg irányító gombok aktiválásához szükséges lenyomás érzékenységének " +"beállítása." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Haladó" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Haladó beállítások" @@ -641,14 +681,15 @@ msgstr "Haladó beállítások" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Minden GC/Wii fájl (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Minden GC/Wii képfájl (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Minden Gamecube GCM fájl (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -661,31 +702,38 @@ msgstr "Minden Gamecube GCM fájl (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Minden Wii ISO fájl (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 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:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Minden fájl (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Bizonyos opciók elérhetÅ‘vé válnak a 3, 4, 5, 6 és 7 gyorsbillentyűkkel az emulációs ablakon belül.\n" +"Bizonyos opciók elérhetÅ‘vé válnak a 3, 4, 5, 6 és 7 gyorsbillentyűkkel az " +"emulációs ablakon belül.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD <<<<<<< HEAD @@ -697,6 +745,9 @@ msgid "Alternate Wiimote Timing" msgstr "Emulált Wiimote" >>>>>>> Update translation files for recent changes in the code. ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Változtatható Wiimote idÅ‘zítés" >>>>>>> Update Hungarian and Turkish translations. @@ -711,13 +762,14 @@ msgstr "Élsimítás:" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:317 msgid "Apploader is the wrong size...is it really an apploader?" -msgstr "A betöltÅ‘ program nem megfelelÅ‘ méretű...ez tényleg egy betöltÅ‘ program?" +msgstr "" +"A betöltÅ‘ program nem megfelelÅ‘ méretű...ez tényleg egy betöltÅ‘ program?" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:311 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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "BetöltÅ‘ program:" @@ -735,7 +787,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: (ki)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arab" @@ -744,7 +796,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -752,10 +804,11 @@ msgstr "" "Biztos törlöd ezeket a fájlokat?\n" "Végleg el fognak veszni!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -765,6 +818,9 @@ msgstr "Biztos törlöd ezt a fájlt? Végleg el fog veszni!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -773,18 +829,20 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Hang" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Hang feldolgozó:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -794,6 +852,9 @@ msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatikus" @@ -827,8 +888,10 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Automatikusan létrehozza a mipmapeket, inkább mintsem kikódolná azokat a memóriából.\n" -"Egy keveset növel a teljesítményen, de kisebb textúra hiányosságokat okozhat.\n" +"Automatikusan létrehozza a mipmapeket, inkább mintsem kikódolná azokat a " +"memóriából.\n" +"Egy keveset növel a teljesítményen, de kisebb textúra hiányosságokat " +"okozhat.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -836,7 +899,7 @@ msgstr "" msgid "Back" msgstr "Hátra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Hang feldolgozó beállításai" @@ -863,11 +926,11 @@ msgstr "Rossz fájl fejléc" msgid "Banner" msgstr "Játék kép" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Játék kép részletek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Játék kép:" @@ -879,7 +942,7 @@ msgstr "VevÅ‘" msgid "Basic" msgstr "Alap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Alap beállítások" @@ -910,6 +973,7 @@ msgstr "Kék jobbra" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -917,6 +981,9 @@ msgstr "Kék jobbra" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Gomb" @@ -925,7 +992,7 @@ msgstr "Gomb" msgid "Bound Controls: %lu" msgstr "Összekötött irányítások: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Hibás" @@ -941,7 +1008,7 @@ msgstr "Hozzáadandó könyvtár tallózása" msgid "Browse for an ISO directory..." msgstr "Egy ISO könyvtár tallózása..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Kimeneti könyvtár tallózása" @@ -971,23 +1038,28 @@ msgstr "C kar" msgid "C-Stick" msgstr "C-kar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Processzor emulátor motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "KijelzÅ‘ listák gyorsítótárazása" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel depth calculations are necessary to properly emulate a small number of games.\n" +"In contrast to pixel lighting (which is merely an enhancement), per-pixel " +"depth calculations are necessary to properly emulate a small number of " +"games.\n" "\n" "If unsure, leave this checked." msgstr "" -"A 3D-s grafika mélységének értékét képpont alapon számolja inkább, mintsem csúcspont alapon.\n" -"Ellentétben a képpont megvilágítással (ami pusztán egy finomítás), a képpont alapú mélység számítás csupán csak néhány játék pontos emulálásához szükséges.\n" +"A 3D-s grafika mélységének értékét képpont alapon számolja inkább, mintsem " +"csúcspont alapon.\n" +"Ellentétben a képpont megvilágítással (ami pusztán egy finomítás), a képpont " +"alapú mélység számítás csupán csak néhány játék pontos emulálásához " +"szükséges.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -999,7 +1071,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"A 3D-s grafikai fényhatásokat képpont alapon számolja inkább, mintsem csúcspont alapon.\n" +"A 3D-s grafikai fényhatásokat képpont alapon számolja inkább, mintsem " +"csúcspont alapon.\n" "Néhány százalékkal csökkenti az emuláció sebességét (videókártyától függ).\n" "Ez többnyire biztonságos finomítás, de idÅ‘nként hibákat okozhat.\n" "\n" @@ -1031,6 +1104,7 @@ msgstr "A mozgások rögzítése nem lehetséges írásvédett módban." msgid "Cannot unregister events with events pending" msgstr "Nem lehet esemény bejegyzéseket törölni függÅ‘ben lévÅ‘ eseményekkel" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 @@ -1040,6 +1114,9 @@ msgstr "Nem lehet esemény bejegyzéseket törölni függÅ‘ben lévÅ‘ események ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1050,7 +1127,7 @@ msgstr "" "%s\n" "fájl nem megfelelÅ‘ GameCube memóriakártya fájl" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1068,8 +1145,6 @@ msgstr "Nem található WiiMote bd szerint: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Nem található WiiMote %02x csatlakozás kezelÅ‘ szerint" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1079,7 +1154,7 @@ msgstr "Sikertelen beolvasás a DVD_Plugin - DVD-felületbÅ‘l: végzetes hiba" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Katalán" @@ -1104,7 +1179,7 @@ msgstr "Lemez váltás" msgid "Change Game" msgstr "Játék váltás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1120,8 +1195,8 @@ 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 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 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!" @@ -1141,31 +1216,31 @@ msgstr "Csalás keresés" msgid "Cheats Manager" msgstr "Csalás kezelÅ‘" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Kínai (egyszerűsített)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Kínai (hagyományos)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Válassz DVD gyökér könyvtárat:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Válassz NAND gyökér könyvtárat:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Válassz alapértelmezett ISO fájlt:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Válassz hozzáadandó könyvtárat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Válasz megnyitandó fájl" @@ -1173,12 +1248,16 @@ msgstr "Válasz megnyitandó fájl" msgid "Choose a memory card:" msgstr "Válassz memóriakártyát:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" -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/ConfigMain.cpp:757 +msgid "" +"Choose file to use as apploader: (applies to discs constructed from " +"directories only)" +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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Válassz mappát a kitömörítéshez" @@ -1190,25 +1269,30 @@ msgstr "Körös kar" msgid "Classic" msgstr "Klasszikus" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Törlés" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Törlés sikertelen." #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." -msgstr "A kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. Kézileg kell leállítanod a játékot." +msgid "" +"Client disconnect while game is running!! NetPlay is disabled. You must " +"manually stop the game." +msgstr "" +"A kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. Kézileg " +"kell leállítanod a játékot." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1217,6 +1301,10 @@ msgstr "A kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. K #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Bezárás" @@ -1240,20 +1328,20 @@ msgstr "Parancs" msgid "Comment" msgstr "Megjegyzés" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Megjegyzés:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "ISO tömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Kiválasztott ISO tömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "ISO tömörítése" @@ -1280,13 +1368,13 @@ msgstr "Irányítók beállítása" msgid "Configure..." msgstr "Beállítások..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Fájl felülírás jóváhagyása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Kilépéskor megerÅ‘sítés" @@ -1295,7 +1383,7 @@ msgstr "Kilépéskor megerÅ‘sítés" msgid "Connect" msgstr "Csatlakozás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USB billentyűzet csatlakoztatása" @@ -1352,12 +1440,12 @@ msgstr "Konvertálás: GCI" msgid "Copy failed" msgstr "Másolás sikertelen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "%c. memóriakártyára másolás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Mag" @@ -1373,15 +1461,21 @@ msgstr "%s hang feldolgozó iniciálása sikertelen." #: 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 backup. Please note that original Gamecube and Wii discs cannot be read by most PC DVD drives." -msgstr "\"%s\" nem olvasható. Nincs lemez a meghajtóban, vagy ez nem egy GC/Wii 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." +msgid "" +"Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " +"backup. Please note that original Gamecube and Wii discs cannot be read by " +"most PC DVD drives." +msgstr "" +"\"%s\" nem olvasható. Nincs lemez a meghajtóban, vagy ez nem egy GC/Wii " +"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:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "%s ISO fájl nem ismerhetÅ‘ fel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "%s nem menthetÅ‘ el" @@ -1394,18 +1488,19 @@ 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 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" "\n" -"Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?" +"Are you running Dolphin from a CD/DVD, or is the save file maybe write " +"protected?" msgstr "" "%s memóriakártya fájl nem írható.\n" "\n" "CD/DVD lemezrÅ‘l futtatod a Dolphin emulátort, vagy a mentési fájl írásvédett?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Az 'ini' kiterjesztéshez nem található nyitott parancs!" @@ -1422,7 +1517,7 @@ msgstr "" msgid "Count:" msgstr "Számláló:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Ország:" @@ -1436,23 +1531,26 @@ msgstr "AR kód létrehozása" msgid "Create new perspective" msgstr "Új perspektíva készítése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Készítette: KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "Készítette: Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +msgid "" +"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +msgstr "" +"Készítette: Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Készítette: VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "Készítette: black_rider és közzétette ForumW.org > Web Developments oldalon" +msgstr "" +"Készítette: black_rider és közzétette ForumW.org > Web Developments oldalon" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "KészítÅ‘:" @@ -1460,7 +1558,7 @@ msgstr "KészítÅ‘:" msgid "Critical" msgstr "Kritikus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Levágás" @@ -1483,7 +1581,7 @@ msgstr "Kereszthalkítás" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Ez a könyvtár megváltozott errÅ‘l: %s erre: %s a wxFileSelector után!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Egyedi megjelenítési hack" @@ -1491,11 +1589,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:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 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:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Cseh" @@ -1507,10 +1605,11 @@ msgstr "Digitális irányok" msgid "DSP" msgstr "Hang" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSP emulátor motor" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1521,18 +1620,22 @@ msgstr "DSP emulátor motor" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emuláció (gyors)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (lassú)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE folyamatágon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" @@ -1540,15 +1643,23 @@ msgstr "DSP LLE recompiler" msgid "DSP settings" msgstr "Hang (DSP) beállítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD gyökér könyvtár:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Adatok mérete" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Dátum:" @@ -1569,7 +1680,7 @@ msgstr "Holtsáv" msgid "Debug" msgstr "HibakeresÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Hibakeresés" @@ -1577,16 +1688,16 @@ msgstr "Hibakeresés" msgid "Decimal" msgstr "Decimális" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "ISO kitömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "A kiválasztott ISO fájlok kitömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "ISO kitömörítés" @@ -1594,11 +1705,11 @@ msgstr "ISO kitömörítés" msgid "Default" msgstr "Alap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Alapértelmezett ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Alap betűtípus" @@ -1607,7 +1718,7 @@ msgstr "Alap betűtípus" msgid "Delete" msgstr "Törlés" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Mentés törlése" @@ -1616,7 +1727,7 @@ msgstr "Mentés törlése" msgid "Delete the existing file '%s'?" msgstr "Törlöd a meglévÅ‘ '%s' fájlt?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Leírás" @@ -1624,18 +1735,22 @@ msgstr "Leírás" msgid "Detect" msgstr "Észlelés" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." -msgstr "A kimeneti puffernél nagyobb adamennyiség kiolvasására történÅ‘ probálkozás észlelve a DVD lemezrÅ‘l. Beszabályozás." +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 +msgid "" +"Detected attempt to read more data from the DVD than fit inside the out " +"buffer. Clamp." +msgstr "" +"A kimeneti puffernél nagyobb adamennyiség kiolvasására történÅ‘ probálkozás " +"észlelve a DVD lemezrÅ‘l. Beszabályozás." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 msgid "Device" msgstr "Eszköz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Eszköz beállítások" @@ -1660,47 +1775,55 @@ msgstr "" " és a könyvtár biztonsági mentés ellenÅ‘rzÅ‘ összeg hibás" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Kikapcsolás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Köd kikapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Fényhatások kikapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Képpont mélység kikapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Textúrák kikapcsolása" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" -"Speeds up emulation a lot but causes heavy glitches in many games which rely on them (especially homebrew applications).\n" +"Speeds up emulation a lot but causes heavy glitches in many games which rely " +"on them (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Bármilyen XFB emuláció kikapcsolása.\n" -"Nagymértékben gyorsítja az emulációt, de számos grafikai hibát okoz sok olyan játékban, amelyhez szükséges az XFB (fÅ‘leg egyedi fejlesztésű alkalmazások).\n" +"Nagymértékben gyorsítja az emulációt, de számos grafikai hibát okoz sok " +"olyan játékban, amelyhez szükséges az XFB (fÅ‘leg egyedi fejlesztésű " +"alkalmazások).\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" -"These are often used for post-processing or render-to-texture effects, so while checking this setting gives a great speedup it almost always also causes issues.\n" +"These are often used for post-processing or render-to-texture effects, so " +"while checking this setting gives a great speedup it almost always also " +"causes issues.\n" "\n" "If unsure, leave this unchecked." msgstr "" "EFB másolatok emulációjának kikapcsolása.\n" -"A másolatok gyakran használatosak utófeldolgozáshoz vagy textúra megjelenítési effektusokhoz, ezért ennek a beállításnak a kijelölésével nagymértékű sebesség növekedés érhetÅ‘ el, azonban majdnem mindig hibákat is okoz.\n" +"A másolatok gyakran használatosak utófeldolgozáshoz vagy textúra " +"megjelenítési effektusokhoz, ezért ennek a beállításnak a kijelölésével " +"nagymértékű sebesség növekedés érhetÅ‘ el, azonban majdnem mindig hibákat is " +"okoz.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -1714,7 +1837,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Lemez" @@ -1741,6 +1864,7 @@ msgstr "" msgid "Divide" msgstr "Megosztás" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1750,10 +1874,13 @@ msgstr "Megosztás" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. 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/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1778,6 +1905,7 @@ msgstr "Dolphin emulált Wiimote beállítások" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1802,6 +1930,14 @@ msgstr "Dolphin GCPad beállítások" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad beállítások" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" @@ -1814,23 +1950,31 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin &Google Code oldal" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." -msgstr "Dolphin nem talált egyetlen GC/Wii ISO fájlt sem. Fájlok tallózásához dupla kattintás ide..." +msgid "" +"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " +"files..." +msgstr "" +"Dolphin nem talált egyetlen GC/Wii ISO fájlt sem. Fájlok tallózásához dupla " +"kattintás ide..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." -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..." +msgid "" +"Dolphin is currently set to hide all games. Doubleclick here to show all " +"games..." +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/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Le" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Kódok letöltése (WiiRD adatbázis)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Letöltve %lu kód. (hozzáadva %lu)" @@ -1839,23 +1983,23 @@ msgstr "Letöltve %lu kód. (hozzáadva %lu)" msgid "Drums" msgstr "Dobok" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Utánzat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Hang mentése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "EFB cél letárolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Képkockák letárolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Textúrák letárolása" @@ -1865,7 +2009,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Az összes létrehozott képkocka mentése egy AVI fájlba ide: User/Dump/Frames/\n" +"Az összes létrehozott képkocka mentése egy AVI fájlba ide: User/Dump/" +"Frames/\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -1889,6 +2034,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1904,6 +2050,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holland" @@ -1917,10 +2068,18 @@ msgstr "EFB másolatok" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, c-format -msgid "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least version %d.%d -- If you recently upgraded your Dolphin distribution, a reboot is probably required at this point to get Windows to see the new driver." -msgstr "HIBA: A Dolphin ezen változatához szükséges a TAP-Win32 driver %d.%d verziója legalább -- Ha mostanában telepítetted a Dolphin emulátort, akkor valószínűleg újra kell indítanod a számítógépet, hogy a Windows felismerje az új illesztÅ‘programot." +msgid "" +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"version %d.%d -- If you recently upgraded your Dolphin distribution, a " +"reboot is probably required at this point to get Windows to see the new " +"driver." +msgstr "" +"HIBA: A Dolphin ezen változatához szükséges a TAP-Win32 driver %d.%d " +"verziója legalább -- Ha mostanában telepítetted a Dolphin emulátort, akkor " +"valószínűleg újra kell indítanod a számítógépet, hogy a Windows felismerje " +"az új illesztÅ‘programot." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EURÓPA" @@ -1936,7 +2095,7 @@ msgstr "Szerkesztés" msgid "Edit ActionReplay Code" msgstr "ActionReplay kód szerkesztése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Beállítások szerkesztése" @@ -1948,8 +2107,8 @@ msgstr "Patch szerkesztése" msgid "Edit current perspective" msgstr "Jelenlegi perspektíva szerkesztése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Szerkesztés..." @@ -1968,24 +2127,30 @@ msgstr "Az emuláció már fut" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" -"Slows down emulation a lot and prohibits high-resolution rendering but is necessary to emulate a number of games properly.\n" +"Slows down emulation a lot and prohibits high-resolution rendering but is " +"necessary to emulate a number of games properly.\n" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" "Az XFB pontos emulációja.\n" -"JelentÅ‘sen lassítja az emulációt és korlátozza a nagy felbontású megjelenítést, azonban szükséges számos játék pontos emulációjához.\n" +"JelentÅ‘sen lassítja az emulációt és korlátozza a nagy felbontású " +"megjelenítést, azonban szükséges számos játék pontos emulációjához.\n" "\n" "Ha bizonytalan vagy, jelöld ki inkább az XFB emulációt." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" -"Fixes many games which don't work without XFB emulation while not being as slow as real XFB emulation. However, it may still fail for a lot of other games (especially homebrew applications).\n" +"Fixes many games which don't work without XFB emulation while not being as " +"slow as real XFB emulation. However, it may still fail for a lot of other " +"games (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "XFB emuláció grafikai processzor textúra objektumainak használatával.\n" -"Javít sok XFB emuláció nélkül nem működÅ‘ játékot miközben nem olyan lassú, mint a valódi XFB emuláció. Azonban, még mindig nem használható sok más játék esetén (fÅ‘leg egyedi fejlesztésű alkalmazások).\n" +"Javít sok XFB emuláció nélkül nem működÅ‘ játékot miközben nem olyan lassú, " +"mint a valódi XFB emuláció. Azonban, még mindig nem használható sok más " +"játék esetén (fÅ‘leg egyedi fejlesztésű alkalmazások).\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -1993,7 +2158,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulált Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Emuláció állapota:" @@ -2003,13 +2168,15 @@ msgstr "Használat" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" -"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\n" +"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " +"supported by your GPU.\n" "Possibly causes issues.\n" "Requires fullscreen to work.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"A 3D-s effektusok megjelenítése sztereoszkópikus módon az Nvidia 3D Vision technológia használatával, ha támogatja a videókártya.\n" +"A 3D-s effektusok megjelenítése sztereoszkópikus módon az Nvidia 3D Vision " +"technológia használatával, ha támogatja a videókártya.\n" "Estleg hibákat okozhat.\n" "Működéséhez teljes képernyÅ‘ szükséges.\n" "\n" @@ -2019,18 +2186,15 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR naplózás bekapcsolása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Hang szabályozás használata" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Blokk csatlakozás használata" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 @@ -2041,6 +2205,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Bounding Box kalkuláció használata" @@ -2049,6 +2216,7 @@ msgstr "Bounding Box kalkuláció használata" msgid "Enable Cache" msgstr "Gyorsítótár használata" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2058,51 +2226,54 @@ msgstr "Gyorsítótár használata" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Csalások használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "DTK zene bekapcsolása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Dual Core használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Dual Core használata (gyorsítás)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Gyorsbillentyűk használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Tétlen állapot mellÅ‘zése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Tétlen állapot mellÅ‘zése (gyorsítás)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Progresszív pásztázás használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "KépernyÅ‘védÅ‘ bekapcsolása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "SzéleskijelzÅ‘ bekapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Vonalháló bekapcsolása" @@ -2120,11 +2291,15 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "Enable fast disc access. Needed for a few 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/DolphinWX/Src/ISOProperties.cpp:325 +msgid "" +"Enable fast disc access. Needed for a few 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/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Oldalak bekapcsolása" @@ -2142,23 +2317,35 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" -"Enable this if you want to use the main Dolphin window for rendering rather than a separate render window.\n" +"Enable this if you want to use the main Dolphin window for rendering rather " +"than a separate render window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Kapcsold be ha azt akarod, hogy inkább a Dolphin fÅ‘ ablakában jelenjen meg az emuláció, mint sem egy különálló ablakban.\n" +"Kapcsold be ha azt akarod, hogy inkább a Dolphin fÅ‘ ablakában jelenjen meg " +"az emuláció, mint sem egy különálló ablakban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." -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 +msgid "" +"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " +"ANY other game." +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:311 -msgid "Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)" -msgstr "Bekapcsolja a Blokk cím átvitelt (BAT); a memória vezérlÅ‘ egység egyik funkcióját. A hardverhez viszonyítva pontos, de az emulációhoz lassú. (BE = kompatibilis, KI = gyors)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +msgid "" +"Enables Block Address Translation (BAT); a function of the Memory Management " +"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " +"Fast)" +msgstr "" +"Bekapcsolja a Blokk cím átvitelt (BAT); a memória vezérlÅ‘ egység egyik " +"funkcióját. A hardverhez viszonyítva pontos, de az emulációhoz lassú. (BE = " +"kompatibilis, KI = gyors)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Egyedi megjelenítési hack használata" @@ -2169,14 +2356,19 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Bekapcsolja a progresszív pásztázást, ha az támogatott az emulált szoftver által.\n" +"Bekapcsolja a progresszív pásztázást, ha az támogatott az emulált szoftver " +"által.\n" "A legtöbb játék nem használja ezt.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" -msgstr "Bekapcsolja a memória kezelÅ‘ egységet (Memory Management Unit), szükséges néhány játékhoz. (BE = kompatibilis, KI = gyors)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +msgid "" +"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " +"OFF = Fast)" +msgstr "" +"Bekapcsolja a memória kezelÅ‘ egységet (Memory Management Unit), szükséges " +"néhány játékhoz. (BE = kompatibilis, KI = gyors)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" @@ -2192,6 +2384,7 @@ msgstr "" msgid "End" msgstr "Vége" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2207,6 +2400,11 @@ msgstr "Vége" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Angol" @@ -2237,6 +2435,7 @@ msgstr "EgyenlÅ‘" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hiba" @@ -2269,18 +2468,30 @@ msgstr "" "Sajnos a Wii videó rögzítés egyenlÅ‘re nem működik." >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Hiba" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." -msgstr "Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett visszaállítva." +msgstr "" +"Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett " +"visszaállítva." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD ======= "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x%X). " "Mentés betöltésének leállítása..." @@ -2289,11 +2500,20 @@ msgstr "" msgid "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load..." msgstr "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x%X). Mentés betöltésének leállítása..." >>>>>>> Update Hungarian translation. +======= +"Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x%X). " +"Mentés betöltésének leállítása..." +>>>>>>> Update the pot file to reflect recent changes in the code. -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format -msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." -msgstr "Hiba: A(z) %s betűtípusokhoz történÅ‘ hozzáférési próbálkozás során, a betöltésük sikertelen. A játékokban a betűk lehet nem jelennek meg megfelelÅ‘en, vagy kifagynak." +msgid "" +"Error: Trying to access %s fonts but they are not loaded. Games may not show " +"fonts correctly, or crash." +msgstr "" +"Hiba: A(z) %s betűtípusokhoz történÅ‘ hozzáférési próbálkozás során, a " +"betöltésük sikertelen. A játékokban a betűk lehet nem jelennek meg " +"megfelelÅ‘en, vagy kifagynak." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2320,7 +2540,7 @@ msgstr "Kilépés a Dolphin emulátorból" msgid "Export Failed" msgstr "Exportálás sikertelen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Fájl exportálása" @@ -2333,15 +2553,15 @@ msgstr "Felvétel exportálása" msgid "Export Recording..." msgstr "Felvétel exportálása..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Mentés exportálása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Wii mentés exportálása (kísérleti)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Minden mentés exportálása" @@ -2357,7 +2577,7 @@ msgstr "Exportálás mentése másként..." msgid "Extension" msgstr "KiegészítÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "KülsÅ‘ képkocka puffer" @@ -2369,44 +2589,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Minden fájl kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "BetöltÅ‘ program kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "DOL kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Könyvtár kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Fájl kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Partíció kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "%s kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Minden fájl kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Könyvtár kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Kitömörítés..." @@ -2418,11 +2638,11 @@ msgstr "FIFO bájt" msgid "FIFO Player" msgstr "FIFO lejátszó" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANCIAORSZÃG" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST méret:" @@ -2434,11 +2654,11 @@ msgstr "Csatlakozás sikertelen!" msgid "Failed to Listen!!" msgstr "Meghallgatás sikertelen!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Kódok letöltése sikertelen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Kitömörítés nem sikerült ide: %s!" @@ -2483,7 +2703,8 @@ msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -"A blokk kiosztási tábla biztonsági mentésének pontos visszaolvasása sikertelen\n" +"A blokk kiosztási tábla biztonsági mentésének pontos visszaolvasása " +"sikertelen\n" "(0x8000-0x9FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:144 @@ -2555,18 +2776,28 @@ msgstr "Fejléc írása sikertelen a(z) %s számára" 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/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Gyors" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Gyors mipmapek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Fifo lejátszó" @@ -2575,7 +2806,7 @@ msgstr "Fifo lejátszó" msgid "File Info" msgstr "Fájl infó" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "A fájl nem tartalmazott kódokat." @@ -2608,16 +2839,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:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Ismeretlen megnyitási mód : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Fájlrendszer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Az 'ini' fájltípus ismeretlen! Nem lesz megnyitva!" @@ -2625,7 +2856,7 @@ msgstr "Az 'ini' fájltípus ismeretlen! Nem lesz megnyitva!" msgid "First Block" msgstr "ElsÅ‘ blokk" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Ãllandó ellenÅ‘rzőösszeg" @@ -2637,7 +2868,7 @@ msgstr "Kényszerített 16:9" msgid "Force 4:3" msgstr "Kényszerített 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Konzol kényszerítése NTSC-J típusra" @@ -2652,7 +2883,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Kényszerített textúra szűrés lesz még akkor is, ha a játék határozottan letiltotta azt.\n" +"Kényszerített textúra szűrés lesz még akkor is, ha a játék határozottan " +"letiltotta azt.\n" "Némileg javítja a textúra minÅ‘séget, de képhibákat okozhat néhány játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -2669,13 +2901,15 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" -"Left unchecked, dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games." +"Left unchecked, dolphin defaults to NTSC-U and automatically enables this " +"setting when playing Japanese games." msgstr "" "Az NTSC-J működési módot kényszeríti japán ROM betűkészlet használatához.\n" -"Hagyd kijelöletlenül, a Dolphin alapértelmezett az NTSC-U és automatikusan bekapcsolódik ez a beállítás japán játékok használatakor." +"Hagyd kijelöletlenül, a Dolphin alapértelmezett az NTSC-U és automatikusan " +"bekapcsolódik ez a beállítás japán játékok használatakor." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -2703,7 +2937,7 @@ msgstr "Képkocka" msgid "Frame Advance" msgstr "Képkocka léptetés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Képkocka mentések FFV1 használatával" @@ -2715,7 +2949,7 @@ msgstr "Képkocka rendezés" msgid "Frame S&kipping" msgstr "Képkocka k&ihagyás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Képkocka korlát:" @@ -2723,10 +2957,11 @@ msgstr "Képkocka korlát:" msgid "Frames To Record" msgstr "RögzítendÅ‘ képkockák" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Szabad nézet" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2742,6 +2977,11 @@ msgstr "Szabad nézet" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francia" @@ -2780,7 +3020,7 @@ msgstr "GCMic beállítások" msgid "GCPad" msgstr "GC irányító" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "Játék azonosító:" @@ -2796,15 +3036,15 @@ msgstr "A játék nem fut!" msgid "Game not found!!" msgstr "A játék nem található!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "A játék sajátos beállításai" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Játék konfig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2815,6 +3055,7 @@ msgstr "Gamecube &irányító beállítások" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2822,6 +3063,9 @@ msgstr "Gamecube &irányító beállítások" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" @@ -2830,15 +3074,17 @@ msgid "Gamecube Pad settings" msgstr "Gamecube irányító beállítások" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko kódok" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "GeckoCode futtatása sikertelen (CT%i CST%i) (%s)\n" "(vagy rossz a kód vagy a kód típus még nem támogatott.)" @@ -2847,6 +3093,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2855,6 +3102,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Ãltalános" @@ -2863,6 +3113,7 @@ msgstr "Ãltalános" msgid "General Settings" msgstr "Ãltalános beállítások" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2878,6 +3129,11 @@ msgstr "Ãltalános beállítások" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Német" @@ -2907,19 +3163,23 @@ msgstr "Nagyobb mint" ======= >>>>>>> Update Hungarian and Turkish translations. msgid "" -"Greatly increases quality of textures generated using render to texture effects.\n" +"Greatly increases quality of textures generated using render to texture " +"effects.\n" "Raising the internal resolution will improve the effect of this setting.\n" -"Slightly decreases performance and possibly causes issues (although unlikely).\n" +"Slightly decreases performance and possibly causes issues (although " +"unlikely).\n" "\n" "If unsure, leave this checked." msgstr "" -"Nagymértékben javítja azon textúrák minÅ‘ségét, amelyeket a textúra effektusokhoz használatos képalkotó hozott létre.\n" +"Nagymértékben javítja azon textúrák minÅ‘ségét, amelyeket a textúra " +"effektusokhoz használatos képalkotó hozott létre.\n" "A belsÅ‘ felbontás növelése javítja ennek a beállításnak a hatását.\n" -"Némileg csökkenti a teljesítményt és esetlegesen hibákat okozhat (habár valószínűtlen).\n" +"Némileg csökkenti a teljesítményt és esetlegesen hibákat okozhat (habár " +"valószínűtlen).\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Görög" @@ -2951,7 +3211,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:303 msgid "Hebrew" msgstr "Héber" @@ -2974,7 +3234,8 @@ msgid "" msgstr "" "Szia,\n" "\n" -"A Dolphin működéséhez szükséges, hogy a processzor rendelkezzen SSE2 utasításkészlettel.\n" +"A Dolphin működéséhez szükséges, hogy a processzor rendelkezzen SSE2 " +"utasításkészlettel.\n" "Sajnos a processzorod nem támogatja azt, ezért a Dolphin nem fog működni.\n" "\n" "Sayonara!\n" @@ -3020,12 +3281,16 @@ msgstr "Gyorsbillentyű beállítások" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Gyorsbill." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Magyar" @@ -3033,27 +3298,31 @@ msgstr "Magyar" msgid "Hybrid Wiimote" msgstr "Hibrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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" +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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" -"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available in your nand dump\n" +"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " +"in your nand dump\n" "TitleID %016llx.\n" " Dolphin will likely hang now" msgstr "" -"IOCTL_ES_LAUNCH: A játék megkísérelte az IOS újratöltését vagy egy olyan címét ami nem érhetÅ‘ el a NAND mentésedben\n" +"IOCTL_ES_LAUNCH: A játék megkísérelte az IOS újratöltését vagy egy olyan " +"címét ami nem érhetÅ‘ el a NAND mentésedben\n" "TitleID %016llx.\n" " A Dolphin valószínűleg kifagy most" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - rossz cél" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL beállítások" @@ -3069,15 +3338,15 @@ msgstr "IR mutató" msgid "IR Sensitivity:" msgstr "IR érzékenysége:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO részletek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO könyvtárak" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "OLASZORSZÃG" @@ -3085,13 +3354,18 @@ msgstr "OLASZORSZÃG" msgid "Icon" msgstr "Ikon" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 <<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD ======= "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario " "játékok használják." @@ -3100,14 +3374,28 @@ msgstr "" msgid "If checked, the bounding box registers will be updated. Used by the Paper Mario games." msgstr "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario játékok használják." >>>>>>> Update Hungarian translation. +======= +"Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario " +"játékok használják." +>>>>>>> Update the pot file to reflect recent changes in the code. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +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)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -msgid "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you also have to disable Audio Throttle in DSP to make it effective." -msgstr "Ha a képkocka korlát értéke magasabb a játék teljes sebességénél (NTSC:60, PAL:50), akkor a hatékonyság eléréséhez ki kell kapcsolni a hang szabályozást is a DSP beállításoknál. " +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy +msgid "" +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). 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át értéke magasabb a játék teljes sebességénél (NTSC:60, " +"PAL:50), akkor a hatékonyság eléréséhez ki kell kapcsolni a hang " +"szabályozást is a DSP beállításoknál. " #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3116,28 +3404,33 @@ msgstr "Formátum változások kihagyása" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" -"Improves performance in many games without any negative effect. Causes graphical defects in a small number of other games though.\n" +"Improves performance in many games without any negative effect. Causes " +"graphical defects in a small number of other games though.\n" "\n" "If unsure, leave this checked." msgstr "" "Minden EFB formátum változás figyelmen kívül hagyása.\n" -"Sok játékban növeli a teljesítményt bármilyen negatív hatás nélkül. Noha grafikai hiányosságok jelentkezhetnek kevés egyéb játékban.\n" +"Sok játékban növeli a teljesítményt bármilyen negatív hatás nélkül. Noha " +"grafikai hiányosságok jelentkezhetnek kevés egyéb játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" -"Improves performance in some games, but might disable some gameplay-related features or graphical effects.\n" +"Improves performance in some games, but might disable some gameplay-related " +"features or graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Figyelmen kívül hagyja a processzor összes EFB-re irányuló kiolvasási vagy írási kérelmét.\n" -"Néhány játékban növeli a teljesítményt, de kikapcsolhat néhány játékmenetre vonatkozó funkciót vagy grafikus effektust.\n" +"Figyelmen kívül hagyja a processzor összes EFB-re irányuló kiolvasási vagy " +"írási kérelmét.\n" +"Néhány játékban növeli a teljesítményt, de kikapcsolhat néhány játékmenetre " +"vonatkozó funkciót vagy grafikus effektust.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Mentés importálása" @@ -3167,11 +3460,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" -"Improves performance but causes glitches in most games which rely on proper fog emulation.\n" +"Improves performance but causes glitches in most games which rely on proper " +"fog emulation.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Növeli a teljesítményt de képhibákat okoz azokban a játékban, amelykben fontos a megfelelÅ‘ köd emuláció.\n" +"Növeli a teljesítményt de képhibákat okoz azokban a játékban, amelykben " +"fontos a megfelelÅ‘ köd emuláció.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -3181,11 +3476,12 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Növeli a teljesítményt, de használatával a fényhatások eltűnnek a legtöbb játékban.\n" +"Növeli a teljesítményt, de használatával a fényhatások eltűnnek a legtöbb " +"játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Elindul" @@ -3194,7 +3490,7 @@ msgid "In-Game" msgstr "Elindul" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Infó" @@ -3214,7 +3510,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:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD kártya behelyezése" @@ -3226,14 +3522,17 @@ msgstr "Ãrj be ide nevet..." msgid "Install WAD" msgstr "WAD telepítése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Telepítés a Wii menübe" #: Source/Core/Core/Src/MemTools.cpp:248 -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." +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." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3243,14 +3542,17 @@ msgstr "InstallExceptionHandler elÅ‘idézve, de ez a platform még nem támogatj ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD telepítése..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Felhasználói felület" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Felület beállítások" @@ -3275,11 +3577,11 @@ msgstr "BelsÅ‘ LZO hiba - lzo_init() sikertelen" msgid "Internal Resolution:" msgstr "BelsÅ‘ felbontás:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (NAGYON lassú)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intró" @@ -3296,7 +3598,7 @@ msgstr "Érvénytelen érték!" msgid "Invalid bat.map or dir entry" msgstr "Érvénytelen bat.map vagy könyvtár bejegyzés" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Érvénytelen esemény fajta %i" @@ -3316,14 +3618,15 @@ msgstr "" "%s\n" " Valószínűleg újra le kell mentened a játékot." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Nem megfelelÅ‘ rögzített fájl" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Nem megfelelÅ‘ mentés" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3339,27 +3642,32 @@ msgstr "Nem megfelelÅ‘ mentés" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Olasz" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPÃN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (ajánlott)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL Recompiler (kísérleti)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japán" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3368,8 +3676,8 @@ msgstr "KOREA" msgid "Key" msgstr "Bill." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Koreai" @@ -3387,7 +3695,7 @@ msgstr "L gomb" msgid "L-Analog" msgstr "Bal analóg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Nyelv:" @@ -3440,7 +3748,7 @@ msgstr "" msgid "Less Than" msgstr "Kevesebb mint" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "FPS alapú korlátozás" @@ -3448,7 +3756,7 @@ msgstr "FPS alapú korlátozás" msgid "Load" msgstr "Betöltés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Egyedi textúrák betöltése" @@ -3496,6 +3804,7 @@ msgstr "Ãllás betöltése a 8. helyrÅ‘l" msgid "Load State..." msgstr "Ãllás betöltése..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3517,6 +3826,13 @@ msgstr "Wii rendszer menü betöltése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Wii rendszer menü betöltése" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii rendszer menü betöltése %d%c" @@ -3543,7 +3859,7 @@ msgstr "Meghatározott fájlt tölt be (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "Helyi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Folyamatágak magokhoz zárolása" @@ -3555,11 +3871,11 @@ msgstr "Napló" msgid "Log Configuration" msgstr "Napló beállítások" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Napló típus" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Napló kimenetek" @@ -3589,7 +3905,7 @@ msgstr "" "MD5 eltérés\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU sebesség növelÅ‘ hack" @@ -3611,11 +3927,11 @@ msgstr "MadCatz Gameshark fájlok (*.gcs)" msgid "Main Stick" msgstr "FÅ‘kar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "Gyártó azonosító:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Gyártó:" @@ -3639,6 +3955,7 @@ msgstr "Memória bájt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3646,12 +3963,19 @@ msgstr "Memória bájt" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Memóriakártya" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" -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!" +msgid "" +"Memory Card Manager WARNING-Make backups before using, should be fixed but " +"could mangle stuff!" +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:369 #, c-format @@ -3678,7 +4002,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:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mikrofon" @@ -3687,11 +4011,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Egyebek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Egyéb beállítások" @@ -3702,15 +4026,17 @@ msgstr "Változó" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" -"Modify textures to show the format they're encoded in. Needs an emulation reset in most cases.\n" +"Modify textures to show the format they're encoded in. Needs an emulation " +"reset in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Tetxúrák módosítása a kódolásukhoz használt formátum megjelenítéséhez. A legtöbb esetben az emuláció alapra állítása szükséges.\n" +"Tetxúrák módosítása a kódolásukhoz használt formátum megjelenítéséhez. A " +"legtöbb esetben az emuláció alapra állítása szükséges.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Azonos szélességű betűtípus" @@ -3723,7 +4049,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3745,9 +4071,13 @@ msgstr "" msgid "Multiply" msgstr "Multiply" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." -msgstr "Lenémítja a Wiimote hangszórót. Javítja a valódi Wiimote irányítók véletlenszerű lekapcsolódási hibáját. Nincs hatással az emulált irányítókra." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +msgid "" +"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " +"effect on emulated wiimotes." +msgstr "" +"Lenémítja a Wiimote hangszórót. Javítja a valódi Wiimote irányítók " +"véletlenszerű lekapcsolódási hibáját. Nincs hatással az emulált irányítókra." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Add" @@ -3833,6 +4163,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3842,6 +4173,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3850,7 +4184,7 @@ msgstr "Cím:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Név:" @@ -3864,7 +4198,7 @@ msgid "New Scan" msgstr "Új keresés" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "KövetkezÅ‘ lap" @@ -3876,7 +4210,7 @@ msgstr "KövetkezÅ‘ keresés" msgid "Nickname :" msgstr "Becenév:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Nincs ország (SDK)" @@ -3915,7 +4249,7 @@ msgstr "%s játékhoz nem található mentési mappa" msgid "None" msgstr "Nincs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norvég" @@ -3923,8 +4257,8 @@ msgstr "Norvég" msgid "Not Equal" msgstr "Nem egyenlÅ‘" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Nincs beállítva" @@ -3944,7 +4278,7 @@ msgstr "Nincs csatlakoztatva" msgid "Notes" msgstr "Megjegyzés" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Megjegyzések:" @@ -3982,7 +4316,7 @@ msgstr "Elem" msgid "Object Range" msgstr "Elem hatótáv" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Ki" @@ -4008,11 +4342,11 @@ msgstr "Csak %d blokk szabad" msgid "Open" msgstr "Megnyitás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "A játékot &tartalmazó mappa megnyitása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Wii &mentések mappa megnyitása" @@ -4034,11 +4368,11 @@ msgstr "OpenAL: nem található hang eszköz" msgid "OpenAL: can't open device %s" msgstr "OpenAL: %s eszköz nem nyitható meg" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL textúra dekódoló" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP textúra dekódoló" @@ -4070,13 +4404,17 @@ msgstr "" "és az állásmentések importálásához az új memóriakártyára\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Egyéb" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." -msgstr "A másik kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. Kézileg kell leállítanod a játékot." +msgid "" +"Other client disconnected while game is running!! NetPlay is disabled. You " +"manually stop the game." +msgstr "" +"A másik kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. " +"Kézileg kell leállítanod a játékot." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4118,19 +4456,20 @@ msgstr "Paragraph" msgid "Parameters" msgstr "Paraméterek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "%i partíció" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Javítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Mappák" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4143,6 +4482,10 @@ msgstr "Mappák" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Szünet" @@ -4151,7 +4494,7 @@ msgstr "Szünet" msgid "Per-Pixel Lighting" msgstr "Képpont alapú fényhatások" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Tökéletes" @@ -4164,6 +4507,7 @@ msgstr "%d perspektíva" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4174,6 +4518,10 @@ msgstr "%d perspektíva" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Indítás" @@ -4187,7 +4535,7 @@ msgstr "Felvétel visszajátszása" msgid "Play/Pause" msgstr "Indítás/Szünet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Játszható" @@ -4199,6 +4547,7 @@ msgstr "Visszajátszási lehetÅ‘ségek" msgid "Players" msgstr "Játékosok" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4208,6 +4557,9 @@ msgstr "Játékosok" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -4219,23 +4571,23 @@ 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:309 msgid "Polish" msgstr "Lengyel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "1. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "2. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "3. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "4. port" @@ -4244,11 +4596,11 @@ msgstr "4. port" msgid "Port :" msgstr "Port:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugál" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugál (brazil)" @@ -4256,7 +4608,7 @@ msgstr "Portugál (brazil)" msgid "Post-Processing Effect:" msgstr "Utófeldolgozási effektus:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" <<<<<<< HEAD @@ -4265,7 +4617,7 @@ msgstr "" msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u" >>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" <<<<<<< HEAD @@ -4274,7 +4626,7 @@ msgstr "" msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u" >>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" <<<<<<< HEAD @@ -4291,7 +4643,7 @@ msgstr "Gombkiosztás:" msgid "Prev Page" msgstr "ElÅ‘zÅ‘ lap" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "ElÅ‘zÅ‘ lap" @@ -4342,7 +4694,7 @@ msgstr "Jobb analóg" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "OROSZORSZÃG" @@ -4355,7 +4707,7 @@ msgstr "Hatótáv" msgid "Read-only mode" msgstr "Ãrásvédett mód" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Valódi" @@ -4409,7 +4761,8 @@ msgid "" "\n" "If unsure, select None." msgstr "" -"Csökkenti az éltöredezettséget, amit a képpontokra felbontott 3D-s grafika okoz.\n" +"Csökkenti az éltöredezettséget, amit a képpontokra felbontott 3D-s grafika " +"okoz.\n" "Ezáltal a megjelenített kép kevésbé lesz recézett.\n" "ErÅ‘sen csökkenti az emuláció sebességét és néha hibákat okoz.\n" "Ha bizonytalan vagy, válaszd ezt: Nincs. " @@ -4429,6 +4782,7 @@ msgstr "A lista frissítése" msgid "Refresh game list" msgstr "Játéklista frissítése" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4447,6 +4801,12 @@ msgstr "Játéklista frissítése" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Törlés" @@ -4499,11 +4859,11 @@ msgstr "Jobb kar" msgid "Rumble" msgstr "Rumble funkció" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSP LLE futtatása egy dedikált folyamatágon (nem ajánlott)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Orosz" @@ -4511,10 +4871,11 @@ msgstr "Orosz" msgid "Sa&ve State" msgstr "Ãl&lás mentése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Biztonságos" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4524,6 +4885,9 @@ msgstr "Biztonságos" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Mintavételezési frekvencia:" @@ -4581,12 +4945,12 @@ msgstr "Ãllás mentés a 8. helyre" msgid "Save State..." msgstr "Ãllás mentése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Mentés másként..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Tömörített GCM/ISO mentése" @@ -4594,11 +4958,11 @@ msgstr "Tömörített GCM/ISO mentése" msgid "Save current perspective" msgstr "Jelenlegi perspektíva mentése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Kitömörített GCM/ISO mentése" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, 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..." @@ -4607,6 +4971,7 @@ msgstr "%s állásmentés videója sérült, videó rögzítése leáll..." msgid "Scaled EFB Copy" msgstr "Méretezett EFB másolat" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4616,15 +4981,18 @@ msgstr "Méretezett EFB másolat" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Keresés %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "ISO fájlok keresése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Keresés..." @@ -4640,14 +5008,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Keresési szűrÅ‘" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Keresés az almappákban" -#: Source/Core/Common/Src/SysConf.h:104 -#: Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 -#: Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "%s rész nem található a SYSCONF fájlban" @@ -4657,6 +5023,7 @@ msgstr "%s rész nem található a SYSCONF fájlban" msgid "Select" msgstr "Választás" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4681,6 +5048,14 @@ msgstr "Válassz rögzítendÅ‘ fájlt" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Válassz rögzítendÅ‘ fájlt" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendÅ‘ Wii WAD fájlt" @@ -4706,6 +5081,7 @@ msgstr "Válassz lebegÅ‘ ablakokat" msgid "Select the file to load" msgstr "BetöltendÅ‘ fájl kiválasztása" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4722,19 +5098,26 @@ msgstr "Válassz betöltendÅ‘ állásmentést" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Válassz mentési fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Válassz betöltendÅ‘ állásmentést" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Válassz mentendÅ‘ állást" @@ -4756,20 +5139,22 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: Automatikus." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Kiválasztott betűtípus" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Selects the display resolution used in fullscreen mode.\n" -"This should always be bigger than or equal to the internal resolution. Performance impact is negligible.\n" +"This should always be bigger than or equal to the internal resolution. " +"Performance impact is negligible.\n" "\n" "If unsure, use your desktop resolution.\n" "If still unsure, use the highest resolution which works for you." msgstr "" "A teljes kijelzÅ‘ estén használatos felbontást állítja be.\n" -"Ennek mindig nagyobbnak, vagy azonosnak kell lennie a belsÅ‘ felbontással. Hatása a teljesítményre elhanyagolható.\n" +"Ennek mindig nagyobbnak, vagy azonosnak kell lennie a belsÅ‘ felbontással. " +"Hatása a teljesítményre elhanyagolható.\n" "\n" "Ha bizonytalan vagy, használd az asztali felbontást.\n" "Ha továbbra is bizonytalan vagy, használd a legmagasabb működÅ‘ felbontást." @@ -4777,14 +5162,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects what graphics API to use internally.\n" -"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. Direct3D 11 is somewhere between the two.\n" +"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " +"Direct3D 11 is somewhere between the two.\n" "Note that the Direct3D backends are only available on Windows.\n" "\n" "If unsure, use Direct3D 9." msgstr "" "Kiválasztja melyik grafikus API legyen használva belsÅ‘leg.\n" -"A Direct3D 9 többnyire a leggyorsabb. Az OpenGL azonban pontosabb. A Direct3D 11 valahol a kettÅ‘ között van.\n" -"Vedd figyelembe, hogy a Direct3D feldolgozók csak Windows esetén állnak rendelkezésre.\n" +"A Direct3D 9 többnyire a leggyorsabb. Az OpenGL azonban pontosabb. A " +"Direct3D 11 valahol a kettÅ‘ között van.\n" +"Vedd figyelembe, hogy a Direct3D feldolgozók csak Windows esetén állnak " +"rendelkezésre.\n" "\n" "Ha bizonytalan vagy, használd ezt: Direct3D 9." @@ -4800,23 +5188,25 @@ msgstr "ÉrzékelÅ‘ helyzete:" msgid "Separator" msgstr "Elválasztó" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Szerb" -#: 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. soros port - Ezt a portot használják azok az eszközök, mint a net adapter" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +msgid "" +"Serial Port 1 - This is the port which devices such as the net adapter use" +msgstr "" +"1. soros port - Ezt a portot használják azok az eszközök, mint a net adapter" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" msgstr "Beáll." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Beállítás &alapértelmezett ISO fájlként" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Beállítás alapértelmezett %c. memóriakártyaként" @@ -4824,9 +5214,10 @@ msgstr "Beállítás alapértelmezett %c. memóriakártyaként" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, c-format 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" +msgstr "" +"SetARCode_IsActive: A jelzÅ‘szám nagyobb mint az ar kód lista mérete %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Beállítások..." @@ -4838,7 +5229,7 @@ msgstr "SetupWiiMem: Nem található a beállítási fájl" msgid "Shake" msgstr "Rázás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Rövid cím:" @@ -4866,7 +5257,7 @@ msgstr "Eszközsor &mutatása" msgid "Show Drives" msgstr "Meghajtók mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "EFB másolat régiók megjelenítése" @@ -4882,7 +5273,7 @@ msgstr "Franciaország mutatása" msgid "Show GameCube" msgstr "GameCube mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Bemeneti kijelzÅ‘ megjelenítése" @@ -4898,7 +5289,7 @@ msgstr "JAP mutatása" msgid "Show Korea" msgstr "Korea mutatása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "A játék nyelve:" @@ -4918,7 +5309,7 @@ msgstr "Platformok mutatása" msgid "Show Regions" msgstr "Régiók mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Statisztikák megjelenítése" @@ -4938,45 +5329,50 @@ msgstr "Wad mutatása" msgid "Show Wii" msgstr "Wii mutatása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" -"Disabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all." +"Disabling this may avoid annoying and non-fatal messages, but it may also " +"mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -"FigyelmeztetÅ‘ üzenet jelenik meg egy potenciálisan komoly hiba bekövetkezésekor.\n" -"Kikapcsolásával megszűntethetÅ‘k a kellemetlen és nem végzetes üzenetek, de ezáltal a Dolphin hirtelen kifagyhat bármilyen magyarázat nélkül." +"FigyelmeztetÅ‘ üzenet jelenik meg egy potenciálisan komoly hiba " +"bekövetkezésekor.\n" +"Kikapcsolásával megszűntethetÅ‘k a kellemetlen és nem végzetes üzenetek, de " +"ezáltal a Dolphin hirtelen kifagyhat bármilyen magyarázat nélkül." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Az elsÅ‘ blokk megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "MentendÅ‘ blokkok megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "MentendÅ‘ megjegyzések megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "MentendÅ‘ ikonok megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "MentendÅ‘ címek megjelenítése" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" -"Show the number of frames rendered per second as a measure of emulation speed.\n" +"Show the number of frames rendered per second as a measure of emulation " +"speed.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"A másodpercenként megjelenített képkockák számát jelzi ki az emuláció sebességének méréséhez.\n" +"A másodpercenként megjelenített képkockák számát jelzi ki az emuláció " +"sebességének méréséhez.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5002,7 +5398,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Oldalt tartott Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Egyszerűsített kínai" @@ -5010,11 +5406,11 @@ msgstr "Egyszerűsített kínai" msgid "Size" msgstr "Méret" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "BIOS kihagyása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Dest. Alpha Pass kihagyása" @@ -5024,11 +5420,13 @@ msgstr "Az EFB processzor hozzáférésének átugrása" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" -"Skip the destination alpha pass used in many games for various graphical effects.\n" +"Skip the destination alpha pass 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" +"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." @@ -5036,13 +5434,15 @@ msgstr "" msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" -"If you're experiencing any issues, try raising texture cache accuracy or disable this option.\n" +"If you're experiencing any issues, try raising texture cache accuracy or " +"disable this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Kissé gyorsítja az EFB RAM másolatokat az emuláció pontosságának rovására.\n" "Néha a vizuális minÅ‘séget is növeli.\n" -"Ha bármely hibát tapasztalsz, próbáld növelni a textúra gyorsítótár pontosságát vagy kapcsold ki ezt az opciót.\n" +"Ha bármely hibát tapasztalsz, próbáld növelni a textúra gyorsítótár " +"pontosságát vagy kapcsold ki ezt az opciót.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5052,11 +5452,11 @@ msgstr "" msgid "Slot %i" msgstr "%i hely" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "A hely" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "B hely" @@ -5070,15 +5470,18 @@ msgstr "Szoftveres képalkotó" #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:83 msgid "" -"Software rendering is an order of magnitude slower than using the other backends.\n" +"Software rendering is an order of magnitude slower than using the other " +"backends.\n" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -"A szoftveres képalkotó egy fontosságbeli sorrenden alapul és lassabb a feldolgozók használatánál.\n" +"A szoftveres képalkotó egy fontosságbeli sorrenden alapul és lassabb a " +"feldolgozók használatánál.\n" "Csak hibakeresési célra hasznos.\n" -"Biztosan be kívánod kapcsolni a szoftveres képalkotót? Ha bizonytalan vagy, válaszd ezt: 'Nem'." +"Biztosan be kívánod kapcsolni a szoftveres képalkotót? Ha bizonytalan vagy, " +"válaszd ezt: 'Nem'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Hang beállítások" @@ -5096,6 +5499,7 @@ msgstr "Hang puffer létrehozása sikertelen: %s" msgid "Space" msgstr "Szóköz" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5111,6 +5515,11 @@ msgstr "Szóköz" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanyol" @@ -5120,13 +5529,21 @@ msgstr "Hangszóró hangerÅ‘:" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" -"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.\n" -"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n" +"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.\n" +"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less " +"issues. Generally speaking, the lower the internal resolution is, the better " +"your performance will be.\n" "\n" "If unsure, select 640x528." msgstr "" -"Meghatározza a megjelenítéshez használatos felbontást. A magas felbontás nagyban növeli a vizuális minÅ‘séget, de erÅ‘sen befolyásolja a teljesítményt és képhibákat okozhat bizonyos játékoknál.\n" -"\"640x528 többszöröse\" egy kicsivel lassabb, mint az \"Ablak méret\" viszont kevesebb hibák eredményez. Ãltalánosságban elmondható, minél kisebb a belsÅ‘ felbontás, annál jobb a teljesítmény.\n" +"Meghatározza a megjelenítéshez használatos felbontást. A magas felbontás " +"nagyban növeli a vizuális minÅ‘séget, de erÅ‘sen befolyásolja a teljesítményt " +"és képhibákat okozhat bizonyos játékoknál.\n" +"\"640x528 többszöröse\" egy kicsivel lassabb, mint az \"Ablak méret\" " +"viszont kevesebb hibák eredményez. Ãltalánosságban elmondható, minél kisebb " +"a belsÅ‘ felbontás, annál jobb a teljesítmény.\n" "\n" "Ha bizonytalan vagy, válaszd ezt: 640x528." @@ -5134,7 +5551,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Válassz videó feldolgozót" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "A lemez adatátviteli arány gyorsítása" @@ -5142,7 +5559,7 @@ msgstr "A lemez adatátviteli arány gyorsítása" msgid "Square Stick" msgstr "Négyzetes kar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Normál irányító" @@ -5204,12 +5621,15 @@ msgstr "Leállítás" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Store EFB copies in GPU texture objects.\n" -"This is not so accurate, but it works well enough for most games and gives a great speedup over EFB to RAM.\n" +"This is not so accurate, but it works well enough for most games and gives a " +"great speedup over EFB to RAM.\n" "\n" "If unsure, leave this checked." msgstr "" "Az EFB másolatokat a grafikai processzor textúra objektumaiban tárolja.\n" -"Ez nem annyira pontos, de elég jól működik a legtöbb játék esetén és jelentÅ‘s sebességnövekedést okoz az EFB RAM-ban történÅ‘ tárolásával szemben.\n" +"Ez nem annyira pontos, de elég jól működik a legtöbb játék esetén és " +"jelentÅ‘s sebességnövekedést okoz az EFB RAM-ban történÅ‘ tárolásával " +"szemben.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -5238,12 +5658,12 @@ msgstr "Mentés fájlok sikeresen importálva" msgid "Swing" msgstr "Lengetés" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Rendszer nyelv:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAJVAN" @@ -5289,7 +5709,7 @@ msgstr "Tábla jobbra" msgid "Take Screenshot" msgstr "Pillanatkép készítése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" <<<<<<< HEAD msgstr "" @@ -5309,7 +5729,7 @@ msgstr "Textúra" msgid "Texture Cache" msgstr "Textúra gyorsítótár" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Textúra formátum átfedés" @@ -5325,13 +5745,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 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:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5342,15 +5762,19 @@ msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:51 #, c-format -msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." -msgstr "%s fájl nem nyitható meg íráshoz. EllenÅ‘rizd, hogy nincs-e megnyitva már másik program által." +msgid "" +"The file %s could not be opened for writing. Please check if it's already " +"opened by another program." +msgstr "" +"%s fájl nem nyitható meg íráshoz. EllenÅ‘rizd, hogy nincs-e megnyitva már " +"másik program által." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format msgid "The file %s was already open, the file header will not be written." msgstr "%s fáj már meg van nyitva, a fájl fejléce nem írható." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Az általad megadott (%s) fájl nem létezik" @@ -5368,12 +5792,15 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "A kapott kódolatlan AR kód nem tartalmaz sorokat." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" -"The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" -"Minél biztonságosabb a beállítás, annál kevésbé valószínű, hogy az emulátor textúra frissítést fog a RAM-ból hiányolni.\n" +"Minél biztonságosabb a beállítás, annál kevésbé valószínű, hogy az emulátor " +"textúra frissítést fog a RAM-ból hiányolni.\n" "\n" "Ha bizonytalan vagy, használd a második leggyorsabb értéket jobbról." @@ -5382,8 +5809,12 @@ 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:353 -msgid "The selected language is not supported by your system. Falling back to system default." -msgstr "A választott nyelvet nem támogatja az oprációs rendszer. Visszaállás a rendszer alapértelmezettre." +msgid "" +"The selected language is not supported by your system. Falling back to " +"system default." +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:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5410,7 +5841,7 @@ 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:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Kinézet" @@ -5418,11 +5849,15 @@ msgstr "Kinézet" msgid "Theme selection went wrong" msgstr "Kinézet választáskor hiba történt" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 -msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." -msgstr "Kell lennie egy jegynek itt: 00000001/00000002. A NAND mentésed valószínűleg befejezetlen." +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 +msgid "" +"There must be a ticket for 00000001/00000002. Your NAND dump is probably " +"incomplete." +msgstr "" +"Kell lennie egy jegynek itt: 00000001/00000002. A NAND mentésed valószínűleg " +"befejezetlen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5431,52 +5866,53 @@ msgstr "" "A módosítatlan opcióknál a játék a Dolphin beállításait használja." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "This action replay simulator does not support codes that modify Action Replay itself." -msgstr "Az action replay szimulátor nem támogat olyan kódokat, amelyek módosítját magát az Action Replay-t." +msgid "" +"This action replay simulator does not support codes that modify Action " +"Replay itself." +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:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 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." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. Hold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n" +"Hold the right mouse button and move the mouse to pan the camera around. " +"Hold SHIFT and press one of the WASD keys to move the camera by a certain " +"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " +"SHIFT+R to reset the camera.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Ez a funkció lehetÅ‘vé teszi a játék kamera szabad irányítását.\n" -"Tartsd lenyomva a jobb egér gombot és mozgasd az egeret, hogy körbepásztázz a kamerával. Tartsd lenyomva a SHIFT billentyűt és a WASD billentyűk valamelyikével mozgasd a kamerát távolsági léptékenként (SHIFT+0 megduplázza (x2) és a SHIFT+9 megfelezi (x0.5)). Nyomd le a SHIFT+R kombinációt a kamera alapértékre állításához.\n" +"Tartsd lenyomva a jobb egér gombot és mozgasd az egeret, hogy körbepásztázz " +"a kamerával. Tartsd lenyomva a SHIFT billentyűt és a WASD billentyűk " +"valamelyikével mozgasd a kamerát távolsági léptékenként (SHIFT+0 megduplázza " +"(x2) és a SHIFT+9 megfelezi (x0.5)). Nyomd le a SHIFT+R kombinációt a " +"kamera alapértékre állításához.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Ez a játék sebességének szabályozására szolgál a hang szabályozás által.\n" -"Kikapcsolása rendellenes sebességet okozhat, többnyire túl gyorsat.\n" -"Viszont néha a bekapcsolása folyamatos zajt eredményezhet.\n" -"\n" -"Gyorsbillentyű : Tartsd lenyomva a szabályozás azonnali kikapcsolásához." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Ez a zenei sávok, mint BGM lejátszásra szolgál." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" -"This splits the Video and CPU threads, so they can be run on separate cores.\n" -"Causes major speed improvements on PCs with more than one core, but can also cause occasional crashes/glitches." +"This splits the Video and CPU threads, so they can be run on separate " +"cores.\n" +"Causes major speed improvements on PCs with more than one core, but can also " +"cause occasional crashes/glitches." msgstr "" -"Ez megosztja a videó és processzor folyamatágakat, így azok külön magon futhatnak.\n" -"SzámottevÅ‘ sebességnövekedés érhetÅ‘ el egynél több magos számítógépeken, ugyanakkor véletlenszerű fagyásokat/hibákat is okozhat." +"Ez megosztja a videó és processzor folyamatágakat, így azok külön magon " +"futhatnak.\n" +"SzámottevÅ‘ sebességnövekedés érhetÅ‘ el egynél több magos számítógépeken, " +"ugyanakkor véletlenszerű fagyásokat/hibákat is okozhat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Ez által kézileg szerkesztheted az INI konfigurációs fájlt" @@ -5499,7 +5935,7 @@ msgstr "Cím" msgid "To" msgstr "eddig:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Minden napló típus kijelölése" @@ -5519,6 +5955,7 @@ msgstr "Váltás teljes nézetre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5526,14 +5963,17 @@ msgstr "Váltás teljes nézetre" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Fent" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Hagyományos kínai" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Próbálkozás egy ismeretlen fájltípus betöltésével. " @@ -5541,8 +5981,7 @@ msgstr "Próbálkozás egy ismeretlen fájltípus betöltésével. " msgid "Triggers" msgstr "Kioldó gombok" -#: Source/Core/Common/Src/SysConf.h:92 -#: Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Olvasási próbálkozás az érvénytelen SYSCONF fájlból" @@ -5554,7 +5993,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:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Török" @@ -5575,11 +6014,11 @@ msgstr "UDP port:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "ISMERETLEN" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5594,10 +6033,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format msgid "" -"Unable to parse line %lu of the entered AR code as a valid encrypted or decrypted code. Make sure you typed it correctly.\n" +"Unable to parse line %lu of the entered AR code as a valid encrypted or " +"decrypted code. Make sure you typed it correctly.\n" "Would you like to ignore this line and continue parsing?" msgstr "" -"A megadott AR kód %lu sorának érvényes kódolt, vagy kódolatlan kódként történÅ‘ elemzése nem lehetséges. GyÅ‘zÅ‘dj meg róla, hogy helyesen írtad be.\n" +"A megadott AR kód %lu sorának érvényes kódolt, vagy kódolatlan kódként " +"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:404 @@ -5631,7 +6072,9 @@ msgstr "Ismeretlen üzenet érkezett ezzel az azonosítóval : %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -msgstr "Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettÅ‘l a játékostól:%d Játékos kirúgása!" +msgstr "" +"Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettÅ‘l a játékostól:%d " +"Játékos kirúgása!" <<<<<<< HEAD <<<<<<< HEAD @@ -5662,7 +6105,7 @@ msgstr "Frissítés" msgid "Upright Wiimote" msgstr "ElÅ‘re tartott Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 mód (PAL60) használata" @@ -5674,7 +6117,7 @@ msgstr "Teljes nézet használata" msgid "Use Hex" msgstr "Hexa használat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "HibakezelÅ‘k használata" @@ -5686,23 +6129,27 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Több folyamatág használata a textúrák dekódolásához.\n" -"Sebesség növekedést eredményezhet (fÅ‘leg a két magnál többel rendelkezÅ‘ processzorok esetén).\n" +"Sebesség növekedést eredményezhet (fÅ‘leg a két magnál többel rendelkezÅ‘ " +"processzorok esetén).\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" -"However, one may skip the popups to allow interruption free gameplay by checking this option.\n" +"However, one may skip the popups to allow interruption free gameplay by " +"checking this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Ãltalában ha az árnyaló összeállítása sikertelen, megjelenik egy hibaüzenet.\n" -"Azonban, ennek az opciónak a kijelölésével elérhetÅ‘ a felugró ablak kihagyása, azaz a megszakítás nélküli játékmenet.\n" +"Ãltalában ha az árnyaló összeállítása sikertelen, megjelenik egy " +"hibaüzenet.\n" +"Azonban, ennek az opciónak a kijelölésével elérhetÅ‘ a felugró ablak " +"kihagyása, azaz a megszakítás nélküli játékmenet.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Kellékek" @@ -5726,25 +6173,29 @@ msgstr "Érték:" msgid "Verbosity" msgstr "Verbosity" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Kép" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtuális" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "HangerÅ‘" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, 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:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD telepítési hiba: hiba a(z) %s létrehozása közben" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5763,15 +6214,15 @@ msgstr "" msgid "Warning" msgstr "Figyelem" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Figyelem - DOL indítása nem megfelelÅ‘ konzol módban!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Figyelem - ELF indítása nem megfelelÅ‘ konzol módban!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Figyelem - ISO indítása nem megfelelÅ‘ konzol módban!" @@ -5799,20 +6250,27 @@ msgstr "" "és azonos néven fog szerepelni a memóriakártyán lévÅ‘kkel\n" "Folytatod?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD ======= +======= +>>>>>>> Update the pot file to reflect recent changes in the code. "Figyelem: Olyan mentést töltöttél be, ami a választott videó befejezése " "utáni. (%u > %u bájt) (%u > %u képkocka). Folytatás elÅ‘tt betölthetsz egy " "másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása " "után." +<<<<<<< HEAD >>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:646 @@ -5832,50 +6290,82 @@ msgstr "" ======= msgid "Warning: You loaded a save that's after the end of the current movie. (byte %u > %u) (frame %u > %u). You should load another save before continuing, or load this state with read-only mode off." msgstr "Figyelem: Olyan mentést töltöttél be, ami a választott videó befejezése utáni. (%u > %u bájt) (%u > %u képkocka). Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása után." +======= +>>>>>>> Update the pot file to reflect recent changes in the code. -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format +<<<<<<< HEAD msgid "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync." msgstr "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d (0x%X) bájt eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben szinkronizációs hibák jelentkezhetnek." >>>>>>> Update Hungarian translation. +======= +msgid "" +"Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " +"should load another save before continuing, or load this state with read-" +"only mode off. Otherwise you'll probably get a desync." +msgstr "" +"Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d (0x%X) bájt " +"eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy " +"betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " +"esetben szinkronizációs hibák jelentkezhetnek." +>>>>>>> Update the pot file to reflect recent changes in the code. -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" -"Warning: You loaded a save whose movie mismatches on frame %d. You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync.\n" +"Warning: You loaded a save whose movie mismatches on frame %d. You should " +"load another save before continuing, or load this state with read-only mode " +"off. Otherwise you'll probably get a desync.\n" "\n" -"More information: The current movie is %d frames long and the savestate's movie is %d frames long.\n" +"More information: The current movie is %d frames long and the savestate's " +"movie is %d frames long.\n" "\n" "On frame %d, the current movie presses:\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" +"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" "On frame %d, the savestate's movie presses:\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" +"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 "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= +======= +>>>>>>> Update the pot file to reflect recent changes in the code. "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka eltérés " "mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted " "ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben " "szinkronizációs hibák jelentkezhetnek.\n" +<<<<<<< HEAD ======= "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben szinkronizációs hibák jelentkezhetnek.\n" >>>>>>> Update Hungarian translation. +======= +>>>>>>> Update the pot file to reflect recent changes in the code. "\n" -"BÅ‘vebb információk: A választott videó %d képkocka hosszú, a mentett állás videója pedig %d képkocka hosszú.\n" +"BÅ‘vebb információk: A választott videó %d képkocka hosszú, a mentett állás " +"videója pedig %d képkocka hosszú.\n" "\n" "%d képkockánál a videó tömörítve lesz:\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" +"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 képkockánál a mentett állás videója tömörítve lesz:\n" <<<<<<< HEAD +<<<<<<< HEAD "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" >>>>>>> Update from master branch. ======= "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" >>>>>>> Update Hungarian translation. +======= +"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" +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5886,7 +6376,7 @@ msgstr "WaveFileWriter - fájl nincs megnyitva." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Szélesvásznú hack" @@ -5894,15 +6384,15 @@ msgstr "Szélesvásznú hack" msgid "Width" msgstr "Szélesség" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii konzol" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND gyökér könyvtár:" @@ -5910,6 +6400,7 @@ msgstr "Wii NAND gyökér könyvtár:" msgid "Wii Save Import" msgstr "Wii mentés importálása" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5919,6 +6410,9 @@ msgstr "Wii mentés importálása" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -5985,10 +6479,11 @@ msgstr "Windows menü" msgid "Windows Right" msgstr "Jobb Windows" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6004,6 +6499,11 @@ msgstr "Word Wrap" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Folyamatban..." @@ -6011,6 +6511,11 @@ msgstr "Folyamatban..." msgid "Write to Console" msgstr "Ãrás a konzolba" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Ãrás fájlba" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Ãrás fájlba" @@ -6060,15 +6565,17 @@ msgstr "Meg kell adnod egy nevet!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 msgid "You must enter a valid decimal, hexadecimal or octal value." -msgstr "Be kell írnod egy érvényes decimális, hexadecimális vagy oktális értéket." +msgstr "" +"Be kell írnod egy érvényes decimális, hexadecimális vagy oktális értéket." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 msgid "You must enter a valid profile name." msgstr "Meg kell adnod egy érvényes profil nevet." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 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." +msgstr "" +"Újra kell indítanod a Dolphin emulátort a változtatások érvényesítéséhez." #: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" @@ -6089,7 +6596,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:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6126,14 +6633,19 @@ msgstr "[Egyedi]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" -"Aims to speed up emulation by offloading texture decoding to the GPU using the OpenCL framework.\n" -"However, right now it's known to cause texture defects in various games. Also it's slower than regular CPU texture decoding in most cases.\n" +"Aims to speed up emulation by offloading texture decoding to the GPU using " +"the OpenCL framework.\n" +"However, right now it's known to cause texture defects in various games. " +"Also it's slower than regular CPU texture decoding in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" "[KÃSÉRLETI]\n" -"Az emuláció gyorsítása a célja a textúrák kirakásával dekódolva a grafikai processzor számára az OpenCL keretrendszert használva.\n" -"Azonban, jelenleg köztudottan textúra hiányosságokat okoz számos játékban. Lassabb is mint az átlagos processzoros textúra dekódolás a legtöbb esetben.\n" +"Az emuláció gyorsítása a célja a textúrák kirakásával dekódolva a grafikai " +"processzor számára az OpenCL keretrendszert használva.\n" +"Azonban, jelenleg köztudottan textúra hiányosságokat okoz számos játékban. " +"Lassabb is mint az átlagos processzoros textúra dekódolás a legtöbb " +"esetben.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -6155,7 +6667,7 @@ msgstr "" msgid "^ ADD" msgstr "^ HOZZÃADÃS" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "betöltÅ‘ program (.img)" @@ -6186,12 +6698,12 @@ msgstr "nem Wii mentés vagy a fájl fejléc méretének kiolvasása sikertelen msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "ismeretlen parancs 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute visszatért -1 alkalmazás fut!" @@ -6403,6 +6915,9 @@ msgstr "| VAGY" #~ msgid "Emulator Display Settings" #~ msgstr "Emulátor kijelzÅ‘ beállítások" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Hang szabályozás használata" + #~ msgid "Enable CPU Access" #~ msgstr "Processzor hozzáférés engedélyezése" @@ -6460,6 +6975,13 @@ msgstr "| VAGY" #~ msgid "Error allocating buffer" #~ msgstr "Puffer kiosztási hiba" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "PlayWiimote hiba. %u != %u, bájt %d.\n" +#~ "Sajnos a Wii videó rögzítés egyenlÅ‘re nem működik." + #~ msgid "Error loading %s: can't read info" #~ msgstr "Hiba a(z) %s betöltése közben: az infó nem olvasható" @@ -6743,6 +7265,20 @@ msgstr "| VAGY" #~ msgid "The file " #~ msgstr "A fájl" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Ez a játék sebességének szabályozására szolgál a hang szabályozás által.\n" +#~ "Kikapcsolása rendellenes sebességet okozhat, többnyire túl gyorsat.\n" +#~ "Viszont néha a bekapcsolása folyamatos zajt eredményezhet.\n" +#~ "\n" +#~ "Gyorsbillentyű : Tartsd lenyomva a szabályozás azonnali " +#~ "kikapcsolásához." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Ez a játék hangok és hang effektusok lejátszásra szolgál." diff --git a/Languages/po/it.po b/Languages/po/it.po index 622cfea1fe..bc89c73efc 100644 --- a/Languages/po/it.po +++ b/Languages/po/it.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-04-08 20:40+0100\n" "Last-Translator: RebuMan, Dolphin Team\n" "Language-Team: \n" @@ -57,9 +61,9 @@ msgstr "\"%s\" è un file GCM/ISO non valido, oppure non è una ISO GC/Wii." msgid "%1$sCopy%1$s" msgstr "%1$sCopia%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -153,7 +157,7 @@ msgstr "%sEsporta GCI%s" msgid "%sImport GCI%s" msgstr "%sImporta GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Blocchi Liberi; %u Voci Directory Libere" @@ -186,11 +190,11 @@ msgstr "Gestore &Trucchi" msgid "&DSP Settings" msgstr "&Impostazioni DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Elimina ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Elimina ISO selezionate..." @@ -254,7 +258,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Gioca" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Proprietà" @@ -298,7 +302,7 @@ msgstr "&Visualizza" msgid "&Wiimote Settings" msgstr "Impostazioni &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -342,7 +346,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -351,7 +355,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -409,13 +413,13 @@ msgstr "" "\n" "E' necessario inoltrare la porta TCP all'host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "Scheda basata su AM" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Codici AR" @@ -427,11 +431,11 @@ msgstr "A proposito di Dolphin" msgid "Acceleration" msgstr "Accellerazione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulazione VBeam accurata" @@ -548,11 +552,11 @@ msgstr "Adattatore:" msgid "Add" msgstr "Aggiungi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Aggiungi codice ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Aggiungi Patch" @@ -560,6 +564,7 @@ msgstr "Aggiungi Patch" msgid "Add new pane" msgstr "Aggiungi nuovo riquadro" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -575,6 +580,11 @@ msgstr "Aggiungi nuovo riquadro" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Aggiungi..." @@ -626,11 +636,11 @@ msgstr "" "Regolare la pressione del comando analogico necessaria per attivare i " "pulsanti." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avanzate" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Impostazioni Avanzate" @@ -638,14 +648,15 @@ msgstr "Impostazioni Avanzate" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tutti i file GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Tutti i file di immagine GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Tutti i file GCM GameCube (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -658,18 +669,22 @@ msgstr "Tutti i file GCM GameCube (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Tutti i file ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tutti i file compressi GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Tutti i file (*.*)|*.*" @@ -681,7 +696,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Wiimote Emulato" @@ -704,7 +719,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Impossibile caricare l'Apploader dal file" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Programma di Caricamento (Apploader):" @@ -719,7 +734,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabo" @@ -728,7 +743,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -736,11 +751,12 @@ msgstr "" "Sei sicuro di voler eliminare questi file?\n" "Andranno persi definitivamente!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -750,6 +766,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspetto:" @@ -758,18 +777,20 @@ msgstr "Aspetto:" msgid "At least one pane must remain open." msgstr "Almeno un riquadro deve rimanere aperto." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Interfaccia Audio:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -779,6 +800,9 @@ msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -817,7 +841,7 @@ msgstr "" msgid "Back" msgstr "Indietro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Impostazioni Interfaccia" @@ -845,11 +869,11 @@ msgstr "File di Intestazione (Header) difettoso" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Dettagli Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -861,7 +885,7 @@ msgstr "Barra" msgid "Basic" msgstr "Impostazioni di Base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Impostazioni di Base" @@ -893,6 +917,7 @@ msgstr "Blu Destro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -900,6 +925,9 @@ msgstr "Blu Destro" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Sotto" @@ -908,7 +936,7 @@ msgstr "Sotto" msgid "Bound Controls: %lu" msgstr "Controlli Associati: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Corrotto" @@ -924,7 +952,7 @@ msgstr "Cerca una directory da aggiungere" msgid "Browse for an ISO directory..." msgstr "Cerca una directory per le ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Cerca una directory di destinazione" @@ -955,11 +983,11 @@ msgstr "Levetta di Controllo" msgid "C-Stick" msgstr "Levetta di Controllo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Motore di Emulazione CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 #, fuzzy msgid "Cache Display Lists" msgstr "Attiva Display List Caching" @@ -999,7 +1027,7 @@ msgstr "Impossibile aprire %s" msgid "Cannot unregister events with events pending" msgstr "Impossibile non registrare gli eventi in sospeso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1009,7 +1037,7 @@ msgstr "" "Impossibile utilizzare il file come una scheda di memoria.\n" "Stai tentando di utilizzare lo stesso file su ambedue gli ingressi (slots)?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1028,8 +1056,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "Impossibile trovare il WiiMote attraverso l'handle di connessione %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1039,7 +1065,7 @@ msgstr "Impossibile leggere da DVD_Plugin - Interfaccia DVD: Errore Fatale" msgid "Caps Lock" msgstr "Bloc Maiusc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -1064,7 +1090,7 @@ msgstr "Cambia Disco" msgid "Change Game" msgstr "Cambia Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1080,8 +1106,8 @@ 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 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 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 " @@ -1103,32 +1129,32 @@ msgstr "Cerca Trucco" msgid "Cheats Manager" msgstr "Gestore Trucchi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Cinese (Semplificato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Cinese (Tradizionale)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Scegli una directory principale per i DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Scegli una directory principale per i DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Scegli una ISO predefinita:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Scegli una directory da aggiungere" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Scegli un file da aprire" @@ -1136,7 +1162,7 @@ msgstr "Scegli un file da aprire" msgid "Choose a memory card:" msgstr "Scegli una scheda di memoria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1144,8 +1170,8 @@ msgstr "" "Scegli il file da utilizzare come apploader: (vale per i dischi costruiti " "solo da directory)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Scegli la cartella in cui 'estrarre in'" @@ -1157,14 +1183,14 @@ msgstr "Levetta Circolare" msgid "Classic" msgstr "Controller Classico" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Cancella" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Cancellazione non riuscita." @@ -1180,6 +1206,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1188,6 +1215,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Chiudi" @@ -1211,20 +1242,20 @@ msgstr "Comando" msgid "Comment" msgstr "Note" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Note:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Comprimi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Comprimi le ISO selezionate..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Compressione ISO" @@ -1251,13 +1282,13 @@ msgstr "Configura Pads" msgid "Configure..." msgstr "Configura..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Conferma la Sovrascrittura del File" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "Conferma alla Chiusura" @@ -1267,7 +1298,7 @@ msgstr "Conferma alla Chiusura" msgid "Connect" msgstr "Connetti" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Collega Tastiera USB" @@ -1324,12 +1355,12 @@ msgstr "Converti a GCI" msgid "Copy failed" msgstr "Copia non riuscita" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Copia nella Memcard %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Core" @@ -1359,7 +1390,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Impossibile riconoscere il file ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Impossibile salvare %s" @@ -1374,7 +1405,7 @@ msgstr "" "(l'impostazione dei pads mentre il gioco è in esecuzione è una funzione al " "momento non supportata)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1387,7 +1418,7 @@ msgstr "" "Stai eseguendo Dolphin da CD/DVD, o il file di salvataggio è protetto in " "scrittura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossibile trovare il comando di apertura per l'estensione 'ini'!" @@ -1404,7 +1435,7 @@ msgstr "" msgid "Count:" msgstr "Conteggio:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Paese:" @@ -1418,25 +1449,25 @@ msgstr "Crea codice AR" msgid "Create new perspective" msgstr "Crea nuova prospettiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Creata da KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Creata da Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Creata da VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Creata da black_rider e pubblicata su ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Creatore: " @@ -1444,7 +1475,7 @@ msgstr "Creatore: " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Taglia Immagine lungo i Bordi" @@ -1464,7 +1495,7 @@ msgstr "Dissolvenza Incrociata" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Directory corrente cambiata da %s a %s dopo wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Hack Proiezione Personalizzato" @@ -1472,11 +1503,11 @@ msgstr "Hack Proiezione Personalizzato" msgid "Custom Projection Hack Settings" msgstr "Impostazioni Hack Proiezione Personalizzato" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizza alcuni parametri di Proiezione Ortografica" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Ceco" @@ -1488,10 +1519,11 @@ msgstr "Croce Direzionale" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Motore di Emulazione DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1502,19 +1534,23 @@ msgstr "Motore di Emulazione DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulazione DSP HLE (veloce)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Interprete DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 #, fuzzy msgid "DSP LLE on Thread" msgstr "Esegui DSP LLE in un processo dedicato" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Ricompilatore DSP LLE" @@ -1522,15 +1558,23 @@ msgstr "Ricompilatore DSP LLE" msgid "DSP settings" msgstr "Impostazioni DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Origine DVD:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Dimensione Dati" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Data:" @@ -1551,7 +1595,7 @@ msgstr "Zona Morta" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1560,16 +1604,16 @@ msgstr "Debug" msgid "Decimal" msgstr "." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Decomprimi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Decomprimi ISO selezionate..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Decompressione ISO" @@ -1577,11 +1621,11 @@ msgstr "Decompressione ISO" msgid "Default" msgstr "Predef." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO Predefinita:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Carattere predefinito" @@ -1590,7 +1634,7 @@ msgstr "Carattere predefinito" msgid "Delete" msgstr "Elimina" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Elimina Save" @@ -1599,7 +1643,7 @@ msgstr "Elimina Save" msgid "Delete the existing file '%s'?" msgstr "Elimina l'esistente file di salvataggio '%s'" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 #, fuzzy msgid "Description" msgstr "Descrizione Vertex" @@ -1608,8 +1652,8 @@ msgstr "Descrizione Vertex" msgid "Detect" msgstr "Rileva" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1622,8 +1666,8 @@ msgstr "" msgid "Device" msgstr "Periferica" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Impostazioni Periferica" @@ -1648,25 +1692,25 @@ msgstr "" " e 'checksum' Directory di backup" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "Disabilita Nebbia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Disabilita Nebbia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Disabilita Illuminazione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "Profondità Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Disabilita Trame" @@ -1696,7 +1740,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disco" @@ -1721,6 +1765,7 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Divide" msgstr "/" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1730,10 +1775,13 @@ msgstr "/" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1758,6 +1806,7 @@ msgstr "Dolphin - Configurazione Wiimote Emulato" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1782,6 +1831,14 @@ msgstr "Dolphin - Configurazione Controlli GC" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin - Configurazione Controlli GC" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" @@ -1813,11 +1870,11 @@ msgstr "" msgid "Down" msgstr "Giù" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Scarica Codici (Database WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Codici %lu scaricati. (%lu aggiunti)" @@ -1826,23 +1883,23 @@ msgstr "Codici %lu scaricati. (%lu aggiunti)" msgid "Drums" msgstr "Percussioni/Batteria" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Fittizio/a" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Immagazzina Audio su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Immagazzina Oggetti EFB su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Immagazzina Fotogrammi su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Immagazzina Trame su disco" @@ -1870,6 +1927,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1885,6 +1943,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Olandese" @@ -1910,7 +1973,7 @@ msgstr "" "distribuzione di Dolphin, probabile sia richiesto un riavvio per consentire " "Windows di 'vedere' il nuovo driver." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1926,7 +1989,7 @@ msgstr "Modifica" msgid "Edit ActionReplay Code" msgstr "Modifica Codice ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Modifica Configurazione" @@ -1938,8 +2001,8 @@ msgstr "Modifica Pacth" msgid "Edit current perspective" msgstr "Modifica prospettiva corrente" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Modifica..." @@ -1979,7 +2042,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote Emulato" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Stato dell'Emulazione: " @@ -2001,23 +2064,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Attiva Registrazione Eventi AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Abilita Autoregolazione Audio" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Attiva BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Attiva Unione Blocchi" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2031,6 +2094,7 @@ msgstr "" msgid "Enable Cache" msgstr "Attiva Cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2040,52 +2104,55 @@ msgstr "Attiva Cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Abilita Trucchi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Abilita Audio DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Attiva Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Attiva Dual Core (aumenta la velocità)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Attiva Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Salta pause dovute a inattività" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Salta pause dovute a inattività (aumenta la velocità)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Attiva MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Attiva Scansione Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "Attiva WideScreen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Attiva WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Attiva Rappres. Vettoriale" @@ -2102,7 +2169,7 @@ msgstr "" "Migliora la qualità visiva delle trame che si trovano sotto un angolo di " "vista obliquo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2110,7 +2177,7 @@ msgstr "" "Attivare l'accesso veloce del disco. Necessario per alcuni giochi. " "(Abilitato = Veloce, Disabilitato = Compatibile)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Attiva pagine" @@ -2130,7 +2197,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2138,7 +2205,7 @@ msgstr "" "Se attivato velocizza The Legend of Zelda: Twilight Princess. Disattiva per " "qualsiasi altro gioco" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2149,7 +2216,7 @@ msgstr "" "Accresce l'accuratezza dell'hardware emulato, ma è lento da eseguire (Attivo " "= Compatibile, Disattivato = Veloce)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Abilita Hack Proiezione Personalizzato" @@ -2161,7 +2228,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2180,6 +2247,7 @@ msgstr "" msgid "End" msgstr "Fine" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2195,6 +2263,11 @@ msgstr "Fine" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglese" @@ -2225,6 +2298,7 @@ msgstr "Uguale" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Errore/i" @@ -2255,20 +2329,26 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Errore/i" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Errore caricamento della lingua selezionata. Ritorno alla predefinita di " "sistema." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2304,7 +2384,7 @@ msgstr "Esci dall'Emulatore Dolphin" msgid "Export Failed" msgstr "Esportazione non riuscita" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Esporta File" @@ -2317,15 +2397,15 @@ msgstr "Esporta Registrazione" msgid "Export Recording..." msgstr "Esporta Registrazione..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Esporta Salvataggio" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Esporta salvataggi Wii (sperimentale)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Esporta tutti i salvataggi" @@ -2341,7 +2421,7 @@ msgstr "Esporta salvataggio come..." msgid "Extension" msgstr "Estensione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 #, fuzzy msgid "External Frame Buffer" msgstr "Frame Buffer" @@ -2354,44 +2434,44 @@ msgstr "Parametro Extra" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parametro Extra utile solo in ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Estrai Tutti i File..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Estrai Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Estrai DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Estrai Directory..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Estrai File..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Estrai Partizione..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Estrazione %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Estrazione di Tutti i File" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Estrazione Directory" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Estrazione..." @@ -2403,11 +2483,11 @@ msgstr "Byte FIFO" msgid "FIFO Player" msgstr "Lettore FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANCIA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Dimensione FST:" @@ -2419,11 +2499,11 @@ msgstr "Connessione non riuscita!" msgid "Failed to Listen!!" msgstr "Impossibile 'rimanere in ascolto'!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Download dei codici non riuscito" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Estrazione in %s non riuscita!" @@ -2544,19 +2624,29 @@ msgstr "Scrittura intestazione per %s non riuscita" msgid "Failed to write header for file %d" msgstr "Scrittura intestazione per il file %d non riuscita" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Veloce" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "Fast Mipmaps" msgstr "Carica Mip Maps precalcolate" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versione veloce della MMU. Non funziona con qualsiasi gioco." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Lettore Fifo" @@ -2565,7 +2655,7 @@ msgstr "Lettore Fifo" msgid "File Info" msgstr "Info File" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Il file non conteneva codici." @@ -2598,16 +2688,16 @@ msgstr "Il file non è riconosciuto come una memcard" msgid "File not compressed" msgstr "File non compresso" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "File I/O: Modalità di apertura sconosciuta : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Filesystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Il tipo 'ini' è sconosciuto! Il file non verrà aperto!" @@ -2615,7 +2705,7 @@ msgstr "Il tipo 'ini' è sconosciuto! Il file non verrà aperto!" msgid "First Block" msgstr "Primo Blocco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Ripara Somme di Controllo (Checksums)" @@ -2627,7 +2717,7 @@ msgstr "Forza 16:9" msgid "Force 4:3" msgstr "Forza 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Imposta come Console NTSC-J" @@ -2661,7 +2751,7 @@ msgstr "" "Forza l'uscita video del gioco per risoluzioni widescreen.\n" "Questo potrebbe causare difetti grafici" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2694,7 +2784,7 @@ msgstr "Fotogramma " msgid "Frame Advance" msgstr "Fotogramma per Fotogramma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "Usa FFV1 per immagazzinare i fotogrammi" @@ -2707,7 +2797,7 @@ msgstr "Intervallo Fotogramma" msgid "Frame S&kipping" msgstr "Salta &Fotogramma" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limite FPS:" @@ -2715,10 +2805,11 @@ msgstr "Limite FPS:" msgid "Frames To Record" msgstr "Fotogrammi da Registrare:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Visuale Libera" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2734,6 +2825,11 @@ msgstr "Visuale Libera" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francese" @@ -2768,7 +2864,7 @@ msgstr "Configurazione Log" msgid "GCPad" msgstr "Controlli GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID Gioco:" @@ -2784,15 +2880,15 @@ msgstr "Il gioco non è avviato" msgid "Game not found!!" msgstr "Gioco non trovato!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Impostazioni di Gioco Specifiche" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configurazione di Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "GameCube" @@ -2803,6 +2899,7 @@ msgstr "Impostazioni &Controlli GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2810,6 +2907,9 @@ msgstr "Impostazioni &Controlli GameCube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" @@ -2818,15 +2918,17 @@ msgid "Gamecube Pad settings" msgstr "Impostazioni Controlli GameCube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Codici Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Esecuzione Codice Gecko non riuscita (CT%i CST%i) (%s)\n" "(codice corrotto oppure tipo di codice non ancora supportato.)" @@ -2841,8 +2943,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generale" @@ -2852,6 +2958,7 @@ msgstr "Generale" msgid "General Settings" msgstr "Impostazioni Interfaccia" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2867,6 +2974,11 @@ msgstr "Impostazioni Interfaccia" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Tedesco" @@ -2900,7 +3012,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Greco" @@ -2932,7 +3044,7 @@ msgstr "" 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:303 msgid "Hebrew" msgstr "Ebreo" @@ -3000,12 +3112,16 @@ msgstr "Configurazione Tasti di Scelta Rapida" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Ungherese" @@ -3013,14 +3129,14 @@ msgstr "Ungherese" msgid "Hybrid Wiimote" msgstr "Wiimote Ibrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Tentativo di accesso ai dati da un punto di ingresso " "sconosciuto: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3033,11 +3149,11 @@ msgstr "" "IDTitolo %016llx.\n" " Dolphin, adesso, probabile vada in blocco" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destinazione corrotta" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Impostazioni IPL" @@ -3053,15 +3169,15 @@ msgstr "Puntatore a raggi infrarossi (IR)" msgid "IR Sensitivity:" msgstr "Sensibilità IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Dettagli ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Directory ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITALIA" @@ -3069,23 +3185,25 @@ msgstr "ITALIA" msgid "Icon" msgstr "Icona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 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 " "porre rimedio. (Attivo = Compatibile, Disabilitato = Veloce)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "Se si imposta un Limite di Fotogramma elevato (NTSC:60, PAL:50),\n" "bisogna disabilitare l'Autoregolazione Audio in DSP per rendere efficace " @@ -3114,7 +3232,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Salva Importazione" @@ -3163,7 +3281,7 @@ msgstr "" "Disabilita illuminazione. Migliora le prestazioni ma provoca la scomparasa\n" "dell'illuminazione stessa nei giochi che la utilizzano" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "In Game" @@ -3172,7 +3290,7 @@ msgid "In-Game" msgstr "In-Game" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3192,7 +3310,7 @@ msgstr "Ins" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserisci il codice criptato o decriptato qui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Inserisci SD Card" @@ -3204,7 +3322,7 @@ msgstr "Inserire il nome qui..." msgid "Install WAD" msgstr "Installa WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Installa in Menu Wii" @@ -3215,6 +3333,7 @@ msgstr "" "E' stata sollevata un'Eccezione all'Installazione, tuttavia questa " "piattaforma non la supporta ancora." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3224,15 +3343,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Installazione WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "Impostazioni Interfaccia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Impostazioni Interfaccia" @@ -3258,11 +3380,11 @@ msgstr "Errore Interno LZO - lzo_init() non riuscita" msgid "Internal Resolution:" msgstr "Risoluzione video a Schermo Intero:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interprete (molto lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3279,7 +3401,7 @@ msgstr "Valore non Valido!" msgid "Invalid bat.map or dir entry" msgstr "bat.map o voce directory non valide" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Tipo di evento %i non valido" @@ -3299,14 +3421,15 @@ msgstr "" "%s\n" " E' possibile che sia necessario il redumping del gioco." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "File di registrazione non valido" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Stato non valido" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3322,27 +3445,32 @@ msgstr "Stato non valido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "GIAPPONE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Ricompilatore JIT (consigliato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Ricompilatore JITIL sperimentale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Giapponese" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3351,8 +3479,8 @@ msgstr "KOREA" msgid "Key" msgstr "Combinaz. Tasti" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coreano" @@ -3370,7 +3498,7 @@ msgstr "Pulsante L" msgid "L-Analog" msgstr "L-Analogico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Lingua:" @@ -3423,7 +3551,7 @@ msgstr "" msgid "Less Than" msgstr "Minore di" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3431,7 +3559,7 @@ msgstr "" msgid "Load" msgstr "Carica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 #, fuzzy msgid "Load Custom Textures" msgstr "Carica Trame ad Alta Risoluzione" @@ -3480,6 +3608,7 @@ msgstr "Carica Stato di Gioco dall'Ingresso 8" msgid "Load State..." msgstr "Carica Stato di Gioco..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3489,10 +3618,14 @@ msgstr "Carica Stato di Gioco..." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Carica il Menu di Sistema Wii %d%c" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3502,6 +3635,9 @@ msgstr "Carica il Menu di Sistema Wii %d%c" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carica il Menu di Sistema Wii %d%c" @@ -3528,7 +3664,7 @@ msgstr "Carica il file specificato (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Locale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "Blocca processi ai nuclei" @@ -3541,11 +3677,11 @@ msgstr "Log" msgid "Log Configuration" msgstr "Configurazione Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipi di Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Destinazione Logger" @@ -3575,7 +3711,7 @@ msgstr "" "L'MD5 non corrisponde\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Hack Velocità MMU" @@ -3597,11 +3733,11 @@ msgstr "File MadCatz Gameshark(*.gcs)" msgid "Main Stick" msgstr "Levetta Principale" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID Produttore:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Produttore:" @@ -3625,6 +3761,7 @@ msgstr "Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3632,6 +3769,9 @@ msgstr "Byte" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Scheda di Memoria" @@ -3668,7 +3808,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mic" @@ -3678,11 +3818,11 @@ msgstr "Mic" msgid "Min" msgstr "Mic" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Varie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Impostazioni Varie" @@ -3699,7 +3839,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Carattere a spaziatura fissa" @@ -3712,7 +3852,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motore" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3727,7 +3867,7 @@ msgstr "" msgid "Multiply" msgstr "*" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3817,6 +3957,7 @@ msgstr "TN Tab" msgid "NP Up" msgstr "TN Su" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3826,6 +3967,9 @@ msgstr "TN Su" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3834,7 +3978,7 @@ msgstr "Nome:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nome: " @@ -3848,7 +3992,7 @@ msgid "New Scan" msgstr "Nuova Ricerca" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Pagina Successiva" @@ -3860,7 +4004,7 @@ msgstr "Ricerca Successiva" msgid "Nickname :" msgstr "Pseudonimo:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Nessun Paese (SDK)" @@ -3899,7 +4043,7 @@ msgstr "Nessuna cartella di salvataggio trovata per il titolo %s" msgid "None" msgstr "Nessuno/a" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norvegese" @@ -3907,8 +4051,8 @@ msgstr "Norvegese" msgid "Not Equal" msgstr "Diverso" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Non Impostato" @@ -3928,7 +4072,7 @@ msgstr "Non collegato" msgid "Notes" msgstr "Note" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Note: " @@ -3966,7 +4110,7 @@ msgstr "Oggetto" msgid "Object Range" msgstr "Intervallo Oggetto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Spento" @@ -3992,11 +4136,11 @@ msgstr "Solo %d blocchi disponibili" msgid "Open" msgstr "Apri" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Apri &percorso file" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Apri cartella &salvataggi Wii" @@ -4018,12 +4162,12 @@ msgstr "OpenAL: impossibile trovare la periferica audio" msgid "OpenAL: can't open device %s" msgstr "OpenAL: impossibile aprire il dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 #, fuzzy msgid "OpenCL Texture Decoder" msgstr "Decodificatore Trama OpenMP" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "Decodificatore Trama OpenMP" @@ -4057,7 +4201,7 @@ msgstr "" "memcard\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -4109,19 +4253,20 @@ msgstr "Paragrafo" msgid "Parameters" msgstr "Parametri" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partizione %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Percorsi" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4134,6 +4279,10 @@ msgstr "Percorsi" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4143,7 +4292,7 @@ msgstr "Pausa" msgid "Per-Pixel Lighting" msgstr "Illuminazione Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfetto" @@ -4156,6 +4305,7 @@ msgstr "Prospettiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4166,6 +4316,10 @@ msgstr "Prospettiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Gioca" @@ -4179,7 +4333,7 @@ msgstr "Avvia Riproduzione Registrazione" msgid "Play/Pause" msgstr "Gioca/Pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Giocabile" @@ -4191,6 +4345,7 @@ msgstr "Opzioni di Riproduzione" msgid "Players" msgstr "Giocatori" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4200,6 +4355,9 @@ msgstr "Giocatori" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Per favore confermare..." @@ -4211,23 +4369,23 @@ 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:309 msgid "Polish" msgstr "Polacco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Porta 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Porta 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Porta 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Porta 4:" @@ -4236,11 +4394,11 @@ msgstr "Porta 4:" msgid "Port :" msgstr "Porta:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portoghese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portoghese (Brasiliano)" @@ -4249,17 +4407,17 @@ msgstr "Portoghese (Brasiliano)" msgid "Post-Processing Effect:" msgstr "Effetti di Post-Processing:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4272,7 +4430,7 @@ msgstr "Preimpostazioni: " msgid "Prev Page" msgstr "Pagina Precedente" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Pagina Precedente" @@ -4323,7 +4481,7 @@ msgstr "R-Analogico" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSSIA" @@ -4336,7 +4494,7 @@ msgstr "Gamma" msgid "Read-only mode" msgstr "Modalità in Sola-lettura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Reale" @@ -4413,6 +4571,7 @@ msgstr "Aggiorna Elenco" msgid "Refresh game list" msgstr "Aggiorna elenco giochi" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4431,6 +4590,12 @@ msgstr "Aggiorna elenco giochi" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Rimuovi" @@ -4483,11 +4648,11 @@ msgstr "Levetta Destra" msgid "Rumble" msgstr "Vibrazione" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Esegui DSP LLE in un thread dedicato (non raccomandato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russo" @@ -4495,10 +4660,11 @@ msgstr "Russo" msgid "Sa&ve State" msgstr "Sa&lva Stato di Gioco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Accurata" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4508,6 +4674,9 @@ msgstr "Accurata" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Frequenza di Campionamento:" @@ -4565,12 +4734,12 @@ msgstr "Salva Stato di Gioco nell'Ingresso 8" msgid "Save State..." msgstr "Salva Stato di Gioco..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Salva come..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Salva GCM/ISO compressi" @@ -4578,11 +4747,11 @@ msgstr "Salva GCM/ISO compressi" msgid "Save current perspective" msgstr "Salva prospettiva corrente" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Salva GCM/ISO decompressi" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." @@ -4592,6 +4761,7 @@ msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." msgid "Scaled EFB Copy" msgstr "Scala Copie EFB" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4601,15 +4771,18 @@ msgstr "Scala Copie EFB" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Ricerca..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Ricerca ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Ricerca..." @@ -4625,12 +4798,12 @@ msgstr "Bloc Scroll" msgid "Search Filter" msgstr "Filtro di Ricerca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Cerca nelle Sottocartelle" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Sezione %s non trovata in SYSCONF" @@ -4640,6 +4813,7 @@ msgstr "Sezione %s non trovata in SYSCONF" msgid "Select" msgstr "Seleziona" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4664,6 +4838,14 @@ msgstr "Seleziona il File di Registrazione" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Seleziona il File di Registrazione" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" @@ -4689,16 +4871,21 @@ msgstr "Seleziona finestre libere/mobili" msgid "Select the file to load" msgstr "Seleziona il file da caricare" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Seleziona il file di salvataggio" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4718,6 +4905,9 @@ msgstr "Seleziona lo stato di gioco da caricare" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" @@ -4739,7 +4929,7 @@ msgstr "" "- Adatta a finestra: Estende l'immagine per adattarsi alle dimensioni della " "finestra." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Carattere selezionato" @@ -4775,11 +4965,11 @@ msgstr "Posizione della Barra a Sensori: " msgid "Separator" msgstr "Separatore" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4790,11 +4980,11 @@ msgstr "" msgid "Set" msgstr "Imposta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Imposta come ISO &predefinita" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Imposta %c come Memcard predefinita" @@ -4806,7 +4996,7 @@ msgstr "" "SetARCode_IsActive: Indice troppo grande rispetto alla dimensione " "dell'elenco dei codici AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Impostazioni..." @@ -4818,7 +5008,7 @@ msgstr "SetupWiiMem: Impossible trovare il file per le impostazioni" msgid "Shake" msgstr "Scuoti" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Nome breve:" @@ -4847,7 +5037,7 @@ msgstr "Mostra Barra degli St&rumenti" msgid "Show Drives" msgstr "Mostra Unità a Disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 #, fuzzy msgid "Show EFB Copy Regions" msgstr "Individua Copie EFB" @@ -4864,7 +5054,7 @@ msgstr "Mostra Francia" msgid "Show GameCube" msgstr "Mostra GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Mostra Tasti di Input" @@ -4880,7 +5070,7 @@ msgstr "Mostra JAP" msgid "Show Korea" msgstr "Mostra Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Mostra Lingua:" @@ -4900,7 +5090,7 @@ msgstr "Mostra Piattaforme" msgid "Show Regions" msgstr "Mostra Regioni" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Show Statistics" msgstr "Statistiche" @@ -4921,11 +5111,11 @@ msgstr "Mostra Wad" msgid "Show Wii" msgstr "Mostra Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4937,23 +5127,23 @@ msgstr "" "potrà accadere che Dolphin improvvisamente incorra in un crash senza nessuna " "apparente spiegazione." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Mostra primo blocco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Mostra blocchi salvati" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Mostra commento salvato" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Mostra icona salvata" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Mostra titolo salvato" @@ -4984,7 +5174,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote in posizione di traverso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Cinese Semplificato" @@ -4992,12 +5182,12 @@ msgstr "Cinese Semplificato" msgid "Size" msgstr "Dimensioni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "Salta Caricamento BIOS GC" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Disabilita Dest. Alpha Pass" @@ -5030,11 +5220,11 @@ msgstr "" msgid "Slot %i" msgstr "Ingresso %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Ingresso A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Ingresso B" @@ -5054,7 +5244,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Impostazioni Audio" @@ -5072,6 +5262,7 @@ msgstr "Creazione buffer audio non riuscita: %s" msgid "Space" msgstr "Spazio" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5087,6 +5278,11 @@ msgstr "Spazio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spagnolo" @@ -5110,7 +5306,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Seleziona un plugin video" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Aumenta la velocità di trasferimento del Disco" @@ -5118,7 +5314,7 @@ msgstr "Aumenta la velocità di trasferimento del Disco" msgid "Square Stick" msgstr "Levetta Quadrata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Controller Standard" @@ -5211,12 +5407,12 @@ msgstr "Seleziona il file di salvataggio" msgid "Swing" msgstr "Ruota/Oscilla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Lingua di Sistema:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5256,7 +5452,7 @@ msgstr "Semipiano destro" msgid "Take Screenshot" msgstr "Genera un'Istantanea di Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5273,7 +5469,7 @@ msgstr "Trama" msgid "Texture Cache" msgstr "Cmd Trama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 #, fuzzy msgid "Texture Format Overlay" msgstr "Formato Trama" @@ -5290,13 +5486,13 @@ msgstr "L'indirizzo non è valido" msgid "The checksum was successfully fixed" msgstr "Tentativo di ripristino della somma di controllo riuscito" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "La directory scelta è già in lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5318,7 +5514,7 @@ msgid "The file %s was already open, the file header will not be written." msgstr "" "Il file %s è già stato aperto, il file di intestazione non verrà scritto." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Il file %s specificato non esiste" @@ -5340,7 +5536,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5382,7 +5578,7 @@ msgstr "il file \"%s\" specificato non esiste" msgid "The value is invalid" msgstr "Il valore non è valido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" @@ -5390,7 +5586,7 @@ msgstr "Tema" msgid "Theme selection went wrong" msgstr "La selezione del Tema non era corretta" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5398,7 +5594,7 @@ msgstr "" "Un punto di ingresso in 00000001/00000002 deve essere presente. Dumping NAND " "probabilmente incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5414,7 +5610,7 @@ msgid "" msgstr "" "Questo simulatore di action replay non supporta codici automodificanti." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 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 " @@ -5432,28 +5628,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Questo è utilizzato per calibrare la velocità di gioco secondo " -"l'autoregolazione audio.\n" -"La disabilitazione di quest'opzione potrebbe causare una velocità di gioco " -"anomala e troppo veloce.\n" -"Ma alcune volte la sua attivazione porta a rumori e disturbi costanti " -"all'audio.\n" -"\n" -"Scorciatoia da Tastiera : Tenere premuto per disabilitare " -"istantaneamente l'Autoregolazione." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Questo è usato per riprodurre tracce e brani musicali, come BGM." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5467,7 +5645,7 @@ msgstr "" "Migliora la velocità sui PC con più di un core,\n" "ma può anche provocare occasionali crash/difetti." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" "Questo vi permetterà di modificare manualmente il file di configurazione INI" @@ -5491,7 +5669,7 @@ msgstr "Titolo" msgid "To" msgstr "a" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Seleziona/Deseleziona tutti i Tipi di Log" @@ -5511,6 +5689,7 @@ msgstr "Commuta a Schermo Intero" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5518,14 +5697,17 @@ msgstr "Commuta a Schermo Intero" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Sopra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Cinese Tradizionale" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Tentativo di caricamento di un tipo di file sconosciuto." @@ -5533,7 +5715,7 @@ msgstr "Tentativo di caricamento di un tipo di file sconosciuto." msgid "Triggers" msgstr "Grilletti" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Tentativo di accesso da una SYSCONF non valida" @@ -5545,7 +5727,7 @@ msgstr "" "Tentativo di accesso da una SYSCONF non valida\n" "Gli identificativi Wiimote bt non sono disponibili" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turco" @@ -5566,11 +5748,11 @@ msgstr "Porta UDP:" msgid "UDP Wiimote" msgstr "Wiimote UDP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "SCONOSCIUTO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5652,7 +5834,7 @@ msgstr "Aggiorna" msgid "Upright Wiimote" msgstr "Wiimote in posizione verticale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilizza Modalità EuRGB60 (PAL60)" @@ -5665,7 +5847,7 @@ msgstr "&Schermo Intero" msgid "Use Hex" msgstr "Usa Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Avvisi di Errore" @@ -5686,7 +5868,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Utilità" @@ -5710,25 +5892,29 @@ msgstr "Valore: " msgid "Verbosity" msgstr "Verboso" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtuale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, 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:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Installazione WAD non riuscita: errore nella creazione di %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5743,15 +5929,15 @@ msgstr "" msgid "Warning" msgstr "Allarme/i" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Attenzione - avvio DOL in modalità console errata!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Attenzione - avvio ELF in modalità console errata!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Attenzione - avvio ISO in modalità console errata!" @@ -5781,7 +5967,7 @@ msgstr "" "la quale presenta un nome uguale ai file sulla tua memcard\n" "Continuare?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5789,7 +5975,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5797,7 +5983,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5825,7 +6011,7 @@ msgstr "WaweFileWriter - file non aperto." msgid "Whammy" msgstr "Tremolo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack Widescreen" @@ -5833,15 +6019,15 @@ msgstr "Hack Widescreen" msgid "Width" msgstr "Larghezza" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "Origine DVD:" @@ -5850,6 +6036,7 @@ msgstr "Origine DVD:" msgid "Wii Save Import" msgstr "Importa Salvataggi Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5859,6 +6046,9 @@ msgstr "Importa Salvataggi Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Salva i file Wii (*.bin)|*.bin" @@ -5926,10 +6116,11 @@ msgstr "Menù Windows" msgid "Windows Right" msgstr "Windows Destro" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Adatta Testo" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5945,6 +6136,11 @@ msgstr "Adatta Testo" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Attività in corso..." @@ -5952,6 +6148,11 @@ msgstr "Attività in corso..." msgid "Write to Console" msgstr "Scrivi nella Console" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Scrivi su File" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Scrivi su File" @@ -6005,7 +6206,7 @@ msgstr "E' necessario inserire un valore decimale, esadecimale o ottale." msgid "You must enter a valid profile name." msgstr "E' necessario inserie un nome valido per il profilo." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "E' necessario il riavvio di Dolphin affinché le modifiche abbiano effetto." @@ -6029,7 +6230,7 @@ msgstr "" "Dovrebbe essere 0x%04x (invece di 0x%04llx)\n" "Desideri generarne uno nuovo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "Hack ZTP" @@ -6083,7 +6284,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6116,12 +6317,12 @@ msgstr "" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "cmd 0x%08x sconosciuto" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "valore wxExecute ritornato -1 su applicazione in esecuzione!" @@ -6554,6 +6755,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Impostazioni di Visualizzazione dell'Emulatore" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Abilita Autoregolazione Audio" + #~ msgid "Enable CPU Access" #~ msgstr "Attiva Accesso alla CPU" @@ -7019,6 +7223,23 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "Il file" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Questo è utilizzato per calibrare la velocità di gioco secondo " +#~ "l'autoregolazione audio.\n" +#~ "La disabilitazione di quest'opzione potrebbe causare una velocità di " +#~ "gioco anomala e troppo veloce.\n" +#~ "Ma alcune volte la sua attivazione porta a rumori e disturbi costanti " +#~ "all'audio.\n" +#~ "\n" +#~ "Scorciatoia da Tastiera : Tenere premuto per disabilitare " +#~ "istantaneamente l'Autoregolazione." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Questo solitamente è usato per riprodurre voci ed effetti sonori." diff --git a/Languages/po/ja.po b/Languages/po/ja.po index 12fee69911..eec5710d55 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -9,7 +9,11 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-10-12 20:45+0900\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -62,9 +66,9 @@ msgstr "\"%s\" ã¯ç„¡åŠ¹ãªãƒ•ã‚¡ã‚¤ãƒ«ã€ã¾ãŸã¯ã‚²ãƒ¼ãƒ ã‚­ãƒ¥ãƒ¼ãƒ–ï¼Wii msgid "%1$sCopy%1$s" msgstr "%1$s コピー %1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -159,7 +163,7 @@ msgstr "%s エクスãƒãƒ¼ãƒˆ GCI %s" msgid "%sImport GCI%s" msgstr "%s インãƒãƒ¼ãƒˆ GCI %s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u ブロック空ã | %u エントリ空ã" @@ -192,11 +196,11 @@ msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ç·¨é›†ãƒ„ール(&C)" msgid "&DSP Settings" msgstr "サウンド設定(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“を削除(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "é¸æŠžã—ãŸã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ã‚’å…¨ã¦å‰Šé™¤(&D)" @@ -260,7 +264,7 @@ msgstr "一時åœæ­¢(&P)" msgid "&Play" msgstr "開始(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "プロパティ(&P)" @@ -304,7 +308,7 @@ msgstr "表示(&V)" msgid "&Wiimote Settings" msgstr "Wii入力設定(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "å…¬å¼Wiki(英語)ã§å‹•ä½œçŠ¶æ³ã‚’確èª(&W)" @@ -348,7 +352,7 @@ msgstr "コードåを入力ã—ã¦ãã ã•ã„" msgid "" msgstr "<対応解åƒåº¦ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "ãªã—" @@ -357,7 +361,7 @@ msgstr "ãªã—" msgid "" msgstr "入力を待機..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "＜システムã®è¨€èªžï¼ž" @@ -412,13 +416,13 @@ msgstr "" "\n" "TCPãƒãƒ¼ãƒˆã®é–‹æ”¾ã‚’忘れãšã«ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "Triforce基æ¿" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "アクションリプレイコード" @@ -430,11 +434,11 @@ msgstr "Dolphinã«ã¤ã„ã¦" msgid "Acceleration" msgstr "加速度" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "精度：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" @@ -558,11 +562,11 @@ msgstr "ビデオカード：" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "コードを追加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "パッãƒã‚’追加" @@ -570,6 +574,7 @@ msgstr "パッãƒã‚’追加" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -585,6 +590,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "追加" @@ -630,11 +640,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "ボタンãŒåå¿œã™ã‚‹æ„Ÿåº¦ã‚’調整ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "高度ãªè¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "高度ãªè¨­å®š" @@ -642,14 +652,15 @@ msgstr "高度ãªè¨­å®š" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "å…¨ã¦ã® GC/Wii ファイル (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "å…¨ã¦ã® GC/Wii イメージ (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "GC GCMファイル (gcm)|*.gcm" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -662,18 +673,22 @@ msgstr "GC GCMファイル (gcm)|*.gcm" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "å…¨ã¦ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイル (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Wii ISOファイル (iso)|*.iso" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "圧縮ã•ã‚ŒãŸGC/Wii ISOファイル (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ« (*.*)|*.*" @@ -689,6 +704,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD <<<<<<< HEAD @@ -700,6 +716,9 @@ msgid "Alternate Wiimote Timing" msgstr "Wii リモコンをエミュレート" >>>>>>> Update translation files for recent changes in the code. ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" >>>>>>> Update Arabic and Japanese translations. @@ -721,7 +740,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Apploader ファイルã‹ã‚‰èª­ã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader" @@ -739,7 +758,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€ã‚ªãƒ•ã€‘ã‚’é¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "アラビア語" @@ -748,7 +767,7 @@ msgstr "アラビア語" msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" ã“ã®ãƒ—ロファイルを削除ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -756,10 +775,11 @@ msgstr "" "ã“れら複数ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿ\n" "å…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿå…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -769,6 +789,9 @@ msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿå…ƒã«æˆ» ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "アスペクト比：" @@ -777,18 +800,20 @@ msgstr "アスペクト比：" msgid "At least one pane must remain open." msgstr "At least one pane must remain open." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "サウンド" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "出力API (Audio Backend)" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error opening AO device.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -798,6 +823,9 @@ msgstr "AudioCommon: Error opening AO device.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -840,7 +868,7 @@ msgstr "" msgid "Back" msgstr "Back" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "出力設定" @@ -867,11 +895,11 @@ msgstr "ファイルヘッダã®ä¸è‰¯" msgid "Banner" msgstr "ãƒãƒŠãƒ¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "ãƒãƒŠãƒ¼ã®è©³ç´°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "ãƒãƒŠãƒ¼è¡¨ç¤º" @@ -883,7 +911,7 @@ msgstr "ãƒãƒ¼" msgid "Basic" msgstr "基本設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "基本設定" @@ -914,6 +942,7 @@ msgstr "é’ - å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -921,6 +950,9 @@ msgstr "é’ - å³" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "下部" @@ -929,7 +961,7 @@ msgstr "下部" msgid "Bound Controls: %lu" msgstr "コマンド数: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "ダメダメ" @@ -945,7 +977,7 @@ msgstr "ゲームリストã«è¿½åŠ ã™ã‚‹ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠžã—ã¦ãã ã•ã„ msgid "Browse for an ISO directory..." msgstr "ISOã®ã‚るフォルダをブラウズ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "出力先をé¸æŠž" @@ -975,11 +1007,11 @@ msgstr "C-スティック" msgid "C-Stick" msgstr "C-スティック" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPUエミュレーション方å¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cache Display Lists" @@ -1029,7 +1061,7 @@ msgstr "%s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“" msgid "Cannot unregister events with events pending" msgstr "Cannot unregister events with events pending" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1040,7 +1072,7 @@ msgstr "" "%s\n" "ã“ã‚Œã¯ä¸æ­£ãªãƒ¡ãƒ¢ãƒªãƒ¼ã‚«ãƒ¼ãƒ‰ãƒ‡ãƒ¼ã‚¿ã§ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1058,8 +1090,6 @@ msgstr "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Cant find WiiMote by connection handle %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1069,7 +1099,7 @@ msgstr "DVD_Pluginã‹ã‚‰ã®èª­ã¿è¾¼ã¿ãŒä¸å¯èƒ½ - DVD-Interface: 致命的 msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "カタルーニャ語" @@ -1095,7 +1125,7 @@ msgstr "ディスクã®å…¥ã‚Œæ›¿ãˆ" msgid "Change Game" msgstr "ゲームを変更" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1113,8 +1143,8 @@ msgstr "Changes sign to zFar Parameter (after correction)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Changes sign to zNear Parameter (after correction)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "ã“ã®è¨­å®šã¯æ¬¡å›žã®ã‚²ãƒ¼ãƒ é–‹å§‹æ™‚ã«å映ã•ã‚Œã¾ã™ï¼" @@ -1134,31 +1164,31 @@ msgstr "コードサーãƒ" msgid "Cheats Manager" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ç·¨é›†ãƒ„ール" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "簡体字中国語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "ç¹ä½“字中国語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "DVDルートフォルダをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "NANDã®ã‚るルートフォルダをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "ディスクãƒãƒ£ãƒ³ãƒãƒ«ã«è¡¨ç¤ºã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "追加ã—ãŸã„フォルダをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "メモリーカードをé¸æŠž" @@ -1166,7 +1196,7 @@ msgstr "メモリーカードをé¸æŠž" msgid "Choose a memory card:" msgstr "メモリーカードをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1174,8 +1204,8 @@ msgstr "" "apploaderã¨ã—ã¦ä½¿ç”¨ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžï¼š(フォルダã‹ã‚‰ã®ã¿æ§‹ç¯‰ã•ã‚ŒãŸãƒ‡ã‚£ã‚¹ã‚¯ã«" "é©ç”¨ã•ã‚Œã¾ã™)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "抽出先ã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠž" @@ -1187,14 +1217,14 @@ msgstr "丸ã¿" msgid "Classic" msgstr "クラシックコントローラ" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "全消去" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "クリアã«å¤±æ•—" @@ -1210,6 +1240,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1218,6 +1249,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "é–‰ã˜ã‚‹" @@ -1241,20 +1276,20 @@ msgstr "Command" msgid "Comment" msgstr "コメント" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "ゲーム紹介" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã‚’圧縮" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "é¸æŠžã—ãŸISOファイルを全ã¦åœ§ç¸®" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "圧縮ã—ã¦ã„ã¾ã™..." @@ -1281,13 +1316,13 @@ msgstr "パッド設定" msgid "Configure..." msgstr "Dolphin本体ã®è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "ファイルã®ä¸Šæ›¸ãを確èª" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "動作åœæ­¢æ™‚ã«ç¢ºèª" @@ -1296,7 +1331,7 @@ msgstr "動作åœæ­¢æ™‚ã«ç¢ºèª" msgid "Connect" msgstr "接続" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USBキーボードã®æŽ¥ç¶šã‚’エミュレート" @@ -1353,12 +1388,12 @@ msgstr "GCIファイルã«å¤‰æ›" msgid "Copy failed" msgstr "コピーã«å¤±æ•—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "メモリーカード%cã«ã‚³ãƒ”ー" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "コア" @@ -1388,7 +1423,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "ISOファイル %s ã‚’èªè­˜ã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "%s をセーブã§ãã¾ã›ã‚“ã§ã—ãŸ" @@ -1401,7 +1436,7 @@ msgstr "" "ç¾åœ¨ãƒ‘ッド設定を行ãˆã¾ã›ã‚“。 プレーヤーãŒæ®‹ã£ã¦ã„ã‚‹ã‹ã‚²ãƒ¼ãƒ ãŒèµ·å‹•ä¸­ã§ã™ï¼\n" "(ゲーム中ã®ãƒ‘ッド設定ã¯ç¾åœ¨ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1414,7 +1449,7 @@ msgstr "" "Dolphinã‚’CD/DVDã‹ã‚‰èµ·å‹•ã—ã¦ã„ã‚‹ã‹ã€ã‚»ãƒ¼ãƒ–ファイルãŒèª­ã¿å–り専用ã«ãªã£ã¦ã„ã¾ã›" "ã‚“ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "æ‹¡å¼µå­'ini'ã«å¯¾ã—ã¦é–¢é€£ä»˜ã‘られã¦ã„るプログラムãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼" @@ -1431,7 +1466,7 @@ msgstr "" msgid "Count:" msgstr "該当：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "発売国" @@ -1445,25 +1480,25 @@ msgstr "アクションリプレイコードを作æˆ" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Created by KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Created by VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Created by black_rider and published on ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "制作者： " @@ -1471,7 +1506,7 @@ msgstr "制作者： " msgid "Critical" msgstr "致命的ãªã‚¨ãƒ©ãƒ¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "クロッピング" @@ -1495,7 +1530,7 @@ msgstr "クロスフェーダー" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "カレントフォルダ㯠wxFileSelector ã®å¾Œã« %s ã‹ã‚‰ %s ã«å¤‰æ›´ã•ã‚Œã¾ã—ãŸï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Custom Projection Hack" @@ -1503,11 +1538,11 @@ msgstr "Custom Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Custom Projection Hack Settings" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "設定画é¢ã«å…¥ã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "ãƒã‚§ã‚³èªž" @@ -1519,10 +1554,11 @@ msgstr "å字キー" msgid "DSP" msgstr "サウンド" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSPエミュレーション方å¼" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1533,18 +1569,22 @@ msgstr "DSPエミュレーション方å¼" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP-HLE エミュレーション (高速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP-LLE インタプリタ (低速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP-LLEを別スレッドã§å®Ÿè¡Œ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP-LLE リコンパイラ" @@ -1552,15 +1592,23 @@ msgstr "DSP-LLE リコンパイラ" msgid "DSP settings" msgstr "サウンドã«é–¢ã™ã‚‹è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVDルート" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "データサイズ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "発売日" @@ -1581,7 +1629,7 @@ msgstr "'éŠã³'ã®èª¿æ•´" msgid "Debug" msgstr "デãƒãƒƒã‚°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "デãƒãƒƒã‚°ç”¨é …ç›®" @@ -1589,16 +1637,16 @@ msgstr "デãƒãƒƒã‚°ç”¨é …ç›®" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "ISOファイルを解å‡" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "é¸æŠžã—ãŸISOファイルを全ã¦è§£å‡" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "解å‡ä¸­..." @@ -1606,11 +1654,11 @@ msgstr "解å‡ä¸­..." msgid "Default" msgstr "既定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "デフォルトISO" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "既定ã®ãƒ•ã‚©ãƒ³ãƒˆ" @@ -1619,7 +1667,7 @@ msgstr "既定ã®ãƒ•ã‚©ãƒ³ãƒˆ" msgid "Delete" msgstr "削除" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "ã“ã®ã‚»ãƒ¼ãƒ–データを削除" @@ -1628,7 +1676,7 @@ msgstr "ã“ã®ã‚»ãƒ¼ãƒ–データを削除" msgid "Delete the existing file '%s'?" msgstr "既存ファイル '%s' を削除ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "説明" @@ -1636,8 +1684,8 @@ msgstr "説明" msgid "Detect" msgstr "検出" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 #, fuzzy msgid "" "Detected attempt to read more data from the DVD than fit inside the out " @@ -1651,8 +1699,8 @@ msgstr "" msgid "Device" msgstr "デãƒã‚¤ã‚¹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "デãƒã‚¤ã‚¹è¨­å®š" @@ -1677,23 +1725,23 @@ msgstr "" "ディレクトリãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã«ã‚‚失敗" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "無効化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Disable Fog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Disable Lighting" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Disable Per-Pixel Depth" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "テクスãƒãƒ£ç„¡åŠ¹åŒ–" @@ -1736,7 +1784,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disc" @@ -1763,6 +1811,7 @@ msgstr "" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1772,10 +1821,13 @@ msgstr "Divide" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "動作中ã®ã‚²ãƒ¼ãƒ ã‚’åœæ­¢ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1800,6 +1852,7 @@ msgstr "Wii リモコンã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³è¨­å®š" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1824,6 +1877,14 @@ msgstr "GCコントローラ設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "GCコントローラ設定" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" @@ -1856,11 +1917,11 @@ msgstr "" msgid "Down" msgstr "Down" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ã‚’ダウンロード (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu個ã®ã‚³ãƒ¼ãƒ‰ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚( æ–°è¦è¿½åŠ ï¼š %lu個 )" @@ -1869,23 +1930,23 @@ msgstr "%lu個ã®ã‚³ãƒ¼ãƒ‰ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚( æ–°è¦è¿½åŠ ï¼š %lu個 )" msgid "Drums" msgstr "ドラムコントローラ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "ダミーデãƒã‚¤ã‚¹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "サウンドã®ãƒ€ãƒ³ãƒ—" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "EFBターゲットをダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "フレームをダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "テクスãƒãƒ£ã‚’ダンプ" @@ -1920,6 +1981,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1935,6 +1997,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "オランダ語" @@ -1958,7 +2025,7 @@ msgstr "" "Dolphinã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’æ›´æ–°ã—ãŸå ´åˆã¯ã€ãƒ‰ãƒ©ã‚¤ãƒã‚’èªè­˜ã•ã›ã‚‹ãŸã‚ã«Windowsã®å†èµ·" "å‹•ãŒå¿…è¦ã«ãªã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "欧州" @@ -1974,7 +2041,7 @@ msgstr "編集" msgid "Edit ActionReplay Code" msgstr "コードを編集" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "iniを編集" @@ -1986,8 +2053,8 @@ msgstr "パッãƒã‚’編集" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "編集" @@ -2038,7 +2105,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wii リモコンをエミュレート" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "動作状æ³ï¼š" @@ -2066,23 +2133,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "アクションリプレイコードã®ãƒ­ã‚°ã‚’å–å¾—ã™ã‚‹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Enable Audio Throttle" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Enable BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Enable Block Merging" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2095,6 +2162,7 @@ msgstr "" msgid "Enable Cache" msgstr "Enable Cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2104,51 +2172,54 @@ msgstr "Enable Cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ã‚’有効化" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Enable DTK Music" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Enable Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "デュアルコア動作を行ㆠ(速度å‘上)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "ホットキーを使用" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Enable Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "アイドルスキップ処ç†ã‚’行ㆠ(速度å‘上)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Enable MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "プログレッシブ表示を有効化" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "スクリーンセーãƒãƒ¼ã‚’有効化" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Enable WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "ワイヤーフレーム有効化" @@ -2166,7 +2237,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€1x】をé¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2174,7 +2245,7 @@ msgstr "" "ディスクã®èª­ã¿å–り速度をå‘上ã•ã›ã¾ã™ã€‚å¿…è¦ã«ãªã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã¯ã‚ãšã‹ã§ã™ [有効ï¼" "ロード時間短縮ï¼ç„¡åŠ¹ï¼äº’æ›æ€§ãƒ»å®‰å®šæ€§é‡è¦–]" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "ページ分ã‘ã—ã¦è¡¨ç¤º" @@ -2201,7 +2272,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2209,7 +2280,7 @@ msgstr "" "トワイライトプリンセスã«ãŠã„ã¦ã€åºƒå¤§ãªã‚¨ãƒªã‚¢ã§ç™ºç”Ÿã™ã‚‹FPS低下を抑ãˆã¾ã™ã€‚ä»–ã®" "タイトルã§ã¯ç„¡åŠ¹ã«ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2219,7 +2290,7 @@ msgstr "" "ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ç²¾åº¦ãŒå‘上ã—ã¾ã™[有効ï¼äº’æ›æ€§é‡è¦–,ï¼ç„¡åŠ¹ï¼å‹•ä½œ" "速度å‘上]" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Enables Custom Projection Hack" @@ -2235,7 +2306,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2257,6 +2328,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2272,6 +2344,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "英語" @@ -2302,6 +2379,7 @@ msgstr "ã«ä¸€è‡´ã™ã‚‹" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "エラー" @@ -2332,19 +2410,25 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "エラー" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "é¸æŠžã—ãŸè¨€èªžã®èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚＜システムã®è¨€èªžï¼žã«è¨­å®šã‚’戻ã—ã¾ã™" -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2378,7 +2462,7 @@ msgstr "Dolphinを終了" msgid "Export Failed" msgstr "エクスãƒãƒ¼ãƒˆã«å¤±æ•—" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "ファイルを抽出" @@ -2391,15 +2475,15 @@ msgstr "録画ファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ" msgid "Export Recording..." msgstr "録画ファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "セーブデータをエクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "セーブデータをエクスãƒãƒ¼ãƒˆ (実験的)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "å…¨ã¦ã®ã‚»ãƒ¼ãƒ–データをエクスãƒãƒ¼ãƒˆ" @@ -2415,7 +2499,7 @@ msgstr "セーブデータã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆå…ˆã‚’é¸æŠž" msgid "Extension" msgstr "拡張コントローラ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "External Frame Buffer (外部フレームãƒãƒƒãƒ•ã‚¡)" @@ -2427,44 +2511,44 @@ msgstr "特殊パラメータ" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "『メトロイド Other Mã€ã®ã¿ã«æœ‰åŠ¹ãªè¨­å®šã§ã™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Apploaderを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "DOLを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "ã“ã® Partition を抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "%s を抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’エクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "フォルダをエクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "抽出中" @@ -2476,11 +2560,11 @@ msgstr "FIFO ãƒã‚¤ãƒˆ" msgid "FIFO Player" msgstr "FIFO プレーヤー" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "フランス" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FSTサイズ" @@ -2492,11 +2576,11 @@ msgstr "接続ã«å¤±æ•—ï¼" msgid "Failed to Listen!!" msgstr "Listenã«å¤±æ•—ï¼" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "見ã¤ã‹ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "%s ã¸ã®æŠ½å‡ºã«å¤±æ•—" @@ -2613,18 +2697,28 @@ msgstr "Failed to write header for %s" msgid "Failed to write header for file %d" msgstr "Failed to write header for file %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Fast" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Fast Mipmaps" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "高速ãªMMUを使用ã—ã¾ã™ã€‚å…¨ã¦ã®ã‚²ãƒ¼ãƒ ã§ã†ã¾ãå‹•ãã‚ã‘ã§ã¯ã‚ã‚Šã¾ã›ã‚“" +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "FIFO プレーヤー" @@ -2633,7 +2727,7 @@ msgstr "FIFO プレーヤー" msgid "File Info" msgstr "ファイル情報" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "コードをå«ã¾ãªã„ファイルã§ã™" @@ -2666,16 +2760,16 @@ msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ¡ãƒ¢ãƒªãƒ¼ã‚«ãƒ¼ãƒ‰ã¨ã—ã¦èªè­˜ã•ã‚Œã¾ã›ã‚“ msgid "File not compressed" msgstr "圧縮ã•ã‚Œã¦ã„ãªã„ファイル" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Unknown open mode : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "構造" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr " 'ini' ã¯ä¸æ˜Žãªæ‹¡å¼µå­ã§ã™ã€‚é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“ï¼" @@ -2683,7 +2777,7 @@ msgstr " 'ini' ã¯ä¸æ˜Žãªæ‹¡å¼µå­ã§ã™ã€‚é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“ï¼" msgid "First Block" msgstr "ブロック開始ä½ç½®" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã‚’修正" @@ -2695,7 +2789,7 @@ msgstr "Force 16:9" msgid "Force 4:3" msgstr "Force 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "コンソールを日本å‘ã‘ (NTSC-J) ã«è¨­å®š" @@ -2729,7 +2823,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2766,7 +2860,7 @@ msgstr "フレーム" msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "FFV1を使用ã—ã¦ãƒ•ãƒ¬ãƒ¼ãƒ ã‚’ダンプ" @@ -2778,7 +2872,7 @@ msgstr "フレームã®ç¯„囲" msgid "Frame S&kipping" msgstr "フレームスキップ(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "フレームリミット：" @@ -2786,10 +2880,11 @@ msgstr "フレームリミット：" msgid "Frames To Record" msgstr "録画フレーム数設定" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "フリールック" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2805,6 +2900,11 @@ msgstr "フリールック" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "フランス語" @@ -2838,7 +2938,7 @@ msgstr "ログã®è¨­å®š" msgid "GCPad" msgstr "入力(GC)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ゲームID" @@ -2854,15 +2954,15 @@ msgstr "ゲームãŒèµ·å‹•ã—ã¦ã„ã¾ã›ã‚“ï¼" msgid "Game not found!!" msgstr "ゲームãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "固有設定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "ゲーム設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "ゲームキューブ" @@ -2873,6 +2973,7 @@ msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2880,6 +2981,9 @@ msgstr "ゲームキューブ入力設定(&P)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp" @@ -2888,15 +2992,17 @@ msgid "Gamecube Pad settings" msgstr "ゲームキューブã®å…¥åŠ›è¨­å®šã‚’è¡Œã„ã¾ã™" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Geckoコード" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Geckoコードã®å®Ÿè¡Œã«å¤±æ•— (CT%i CST%i) (%s)\n" "(コードã«å•é¡ŒãŒã‚ã‚‹ã‹ã€ã¾ã ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„タイプã®ã‚³ãƒ¼ãƒ‰ã§ã™)" @@ -2911,8 +3017,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2921,6 +3031,7 @@ msgstr "一般" msgid "General Settings" msgstr "一般" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2936,6 +3047,11 @@ msgstr "一般" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "ドイツ語" @@ -2980,7 +3096,7 @@ msgstr "" "動作速度ã¯å°‘々低下ã—ã€ã¾ã‚Œã«æç”»ãƒã‚°ã®åŽŸå› ã«ã‚‚ãªã‚‹ã“ã¨ã‚‚ã‚ã‚Šã¾ã™ã€‚\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "ギリシア語" @@ -3012,7 +3128,7 @@ msgstr "高速化(Hacks)" msgid "Header checksum failed" msgstr "ヘッダã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã«å¤±æ•—" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "ヘブライ語" @@ -3077,6 +3193,7 @@ msgstr "ホットキーã®è¨­å®š" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 @@ -3085,10 +3202,13 @@ msgstr "ホットキーã®è¨­å®š" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "ホットキー" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "ãƒãƒ³ã‚¬ãƒªãƒ¼èªž" @@ -3096,12 +3216,12 @@ msgstr "ãƒãƒ³ã‚¬ãƒªãƒ¼èªž" msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3114,11 +3234,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin will likely hang now" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL設定" @@ -3134,15 +3254,15 @@ msgstr "IR ãƒã‚¤ãƒ³ã‚¿" msgid "IR Sensitivity:" msgstr "感度" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ゲームã®è©³ç´°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "フォルダ一覧" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "イタリア" @@ -3150,22 +3270,24 @@ msgstr "イタリア" msgid "Icon" msgstr "アイコン" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "FPSãŒå®‰å®šã—ãªã„ゲームã§åŠ¹æžœãŒã‚ã‚Šã¾ã™ [有効ï¼äº’æ›æ€§å‘上ï¼ç„¡åŠ¹ï¼å‹•ä½œé€Ÿåº¦å‘上]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). 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)より高ã„FPSã§åˆ¶é™ã‚’ã‹ã‘ã‚‹å ´åˆã€ã‚µã‚¦ãƒ³ãƒ‰è¨­å®šã§ã€ŒAudio " "Throttleã€ã‚’無効ã«ã—ãªã„ã¨åŠ¹æžœãŒç¾ã‚Œã¾ã›ã‚“" @@ -3202,7 +3324,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "セーブデータをインãƒãƒ¼ãƒˆ" @@ -3255,7 +3377,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "ソコソコ" @@ -3264,7 +3386,7 @@ msgid "In-Game" msgstr "ゲーム内" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "情報" @@ -3284,7 +3406,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "ã“ã“ã«æš—å·åŒ–or復å·åŒ–ã•ã‚ŒãŸã‚³ãƒ¼ãƒ‰ã‚’貼り付ã‘ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SDカードã®æŒ¿å…¥ã‚’エミュレート" @@ -3296,7 +3418,7 @@ msgstr "コードåを入力ã—ã¦ãã ã•ã„" msgid "Install WAD" msgstr "Wiiメニューã«WADファイルを追加" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Wiiメニューã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«" @@ -3307,6 +3429,7 @@ msgstr "" "InstallExceptionHandler ãŒå‘¼ã³å‡ºã•ã‚Œã¾ã—ãŸãŒã€ã“ã®ãƒ—ラットフォームã¯ã¾ã ã‚µ" "ãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3316,14 +3439,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WADファイルを追加ã—ã¦ã„ã¾ã™..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "表示" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Dolphinã®è¡¨ç¤ºã«é–¢ã™ã‚‹è¨­å®š" @@ -3348,11 +3474,11 @@ msgstr "Internal LZO Error - lzo_init() failed" msgid "Internal Resolution:" msgstr "内部解åƒåº¦ã®å¤‰æ›´ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "インタプリタ (éžæŽ¨å¥¨)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "イントロ" @@ -3369,7 +3495,7 @@ msgstr "無効ãªå€¤ã§ã™ï¼" msgid "Invalid bat.map or dir entry" msgstr "Invalid bat.map or dir entry" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Invalid event type %i" @@ -3389,14 +3515,15 @@ msgstr "" "%s\n" " ã“ã®ã‚²ãƒ¼ãƒ ã‚’ダンプã—ãªãŠã—ã¦ãã ã•ã„" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "ä¸æ­£ãªéŒ²ç”»ãƒ•ã‚¡ã‚¤ãƒ«" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "ä¸æ­£ãªã‚»ãƒ¼ãƒ–ï¼ãƒ­ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3412,27 +3539,32 @@ msgstr "ä¸æ­£ãªã‚»ãƒ¼ãƒ–ï¼ãƒ­ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "イタリア語" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "日本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT リコンパイラ (推奨)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL リコンパイラ (実験的)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "日本語" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "韓国" @@ -3441,8 +3573,8 @@ msgstr "韓国" msgid "Key" msgstr "キー設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "韓国語" @@ -3460,7 +3592,7 @@ msgstr "Lボタン" msgid "L-Analog" msgstr "L (åŠæŠ¼ã—)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "GUI言語：" @@ -3513,7 +3645,7 @@ msgstr "" msgid "Less Than" msgstr "よりå°ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "FPSã«ã‚ˆã‚‹åˆ¶é™ã‚’有効化" @@ -3521,7 +3653,7 @@ msgstr "FPSã«ã‚ˆã‚‹åˆ¶é™ã‚’有効化" msgid "Load" msgstr "読込" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "カスタムテクスãƒãƒ£ã‚’読ã¿è¾¼ã‚€" @@ -3569,6 +3701,7 @@ msgstr "ステートロード - スロット 8" msgid "Load State..." msgstr "ファイルã‹ã‚‰ãƒ­ãƒ¼ãƒ‰" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3590,6 +3723,13 @@ msgstr "Wiiメニューを起動" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Wiiメニューを起動" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wiiメニューを起動 ( ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š%d %c )" @@ -3617,7 +3757,7 @@ msgstr "è¦å®šã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "ローカル" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "スレッドをコア数ã«åˆã‚ã›ã¦å›ºå®š" @@ -3629,11 +3769,11 @@ msgstr "ログ" msgid "Log Configuration" msgstr "ログã®è¨­å®š" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "表示ã™ã‚‹ãƒ­ã‚°æƒ…å ±" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "ログ出力先" @@ -3663,7 +3803,7 @@ msgstr "" "MD5ã®ä¸æ•´åˆ\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3685,11 +3825,11 @@ msgstr "MadCatz Gameshark セーブファイル(*.gcs)" msgid "Main Stick" msgstr "コントロールスティック" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "メーカーID" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "メーカー" @@ -3713,6 +3853,7 @@ msgstr "メモリãƒã‚¤ãƒˆ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3720,6 +3861,9 @@ msgstr "メモリãƒã‚¤ãƒˆ" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "メモリーカード" @@ -3754,7 +3898,7 @@ msgstr "メモリカードã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºãŒã€ãƒ˜ãƒƒãƒ€ã®ã‚µã‚¤ã‚ºã« msgid "Menu" msgstr "メニュー" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "マイク" @@ -3763,11 +3907,11 @@ msgstr "マイク" msgid "Min" msgstr "最å°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "ãã®ä»–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "ãã®ä»–ã®è¨­å®š" @@ -3788,7 +3932,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "等幅フォント" @@ -3801,7 +3945,7 @@ msgstr "モーションプラス" msgid "Motor" msgstr "モーター" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3823,7 +3967,7 @@ msgstr "" msgid "Multiply" msgstr "Multiply" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3915,6 +4059,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3924,6 +4069,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3932,7 +4080,7 @@ msgstr "åå‰" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "åå‰ï¼š " @@ -3946,7 +4094,7 @@ msgid "New Scan" msgstr "æ–°è¦æ¤œç´¢" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "次ã®ãƒšãƒ¼ã‚¸" @@ -3958,7 +4106,7 @@ msgstr "続ã‘ã¦æ¤œç´¢" msgid "Nickname :" msgstr "ニックãƒãƒ¼ãƒ ï¼š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "No Country (SDK)" @@ -3997,7 +4145,7 @@ msgstr "%s ã®ã‚»ãƒ¼ãƒ–フォルダãŒã‚ã‚Šã¾ã›ã‚“" msgid "None" msgstr "ãªã—" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "ノルウェー語" @@ -4005,8 +4153,8 @@ msgstr "ノルウェー語" msgid "Not Equal" msgstr "ã«ä¸€è‡´ã—ãªã„" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "未確èª" @@ -4026,7 +4174,7 @@ msgstr "未接続" msgid "Notes" msgstr "ノート" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "補足： " @@ -4064,7 +4212,7 @@ msgstr "オブジェクト" msgid "Object Range" msgstr "オブジェクトã®ç¯„囲" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "オフ" @@ -4090,11 +4238,11 @@ msgstr "残り %d ブロックã—ã‹ã‚ã‚Šã¾ã›ã‚“ï¼" msgid "Open" msgstr "é–‹ã" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "実体ã®ã‚るフォルダを開ã(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "セーブデータã®ã‚るフォルダを開ã(&S)" @@ -4116,11 +4264,11 @@ msgstr "OpenAL: サウンドデãƒã‚¤ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" msgid "OpenAL: can't open device %s" msgstr "OpenAL: デãƒã‚¤ã‚¹ %s ãŒé–‹ã‘ã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" @@ -4152,7 +4300,7 @@ msgstr "" "æ–°ã—ã„メモリーカードã«ã‚»ãƒ¼ãƒ–データを移行ã—ã¦ãã ã•ã„\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "ãã®ä»–" @@ -4204,19 +4352,20 @@ msgstr "Paragraph" msgid "Parameters" msgstr "パラメータ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "パーティション %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "パッãƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "フォルダ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4229,6 +4378,10 @@ msgstr "フォルダ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "一時åœæ­¢" @@ -4237,7 +4390,7 @@ msgstr "一時åœæ­¢" msgid "Per-Pixel Lighting" msgstr "Per-Pixel Lighting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "カンペキï¼" @@ -4250,6 +4403,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4260,6 +4414,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "開始" @@ -4273,7 +4431,7 @@ msgstr "録画ファイルをå†ç”Ÿ" msgid "Play/Pause" msgstr "開始ï¼ä¸€æ™‚åœæ­¢" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "サクサク" @@ -4285,6 +4443,7 @@ msgstr "å†ç”Ÿã‚ªãƒ—ション" msgid "Players" msgstr "プレイヤー一覧" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4294,6 +4453,9 @@ msgstr "プレイヤー一覧" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "確èª" @@ -4305,23 +4467,23 @@ msgstr "" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "ãƒãƒ¼ãƒ©ãƒ³ãƒ‰èªž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "ãƒãƒ¼ãƒˆ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "ãƒãƒ¼ãƒˆ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "ãƒãƒ¼ãƒˆ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "ãƒãƒ¼ãƒˆ 4" @@ -4330,11 +4492,11 @@ msgstr "ãƒãƒ¼ãƒˆ 4" msgid "Port :" msgstr "ãƒãƒ¼ãƒˆ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "ãƒãƒ«ãƒˆã‚¬ãƒ«èªž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "ブラジル語" @@ -4342,17 +4504,17 @@ msgstr "ブラジル語" msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4365,7 +4527,7 @@ msgstr "プリセット：" msgid "Prev Page" msgstr "å‰ã®ãƒšãƒ¼ã‚¸" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "å‰ã®ãƒšãƒ¼ã‚¸" @@ -4416,7 +4578,7 @@ msgstr "R (åŠæŠ¼ã—)" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "ロシア" @@ -4429,7 +4591,7 @@ msgstr "å¼·ã•" msgid "Read-only mode" msgstr "読ã¿è¾¼ã¿å°‚用 有効ï¼ç„¡åŠ¹" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Real" @@ -4505,6 +4667,7 @@ msgstr "ゲームリストをå†æ›´æ–°" msgid "Refresh game list" msgstr "ゲームリストをå†æ›´æ–°ã—ã¾ã™" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4523,6 +4686,12 @@ msgstr "ゲームリストをå†æ›´æ–°ã—ã¾ã™" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "削除" @@ -4575,11 +4744,11 @@ msgstr "å³ã‚¹ãƒ†ã‚£ãƒƒã‚¯" msgid "Rumble" msgstr "振動" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSP-LLEã®å‡¦ç†ã‚’別スレッドã«åˆ†é›¢ã—ã¦è¡Œã„ã¾ã™ (éžæŽ¨å¥¨)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "ロシア語" @@ -4587,10 +4756,11 @@ msgstr "ロシア語" msgid "Sa&ve State" msgstr "ステートセーブ(&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Safe" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4600,6 +4770,9 @@ msgstr "Safe" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "サンプルレート" @@ -4657,12 +4830,12 @@ msgstr "ステートセーブ - スロット 8" msgid "Save State..." msgstr "ファイルã¨ã—ã¦ä¿å­˜" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "ファイルã¨ã—ã¦ä¿å­˜" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "圧縮ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" @@ -4670,11 +4843,11 @@ msgstr "圧縮ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "解å‡ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, fuzzy, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s ã®ç ´æを確èªã—ã¾ã—ãŸã€‚録画を中止ã—ã¦ã„ã¾ã™..." @@ -4683,6 +4856,7 @@ msgstr "Savestate movie %s ã®ç ´æを確èªã—ã¾ã—ãŸã€‚録画を中止㗠msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4692,15 +4866,18 @@ msgstr "Scaled EFB Copy" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "確èªä¸­... .%s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "確èªä¸­..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "確èªä¸­..." @@ -4716,12 +4893,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "フィルタリング" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "サブフォルダも検索" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Section %s not found in SYSCONF" @@ -4731,6 +4908,7 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "é¸æŠž" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4755,6 +4933,14 @@ msgstr "録画ファイルをé¸æŠž" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "録画ファイルをé¸æŠž" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "追加ã™ã‚‹WADファイルをé¸æŠž" @@ -4780,16 +4966,21 @@ msgstr "" msgid "Select the file to load" msgstr "ロードã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "セーブファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4809,6 +5000,9 @@ msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "ステートセーブã®ä¿å­˜å…ˆã‚’é¸æŠž" @@ -4830,7 +5024,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€è‡ªå‹•ã€‘ã‚’é¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "é¸æŠžã—ãŸãƒ•ã‚©ãƒ³ãƒˆ" @@ -4878,11 +5072,11 @@ msgstr "センサーãƒãƒ¼ã®ä½ç½®" msgid "Separator" msgstr "Separator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "セルビア語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "シリアルãƒãƒ¼ãƒˆï¼šãƒ–ロードãƒãƒ³ãƒ‰ã‚¢ãƒ€ãƒ—ã‚¿ãªã©ã®ãƒ‡ãƒã‚¤ã‚¹ãŒæŽ¥ç¶šã§ãã¾ã™" @@ -4891,11 +5085,11 @@ msgstr "シリアルãƒãƒ¼ãƒˆï¼šãƒ–ロードãƒãƒ³ãƒ‰ã‚¢ãƒ€ãƒ—ã‚¿ãªã©ã®ãƒ‡ãƒ msgid "Set" msgstr "é©ç”¨" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Wiiメニュー(ディスクãƒãƒ£ãƒ³ãƒãƒ«)ã«è¡¨ç¤º(&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "メモリーカード%cを既定ã¨ã—ã¦è¨­å®š" @@ -4907,7 +5101,7 @@ msgstr "" "SetARCode_IsActive: インデックスã®ã‚µã‚¤ã‚ºãŒã‚³ãƒ¼ãƒ‰ãƒªã‚¹ãƒˆã®ã‚µã‚¤ã‚ºã‚’上回ã£ã¦ã„ã¾" "ã™ %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "設定" @@ -4919,7 +5113,7 @@ msgstr "SetupWiiMem: 設定ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" msgid "Shake" msgstr "シェイク" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "通称" @@ -4947,7 +5141,7 @@ msgstr "ツールãƒãƒ¼(&T)" msgid "Show Drives" msgstr "DVDドライブ内ã®ã‚½ãƒ•ãƒˆã‚’表示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Show EFB Copy Regions" @@ -4963,7 +5157,7 @@ msgstr "フランス" msgid "Show GameCube" msgstr "ゲームキューブ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "キー入力を表示" @@ -4979,7 +5173,7 @@ msgstr "日本" msgid "Show Korea" msgstr "韓国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "次ã®è¨€èªžã§è¡¨ç¤º" @@ -4999,7 +5193,7 @@ msgstr "特定機種ã®ã‚½ãƒ•ãƒˆã ã‘を表示" msgid "Show Regions" msgstr "特定リージョンã®ã‚½ãƒ•ãƒˆã ã‘を表示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "統計情報を表示" @@ -5019,11 +5213,11 @@ msgstr "WAD(Wii ウェア)" msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "ゲームåœæ­¢å‰ã«ç¢ºèªã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãŒè¡¨ç¤ºã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -5033,23 +5227,23 @@ msgstr "" "無効ã«ã™ã‚‹ã¨è‡´å‘½çš„ã§ãªã„エラーをプレイ中ã«è¡¨ç¤ºã•ã›ãšã«ã™ã¿ã¾ã™ãŒã€ã‚¯ãƒ©ãƒƒã‚·ãƒ¥" "時ã«ã‚¨ãƒ©ãƒ¼è¡¨ç¤ºãªã—ã«çªç„¶å¼·åˆ¶çµ‚了ã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "ブロック開始ä½ç½®ã‚’表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "ブロック数を表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "コメントを表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "アイコンを表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "タイトルを表示" @@ -5087,7 +5281,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "横æŒã¡(Sideways)ã§ä½¿ç”¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "簡体字中国語" @@ -5095,11 +5289,11 @@ msgstr "簡体字中国語" msgid "Size" msgstr "サイズ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "BIOSをスキップ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Skip Dest. Alpha Pass" @@ -5142,11 +5336,11 @@ msgstr "" msgid "Slot %i" msgstr "スロット %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "スロットA" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "スロットB" @@ -5169,7 +5363,7 @@ msgstr "" "デãƒãƒƒã‚°ç”¨é€”ã¨ã—ã¦ã®ã¿ä¾¿åˆ©ãªã‚‚ã®ã§ã™ã€‚\n" "ãã‚Œã§ã‚‚使用ã—ã¾ã™ã‹ï¼Ÿã‚ˆã分ã‹ã‚‰ãªã‘ã‚Œã°ã€é¸æŠžã—ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "サウンド設定" @@ -5187,6 +5381,7 @@ msgstr "Sound buffer creation failed: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5202,6 +5397,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "スペイン語" @@ -5233,7 +5433,7 @@ msgstr "" msgid "Specify a video backend" msgstr "ビデオ出力APIを指定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Speed up Disc Transfer Rate" @@ -5241,7 +5441,7 @@ msgstr "Speed up Disc Transfer Rate" msgid "Square Stick" msgstr "丸ã¿" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "標準コントローラ" @@ -5339,12 +5539,12 @@ msgstr "セーブファイルã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã«æˆåŠŸ" msgid "Swing" msgstr "å‹•ã" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "システムã®è¨€èªžï¼š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "å°æ¹¾" @@ -5383,7 +5583,7 @@ msgstr "å³ãƒ†ãƒ¼ãƒ–ル" msgid "Take Screenshot" msgstr "スクリーンショット" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5399,7 +5599,7 @@ msgstr "Texture" msgid "Texture Cache" msgstr "Texture Cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "テクスãƒãƒ£ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆæƒ…報表示" @@ -5415,13 +5615,13 @@ msgstr "無効ãªã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã™" msgid "The checksum was successfully fixed" msgstr "ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã®ä¿®æ­£ã«æˆåŠŸã—ã¾ã—ãŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "é¸æŠžã—ãŸãƒ•ã‚©ãƒ«ãƒ€ã¯ã™ã§ã«ãƒªã‚¹ãƒˆã«å­˜åœ¨ã—ã¾ã™ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5445,7 +5645,7 @@ msgid "The file %s was already open, the file header will not be written." msgstr "" "ファイル %s ã¯æ—¢ã«é–‹ã‹ã‚Œã¦ã„ã‚‹ãŸã‚ã€ãƒ•ã‚¡ã‚¤ãƒ«ãƒ˜ãƒƒãƒ€ãƒ¼ã¯æ›¸ãè¾¼ã¾ã‚Œã¾ã›ã‚“。" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "指定ã—ãŸãƒ•ã‚¡ã‚¤ãƒ« (%s) ã¯å­˜åœ¨ã—ã¾ã›ã‚“" @@ -5463,11 +5663,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "復å·åŒ–ã—ã¾ã—ãŸãŒã€ã“ã®ã‚³ãƒ¼ãƒ‰ã«ã¯ä¸€ã¤ã‚‚è¡ŒãŒå«ã¾ã‚Œã¦ã„ã¾ã›ã‚“。" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "ã“ã®ã‚¹ãƒ©ã‚¤ãƒ€ã‚’Safeå´ã«è¨­å®šã—ã¦ãŠãã¨ã€RAMã‹ã‚‰ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£æ›´æ–°ã« 失敗ã—ã«ãã" "ãªã‚Šã¾ã™ã€‚\n" @@ -5511,7 +5712,7 @@ msgstr "指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« \"%s\" ã¯å­˜åœ¨ã—ã¾ã›ã‚“" msgid "The value is invalid" msgstr "無効ãªå€¤ã§ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "テーマ" @@ -5519,14 +5720,14 @@ msgstr "テーマ" msgid "Theme selection went wrong" msgstr "テーマã®é¸æŠžã«èª¤ã‚ŠãŒã‚ã‚Šã¾ã™" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 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:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5545,7 +5746,7 @@ msgstr "" "ã“ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ãƒªãƒ—レイシミュレータã¯ã€ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ãƒªãƒ—レイãã®ã‚‚ã®ã‚’変更ã™ã‚‹" "コードã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "有効ã«ã—ã¦ã„ã‚‹ã¨Wiiメニューやã„ãã¤ã‹ã®ã‚¿ã‚¤ãƒˆãƒ«ã§å‹•ä½œé€Ÿåº¦ãŒä½Žä¸‹ã™ã‚‹å ´åˆãŒã‚ã‚Š" @@ -5571,26 +5772,10 @@ msgstr "" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"有効ã«ã—ã¦ã„ã‚‹é–“ã¯ã‚µã‚¦ãƒ³ãƒ‰ã‚¹ãƒ­ãƒƒãƒˆãƒ«ã«ã‚ˆã£ã¦ã‚²ãƒ¼ãƒ ã‚¹ãƒ”ードãŒã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã•ã‚Œ" -"るよã†ã«ãªã‚Šã¾ã™\n" -"無効ã«ã™ã‚‹ã¨ã‚²ãƒ¼ãƒ ã‚¹ãƒ”ードãŒç•°å¸¸ã«é€Ÿããªã£ã¦ã—ã¾ã†ã§ã—ょã†\n" -"有効中ã«ã¯æ™‚々ã€ä¸€å®šã®ãƒŽã‚¤ã‚ºãŒæµã‚Œã‚‹ã“ã¨ãŒã‚るよã†ã§ã™\n" -"\n" -"ノート：ゲーム中ã€ã‚­ãƒ¼ã‚’押ã—続ã‘ã¦ã„ã‚‹é–“ã ã‘ã“ã®ã‚ªãƒ—ションを無効ã«ã™ã‚‹ã“" -"ã¨ãŒã§ãã¾ã™ã€‚" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "BGMã®ã‚ˆã†ãªéŸ³æ¥½ãƒˆãƒ©ãƒƒã‚¯ã®å†ç”Ÿã«ä½¿ç”¨ã•ã‚Œã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5601,7 +5786,7 @@ msgstr "" "有効ã«ã™ã‚‹ã¨å‹•ä½œé€Ÿåº¦ãŒå¤§ããå‘上ã—ã¾ã™ãŒã€ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã‚„ãƒã‚°ã®åŽŸå› ã«ãªã‚‹å ´åˆã‚‚" "ã‚ã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "ã“ã®ã‚²ãƒ¼ãƒ ã®è¨­å®šã‚’テキストã§ç·¨é›†ã—ã¾ã™" @@ -5624,7 +5809,7 @@ msgstr "タイトル" msgid "To" msgstr "終了" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "å…¨ã¦ã®ãƒ­ã‚°æƒ…報をé¸æŠžï¼è§£é™¤" @@ -5644,6 +5829,7 @@ msgstr "フルスクリーン表示切り替ãˆ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5651,14 +5837,17 @@ msgstr "フルスクリーン表示切り替ãˆ" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "上部" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "ç¹ä½“字中国語" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—を読ã¿è¾¼ã‚‚ã†ã¨ã—ã¾ã—ãŸ" @@ -5666,7 +5855,7 @@ msgstr "ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—を読ã¿è¾¼ã‚‚ã†ã¨ã—ã¾ã—ãŸ" msgid "Triggers" msgstr "トリガー" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Trying to read from invalid SYSCONF" @@ -5678,7 +5867,7 @@ msgstr "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "トルコ語" @@ -5699,11 +5888,11 @@ msgstr "UDPãƒãƒ¼ãƒˆ:" msgid "UDP Wiimote" msgstr "UDPã§æŽ¥ç¶š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "ä¸æ˜Ž" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "アメリカåˆè¡†å›½" @@ -5788,7 +5977,7 @@ msgstr "å†å–å¾—" msgid "Upright Wiimote" msgstr "直立状態(Upright)ã§ä½¿ç”¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 (PAL60) モードを使用" @@ -5800,7 +5989,7 @@ msgstr "フルスクリーンã§è¡¨ç¤º" msgid "Use Hex" msgstr "16進" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "パニックãƒãƒ³ãƒ‰ãƒ©ã‚’使用" @@ -5831,7 +6020,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "ユーティリティ" @@ -5855,25 +6044,29 @@ msgstr "値：" msgid "Verbosity" msgstr "Verbosityモード" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "æç”»" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "音é‡" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WADã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã«å¤±æ•—: %s 作æˆã‚¨ãƒ©ãƒ¼" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WADã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã«å¤±æ•—: %s 作æˆã‚¨ãƒ©ãƒ¼" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5893,15 +6086,15 @@ msgstr "" msgid "Warning" msgstr "警告" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "警告 - 誤ã£ãŸãƒ¢ãƒ¼ãƒ‰ã§DOLãŒèµ·å‹•ã•ã‚Œã¦ã„ã¾ã™ï¼" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "警告 - 誤ã£ãŸãƒ¢ãƒ¼ãƒ‰ã§ELFãŒèµ·å‹•ã•ã‚Œã¦ã„ã¾ã™ï¼" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "警告 - 誤ã£ãŸãƒ¢ãƒ¼ãƒ‰ã§ISOãŒèµ·å‹•ã•ã‚Œã¦ã„ã¾ã™ï¼" @@ -5929,7 +6122,7 @@ msgstr "" "ファイルåã¯ãƒ¡ãƒ¢ãƒªãƒ¼ã‚«ãƒ¼ãƒ‰ä¸Šã®åå‰ã¨åŒã˜ã«ãªã‚Šã¾ã™\n" "続ã‘ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5937,7 +6130,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5945,7 +6138,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5973,7 +6166,7 @@ msgstr "WaveFileWriter - ファイルãŒé–‹ã‹ã‚Œã¦ã„ã¾ã›ã‚“" msgid "Whammy" msgstr "ワーミー" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "疑似ワイドスクリーン化" @@ -5981,15 +6174,15 @@ msgstr "疑似ワイドスクリーン化" msgid "Width" msgstr "範囲(横)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii コンソール" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NANDルート" @@ -5997,6 +6190,7 @@ msgstr "Wii NANDルート" msgid "Wii Save Import" msgstr "Wiiã®ã‚»ãƒ¼ãƒ–データをインãƒãƒ¼ãƒˆ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6006,6 +6200,9 @@ msgstr "Wiiã®ã‚»ãƒ¼ãƒ–データをインãƒãƒ¼ãƒˆ" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -6072,10 +6269,11 @@ msgstr "Windows Menu" msgid "Windows Right" msgstr "Windows Right" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "ワードラップ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6091,6 +6289,11 @@ msgstr "ワードラップ" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "動作中..." @@ -6098,6 +6301,11 @@ msgstr "動作中..." msgid "Write to Console" msgstr "コンソールã«å‡ºåŠ›" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "ファイルã«å‡ºåŠ›" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "ファイルã«å‡ºåŠ›" @@ -6153,7 +6361,7 @@ msgstr "10進数・16進数・8進数ã„ãšã‚Œã‹ã®æœ‰åŠ¹ãªå€¤ã‚’入力ã—㦠msgid "You must enter a valid profile name." msgstr "有効ãªãƒ—ロファイルåを入力ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "変更を有効ã«ã™ã‚‹ã«ã¯Dolphinã‚’å†èµ·å‹•ã—ã¦ãã ã•ã„" @@ -6176,7 +6384,7 @@ msgstr "" "æ­£ã—ã㯠0x%04x (ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ 0x%04llx)\n" "æ–°ã—ã作æˆã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6246,7 +6454,7 @@ msgstr "" msgid "^ ADD" msgstr "^ (...ã«åŠ ãˆã¦)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6278,12 +6486,12 @@ msgstr "" msgid "s" msgstr "　" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "unknown cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -6501,6 +6709,9 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Emulator Display Settings" #~ msgstr "エミュレーション画é¢ã«é–¢ã™ã‚‹è¨­å®š" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Enable Audio Throttle" + #~ msgid "Enable CPU Access" #~ msgstr "Enable CPU Access" @@ -6785,6 +6996,21 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Take Screenshot\t" #~ msgstr "スクリーンショット\t" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "有効ã«ã—ã¦ã„ã‚‹é–“ã¯ã‚µã‚¦ãƒ³ãƒ‰ã‚¹ãƒ­ãƒƒãƒˆãƒ«ã«ã‚ˆã£ã¦ã‚²ãƒ¼ãƒ ã‚¹ãƒ”ードãŒã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã•" +#~ "れるよã†ã«ãªã‚Šã¾ã™\n" +#~ "無効ã«ã™ã‚‹ã¨ã‚²ãƒ¼ãƒ ã‚¹ãƒ”ードãŒç•°å¸¸ã«é€Ÿããªã£ã¦ã—ã¾ã†ã§ã—ょã†\n" +#~ "有効中ã«ã¯æ™‚々ã€ä¸€å®šã®ãƒŽã‚¤ã‚ºãŒæµã‚Œã‚‹ã“ã¨ãŒã‚るよã†ã§ã™\n" +#~ "\n" +#~ "ノート：ゲーム中ã€ã‚­ãƒ¼ã‚’押ã—続ã‘ã¦ã„ã‚‹é–“ã ã‘ã“ã®ã‚ªãƒ—ションを無効ã«ã™" +#~ "ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "音声や効果音ã®å†ç”Ÿã«ã‚ˆã使用ã•ã‚Œã¾ã™" <<<<<<< HEAD diff --git a/Languages/po/ko.po b/Languages/po/ko.po index f756486f36..338b22dab0 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" <<<<<<< HEAD ======= @@ -19,6 +20,9 @@ msgstr "" >>>>>>> Update from master branch. "PO-Revision-Date: 2011-07-07 10:24+0900\n" ======= +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2012-01-19 11:47+0900\n" >>>>>>> Update Korean translations. "Last-Translator: \n" @@ -62,9 +66,9 @@ msgstr "\"%s\"는 비ì í•© GCM/ISO 파ì¼ìž„, í˜¹ì€ GC/Wii ISOê°€ 아님." msgid "%1$sCopy%1$s" msgstr "%1$s복사%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -158,7 +162,7 @@ msgstr "%sGCI 내보내기%s" msgid "%sImport GCI%s" msgstr "%sGCI 가져오기%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u 빈 블럭; %u 빈 디렉토리 엔트리" @@ -191,11 +195,11 @@ msgstr "치트 매니저(&C)" msgid "&DSP Settings" msgstr "오디오 설정(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "ISO ì‚­ì œ(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "ì„ íƒëœ ISO들 ì‚­ì œ(&D)..." @@ -259,7 +263,7 @@ msgstr "ì¼ì‹œì •ì§€(&P)" msgid "&Play" msgstr "실행(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "ì†ì„±(&P)" @@ -303,7 +307,7 @@ msgstr "보기(&V)" msgid "&Wiimote Settings" msgstr "위모트 설정(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "위키(&W)" @@ -347,7 +351,7 @@ msgstr "<ì—¬ê¸°ì— ì´ë¦„ì„ ë„£ìœ¼ì„¸ìš”>" msgid "" msgstr "<ë°œê²¬ëœ í•´ìƒë„ê°€ ì—†ìŒ>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<ì—†ìŒ>" @@ -356,7 +360,7 @@ msgstr "<ì—†ìŒ>" msgid "" msgstr "<키를 누르세요>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<시스템>" @@ -412,13 +416,13 @@ msgstr "" "\n" "TCP í¬íŠ¸ë¥¼ í˜¸ìŠ¤íŠ¸ì— ì „ë‹¬í•´ì•¼í•©ë‹ˆë‹¤!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-기반보드" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR 코드" @@ -430,11 +434,11 @@ msgstr "ëŒí•€ì— 대해" msgid "Acceleration" msgstr "ê°€ì†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "정확성:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "정확한 VBeam ì—뮬레ì´ì…˜" @@ -550,11 +554,11 @@ msgstr "어댑터:" msgid "Add" msgstr "추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "ì•¡ì…˜ë¦¬í”Œë ˆì´ ì½”ë“œ 추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "패치 추가" @@ -562,6 +566,7 @@ msgstr "패치 추가" msgid "Add new pane" msgstr "새로운 ì°½ 추가" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -577,6 +582,11 @@ msgstr "새로운 ì°½ 추가" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "추가..." @@ -624,11 +634,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "버튼들 í™œì„±í™”ì— í•„ìš”í•œ 아날로그 컨트롤 ì••ë ¥ì„ ì¡°ì •í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "고급" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "고급 설정" @@ -636,14 +646,15 @@ msgstr "고급 설정" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "모든 GC/Wii 파ì¼ë“¤ (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "모든 GC/Wii ì´ë¯¸ì§€ë“¤ (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임í브 GCM 파ì¼ë“¤ (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -656,18 +667,22 @@ msgstr "모든 게임í브 GCM 파ì¼ë“¤ (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "모든 ìƒíƒœë“¤ 저장 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "모든 Wii ISO 파ì¼ë“¤ (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "모든 ì••ì¶•ëœ GC/Wii ISO 파ì¼ë“¤ (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "모든 íŒŒì¼ (*.*)|*.*" @@ -683,7 +698,7 @@ msgstr "" "\n" "확신 없으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "위모트 타ì´ë° 대안" @@ -703,7 +718,7 @@ msgstr "앱로ë”ê°€ ìž˜ëª»ëœ í¬ê¸°ìž„... ì •ë§ ì•±ë¡œë”입니까?" msgid "Apploader unable to load from file" msgstr "앱로ë”ê°€ 파ì¼ë¡œ 부터 로드할 수 ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "앱로ë”:" @@ -721,7 +736,7 @@ msgstr "" "\n" "확신 없으면, (ë„기)를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "ì•„ëžì–´" @@ -730,7 +745,7 @@ msgstr "ì•„ëžì–´" msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" 를 ì •ë§ë¡œ 지우고 싶습니까?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -738,10 +753,11 @@ msgstr "" "ì´ íŒŒì¼ë“¤ì„ ì •ë§ë¡œ 지우고 싶습니까?\n" "ê·¸ê²ƒë“¤ì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ì´ íŒŒì¼ì„ ì •ë§ë¡œ 지우고 싶습니까? ê·¸ê²ƒì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -751,6 +767,9 @@ msgstr "ì´ íŒŒì¼ì„ ì •ë§ë¡œ 지우고 싶습니까? ê·¸ê²ƒì€ ì˜ì›ížˆ 사 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -759,18 +778,20 @@ msgstr "종횡비:" msgid "At least one pane must remain open." msgstr "ì ì–´ë„ í•˜ë‚˜ì˜ ì°½ì´ ì—´ë ¤ 있어야합니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "오디오" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "오디오 백엔드:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO 장치를 열기 ì—러.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -780,6 +801,9 @@ msgstr "AudioCommon: AO 장치를 열기 ì—러.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "ìžë™" @@ -822,7 +846,7 @@ msgstr "" msgid "Back" msgstr "뒤로" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "백엔드 설정" @@ -849,11 +873,11 @@ msgstr "ë°°ë“œ íŒŒì¼ í—¤ë”" msgid "Banner" msgstr " 배너" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "배너 세부사항" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "배너:" @@ -865,7 +889,7 @@ msgstr "ë°”" msgid "Basic" msgstr "기본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "기본 설정" @@ -896,6 +920,7 @@ msgstr "파랑 오른쪽" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -903,6 +928,9 @@ msgstr "파랑 오른쪽" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "아래" @@ -911,7 +939,7 @@ msgstr "아래" msgid "Bound Controls: %lu" msgstr "바운드 컨트롤들: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "고장남" @@ -927,7 +955,7 @@ msgstr "추가할 디렉토리 둘러보기" msgid "Browse for an ISO directory..." msgstr "ISO 디렉토리 불러오기..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "출력 디렉토리 둘러보기" @@ -957,11 +985,11 @@ msgstr "C 스틱" msgid "C-Stick" msgstr "C-스틱" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU ì—뮬레ì´í„° 엔진" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "화면표시 ëª©ë¡ ìºì‰¬" @@ -1010,7 +1038,7 @@ msgstr "%s를 열수 ì—†ìŒ" msgid "Cannot unregister events with events pending" msgstr "ì´ë²¤íŠ¸ë“¤ ë¯¸í•´ê²°ì„ ì§€ë‹Œ ì´ë²¤íŠ¸ë“¤ì„ 등ë¡í•˜ì§€ ì•Šì„ ìˆ˜ ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1021,7 +1049,7 @@ msgstr "" "%s\n" "는 유효한 게임í브 메모리 ì¹´ë“œ 파ì¼ì´ 아닙니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1039,8 +1067,6 @@ msgstr "bd: %02x:%02x:%02x:%02x:%02x:%02x ì— ì˜í•´ 위모트를 ì°¾ì„ ìˆ˜ ì—† msgid "Cant find WiiMote by connection handle %02x" msgstr "%02x ì—°ê²°í•¸ë“¤ì— ì˜í•´ 위모트를 ì°¾ì„ ìˆ˜ ì—†ìŒ." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1050,7 +1076,7 @@ msgstr "DVD_플러그ì¸ì—ì„œ ì½ì„ 수 ì—†ìŒ - DVD-ì¸í„°íŽ˜ì´ìŠ¤: 치명 msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "카탈로니아어" @@ -1075,7 +1101,7 @@ msgstr "ë””ìŠ¤í¬ ë³€ê²½" msgid "Change Game" msgstr "게임 변경" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1091,8 +1117,8 @@ 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 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "ì—뮬레ì´í„°ê°€ ìž‘ë™í•˜ê³  있는 ë™ì•ˆì— ì´ ë³€ê²½ì€ íš¨ê³¼ê°€ ì—†ì„ ê²ë‹ˆë‹¤!" @@ -1112,31 +1138,31 @@ msgstr "치트 찾기" msgid "Cheats Manager" msgstr "치트들 관리ìž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "중국어 (간소화)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "중국어 (전통)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "DVD 루트 디렉토리 ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "NAND 루트 디렉토리 ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "ë””í´íŠ¸ ISO ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "추가할 디렉토리 ì„ íƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "열려는 íŒŒì¼ ì„ íƒ" @@ -1144,15 +1170,15 @@ msgstr "열려는 íŒŒì¼ ì„ íƒ" msgid "Choose a memory card:" msgstr "메모리 ì¹´ë“œ ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "앱로ë”ë¡œ 사용할 파ì¼ì„ ì„ íƒ: (디렉토리들로만 êµ¬ì„±ëœ ë””ìŠ¤í¬ë“¤ì—게만 ì ìš©ë¨)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "압축해제할 í´ë”를 ì„ íƒ" @@ -1164,14 +1190,14 @@ msgstr "ì„œí´ ìŠ¤í‹±" msgid "Classic" msgstr "í´ëž˜ì‹" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "깨ë—ì´" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "청소 실패했습니다." @@ -1187,6 +1213,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1195,6 +1222,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "닫기" @@ -1218,20 +1249,20 @@ msgstr "명령" msgid "Comment" msgstr "주ì„" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "주ì„:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "ISO 압축..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "ì„ íƒëœ ISO들 압축..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "ISO 압축하기" @@ -1258,13 +1289,13 @@ msgstr "패드들 설정" msgid "Configure..." msgstr "환경설정..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "íŒŒì¼ ë®ì–´ì“°ê¸° 확정" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "중지시 확ì¸" @@ -1273,7 +1304,7 @@ msgstr "중지시 확ì¸" msgid "Connect" msgstr "ì—°ê²°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USB 키보드 ì—°ê²°" @@ -1330,12 +1361,12 @@ msgstr "GCI ë¡œ 변환" msgid "Copy failed" msgstr "복사 실패했습니다" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "메모리카드 %c ì— ë³µì‚¬" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "코어" @@ -1365,7 +1396,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "%s ISO 파ì¼ì„ ì¸ì‹í•  수 없었습니다" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "%s 를 저장할 수 없었습니다" @@ -1378,7 +1409,7 @@ msgstr "" "íŒ¨ë“œë“¤ì„ ì„¤ì •í•  수 없었습니다. 플레ì´ì–´ê°€ 떠났거나 ê²Œìž„ì´ í˜„ìž¬ 구ë™ì¤‘!\n" "(ê²Œìž„ì´ êµ¬ë™ì¤‘ì¼ ë•Œ íŒ¨ë“œë“¤ì„ ì„¤ì •í•˜ê¸°ëŠ” ì•„ì§ ì§€ì›ë˜ì§€ 않습니다)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1390,7 +1421,7 @@ msgstr "" "\n" "CD/DVDì—ì„œ ëŒí•€ì„ 구ë™í•˜ë‚˜ìš”, 아니면 저장 파ì¼ì´ 쓰기 보호ì¼ì§€ë„?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "í™•ìž¥ìž 'ini'ì— ëŒ€í•œ 열린 ëª…ë ¹ì„ ë°œê²¬í•  수 없었습니다!" @@ -1407,7 +1438,7 @@ msgstr "" msgid "Count:" msgstr "카운트:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "êµ­ê°€:" @@ -1421,27 +1452,27 @@ msgstr "AR 코드 ìƒì„±" msgid "Create new perspective" msgstr "새로운 ê´€ì  ìƒì„±" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "KDE-Look.orgì— ì˜í•´ 만들어ì§" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]ì— ì˜í•´ 만들어" "ì§" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "VistaIcons.comì— ì˜í•´ 만들어ì§" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "black_riderì— ì˜í•´ 만들어지고 ForumW.org > Web Developmentsì—ì„œ ê²Œì‹œë¨ " -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "만든ì´:" @@ -1449,7 +1480,7 @@ msgstr "만든ì´:" msgid "Critical" msgstr "치명ì " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "ìžë¥´ê¸°" @@ -1472,7 +1503,7 @@ msgstr "í¬ë¡œìŠ¤íŽ˜ì´ë“œ" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "현재 디렉토리가 %sì—ì„œ wxFileSelectorë’¤ì— %së¡œ 변경ë¨!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵:" @@ -1480,11 +1511,11 @@ msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵:" msgid "Custom Projection Hack Settings" msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵 설정" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "ì¼ë¶€ ì • íˆ¬ì˜ íŒŒë¼ë¯¸í„°ë“¤ì„ 커스터마ì´ì¦ˆ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "ì²´ì½”" @@ -1496,10 +1527,11 @@ msgstr "D-패드" msgid "DSP" msgstr "오디오" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSP ì—뮬레ì´í„° 엔진" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1510,18 +1542,22 @@ msgstr "DSP ì—뮬레ì´í„° 엔진" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE ì—뮬레ì´ì…˜ (빠름)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE ì¸í„°í”„리터 (ëŠë¦¼)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE를 쓰레드ìƒì—" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE 리컴파ì¼ëŸ¬" @@ -1529,15 +1565,23 @@ msgstr "DSP LLE 리컴파ì¼ëŸ¬" msgid "DSP settings" msgstr "DSP 설정" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD 루트:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "ë°ì´í„° í¬ê¸°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "날짜:" @@ -1558,7 +1602,7 @@ msgstr "ë°ë“œ ì¡´" msgid "Debug" msgstr "디버그" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "디버깅" @@ -1566,16 +1610,16 @@ msgstr "디버깅" msgid "Decimal" msgstr "10진수ì˜" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "ISO 압축해제..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "ì„ íƒëœ ISO들 압축해제..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "ISO 압축해제하기" @@ -1583,11 +1627,11 @@ msgstr "ISO 압축해제하기" msgid "Default" msgstr "기본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "기본 ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "기본 í°íŠ¸" @@ -1596,7 +1640,7 @@ msgstr "기본 í°íŠ¸" msgid "Delete" msgstr "ì‚­ì œ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "저장 지우기" @@ -1605,7 +1649,7 @@ msgstr "저장 지우기" msgid "Delete the existing file '%s'?" msgstr "기존 '%s'파ì¼ì„ 삭제합니까?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "설명" @@ -1613,8 +1657,8 @@ msgstr "설명" msgid "Detect" msgstr "ê°ì§€" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1627,8 +1671,8 @@ msgstr "" msgid "Device" msgstr "장비" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "장비 설정" @@ -1653,23 +1697,23 @@ msgstr "" " 그리고 디렉토리 백업 ì²´í¬ì„¬ì´ 실패했습니다" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "비활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "안개 ë”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "ê´‘ì› ë”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "픽셀 ê¹Šì´ ë¹„í™œì„±" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "í…스처들 ë”" @@ -1711,7 +1755,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "디스í¬" @@ -1738,6 +1782,7 @@ msgstr "" msgid "Divide" msgstr "나누기" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1747,10 +1792,13 @@ msgstr "나누기" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "현재 ì—뮬레ì´ì…˜ì„ 중단하고 싶습니까?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "ëŒí•€" @@ -1775,6 +1823,7 @@ msgstr "ëŒí•€ ì—ë®¬ëœ ìœ„ëª¨íŠ¸ 환경설정" msgid "Dolphin FIFO" msgstr "ëŒí•€ FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1799,6 +1848,14 @@ msgstr "ëŒí•€ GC패드 환경설정" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "ëŒí•€ GC패드 환경설정" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "ëŒí•€ TAS ë™ì˜ìƒ (*.dtm)" @@ -1831,11 +1888,11 @@ msgstr "" msgid "Down" msgstr "아래" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "코드(WiiRD ë°ì´í„°ë² ì´ìŠ¤) 다운로드" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu ì½”ë“œë“¤ì´ ë‹¤ìš´ë¡œë“œë¨. (ì¶”ê°€ëœ %lu)" @@ -1844,23 +1901,23 @@ msgstr "%lu ì½”ë“œë“¤ì´ ë‹¤ìš´ë¡œë“œë¨. (ì¶”ê°€ëœ %lu)" msgid "Drums" msgstr "드럼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "ë”미" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "오디오 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "EFB 타겟 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "프레임들 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "í…스처들 ë¤í”„" @@ -1894,6 +1951,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1909,6 +1967,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "네ëœëž€ë“œì–´" @@ -1932,7 +1995,7 @@ msgstr "" "-- ë‹¹ì‹ ì´ ìµœê·¼ì— ë‹¹ì‹ ì˜ ëŒí•€ ë°°í¬ë¥¼ 업그레ì´ë“œí–ˆë‹¤ë©´, 윈ë„우즈가 새로운 ë“œë¼" "ì´ë²„를 알게 하려는 ì‹œì ì—ì„œ ì•„ë§ˆë„ ìž¬ë¶€íŒ…ì´ í•„ìš”í•©ë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "유럽" @@ -1948,7 +2011,7 @@ msgstr "편집" msgid "Edit ActionReplay Code" msgstr "ì•¡ì…˜ë¦¬í”Œë ˆì´ ì½”ë“œ 편집" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "환경 편집" @@ -1960,8 +2023,8 @@ msgstr "패치 편집" msgid "Edit current perspective" msgstr "현재 ê´€ì  íŽ¸ì§‘" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "편집..." @@ -2011,7 +2074,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "ì—ë®¬ëœ ìœ„ëª¨íŠ¸" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "ì—뮬레ì´ì…˜ ìƒíƒœ:" @@ -2039,23 +2102,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR 로깅 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "오디오 병목 활성" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "ë¸”ë¡ í•©ì¹˜ê¸° 활성" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "바운딩 박스 계산 켜기" @@ -2068,6 +2131,7 @@ msgstr "바운딩 박스 계산 켜기" msgid "Enable Cache" msgstr "ìºì‰¬ 활성" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2077,51 +2141,54 @@ msgstr "ìºì‰¬ 활성" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "치트 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "DTK ìŒì•… 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "듀얼 코어 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "듀얼 코어 활성 (ì†ë„ìƒìŠ¹)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "단축키 활성(그래픽 컨트롤)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "ì•„ì´ë“¤ 스킵 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "ì•„ì´ë“¤ 스킵 활성 (ì†ë„ìƒìŠ¹)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "프로그레시브 스캔 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "스í¬ë¦° 세ì´ë²„ 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "와ì´ë“œìŠ¤í¬ë¦° 활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "와ì´ì–´í”„레임 활성" @@ -2139,14 +2206,14 @@ msgstr "" "\n" "모르겠으면, 1x를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" "빠른 ë””ìŠ¤í¬ ì—‘ì„¸ìŠ¤ 활성. ì¼ë¶€ 게임들ì—ì„œ 요구ë¨. (켬 = 빠른, ë” = 호환성)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "페ì´ì§€ 활성" @@ -2174,7 +2241,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2182,7 +2249,7 @@ msgstr "" "The Legend of Zelda: Twilight Princess를 ì†ë„를 올리려면 켬. 다른 ê²Œìž„ì„ ìœ„í•´" "서는 ë”." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2191,7 +2258,7 @@ msgstr "" "블럭 주소 í•´ì„ (BAT); 메모리 관리 유닛 함수 활성. í•˜ë“œì›¨ì–´ì— ì •í™•í•´ì§„ë‹¤, 하지" "만 ì—뮬레ì´íŠ¸ëŠ” ëŠë ¤ì§„다.(켬 = 호환성, ë” = 빠름)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵 활성화" @@ -2207,7 +2274,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2227,6 +2294,7 @@ msgstr "" msgid "End" msgstr "ë" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2242,6 +2310,11 @@ msgstr "ë" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "ì˜ì–´" @@ -2272,6 +2345,7 @@ msgstr "ê°™ìŒ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "ì—러" @@ -2304,11 +2378,17 @@ msgstr "" "죄송합니다, Wii 녹화가 ì¼ì‹œì ìœ¼ë¡œ 깨졌습니다." >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "ì—러" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "ì„ íƒëœ 언어 로딩 ì—러. 시스템 기본으로 ëŒì•„갑니다." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " @@ -2317,7 +2397,7 @@ msgstr "" "ì—러: \"%s\" ë’¤ì—, %d (0x%X)를 발견 %d (0x%X) 세ì´ë¸Œ 표시 대신ì—. ìƒíƒœì €ìž¥ ë¡œ" "드를 취소합니다..." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2351,7 +2431,7 @@ msgstr "ì—뮬레ì´í„°ì™€ 함께 ëŒí•€ 종료" msgid "Export Failed" msgstr "내보내기 실패했습니다" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "íŒŒì¼ ë‚´ë³´ë‚´ê¸°" @@ -2364,15 +2444,15 @@ msgstr "(ìž…ë ¥) ê¸°ë¡ ë‚´ë³´ë‚´ê¸°" msgid "Export Recording..." msgstr "(ìž…ë ¥) ê¸°ë¡ ë‚´ë³´ë‚´ê¸°..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "저장 내보내기" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Wii 저장 내보내기 (실험ì )" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "모든 ì €ìž¥ë“¤ì„ ë‚´ë³´ë‚´ê¸°" @@ -2388,7 +2468,7 @@ msgstr "ì €ìž¥ì„ ë‹¤ë¥¸ ì´ë¦„으로 내보내기..." msgid "Extension" msgstr "확장" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "외부 프레임 버í¼" @@ -2400,44 +2480,44 @@ msgstr "추가 매개변수" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "추가 매개변수는 ''Metroid: Other M''ì—서만 유용합니다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "모든 파ì¼ë“¤ 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "ì•±ë¡œë” ì••ì¶•í’€ê¸°..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "DOL 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "디렉토리 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "íŒŒì¼ ì••ì¶• 풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "파티션 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "%s 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "모든 파ì¼ë“¤ 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "디렉토리 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "압축풀기..." @@ -2449,11 +2529,11 @@ msgstr "FIFO ë°”ì´íŠ¸" msgid "FIFO Player" msgstr "FIFO 플레ì´ì–´" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "프랑스" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST í¬ê¸°:" @@ -2465,11 +2545,11 @@ msgstr "ì—°ê²°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤!" msgid "Failed to Listen!!" msgstr "ë“£ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "코드들 ë‹¤ìš´ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "%së¡œ 압축풀기 실패했습니다!" @@ -2586,18 +2666,28 @@ msgstr "%s ì— ëŒ€í•œ í—¤ë” ì“°ê¸°ì— ì‹¤íŒ¨" msgid "Failed to write header for file %d" msgstr "%d 파ì¼ì— 대한 í—¤ë” ì“°ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "빠름" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "빠른 밉맵" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMUì˜ ë¹ ë¥¸ 버전. 모든 ê²Œìž„ì— ëŒ€í•´ ìž‘ë™í•˜ì§€ëŠ” 않는다." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "FIFO 플레ì´ì–´" @@ -2606,7 +2696,7 @@ msgstr "FIFO 플레ì´ì–´" msgid "File Info" msgstr "íŒŒì¼ ì •ë³´" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "파ì¼ì´ 코드를 지니지 않었습니다." @@ -2639,16 +2729,16 @@ msgstr "파ì¼ì´ 메모리카드로 ì¸ì‹ë˜ì§€ 않는다" msgid "File not compressed" msgstr "파ì¼ì´ 압축ë˜ì§€ 않었습니다" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: 알려지지 ì•Šì€ ì—´ê¸° 모드: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "파ì¼ì‹œìŠ¤í…œ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "'ini'파ì¼íƒ€ìž…ì€ ì•Œë ¤ì§€ì§€ ì•ŠìŒ! 열지 않겠습니다!" @@ -2656,7 +2746,7 @@ msgstr "'ini'파ì¼íƒ€ìž…ì€ ì•Œë ¤ì§€ì§€ ì•ŠìŒ! 열지 않겠습니다!" msgid "First Block" msgstr "첫번째 블럭" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "ì²´í¬ì„¬ë“¤ 고침" @@ -2668,7 +2758,7 @@ msgstr "ê°•ì œ 16:9" msgid "Force 4:3" msgstr "ê°•ì œ 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "ì½˜ì†”ì„ NTSC-Jë¡œ 강제시킴" @@ -2700,7 +2790,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2736,7 +2826,7 @@ msgstr "프레임" msgid "Frame Advance" msgstr "프레임 진행" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "프레임 ë¤í”„ê°€ FFV1를 사용" @@ -2748,7 +2838,7 @@ msgstr "프레임 범위" msgid "Frame S&kipping" msgstr "프레임 스킵(&k)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "프레임제한:" @@ -2756,10 +2846,11 @@ msgstr "프레임제한:" msgid "Frames To Record" msgstr "녹화할 프레임" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "ìžìœ ë¡œìš´ 보기" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2775,6 +2866,11 @@ msgstr "ìžìœ ë¡œìš´ 보기" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "프랑스어" @@ -2807,7 +2903,7 @@ msgstr "GCMic 환경설정" msgid "GCPad" msgstr "GC패드" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "게임 ID:" @@ -2823,15 +2919,15 @@ msgstr "ê²Œìž„ì´ êµ¬ë™ì¤‘ì´ì§€ 않습니다!" msgid "Game not found!!" msgstr "ê²Œìž„ì´ ì°¾ì„ ìˆ˜ 없습니다!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "게임-ìƒì„¸ 설정" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "게임환경" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "게임í브" @@ -2842,6 +2938,7 @@ msgstr "게임í브 패드 설정(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2849,6 +2946,9 @@ msgstr "게임í브 패드 설정(&P)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임í브 메모리 카드들 (*.raw,*.gcp)" @@ -2857,15 +2957,17 @@ msgid "Gamecube Pad settings" msgstr "게임í브 패드 설정" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko 코드" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Gecko코드가 (CT%i CST%i) (%s) 구ë™ì— 실패했습니다\n" "(ìž˜ëª»ëœ ì½”ë“œì´ê±°ë‚˜ 코드 íƒ€ìž…ì´ ì•„ì§ ì§€ì›ì•Šëœë‹¤.)" @@ -2874,6 +2976,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2882,6 +2985,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "ì¼ë°˜" @@ -2890,6 +2996,7 @@ msgstr "ì¼ë°˜" msgid "General Settings" msgstr "ì¼ë°˜ 설정" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2905,6 +3012,11 @@ msgstr "ì¼ë°˜ 설정" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "ë…ì¼ì–´" @@ -2942,7 +3054,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "그리스어" @@ -2974,7 +3086,7 @@ msgstr "핵" msgid "Header checksum failed" msgstr "í—¤ë” ì²´í¬ì„¬ 실패했습니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "히브리어" @@ -3044,12 +3156,16 @@ msgstr "단축키 설정" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "단축키들" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "í—가리어" @@ -3057,14 +3173,14 @@ msgstr "í—가리어" msgid "Hybrid Wiimote" msgstr "하ì´ë¸Œë¦¬ë“œ 위모트" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3077,11 +3193,11 @@ msgstr "" "TitleID %016llx.\n" " ëŒí•€ì€ ì´ì œ 멈추려할 것ì´ë‹¤" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - ìž˜ëª»ëœ ëŒ€ìƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL 설정" @@ -3097,15 +3213,15 @@ msgstr "IR í¬ì¸í„°" msgid "IR Sensitivity:" msgstr "IR ê°ë„:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO 세부사항" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO 디렉토리들" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ì´íƒˆë¦¬ì•„" @@ -3113,7 +3229,7 @@ msgstr "ì´íƒˆë¦¬ì•„" msgid "Icon" msgstr "ì•„ì´ì½˜" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3121,17 +3237,19 @@ msgstr "" "ì²´í¬í•˜ë©´, 바운딩 박스 ë ˆì§€ìŠ¤í„°ë“¤ì´ ì—…ë°ì´íŠ¸ë  것입니다. Paper Mario 게임들ì—" "ì„œ 사용ë©ë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "FPSê°€ 불규칙ì ì´ë©´, ì´ ì˜µì…˜ì´ ë„ì›€ì´ ë  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. (켬 = 호환성, ë” = ë¹ " "름)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). 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ì—ì„œ " "오디오 ë³‘ëª©ë„ êº¼ì•¼ ê·¸ê²ƒì´ íš¨ê³¼ë¥¼ 냅니다." @@ -3168,7 +3286,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "ì €ìž¥ì„ ê°€ì ¸ì˜¤ê¸°" @@ -3217,7 +3335,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "게임안" @@ -3226,7 +3344,7 @@ msgid "In-Game" msgstr "게임-안" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "ì •ë³´" @@ -3246,7 +3364,7 @@ msgstr "삽입" msgid "Insert Encrypted or Decrypted code here..." msgstr "암호화ë˜ê±°ë‚˜ 암호해ë…ëœ ì½”ë“œë¥¼ ì—¬ê¸°ì— ì‚½ìž…í•˜ì„¸ìš”..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD ì¹´ë“œ 삽입" @@ -3258,7 +3376,7 @@ msgstr "ì´ë¦„ì„ ì—¬ê¸°ì— ë„£ìœ¼ì‹œì˜¤..." msgid "Install WAD" msgstr "WAD 설치" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Wii ë©”ë‰´ì— ì„¤ì¹˜" @@ -3269,6 +3387,7 @@ msgstr "" "InstallExceptionHandler 호출ë¨, 하지만 ì´ í”Œëž«í¼ì€ ì•„ì§ ê·¸ê²ƒì„ ì§€ì›í•˜ì§€ 않습" "니다." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3278,14 +3397,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD 설치하기..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "ì¸í„°íŽ˜ì´ìŠ¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "ì¸í„°íŽ˜ì´ìŠ¤ 설정" @@ -3310,11 +3432,11 @@ msgstr "내부 LZO ì—러 - lzo_init() 실패했습니다" msgid "Internal Resolution:" msgstr "내부 í•´ìƒë„:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "ì¸í„°í”„리터 (매우 ëŠë¦¼)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "소개화면" @@ -3331,7 +3453,7 @@ msgstr "비ì í•© ê°’!" msgid "Invalid bat.map or dir entry" msgstr "비ì í•© bat.map í˜¹ì€ ë””ë ‰í† ë¦¬ 엔트리" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "비ì í•© ì´ë²¤íŠ¸ 타입 %i" @@ -3351,14 +3473,15 @@ msgstr "" "%s\n" " ë‹¹ì‹ ì€ ì´ ê²Œìž„ì„ ë¦¬ë¤í”„해야할 지ë„." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "비ì í•© ê¸°ë¡ íŒŒì¼" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "비ì í•© ìƒíƒœ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3374,27 +3497,32 @@ msgstr "비ì í•© ìƒíƒœ" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "ì´íƒˆë¦¬ì•„ì–´" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "ì¼ë³¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT 리컴파ì¼ëŸ¬ (권장)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL ì‹¤í—˜ì  ë¦¬ì»´íŒŒì¼ëŸ¬" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "ì¼ë³¸ì–´" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "한국" @@ -3403,8 +3531,8 @@ msgstr "한국" msgid "Key" msgstr " [ 키 ]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "한국어" @@ -3422,7 +3550,7 @@ msgstr "L 버튼" msgid "L-Analog" msgstr "L-아날로그" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "언어:" @@ -3475,7 +3603,7 @@ msgstr "" msgid "Less Than" msgstr "보다 ë” ì ì€" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "FPSë¡œ 제한" @@ -3483,7 +3611,7 @@ msgstr "FPSë¡œ 제한" msgid "Load" msgstr "로드" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "커스텀 í…스처 로드" @@ -3531,6 +3659,7 @@ msgstr "슬롯8 ìƒíƒœ 로드" msgid "Load State..." msgstr "ìƒíƒœ 로드..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3552,6 +3681,13 @@ msgstr "Wii 시스템 메뉴 로드" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Wii 시스템 메뉴 로드" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii 시스템 메뉴 %d %c 로드" @@ -3578,7 +3714,7 @@ msgstr "ëª…ì‹œëœ íŒŒì¼ (DOL,ELF,WAD,GCM,ISO,WAD) 로드" msgid "Local" msgstr "지역" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "ì½”ì–´ì— ì“°ë ˆë“œ 잠그기" @@ -3590,11 +3726,11 @@ msgstr "로그" msgid "Log Configuration" msgstr "로그 환경설정" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "로그 타입" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "로거 출력" @@ -3624,7 +3760,7 @@ msgstr "" "MD5 미스매치\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU 스피드 핵" @@ -3646,11 +3782,11 @@ msgstr "MadCatz ê²Œìž„ìƒ¤í¬ íŒŒì¼ë“¤(*.gcs)" msgid "Main Stick" msgstr "ë©”ì¸ ìŠ¤í‹±" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "제작사 ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "제작사:" @@ -3674,6 +3810,7 @@ msgstr "메모리 ë°”ì´íŠ¸" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3681,6 +3818,9 @@ msgstr "메모리 ë°”ì´íŠ¸" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "메모리 ì¹´ë“œ" @@ -3717,7 +3857,7 @@ msgstr "메모리카드 파ì¼í¬ê¸°ê°€ í—¤ë” í¬ê¸°ì™€ 불ì¼ì¹˜í•©ë‹ˆë‹¤" msgid "Menu" msgstr "메뉴" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "마ì´í¬" @@ -3726,11 +3866,11 @@ msgstr "마ì´í¬" msgid "Min" msgstr "최소값" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "기타" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "기타 설정" @@ -3751,7 +3891,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "단ì¼ë„어쓰기 í°íŠ¸" @@ -3764,7 +3904,7 @@ msgstr "모션 플러스" msgid "Motor" msgstr "모터" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3786,7 +3926,7 @@ msgstr "" msgid "Multiply" msgstr "곱하기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3878,6 +4018,7 @@ msgstr "NP 탭" msgid "NP Up" msgstr "NP 위" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3887,6 +4028,9 @@ msgstr "NP 위" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3895,7 +4039,7 @@ msgstr "ì´ë¦„:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "ì´ë¦„:" @@ -3909,7 +4053,7 @@ msgid "New Scan" msgstr "새로운 스캔" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "ë‹¤ìŒ íŽ˜ì´ì§€" @@ -3921,7 +4065,7 @@ msgstr "ë‹¤ìŒ ìŠ¤ìº”" msgid "Nickname :" msgstr "별명 :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "êµ­ê°€ ì—†ìŒ (SDK)" @@ -3960,7 +4104,7 @@ msgstr "%s 타ì´í‹€ì— 대한 저장 í´ë”ê°€ ì—†ìŒ" msgid "None" msgstr "ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "ë…¸ë¥´ì›¨ì´ ë¶ëª°ì–´" @@ -3968,8 +4112,8 @@ msgstr "ë…¸ë¥´ì›¨ì´ ë¶ëª°ì–´" msgid "Not Equal" msgstr "같지 ì•ŠìŒ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "설정 안함" @@ -3989,7 +4133,7 @@ msgstr "ì—°ê²°ë˜ì§€ ì•ŠìŒ" msgid "Notes" msgstr "참고 사항" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "참고:" @@ -4027,7 +4171,7 @@ msgstr "오브ì íŠ¸" msgid "Object Range" msgstr "오브ì íŠ¸ 범위" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "ë”" @@ -4053,11 +4197,11 @@ msgstr "%d 블럭들만 유용한" msgid "Open" msgstr "열기" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "ë‹´ê³  있는 í´ë” 열기(&c)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Wii 저장 í´ë” 열기(&s)" @@ -4079,11 +4223,11 @@ msgstr "OpenAL: 사운드 ìž¥ì¹˜ë“¤ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "OpenAL: can't open device %s" msgstr "OpenAL: %s 장치를 ì—´ 수 ì—†ìŒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL í…스처 디코ë”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP í…스처 디코ë”" @@ -4112,7 +4256,7 @@ msgid "" msgstr "íŒŒì¼ ë””ë ‰í† ë¦¬ì•ˆì— íŒŒì¼ì˜ 순서가 블럭 순서와 맞지 않습니다\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "다른 것들" @@ -4164,19 +4308,20 @@ msgstr "단ë½" msgid "Parameters" msgstr "매개변수들" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "파티션 %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "패치" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "경로" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4189,6 +4334,10 @@ msgstr "경로" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "ì¼ì‹œì •ì§€" @@ -4197,7 +4346,7 @@ msgstr "ì¼ì‹œì •ì§€" msgid "Per-Pixel Lighting" msgstr "픽셀단위 ê´‘ì›" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "완벽한" @@ -4210,6 +4359,7 @@ msgstr "ê´€ì  %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4220,6 +4370,10 @@ msgstr "ê´€ì  %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr " 실행 " @@ -4233,7 +4387,7 @@ msgstr "(ìž…ë ¥) ê¸°ë¡ ìž¬ìƒ" msgid "Play/Pause" msgstr "실행/ì¼ì‹œì •ì§€" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "플레ì´ê°€ëŠ¥" @@ -4245,6 +4399,7 @@ msgstr "ìž¬ìƒ ì˜µì…˜" msgid "Players" msgstr "플레ì´ì–´" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4254,6 +4409,9 @@ msgstr "플레ì´ì–´" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "확ì¸í•´ì£¼ì„¸ìš”..." @@ -4265,23 +4423,23 @@ msgstr "ì €ìž¥í•˜ê¸°ì „ì— ê´€ì ì„ ìƒì„±í•´ 주세요." msgid "Plus-Minus" msgstr "플러스-마ì´ë„ˆìŠ¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "í´ëž€ë“œì–´" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "í¬íŠ¸ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "í¬íŠ¸ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "í¬íŠ¸ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "í¬íŠ¸ 4" @@ -4290,11 +4448,11 @@ msgstr "í¬íŠ¸ 4" msgid "Port :" msgstr "í¬íŠ¸:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "í¬ë¥´íˆ¬ê°ˆì–´" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "í¬ë¥´íˆ¬ê°ˆì–´ (브ë¼ì§ˆ)" @@ -4302,17 +4460,17 @@ msgstr "í¬ë¥´íˆ¬ê°ˆì–´ (브ë¼ì§ˆ)" msgid "Post-Processing Effect:" msgstr "후-처리 효과:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "PlayControllerì— ì˜ìƒë§ˆë¬´ë¦¬ê°€ 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "PlayWiimoteì— ì˜ìƒ 마무리가 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PlayWiimoteì— ì˜ìƒ 마무리가 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u > %u" @@ -4325,7 +4483,7 @@ msgstr "사전설정:" msgid "Prev Page" msgstr "ì´ì „ 페ì´ì§€" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "ì´ì „ 페ì´ì§€" @@ -4376,7 +4534,7 @@ msgstr "R-아날로그" msgid "RAM" msgstr "램" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "러시아" @@ -4389,7 +4547,7 @@ msgstr "범위" msgid "Read-only mode" msgstr "ì½ê¸°-ì „ìš© 모드" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "실제" @@ -4464,6 +4622,7 @@ msgstr "ëª©ë¡ ìƒˆë¡œ 고침" msgid "Refresh game list" msgstr "게임 ëª©ë¡ ìƒˆë¡œ 고침" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4482,6 +4641,12 @@ msgstr "게임 ëª©ë¡ ìƒˆë¡œ 고침" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "제거" @@ -4534,11 +4699,11 @@ msgstr "오른쪽 스틱" msgid "Rumble" msgstr "진ë™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSP LLE를 ì „ìš© 쓰레드ìƒì—ì„œ 구ë™í•˜ê¸° (권장 안함)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "러시아어" @@ -4546,10 +4711,11 @@ msgstr "러시아어" msgid "Sa&ve State" msgstr "ìƒíƒœ 저장(&v) " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "안전" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4559,6 +4725,9 @@ msgstr "안전" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "샘플율:" @@ -4616,12 +4785,12 @@ msgstr "슬롯8 ìƒíƒœ 저장" msgid "Save State..." msgstr "ìƒíƒœ 저장..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "다른 ì´ë¦„으로 저장..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "ì••ì¶•ëœ GCM/ISO를 저장" @@ -4629,11 +4798,11 @@ msgstr "ì••ì¶•ëœ GCM/ISO를 저장" msgid "Save current perspective" msgstr "현재 ê´€ì ì„ 저장" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "압축풀린 GCM/ISO를 저장" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "%s ì˜ìƒ ìƒíƒœì €ìž¥ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤, ì˜ìƒ ê¸°ë¡ ì¤‘ì§€..." @@ -4642,6 +4811,7 @@ msgstr "%s ì˜ìƒ ìƒíƒœì €ìž¥ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤, ì˜ìƒ ê¸°ë¡ ì¤‘ì§€... msgid "Scaled EFB Copy" msgstr "스케ì¼ëœ EFB 복사" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4651,15 +4821,18 @@ msgstr "스케ì¼ëœ EFB 복사" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "스ìºë‹ %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "ISOë“¤ì„ ê²€ì‚¬í•˜ê¸°" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "스ìºë‹..." @@ -4675,12 +4848,12 @@ msgstr "스í¬ë¡¤ ë½" msgid "Search Filter" msgstr "í•„í„° 찾기" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "하위í´ë”들 찾기" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "섹션 %s를 SYSCONFì—ì„œ ì°¾ì„ ìˆ˜ ì—†ìŒ" @@ -4690,6 +4863,7 @@ msgstr "섹션 %s를 SYSCONFì—ì„œ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "Select" msgstr "ì„ íƒ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4714,6 +4888,14 @@ msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD íŒŒì¼ ì„ íƒ" @@ -4739,6 +4921,7 @@ msgstr "유ë™ì ì¸ 윈ë„우즈 ì„ íƒ" msgid "Select the file to load" msgstr "로드할 íŒŒì¼ ì„ íƒ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4755,19 +4938,26 @@ msgstr "로드할 ìƒíƒœ ì„ íƒ" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "저장 파ì¼ì„ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "로드할 ìƒíƒœ ì„ íƒ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "저장할 ìƒíƒœ ì„ íƒ" @@ -4789,7 +4979,7 @@ msgstr "" "\n" "모르겠으면, ìžë™ì„ ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "ì„ íƒëœ í°íŠ¸" @@ -4837,11 +5027,11 @@ msgstr "센서 ë°” 위치:" msgid "Separator" msgstr "분리ìž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "세르비아어" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "시리얼 í¬íŠ¸ 1 - ì´ê²ƒì€ ë„· ì–´ëŒ‘í„°ê°™ì€ ë””ë°”ì´ìŠ¤ê°€ 사용하는 í¬íŠ¸ì´ë‹¤" @@ -4850,11 +5040,11 @@ msgstr "시리얼 í¬íŠ¸ 1 - ì´ê²ƒì€ ë„· ì–´ëŒ‘í„°ê°™ì€ ë””ë°”ì´ìŠ¤ê°€ 사 msgid "Set" msgstr "설정" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "ë””í´íŠ¸ ISOë¡œ 설정(&d)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "기본 메모리카드 %c ë¡œ 설정" @@ -4864,7 +5054,7 @@ msgstr "기본 메모리카드 %c ë¡œ 설정" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: 목ë¡ì´ ar 코드 ëª©ë¡ í¬ê¸° %lu 보다 ë” í½ë‹ˆë‹¤" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "설정..." @@ -4876,7 +5066,7 @@ msgstr "SetupWiiMem: 설정 파ì¼ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "Shake" msgstr "í”들기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "단축 ì´ë¦„:" @@ -4904,7 +5094,7 @@ msgstr "툴바 표시(&T)" msgid "Show Drives" msgstr "ë“œë¼ì´ë¸Œ 표시" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "EFB 복사 ì˜ì—­" @@ -4920,7 +5110,7 @@ msgstr "프랑스" msgid "Show GameCube" msgstr "게임í브" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "ìž…ë ¥ 표시 보기" @@ -4936,7 +5126,7 @@ msgstr "JAP (ì¼ë³¸ ë°©ì‹)" msgid "Show Korea" msgstr "한국" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "언어 보기:" @@ -4956,7 +5146,7 @@ msgstr "í”Œëž«í¼ í‘œì‹œ" msgid "Show Regions" msgstr "지역 표시" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "통계들" @@ -4976,11 +5166,11 @@ msgstr "Wad" msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "ê²Œìž„ì„ ë©ˆì¶”ê¸° ì „ì— í™•ì¸ ìƒìž 보여주기." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4990,23 +5180,23 @@ msgstr "" "ì´ê²ƒì„ ë„ë©´ 짜ì¦ë‚˜ê³  심ê°í•˜ì§€ ì•Šì€ ë©”ì‹œì§€ë“¤ì„ í”¼í•  ìˆ˜ë„ ìžˆë‹¤, 하지만 ê·¸ê²ƒì€ " "ëŒí•€ì´ 전혀 설명 ì—†ì´ ê°‘ìžê¸° 깨진다는 ê²ƒì„ ì˜ë¯¸í•  ìˆ˜ë„ ìžˆë‹¤." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "첫번째 블럭 보기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "저장 블럭들 보기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "저장 ì£¼ì„ ë³´ê¸°" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "저장 ì•„ì´ì½˜ 보기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "저장 타ì´í‹€ 보기" @@ -5043,7 +5233,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "사ì´ë“œì›¨ì´ 위모트" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "간소화 중국어" @@ -5051,11 +5241,11 @@ msgstr "간소화 중국어" msgid "Size" msgstr "í¬ê¸°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "ë°”ì´ì˜¤ìŠ¤ 스킵" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "목ì ì§€. 알파 패스 스킵" @@ -5097,11 +5287,11 @@ msgstr "" msgid "Slot %i" msgstr "슬롯 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "슬롯 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "슬롯 B" @@ -5124,7 +5314,7 @@ msgstr "" "디버깅 목ì ìœ¼ë¡œë§Œ 유용합니다.\n" "소프트웨어 ë Œë”ë§ì„ í™œì„±ì„ ì •ë§ ì›í•©ë‹ˆê¹Œ? 모르겠으면, '아니오'를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "사운드 설정" @@ -5142,6 +5332,7 @@ msgstr "사운드 ë²„í¼ ìƒì„± 실패했습니다: %s" msgid "Space" msgstr "스페ì´ìŠ¤" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5157,6 +5348,11 @@ msgstr "스페ì´ìŠ¤" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "스페ì¸ì–´" @@ -5188,7 +5384,7 @@ msgstr "" msgid "Specify a video backend" msgstr "비디오 백엔드 명시" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "ë””ìŠ¤í¬ ì „ì†¡ìœ¨ ì†ë„ ìƒìŠ¹" @@ -5196,7 +5392,7 @@ msgstr "ë””ìŠ¤í¬ ì „ì†¡ìœ¨ ì†ë„ ìƒìŠ¹" msgid "Square Stick" msgstr "스퀘어 스틱" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "표준 컨트롤러" @@ -5293,12 +5489,12 @@ msgstr "세ì´ë¸Œ 파ì¼ë“¤ì„ 성공ì ìœ¼ë¡œ 가져왔ìŒ" msgid "Swing" msgstr "스윙" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "시스템 언어:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "타ì´ì™„" @@ -5337,7 +5533,7 @@ msgstr "í…Œì´ë¸” 오른쪽" msgid "Take Screenshot" msgstr "스í¬ë¦°ìƒ· ì°ê¸°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "타루콩가 (봉고스)" @@ -5353,7 +5549,7 @@ msgstr "í…스처" msgid "Texture Cache" msgstr "í…스처 ìºì‰¬" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "í…스처 í¬ë©§ 오버레ì´" @@ -5369,13 +5565,13 @@ msgstr "ê·¸ 주소는 비ì í•© 입니다" msgid "The checksum was successfully fixed" msgstr "ì²´í¬ì„¬ì´ 성공ì ìœ¼ë¡œ ê³ ì³ì¡ŒìŠµë‹ˆë‹¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "ì„ íƒëœ 디렉토리는 ì´ë¯¸ ë¦¬ìŠ¤íŠ¸ì— ìžˆë‹¤" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5398,7 +5594,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "%s 파ì¼ì´ ì´ë¯¸ ì—´ë ¤ 있었습니다, íŒŒì¼ í—¤ë”는 기ë¡ë˜ì§€ ì•Šì„ ê²ƒìž…ë‹ˆë‹¤." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "ë‹¹ì‹ ì´ ê¸°ìˆ í•œ íŒŒì¼ (%s)는 존재하지 않습니다" @@ -5416,11 +5612,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "í•´ë…ëœ AR 코드 결과가 없습니다." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "ì´ê²ƒì„ 안전하게 ì •í•  수ë¡, ì—뮬레ì´í„°ê°€ 램으로 부터 í…스처 ì—…ë°ì´íŠ¸ë“¤ì„ ëœ ë†“" "치는 ê²½í–¥ì´ ìžˆìŠµë‹ˆë‹¤.\n" @@ -5463,7 +5660,7 @@ msgstr "ê¸°ìˆ ëœ \"%s\" 파ì¼ì€ 존재하지 않는다" msgid "The value is invalid" msgstr "ê°’ì´ ë¹„ì í•© 합니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "테마" @@ -5471,7 +5668,7 @@ msgstr "테마" msgid "Theme selection went wrong" msgstr "테마 ì„ íƒì´ 잘못ë˜ì—ˆë‹¤" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5479,7 +5676,7 @@ msgstr "" "00000001/00000002ì— ëŒ€í•œ í‹°ì¼“ì´ ìžˆì–´ì•¼í•œë‹¤. ë‹¹ì‹ ì˜ NAND ë¤í”„는 ì•„ë§ˆë„ ë¯¸ì™„ì„±" "ì´ë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5495,7 +5692,7 @@ msgstr "" "ì´ ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì‹œë®¬ë ˆì´í„°ëŠ” ì•¡ì…˜ ë¦¬í”Œë ˆì´ ìŠ¤ìŠ¤ë¡œ 수정한 코드를 지ì›í•˜ì§€ ì•Š" "는다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "ì´ê²ƒì€ Wii 메뉴와 ì¼ë¶€ 게임들ì—ì„œ ëŠë ¤ì§ì„ 유발할 수 있다." @@ -5518,23 +5715,10 @@ msgstr "" "모르겠으면. ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"ì´ê²ƒì€ 사운드 병목으로 게임 스피드를 컨트롤하는 ë°ì— ì“°ì¸ë‹¤.\n" -"ì´ê²ƒì„ ë„는 ê²ƒì€ ë¹„ì •ìƒì ì¸ 게임스피드를 유발할 수 있다, 너무 빠르다ë˜ì§€.\n" -"\n" -"키보드 단축키 : ë³‘ëª©ì„ ì¦‰ê° ë„려면 눌러ë¼." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "ì´ê²ƒì€ BGMê°™ì€ ìŒì•… íŠ¸ëž™ë“¤ì„ ìž¬ìƒí•˜ëŠ” ë°ì— 쓰입니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5546,7 +5730,7 @@ msgstr "" "ë‘ê°œ ì´ìƒì˜ 코어를 가진 PC들 ìƒì—ì„œ 주요 ì†ë„ í–¥ìƒë“¤ì„ 유발한다, 하지만 ê°‘ìž‘" "스런 깨ì§/ê²°í•¨ë“¤ì„ ì¼ìœ¼í‚¬ ìˆ˜ë„ ìžˆë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "ì´ê²ƒì€ 수ë™ìœ¼ë¡œ INI 환경파ì¼ì„ 수정하게 해줄ê²ë‹ˆë‹¤" @@ -5569,7 +5753,7 @@ msgstr " 제목" msgid "To" msgstr "To" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "모든 로그 타입 토글" @@ -5589,6 +5773,7 @@ msgstr "전체화면 토글" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5596,14 +5781,17 @@ msgstr "전체화면 토글" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "위" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "전통 중국어" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "알려지지 ì•Šì€ íŒŒì¼ íƒ€ìž…ì„ ë¡œë“œì‹œë„했다." @@ -5611,7 +5799,7 @@ msgstr "알려지지 ì•Šì€ íŒŒì¼ íƒ€ìž…ì„ ë¡œë“œì‹œë„했다." msgid "Triggers" msgstr "트리거" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "비ì í•© SYSCONFë¡œ 부터 ì½ê¸° ì‹œë„" @@ -5623,7 +5811,7 @@ msgstr "" "효한 SYSCONFì—ì„œ ì½ê¸° ì‹œë„\n" "위모트 bt idë“¤ì€ ìœ ìš©í•˜ì§€ 않습니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "터키어" @@ -5644,11 +5832,11 @@ msgstr "UDP í¬íŠ¸:" msgid "UDP Wiimote" msgstr "UDP 위모트" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "알려지지 ì•ŠìŒ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "미국" @@ -5734,7 +5922,7 @@ msgstr "ì—…ë°ì´íŠ¸" msgid "Upright Wiimote" msgstr "ì—…ë¼ì´íŠ¸ 위모트" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 모드 (PAL60) 사용" @@ -5746,7 +5934,7 @@ msgstr "전체화면 사용" msgid "Use Hex" msgstr "16진수 사용" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "패닉 핸들러 사용" @@ -5776,7 +5964,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "유틸리티" @@ -5800,25 +5988,29 @@ msgstr "ê°’:" msgid "Verbosity" msgstr "ìƒì„¸ì„¤ëª…" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "비디오" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "ê°€ìƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "볼륨" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD 설치 실패했습니다: ì—러 ìƒì„± %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD 설치 실패했습니다: ì—러 ìƒì„± %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5837,15 +6029,15 @@ msgstr "" msgid "Warning" msgstr "경고" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "경고 - ìž˜ëª»ëœ ì½˜ì†” 모드ì—ì„œ DOLì„ ì‹œìž‘!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "경고 - ìž˜ëª»ëœ ì½˜ì†” 모드ì—ì„œ ELF 시작!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "경고 - ìž˜ëª»ëœ ì½˜ì†” 모드ì—ì„œ ISO 시작!" @@ -5873,7 +6065,7 @@ msgstr "" "그리고 ë‹¹ì‹ ì˜ ë©”ëª¨ë¦¬ì¹´ë“œì— íŒŒì¼ë¡œ ê°™ì€ ì´ë¦„ì„ ê°€ì§‘ë‹ˆë‹¤\n" "계ì†í•©ë‹ˆê¹Œ?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5884,7 +6076,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:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5895,7 +6087,7 @@ msgstr "" "ì „ì— ë‹¤ë¥¸ 세ì´ë¸Œë¥¼ 로드해야합니다, í˜¹ì€ ì½ê¸°-ì „ìš© 모드를 ë„ê³  로드하세요. ê·¸" "렇지 않으면 ì•„ë§ˆë„ ì‹±í¬ ì–´ê¸‹ë‚¨ì´ ìƒê¸¸ê²ë‹ˆë‹¤." -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5937,7 +6129,7 @@ msgstr "WaveFileWriter - 파ì¼ì´ 열리지 않습니다." msgid "Whammy" msgstr "훼미" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "와ì´ë“œìŠ¤í¬ë¦° 핵" @@ -5945,15 +6137,15 @@ msgstr "와ì´ë“œìŠ¤í¬ë¦° 핵" msgid "Width" msgstr "너비" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii 콘솔" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND 루트:" @@ -5961,6 +6153,7 @@ msgstr "Wii NAND 루트:" msgid "Wii Save Import" msgstr "Wii 저장 가져오기" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5970,6 +6163,9 @@ msgstr "Wii 저장 가져오기" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파ì¼ë“¤ (*.bin)|*.bin" @@ -6036,10 +6232,11 @@ msgstr "윈ë„우즈 메뉴" msgid "Windows Right" msgstr "윈ë„우즈 오른쪽" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "ìžë™ 줄바꿈" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6055,6 +6252,11 @@ msgstr "ìžë™ 줄바꿈" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "ìž‘ë™ì¤‘..." @@ -6062,6 +6264,11 @@ msgstr "ìž‘ë™ì¤‘..." msgid "Write to Console" msgstr "ì½˜ì†”ì— ì“°ê¸°" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "파ì¼ì— 쓰기" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "파ì¼ì— 쓰기" @@ -6117,7 +6324,7 @@ msgstr "ì í•©í•œ 10진수나 16진수나 8진수 ê°’ì„ ë„£ì–´ì•¼ 합니다." msgid "You must enter a valid profile name." msgstr "ì í•©í•œ í”„ë¡œíŒŒì¼ ì´ë¦„ì„ ë„£ì–´ì•¼ 합니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "ë³€ê²½ì´ ì ìš©ë˜ë ¤ë©´ ëŒí•€ì„ 재시작 해야 합니다." @@ -6140,7 +6347,7 @@ msgstr "" "0x%04x ì´ì–´ì•¼í•©ë‹ˆë‹¤ (하지만 0x%04llx ìž„) \n" "새로 ìƒì„±í•˜ì‹œê² ìŠµë‹ˆê¹Œ?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP 핵" @@ -6210,7 +6417,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "ì•±ë¡œë” (.img)" @@ -6241,12 +6448,12 @@ msgstr "wii ì €ìž¥ì´ ì•„ë‹ˆê±°ë‚˜ íŒŒì¼ í—¤ë” í¬ê¸° %xì— ëŒ€í•œ ì½ê¸° 실 msgid "s" msgstr "들" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "알려지지 ì•Šì€ ëª…ë ¹ 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "애플리케ì´ì…˜ 구ë™ìƒì—ì„œ wxExecuteê°€ -1ì„ ë°˜í™˜í–ˆìŠµë‹ˆë‹¤!" @@ -6455,6 +6662,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "ì—뮬레ì´í„° 화면표시 설정" +#~ msgid "Enable Audio Throttle" +#~ msgstr "오디오 병목 활성" + #~ msgid "Enable CPU Access" #~ msgstr "CPU 엑세스 활성" @@ -6511,6 +6721,13 @@ msgstr "| OR" #~ msgid "Error allocating buffer" #~ msgstr "ë²„í¼ í• ë‹¹í•˜ê¸° ì—러" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "PlayWiimoteì— ì—러발ìƒ. %u != %u, byte %d.\n" +#~ "죄송합니다, Wii 녹화가 ì¼ì‹œì ìœ¼ë¡œ 깨졌습니다." + #~ msgid "Error loading %s: can't read info" #~ msgstr "%s 로딩 ì—러: 정보를 ì½ì„ 수 ì—†ìŒ" @@ -6790,6 +7007,19 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "ê·¸ 파ì¼" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "ì´ê²ƒì€ 사운드 병목으로 게임 스피드를 컨트롤하는 ë°ì— ì“°ì¸ë‹¤.\n" +#~ "ì´ê²ƒì„ ë„는 ê²ƒì€ ë¹„ì •ìƒì ì¸ 게임스피드를 유발할 수 있다, 너무 빠르다ë˜" +#~ "지.\n" +#~ "\n" +#~ "키보드 단축키 : ë³‘ëª©ì„ ì¦‰ê° ë„려면 눌러ë¼." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "ì´ê²ƒì€ 보통 ìŒì„±ê³¼ 소리 효과들 재ìƒì— 사용ëœë‹¤." diff --git a/Languages/po/nb.po b/Languages/po/nb.po index d321d1dde5..d2fa9aa314 100644 --- a/Languages/po/nb.po +++ b/Languages/po/nb.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-06-06 20:15+0100\n" "Last-Translator: Knut \n" "Language-Team: Norwegian \n" @@ -60,9 +64,9 @@ msgstr "\"%s\" er en ugyldig GCM/ISO-fil, eller ikke en GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sKopier%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -154,7 +158,7 @@ msgstr "%sEksporter GCI%s" msgid "%sImport GCI%s" msgstr "%sImporter GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Ledige Blokker; %u Ledige Dir Entries" @@ -187,11 +191,11 @@ msgstr "Jukse&kode-manager" msgid "&DSP Settings" msgstr "Innstillinger for &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Slett ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Slett valgte ISO-filer..." @@ -255,7 +259,7 @@ msgstr "&Pause" msgid "&Play" msgstr "&Spill" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Egenskaper" @@ -299,7 +303,7 @@ msgstr "Vi&s" msgid "&Wiimote Settings" msgstr "Innstillinger for Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -343,7 +347,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -352,7 +356,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -409,13 +413,13 @@ msgstr "" "\n" "Du mÃ¥ fremme TCP-porten til verten!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -427,11 +431,11 @@ msgstr "Om Dolphin" msgid "Acceleration" msgstr "Aksellerasjon" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Nøyaktighet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Nøyaktig VBeam-emulering" @@ -551,11 +555,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Legg Til" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Legg til Action Replay Kode" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Legg til Patch" @@ -563,6 +567,7 @@ msgstr "Legg til Patch" msgid "Add new pane" msgstr "Legg til ny rute" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -578,6 +583,11 @@ msgstr "Legg til ny rute" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Legg til..." @@ -625,11 +635,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Juster analogkontrolltrykket som kreves for Ã¥ aktivere knapper." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avansert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Avanserte Innstillinger" @@ -637,14 +647,15 @@ msgstr "Avanserte Innstillinger" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Alle GC/Wii-filer (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -657,18 +668,22 @@ msgstr "Alle GameCube GCM-filer (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO-filer (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle komprimerte GC/Wii-filer (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Alle filer (*.*)|*.*" @@ -684,7 +699,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Emulert Wiimote" @@ -707,7 +722,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Applikasjonlaster klarte ikke Ã¥ laste fra fil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Applikasjonslaster:" @@ -725,7 +740,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabisk" @@ -734,7 +749,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -742,12 +757,13 @@ msgstr "" "Er du sikker pÃ¥ at du vil slette disse filene?\n" "De vil bli borte for alltid!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -757,6 +773,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -765,18 +784,20 @@ msgstr "Aspektforhold:" msgid "At least one pane must remain open." msgstr "Minst en rute mÃ¥ stÃ¥ Ã¥pen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Audio Backend:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Feil ved Ã¥pning av AO-device.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -786,6 +807,9 @@ msgstr "AudioCommon: Feil ved Ã¥pning av AO-device.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisk" @@ -828,7 +852,7 @@ msgstr "" msgid "Back" msgstr "Tilbake" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Backend-innstillinger" @@ -855,11 +879,11 @@ msgstr "DÃ¥rlig Fil-header" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Bannerdetaljer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -871,7 +895,7 @@ msgstr "Bar" msgid "Basic" msgstr "Grunnleggende" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Grunnleggende Innstillinger" @@ -902,6 +926,7 @@ msgstr "BlÃ¥ Høyre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -909,6 +934,9 @@ msgstr "BlÃ¥ Høyre" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Bunn" @@ -917,7 +945,7 @@ msgstr "Bunn" msgid "Bound Controls: %lu" msgstr "Bundede Kontroller: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Ødelagt" @@ -933,7 +961,7 @@ msgstr "Bla etter en mappe Ã¥ legge til" msgid "Browse for an ISO directory..." msgstr "Bla etter en ISO-mappe..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Bla etter lagringssted" @@ -964,11 +992,11 @@ msgstr "C-joystick" msgid "C-Stick" msgstr "C-joystick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU-emulatormotor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cacher Display-lister" @@ -1017,7 +1045,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1027,7 +1055,7 @@ msgstr "" "Kan ikke bruke den filen som et minnekort.\n" "Prøver du Ã¥ bruke samme fil i begge slotter?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1045,8 +1073,6 @@ msgstr "Kan ikke finne Wiimote med bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Kan ikke finne Wiimote med tilkoblingshandler %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1056,7 +1082,7 @@ msgstr "Kan ikke lese fra DVD_Plugin - DVD-Interface: Fatal Feil" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Katalansk" @@ -1081,7 +1107,7 @@ msgstr "Endre Disk" msgid "Change Game" msgstr "Endre Spill" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1097,8 +1123,8 @@ 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 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Ã… endre dette vil ikke ha noen effekt mens emulatoren kjører!" @@ -1118,31 +1144,31 @@ msgstr "Juksekodesøk" msgid "Cheats Manager" msgstr "Juksekode Manager" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Kinesisk (Simplifisert)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Kinesisk (Tradisjonell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Velg en DVD-rotmappe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Velg en NAND-rotmappe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Velg en standard-ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Velg en mappe Ã¥ legge til" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Velg en fil Ã¥ Ã¥pne" @@ -1150,7 +1176,7 @@ msgstr "Velg en fil Ã¥ Ã¥pne" msgid "Choose a memory card:" msgstr "Velg et minnekort:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1158,8 +1184,8 @@ msgstr "" "Velg fil til Ã¥ bruke som applikasjonslaster: (gjelder kun for disker laget " "fra mapper)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Velg mappen Ã¥ ekstrahere til" @@ -1171,14 +1197,14 @@ msgstr "Sirkel-joystick" msgid "Classic" msgstr "Klassisk" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Tøm" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Klarering feilet." @@ -1194,6 +1220,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1202,6 +1229,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Lukk" @@ -1225,20 +1256,20 @@ msgstr "Kommando" msgid "Comment" msgstr "Kommentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Kommentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Komprimer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Komprimer valgte ISO-er..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Komprimerer ISO" @@ -1265,13 +1296,13 @@ msgstr "Konfigurer Kontrollere" msgid "Configure..." msgstr "Konfigurer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Bekreft filoverskriving" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Bekreft ved Stans" @@ -1280,7 +1311,7 @@ msgstr "Bekreft ved Stans" msgid "Connect" msgstr "Koble til" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Koble til USB-tastatur" @@ -1337,12 +1368,12 @@ msgstr "Konverter til GCI" msgid "Copy failed" msgstr "Kopi feilet" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Kopier til Minnekort %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Kjerne" @@ -1372,7 +1403,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Kunne ikke gjennkjenne ISO-fil %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Kunne ikke lagre %s" @@ -1386,7 +1417,7 @@ msgstr "" "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 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1398,7 +1429,7 @@ msgstr "" "\n" "Kjører du Dolphin fra en CD/DVD, eller er lagringsfilen kanskje beskyttet?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kunne ikke finne Ã¥pningskommandoen for utvidelsen 'ini'!" @@ -1415,7 +1446,7 @@ msgstr "" msgid "Count:" msgstr "Antall:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Land:" @@ -1429,25 +1460,25 @@ msgstr "Lag AR-kode" msgid "Create new perspective" msgstr "Lag nytt perspektiv" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Laget av KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Laget av Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Laget av VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Laget av black_rider og publisert pÃ¥ ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Skaper:" @@ -1455,7 +1486,7 @@ msgstr "Skaper:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Krum" @@ -1478,7 +1509,7 @@ msgstr "Kryssutfase" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "NÃ¥værende mappesti endret fra %s til %s etter wxFilVelger!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Selvdefinert Projeksjons-hack" @@ -1486,11 +1517,11 @@ msgstr "Selvdefinert Projeksjons-hack" msgid "Custom Projection Hack Settings" msgstr "Innstillinger for Selvdefinerte Projeksjons-hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Selvdefiner noen Ortografisk Projeksjons-parametere." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tsjekkisk" @@ -1502,10 +1533,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "CPU Emulatormotor" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1516,18 +1548,22 @@ msgstr "CPU Emulatormotor" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulering (raskt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (tregt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE pÃ¥ CPU-trÃ¥d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE re-kompilering" @@ -1535,15 +1571,23 @@ msgstr "DSP LLE re-kompilering" msgid "DSP settings" msgstr "Innstillinger for DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD-rot:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Datastørrelse" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Dato:" @@ -1564,7 +1608,7 @@ msgstr "Dødsone" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Debugging" @@ -1572,16 +1616,16 @@ msgstr "Debugging" msgid "Decimal" msgstr "Desimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Dekomprimer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Dekomprimer valgte ISO-filer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Dekomprimerer ISO" @@ -1589,11 +1633,11 @@ msgstr "Dekomprimerer ISO" msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Standard-ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Standard tekst-font" @@ -1602,7 +1646,7 @@ msgstr "Standard tekst-font" msgid "Delete" msgstr "Slett" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Slett Lagringsfil" @@ -1611,7 +1655,7 @@ msgstr "Slett Lagringsfil" msgid "Delete the existing file '%s'?" msgstr "Slett den eksiterende filen '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Beskrivelse" @@ -1619,8 +1663,8 @@ msgstr "Beskrivelse" msgid "Detect" msgstr "Finn automatisk" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1633,8 +1677,8 @@ msgstr "" msgid "Device" msgstr "Device" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Innstillinger for device" @@ -1659,23 +1703,23 @@ msgstr "" " og mappesti backup-sjekksummen mislyktes" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Deaktiver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Deaktiver tÃ¥ke (fog)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Deaktiver lyseffekter" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Deaktiver Per-Pikseldybde" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Deaktiver teksturer" @@ -1719,7 +1763,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disk" @@ -1746,6 +1790,7 @@ msgstr "" msgid "Divide" msgstr "Del" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1755,10 +1800,13 @@ msgstr "Del" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pÃ¥gÃ¥ende emulering?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1783,6 +1831,7 @@ msgstr "Dolphin Emulert Wiimote Konfigurasjon" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1807,6 +1856,14 @@ msgstr "Dolphin GC-kontroll konfigurasjon" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC-kontroll konfigurasjon" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" @@ -1839,11 +1896,11 @@ msgstr "" msgid "Down" msgstr "Ned" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Last ned juksekoder (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Lastet ned %lu koder. (la til %lu)" @@ -1852,23 +1909,23 @@ msgstr "Lastet ned %lu koder. (la til %lu)" msgid "Drums" msgstr "Trommer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Juksedukke" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Dump Audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Dump EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Skjermdumping" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Dump teksturer" @@ -1902,6 +1959,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1917,6 +1975,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Nederlansk" @@ -1940,7 +2003,7 @@ msgstr "" "versjon %d.%d -- Hvis du nylig oppgraderte din Dolphin-distribusjon, kreves " "sannsynligvis en restart for at Windows skal se den nye driveren." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1956,7 +2019,7 @@ msgstr "Endre" msgid "Edit ActionReplay Code" msgstr "Endre ActionReplay-kode" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Endre Konfigurasjon" @@ -1968,8 +2031,8 @@ msgstr "Endre Patch" msgid "Edit current perspective" msgstr "Endre nÃ¥værende perspektiv" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Endre..." @@ -2019,7 +2082,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulert Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Emulasjonsstatus:" @@ -2047,23 +2110,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Aktiver AR-logging" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Aktiver Audio Throttle" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Aktiver BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Aktiver Block Merging" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2076,6 +2139,7 @@ msgstr "" msgid "Enable Cache" msgstr "Aktiver cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2085,51 +2149,54 @@ msgstr "Aktiver cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Aktiver Juksekoder" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Aktiver DTK-musikk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Aktiver Dobbelkjerne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Aktiver Dobbelkjerne (for bedre ytelse)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Aktiver Snarveistaster" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Aktiver Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Aktiver Idle Skipping (for bedre ytelse)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Aktiver MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Aktiver Progressiv Skanning" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Aktiver Skjermsparer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Aktiver Widescreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Aktiver WireFrame" @@ -2146,7 +2213,7 @@ msgstr "" "\n" "Hvis usikker, velg 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2154,7 +2221,7 @@ msgstr "" "Aktiver rask disktilgang. Trengs for noen fÃ¥ spill. (PÃ… = Raskt, AV = " "Kompitabelt)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Aktiver sider" @@ -2182,7 +2249,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2190,7 +2257,7 @@ msgstr "" "Aktiver dette for Ã¥ bedre ytelsen i The Legend Of Zelda: Twillight Princess. " "Deaktiver for andre spill." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2200,7 +2267,7 @@ msgstr "" "Unit (MMU). Nøyaktig for maskinvaren, men treg Ã¥ emulere. (PÃ… = Kompitabelt, " "AV = Raskt)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Tillater Selvdefinerte Projeksjons-hack" @@ -2217,7 +2284,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2239,6 +2306,7 @@ msgstr "" msgid "End" msgstr "Slutt" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2254,6 +2322,11 @@ msgstr "Slutt" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Engelsk" @@ -2284,6 +2357,7 @@ msgstr "Lik" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Feil" @@ -2314,18 +2388,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Feil" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Feil ved lasting av valgt sprÃ¥k. Faller tilbake til systemstandarden." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2359,7 +2439,7 @@ msgstr "Avslutt Dolphin med emulator" msgid "Export Failed" msgstr "Eksportering mislyktes" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Eksporter Fil" @@ -2372,15 +2452,15 @@ msgstr "Eksporter Opptak" msgid "Export Recording..." msgstr "Eksporter Opptak..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Eksporter Lagringsfil" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Eksporter Wii-lagringsfil (Eksperimentiell)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Eksporter alle lagringsfiler" @@ -2396,7 +2476,7 @@ msgstr "Eksporter lagringsfil som..." msgid "Extension" msgstr "Utvidelse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Ekstern Bildebuffer (EFB)" @@ -2408,44 +2488,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Ekstraher Alle Filer..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Ekstraher Applikasjonslaster..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Ekstraher DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Ekstraher Mappe..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Ekstraher Fil..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Ekstraher Partisjon..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Ekstraherer %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Ekstraherer Alle Filer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Ekstraherer Mappe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Ekstraherer..." @@ -2457,11 +2537,11 @@ msgstr "FIFO-Byte" msgid "FIFO Player" msgstr "FIFO-spiller" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANKRIKE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST-størrelse:" @@ -2473,11 +2553,11 @@ msgstr "Tilkobling Mislyktes!" msgid "Failed to Listen!!" msgstr "Lytting Mislyktes!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Nedlasting av koder mislyktes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Ekstrahering til %s mislyktes!" @@ -2594,18 +2674,28 @@ msgstr "Kunne ikke skrive header for %s" msgid "Failed to write header for file %d" msgstr "Kunne ikke skrive header for filen %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Rask" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Raske Mipmaps" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Fifo-spiller" @@ -2614,7 +2704,7 @@ msgstr "Fifo-spiller" msgid "File Info" msgstr "Filinformasjon" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Filen inneholder ingen koder." @@ -2647,16 +2737,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:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Ukjent Ã¥penmodus: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Filsystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Filtypen 'ini' er ukjent! kan ikke Ã¥pnes!" @@ -2664,7 +2754,7 @@ msgstr "Filtypen 'ini' er ukjent! kan ikke Ã¥pnes!" msgid "First Block" msgstr "Første Blokk" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Fiks Sjekksummer" @@ -2676,7 +2766,7 @@ msgstr "Tving 16:9" msgid "Force 4:3" msgstr "Tving 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Tving Konsoll til NTSC-J" @@ -2709,7 +2799,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2745,7 +2835,7 @@ msgstr "Stillbilde" msgid "Frame Advance" msgstr "Bilde-for-bilde Modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Spillopptak bruker FFV1" @@ -2757,7 +2847,7 @@ msgstr "Bilderekkevidde" msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Framelimit:" @@ -2765,10 +2855,11 @@ msgstr "Framelimit:" msgid "Frames To Record" msgstr "Bilder Til Opptak" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Fri Utkikk" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2784,6 +2875,11 @@ msgstr "Fri Utkikk" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Fransk" @@ -2817,7 +2913,7 @@ msgstr "Konfigurer Logg" msgid "GCPad" msgstr "GC-kontroll" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "Spill-ID:" @@ -2833,15 +2929,15 @@ msgstr "Et spill kjører ikke!" msgid "Game not found!!" msgstr "Spill ikke funnet!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Spill-spesifikke Innstillinger" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "SpillKonfigurasjon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "GameCube" @@ -2852,6 +2948,7 @@ msgstr "Innstillinger for &GameCube-kontroll" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2859,6 +2956,9 @@ msgstr "Innstillinger for &GameCube-kontroll" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" @@ -2867,15 +2967,17 @@ msgid "Gamecube Pad settings" msgstr "Innstillinger for GameCube-kontroll" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko-juksekoder" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "GeckoKode mislyktes i Ã¥ kjøre (CT%i CST%i) (%s)\n" "(Enten en dÃ¥rlig kode, eller sÃ¥ støttes ikke kodeformatet.)" @@ -2884,6 +2986,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2892,6 +2995,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generelt" @@ -2900,6 +3006,7 @@ msgstr "Generelt" msgid "General Settings" msgstr "Generelle Innstillinger" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2915,6 +3022,11 @@ msgstr "Generelle Innstillinger" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Tysk" @@ -2953,7 +3065,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Gresk" @@ -2985,7 +3097,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Header-sjekksum feilet" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebraisk" @@ -3054,12 +3166,16 @@ msgstr "Konfigurer Snarveistaster" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Snarveistaster" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Ungarsk" @@ -3067,12 +3183,12 @@ msgstr "Ungarsk" msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3085,11 +3201,11 @@ msgstr "" "TitleID %016llx.\n" "Dolphin vil sannsynligvis krasje nÃ¥" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - dÃ¥rlig destinasjon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Innstillinger for IPL" @@ -3105,15 +3221,15 @@ msgstr "IR-peker" msgid "IR Sensitivity:" msgstr "IR-sensitivitet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO-detaljer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO-mapper" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITALIA" @@ -3121,23 +3237,25 @@ msgstr "ITALIA" msgid "Icon" msgstr "Ikon" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 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)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). 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 Framelimit høyere enn spillets fulle hastighet (NTSC:60, " "PAL:50), mÃ¥ du ogsÃ¥ deaktivere Audio Throttle i DSP-innstillingene for Ã¥ " @@ -3175,7 +3293,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importer Lagringsfil" @@ -3224,7 +3342,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "I spillet" @@ -3233,7 +3351,7 @@ msgid "In-Game" msgstr "I spillet" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3253,7 +3371,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:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Sett inn SD-kort" @@ -3265,7 +3383,7 @@ msgstr "Sett inn navn her..." msgid "Install WAD" msgstr "Installer WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Installer til Wii Meny" @@ -3274,6 +3392,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3283,14 +3402,17 @@ msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Installer WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Kontrollpanel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Innstillinger for kontrollpanel" @@ -3315,11 +3437,11 @@ msgstr "Intern LZO-feil - lzo_init() mislyktes" msgid "Internal Resolution:" msgstr "Intern Oppløsning:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (VELDIG treg)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3336,7 +3458,7 @@ msgstr "Ugyldig verdi!" msgid "Invalid bat.map or dir entry" msgstr "Ugyldig bat.map eller mappesti" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Ugyldig event-type %i" @@ -3356,14 +3478,15 @@ msgstr "" "%s\n" " Det kan hende du mÃ¥ re-dumpe dette spillet." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Ugyldig opptaksfil" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Ugyldig save state" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3379,27 +3502,32 @@ msgstr "Ugyldig save state" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiensk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Rekompilerer (anbefalt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL eksperimentiell rekompilerer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japansk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3408,8 +3536,8 @@ msgstr "KOREA" msgid "Key" msgstr "Tast" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Koreansk" @@ -3427,7 +3555,7 @@ msgstr "L-Knappen" msgid "L-Analog" msgstr "Venstre-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "SprÃ¥k:" @@ -3480,7 +3608,7 @@ msgstr "" msgid "Less Than" msgstr "Mindre Enn" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Begrens med FPS (bilder-per-sekund)" @@ -3488,7 +3616,7 @@ msgstr "Begrens med FPS (bilder-per-sekund)" msgid "Load" msgstr "Last inn" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Last inn Kustomiserte Teksturer" @@ -3536,6 +3664,7 @@ msgstr "Last Inn Save State Slot 8" msgid "Load State..." msgstr "Last Inn Save State..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3557,6 +3686,13 @@ msgstr "Last inn Wii System Meny" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Last inn Wii System Meny" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Last inn Wii System Meny %d %c" @@ -3583,7 +3719,7 @@ msgstr "Laster den spesifiserte filen (DOL,ELF,WAD,GCM,ISO)" msgid "Local" msgstr "Lokal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "LÃ¥s CPU-trÃ¥der til Kjerner" @@ -3595,11 +3731,11 @@ msgstr "Logg" msgid "Log Configuration" msgstr "Konfigurer Logg" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Loggtyper" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Logger utdata" @@ -3629,7 +3765,7 @@ msgstr "" "MD5 mismatch\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Ytelses-hack for MMU" @@ -3651,11 +3787,11 @@ msgstr "MadCatz Gameshark-filer(*.gcs)" msgid "Main Stick" msgstr "Hoved-joystick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "Skaper-ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Skaper:" @@ -3679,6 +3815,7 @@ msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3686,6 +3823,9 @@ msgstr "Memory Byte" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Minnekort" @@ -3722,7 +3862,7 @@ msgstr "" msgid "Menu" msgstr "Meny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mic" @@ -3731,11 +3871,11 @@ msgstr "Mic" msgid "Min" msgstr "Minimum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Diverse" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Diverse Innstillinger" @@ -3756,7 +3896,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Mono-mellomrom tekst-font" @@ -3769,7 +3909,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3791,7 +3931,7 @@ msgstr "" msgid "Multiply" msgstr "Multipliser" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3883,6 +4023,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Opp" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3892,6 +4033,9 @@ msgstr "NP Opp" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3900,7 +4044,7 @@ msgstr "Navn:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Navn:" @@ -3914,7 +4058,7 @@ msgid "New Scan" msgstr "Nytt Søk" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Neste Side" @@ -3926,7 +4070,7 @@ msgstr "Neste Søk" msgid "Nickname :" msgstr "Brukernavn :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Intet Land (SDK)" @@ -3965,7 +4109,7 @@ msgstr "Ingen lagringsmappe funnet for tittel %s" msgid "None" msgstr "Ingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norsk BokmÃ¥l" @@ -3973,8 +4117,8 @@ msgstr "Norsk BokmÃ¥l" msgid "Not Equal" msgstr "Ikke Lik" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Ikke Satt" @@ -3994,7 +4138,7 @@ msgstr "Ikke tilkoblet" msgid "Notes" msgstr "Notater" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notater:" @@ -4032,7 +4176,7 @@ msgstr "Objekt" msgid "Object Range" msgstr "Objekt Radius" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Av" @@ -4058,11 +4202,11 @@ msgstr "Kun %d blokker tilgjengelig" msgid "Open" msgstr "Ã…pne" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Ã…pne &tilholdsmappe" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Ã…pne Wii-&lagringsfil-mappe" @@ -4084,11 +4228,11 @@ msgstr "OpenAL: Kan ikke finne lyd-device" msgid "OpenAL: can't open device %s" msgstr "OpenAL: Kan ikke Ã¥pne device %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Teksturdekoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Teksturdekoder" @@ -4120,7 +4264,7 @@ msgstr "" "og importer lagringsfilene til et nytt minnekort\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Annet" @@ -4172,19 +4316,20 @@ msgstr "Paragraf" msgid "Parameters" msgstr "Parametere" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partisjon %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patcher" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Mappestier" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4197,6 +4342,10 @@ msgstr "Mappestier" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4205,7 +4354,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Per-Pikselbelysning" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfekt" @@ -4218,6 +4367,7 @@ msgstr "Perspektiv %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4228,6 +4378,10 @@ msgstr "Perspektiv %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Spill" @@ -4241,7 +4395,7 @@ msgstr "Spill Opptak" msgid "Play/Pause" msgstr "Spill/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Spillbar" @@ -4253,6 +4407,7 @@ msgstr "Avspillingsalterntiver" msgid "Players" msgstr "Spillere" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4262,6 +4417,9 @@ msgstr "Spillere" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -4273,23 +4431,23 @@ 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:309 msgid "Polish" msgstr "Polsk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4298,11 +4456,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugisisk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugisisk (Brasilsk)" @@ -4310,17 +4468,17 @@ msgstr "Portugisisk (Brasilsk)" msgid "Post-Processing Effect:" msgstr "postprosesseringseffekt:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4333,7 +4491,7 @@ msgstr "ForhÃ¥ndssatte:" msgid "Prev Page" msgstr "Forrige Side" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Forrige Side" @@ -4384,7 +4542,7 @@ msgstr "Høyre-analog" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSSLAND" @@ -4397,7 +4555,7 @@ msgstr "Rekkevidde" msgid "Read-only mode" msgstr "Les-kun-modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Ekte" @@ -4474,6 +4632,7 @@ msgstr "Oppdater liste" msgid "Refresh game list" msgstr "Oppdater spilliste" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4492,6 +4651,12 @@ msgstr "Oppdater spilliste" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Fjern" @@ -4544,11 +4709,11 @@ msgstr "Høyre Joystick" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Kjør DSP LLE pÃ¥ en dedikert CPU-trÃ¥d (ikke anbefalt)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russisk" @@ -4556,10 +4721,11 @@ msgstr "Russisk" msgid "Sa&ve State" msgstr "Lagre Sa&ve State" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Sikker" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4569,6 +4735,9 @@ msgstr "Sikker" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Samplingsratio:" @@ -4626,12 +4795,12 @@ msgstr "Lagre Save State Slot 8" msgid "Save State..." msgstr "Lagre Save State..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Lagre som..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Lagre komprimert GCM/ISO" @@ -4639,11 +4808,11 @@ msgstr "Lagre komprimert GCM/ISO" msgid "Save current perspective" msgstr "Lagre nÃ¥værende perspektiv" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Lagre dekomprimert GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Save State-film %s er korrupt, opptak avsluttes..." @@ -4652,6 +4821,7 @@ msgstr "Save State-film %s er korrupt, opptak avsluttes..." msgid "Scaled EFB Copy" msgstr "Skalert EFB-kopi" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4661,15 +4831,18 @@ msgstr "Skalert EFB-kopi" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Søker i %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Søker etter ISO-filer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Søker..." @@ -4685,12 +4858,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Søkefilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Søk i Undermapper" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Seksjon %s ikke funnet i SYSCONF" @@ -4700,6 +4873,7 @@ msgstr "Seksjon %s ikke funnet i SYSCONF" msgid "Select" msgstr "Velg" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4724,6 +4898,14 @@ msgstr "Velg Opptaksfil" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Velg Opptaksfil" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil Ã¥ innstallere" @@ -4749,6 +4931,7 @@ msgstr "Velg flytvindu" msgid "Select the file to load" msgstr "Velg fil Ã¥ laste" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4765,19 +4948,26 @@ msgstr "Velg en save state Ã¥ laste" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Velg lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Velg en save state Ã¥ laste" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Velg en save state Ã¥ lagre" @@ -4799,7 +4989,7 @@ msgstr "" "\n" "Hvis usikker, velg Automatisk." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Valgt font" @@ -4847,11 +5037,11 @@ msgstr "Sensorbarposisjon:" msgid "Separator" msgstr "Separatør" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbisk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 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" @@ -4860,11 +5050,11 @@ msgstr "Serieport 1 - Dette er porten enheter som nettadapter bruker" msgid "Set" msgstr "Sett" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Sett som &standard-ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Sett som standard Minnekort %c" @@ -4874,7 +5064,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/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Innstillinger..." @@ -4886,7 +5076,7 @@ msgstr "SetupWiiMem: Kan ikke finne konfigurasjonsfilen" msgid "Shake" msgstr "Rist" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Kortnavn:" @@ -4915,7 +5105,7 @@ msgstr "Vis &Verktøylinje" msgid "Show Drives" msgstr "Vis DVD-stasjoner" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Vis Kopieringsregioner for EFB" @@ -4931,7 +5121,7 @@ msgstr "Vis Frankrike" msgid "Show GameCube" msgstr "Vis GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Vis Inndata" @@ -4947,7 +5137,7 @@ msgstr "Vis JAP" msgid "Show Korea" msgstr "Vis Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Vis SprÃ¥k:" @@ -4967,7 +5157,7 @@ msgstr "Vis Plattformer" msgid "Show Regions" msgstr "Vis Regioner" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Vis Statistikker" @@ -4987,11 +5177,11 @@ msgstr "Vis WAD" msgid "Show Wii" msgstr "Vis Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Vis en bekreftelsesboks før spill stoppes." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -5002,23 +5192,23 @@ msgstr "" "men det kan ogsÃ¥ forÃ¥rsake\n" "at Dolphin plutselig krasjer uten noen forklaring." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Vis første blokk" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Vis lagringsblokker" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Vis lagringskommentar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Vis lagringsikon" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Vis lagringstittel" @@ -5055,7 +5245,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Sideveis-pekende Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Simplifisert Kinesisk" @@ -5063,11 +5253,11 @@ msgstr "Simplifisert Kinesisk" msgid "Size" msgstr "Størrelse" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Dropp BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Dropp Dest. Alpha Pass" @@ -5109,11 +5299,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5136,7 +5326,7 @@ msgstr "" "Det er kun nyttig for Ã¥ debugge.\n" "Vil du virkelig benytte programvarerendering? Hvis usikker, velg 'nei'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Innstillinger for Audio" @@ -5154,6 +5344,7 @@ msgstr "Laging av lydbuffer mislyktes: %s" msgid "Space" msgstr "Mellomrom" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5169,6 +5360,11 @@ msgstr "Mellomrom" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spansk" @@ -5199,7 +5395,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Spesifiser en programvareutvidelse for video" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Øk diskoverføringshatighet" @@ -5207,7 +5403,7 @@ msgstr "Øk diskoverføringshatighet" msgid "Square Stick" msgstr "Kvadrat-joystick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Standardkontroller" @@ -5305,12 +5501,12 @@ msgstr "Importering av lagringsfiler vellykket" msgid "Swing" msgstr "Sving" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "SystemsprÃ¥k:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5350,7 +5546,7 @@ msgstr "Tabell Høyre" msgid "Take Screenshot" msgstr "Ta Skjermbilde" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5366,7 +5562,7 @@ msgstr "Tekstur" msgid "Texture Cache" msgstr "Tekstur-cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Teksturformat Overlegg" @@ -5382,13 +5578,13 @@ msgstr "Adressen er ugyldig" msgid "The checksum was successfully fixed" msgstr "Fiksing av sjekksummen var vellykket" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Den valgte mappen finnes allerede i listen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5411,7 +5607,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Filen %s er allerede Ã¥pen, fil-headeren vil ikke bli skrevet." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Filen du spesifiserte (%s) eksisterer ikke" @@ -5429,11 +5625,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Den dekrypterte AR-koden inneholder ingen linjer." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "Jo tryggere du setter denne, jo mindre sannsynlig er det at emulatoren " "mangler noen teksturoppdateringer fra RAM.\n" @@ -5476,7 +5673,7 @@ msgstr "Den spesifiserte filen \"%s\" eksisterer ikke" msgid "The value is invalid" msgstr "Verdien er ugyldig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" @@ -5484,14 +5681,14 @@ msgstr "Tema" msgid "Theme selection went wrong" msgstr "Velging av tema gikk feil" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 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:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5507,7 +5704,7 @@ msgstr "" "Denne Action Replay-simulatoren støtter ikke koder som modifiserer selve " "Action Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 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." @@ -5530,25 +5727,11 @@ msgstr "" "Hvis usikker, la stÃ¥ avslÃ¥tt." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Dette brukes for Ã¥ kontrollere spillets bildefrekvens via Audio Throttle.\n" -"Deaktivering av denne kan forÃ¥rsake unormal bildefrekvens, kanskje for høy.\n" -"Men Ã¥ aktivere den kan noen ganger forÃ¥sake konstant brÃ¥k.\n" -"\n" -"Tastatursnarvei : Hold nede for Ã¥ deaktivere Audio Throttle." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" "Dette formatet brukes for Ã¥ spille musikkspor, som bakgrunnsmusikk (BGM)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5560,7 +5743,7 @@ msgstr "" "Øker ytelsen pÃ¥ datamaskiner med mer enn én kjerne,\n" "men kan ogsÃ¥ føre til feil/krasj." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Dette lar deg manuelt endre INI-konfigurasjonsfilen" @@ -5583,7 +5766,7 @@ msgstr "Tittel" msgid "To" msgstr "Til" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Vipp Alle Loggtyper" @@ -5603,6 +5786,7 @@ msgstr "Vipp Mellom Vindu/Fullskjerm" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5610,14 +5794,17 @@ msgstr "Vipp Mellom Vindu/Fullskjerm" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Topp" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Tradisjonell Kinesisk" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Forsøkte Ã¥ laste en ukjent filtype." @@ -5625,7 +5812,7 @@ msgstr "Forsøkte Ã¥ laste en ukjent filtype." msgid "Triggers" msgstr "Triggere" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Forsøker Ã¥ lese fra ugyldig SYSCONF" @@ -5637,7 +5824,7 @@ msgstr "" "Forsøker Ã¥ lese fra ugyldig SYSCONF\n" "Wiimote bt ids er ikke tilgjengelig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Tyrkisk" @@ -5658,11 +5845,11 @@ msgstr "UDP Port:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "UKJENT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5745,7 +5932,7 @@ msgstr "Oppdater" msgid "Upright Wiimote" msgstr "Mot-skjerm-pekende Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Bruk EuRGB60-modus (PAL60)" @@ -5757,7 +5944,7 @@ msgstr "Bruk Fullskjerm" msgid "Use Hex" msgstr "Bruk Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Bruk Panikkadvarslere" @@ -5788,7 +5975,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Verktøyet" @@ -5812,25 +5999,29 @@ msgstr "Verdi:" msgid "Verbosity" msgstr "Verbøsitet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volum" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD-installasjon feilet: Skaper feil %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD-installasjon feilet: Skaper feil %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5849,15 +6040,15 @@ msgstr "" msgid "Warning" msgstr "Advarsel" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Advarsel - starter DOL i feil konsollmodus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Advarsel - starter ELF i feil konsollmodus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Advarsel - starter ISO i feil konsollmodus!" @@ -5885,7 +6076,7 @@ msgstr "" "og har samme navn som en fil pÃ¥ ditt minnekort\n" "Fortsette?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5893,7 +6084,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5901,7 +6092,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5929,7 +6120,7 @@ msgstr "WaveFileWriter - fil ikke Ã¥pen." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Widescreen Hack" @@ -5937,15 +6128,15 @@ msgstr "Widescreen Hack" msgid "Width" msgstr "Bredde" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii-konsoll" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND-rot:" @@ -5953,6 +6144,7 @@ msgstr "Wii NAND-rot:" msgid "Wii Save Import" msgstr "Importer Wii-lagringsfil" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5962,6 +6154,9 @@ msgstr "Importer Wii-lagringsfil" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -6029,10 +6224,11 @@ msgstr "Windows Meny" msgid "Windows Right" msgstr "Windows Høyre" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Ordkrumning" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6048,6 +6244,11 @@ msgstr "Ordkrumning" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Arbeider..." @@ -6055,6 +6256,11 @@ msgstr "Arbeider..." msgid "Write to Console" msgstr "Skriv til Konsoll" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Skriv til Fil" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Skriv til Fil" @@ -6108,7 +6314,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 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." @@ -6131,7 +6337,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:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP-hack" @@ -6201,7 +6407,7 @@ msgstr "" msgid "^ ADD" msgstr "^ LEGG TIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "applikasjonslaster (.img)" @@ -6232,12 +6438,12 @@ msgstr "ikke en Wii-lagringsfil eller lesefeil for fil-header-størrelse %x" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "ukjent cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returnerte -1 pÃ¥ applikasjonskjøring!" @@ -6401,6 +6607,9 @@ msgstr "| ELLER" #~ msgid "Emulator Display Settings" #~ msgstr "Innstillinger for Emulasjonsvisning" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Aktiver Audio Throttle" + #~ msgid "Enable CPU Access" #~ msgstr "Aktiver CPU Access" @@ -6714,6 +6923,21 @@ msgstr "| ELLER" #~ msgid "The file " #~ msgstr "Filen" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Dette brukes for Ã¥ kontrollere spillets bildefrekvens via Audio " +#~ "Throttle.\n" +#~ "Deaktivering av denne kan forÃ¥rsake unormal bildefrekvens, kanskje for " +#~ "høy.\n" +#~ "Men Ã¥ aktivere den kan noen ganger forÃ¥sake konstant brÃ¥k.\n" +#~ "\n" +#~ "Tastatursnarvei : Hold nede for Ã¥ deaktivere Audio Throttle." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "" #~ "Dette formatet brukes vanligvis til Ã¥ spille stemme- og lyd- effekter." diff --git a/Languages/po/nl.po b/Languages/po/nl.po index f6c2081f53..017f33c5c1 100644 --- a/Languages/po/nl.po +++ b/Languages/po/nl.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-08-07 16:43+0100\n" "Last-Translator: Goost \n" "Language-Team: DevPro Team. \n" @@ -59,9 +63,9 @@ msgstr "\"%s\" is een onjuist GCM/ISO bestand of het is geen GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sKopieer%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -153,7 +157,7 @@ msgstr "%sExporteer GCI%s" msgid "%sImport GCI%s" msgstr "%sImporteer GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, fuzzy, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%d Vrije Blokken; %d Vrije Bestands Ingangen" @@ -186,11 +190,11 @@ msgstr "&Cheats Manager" msgid "&DSP Settings" msgstr "&DSP Instellingen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Verwijder ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Verwijder geselecteerde ISOs ..." @@ -254,7 +258,7 @@ msgstr "&Pauze" msgid "&Play" msgstr "&Speel " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Eigenschappen " @@ -298,7 +302,7 @@ msgstr "&Bekijk " msgid "&Wiimote Settings" msgstr "&Wiimote Instellingen " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -342,7 +346,7 @@ msgstr " " msgid "" msgstr " " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -351,7 +355,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -409,13 +413,13 @@ msgstr "" "\n" "Je moet de TCP poort forwarden voor het hosten!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Codes" @@ -427,11 +431,11 @@ msgstr "Over Dolphin" msgid "Acceleration" msgstr "Acceleratie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulatie" @@ -552,11 +556,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Voeg toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Voeg ActionReplay Code toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Voeg Patch toe" @@ -564,6 +568,7 @@ msgstr "Voeg Patch toe" msgid "Add new pane" msgstr "Voeg een nieuwe paneel toe" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -579,6 +584,11 @@ msgstr "Voeg een nieuwe paneel toe" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Voeg toe..." @@ -626,11 +636,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Stel de vereiste analoge control druk in om de knop te activeren." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Geavanceerd" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Geavanceerde Instellingen" @@ -638,14 +648,15 @@ msgstr "Geavanceerde Instellingen" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Alle GC/Wii bestanden (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -658,18 +669,22 @@ msgstr "Alle Gamecube GCM bestanden (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Opgeslagen Staten (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO Bestanden (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle gecomprimeerde GC/Wii ISO-bestanden (GCZ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Alle Bestanden (*.*)|*.*" @@ -685,7 +700,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Geëmuleerde Wiimote" @@ -707,7 +722,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Applader is niet in staat om van bestand te laden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Applader:" @@ -725,7 +740,7 @@ msgstr "" "\n" "In geval van twijfel selecteer (uit)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabisch" @@ -734,7 +749,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -742,12 +757,13 @@ msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen?\n" "Deze gegevens zijn niet terug te halen!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -757,6 +773,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -765,18 +784,20 @@ msgstr "Beeldverhouding:" msgid "At least one pane must remain open." msgstr "Er moet tenminste één paneel open blijven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Geluid" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Geluid Backend:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -786,6 +807,9 @@ msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -824,7 +848,7 @@ msgstr "" msgid "Back" msgstr "Terug" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Backend Instellingen" @@ -851,11 +875,11 @@ msgstr "Verkeerde bestands header" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Banner Details" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -867,7 +891,7 @@ msgstr "Balk" msgid "Basic" msgstr "Basis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Basis Instellingen" @@ -898,6 +922,7 @@ msgstr "Blauw Rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -905,6 +930,9 @@ msgstr "Blauw Rechts" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Onder" @@ -913,7 +941,7 @@ msgstr "Onder" msgid "Bound Controls: %lu" msgstr "Gekoppelde controls: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Defect" @@ -929,7 +957,7 @@ msgstr "Zoek een folder om toe te voegen" msgid "Browse for an ISO directory..." msgstr "Zoek een ISO folder" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Zoek een uitvoer folder" @@ -959,11 +987,11 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU Emulatie Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Activeer scherm lijst caching." @@ -1015,7 +1043,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1025,7 +1053,7 @@ msgstr "" "Kan dat bestand niet als geheugenkaart gebruiken. \n" "Probeer je hetzelfde bestand in beide slots te gebruiken?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1043,8 +1071,6 @@ msgstr "Kan WiiMOte niet via bd vinden: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Kan WiiMote met verbinding handle %02x niet vinden" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1054,7 +1080,7 @@ msgstr "Kan niet lezen van DVD_Plugin - DVD-Interface: Fatal Error" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalaans" @@ -1079,7 +1105,7 @@ msgstr "Verander Schijf" msgid "Change Game" msgstr "Spel veranderen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1095,8 +1121,8 @@ 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 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 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!" @@ -1116,31 +1142,31 @@ msgstr "Cheat Zoeken" msgid "Cheats Manager" msgstr "Cheats Manager" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinees (Vereenvoudigd)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinees (Traditioneel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Kies een DVD Station:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Kies een NAND basismap:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Kies een standaard ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Kies een folder om toe te voegen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Kies een bestand om te openen" @@ -1148,7 +1174,7 @@ msgstr "Kies een bestand om te openen" msgid "Choose a memory card:" msgstr "Kies een geheugen kaart:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1156,8 +1182,8 @@ msgstr "" "Kies Bestand te gebruiken als apploader: (geldt voor disks die alleen mappen " "uit mappen zijn opgebouwd)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Kies de folder om naar uit te pakken" @@ -1169,14 +1195,14 @@ msgstr "Cirkel Stick" msgid "Classic" msgstr "Klassiek" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Legen" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Legen mislukt." @@ -1192,6 +1218,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1200,6 +1227,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Sluit" @@ -1223,20 +1254,20 @@ msgstr "Commando" msgid "Comment" msgstr "Reactie" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Reactie:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Comprimeer ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Comprimeer geselecteerde ISO's ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "ISO wordt gecomprimeerd" @@ -1263,13 +1294,13 @@ msgstr "Configureer Besturing Pads" msgid "Configure..." msgstr "Configureer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Bevestig om bestand over te schrijven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "Bevestiging om te stoppen" @@ -1279,7 +1310,7 @@ msgstr "Bevestiging om te stoppen" msgid "Connect" msgstr "Verbind" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Verbind USB Toetsenbord" @@ -1336,12 +1367,12 @@ msgstr "Omzetten naar GCI" msgid "Copy failed" msgstr "Kopiëren mislukt" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Kopieer naar MemKaart %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Core" @@ -1371,7 +1402,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Kon ISO bestand %s niet herkennen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Kon %s niet opslaan" @@ -1385,7 +1416,7 @@ msgstr "" "draait nog!\n" "(pads instellen terwijl het spel draait wordt nog niet ondersteund)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1398,7 +1429,7 @@ msgstr "" "Draai je Dolphin vanaf een CD/DVD, of is het bestand misschien beveiligd " "tegen schrijven?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kon geen open commando vinden voor extensie 'ini'!" @@ -1415,7 +1446,7 @@ msgstr "" msgid "Count:" msgstr "Tel:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Land:" @@ -1429,25 +1460,25 @@ msgstr "Maak AR Code" msgid "Create new perspective" msgstr "Maak een nieuwe perspective" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Gemaakt door KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "Gemaakt door [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Gemaakt door VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "Gemaakt door black_rider and published on ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Auteur:" @@ -1455,7 +1486,7 @@ msgstr "Auteur:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Bijsnijden" @@ -1478,7 +1509,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Huidige map veranderd van %s naar %s na wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Aangepaste Projectie Hack" @@ -1486,11 +1517,11 @@ msgstr "Aangepaste Projectie Hack" msgid "Custom Projection Hack Settings" msgstr "Aangepaste Projectie Instellingen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Pas sommige orthogonale projectie parameters aan." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tsjechisch" @@ -1502,10 +1533,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSP Emulator Motor" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1516,18 +1548,22 @@ msgstr "DSP Emulator Motor" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulatie (snel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Interpreteer (Behoorlijk langzaam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE op Thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE hercompileerder" @@ -1535,15 +1571,23 @@ msgstr "DSP LLE hercompileerder" msgid "DSP settings" msgstr "DSP Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD Station:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Data grootte" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Datum:" @@ -1564,7 +1608,7 @@ msgstr "Dode Zone" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1573,16 +1617,16 @@ msgstr "Debug" msgid "Decimal" msgstr "Decimaal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Decomprimeer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Decomprimeer geselecteerde ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Decomprimeer ISO" @@ -1590,11 +1634,11 @@ msgstr "Decomprimeer ISO" msgid "Default" msgstr "Standaard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Standaard ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Standaard font" @@ -1603,7 +1647,7 @@ msgstr "Standaard font" msgid "Delete" msgstr "Verwijder" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Verwijder Save" @@ -1612,7 +1656,7 @@ msgstr "Verwijder Save" msgid "Delete the existing file '%s'?" msgstr "Verwijder het bestaande bestand '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Beschrijving" @@ -1620,8 +1664,8 @@ msgstr "Beschrijving" msgid "Detect" msgstr "Detect" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1634,8 +1678,8 @@ msgstr "" msgid "Device" msgstr "Apparaat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Apparaat Instellingen" @@ -1660,24 +1704,24 @@ msgstr "" " en map backup checksum is mislukt" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "Schakel Fog uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Schakel Fog uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Schakel Lighting uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Schakel Pixel Diepte uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Schakel Textures uit" @@ -1721,7 +1765,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Schijf" @@ -1748,6 +1792,7 @@ msgstr "" msgid "Divide" msgstr "Verdelen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1757,10 +1802,13 @@ msgstr "Verdelen" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1785,6 +1833,7 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1809,6 +1858,14 @@ msgstr "Dolphin GCPad Configuratie" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Configuratie" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" @@ -1840,11 +1897,11 @@ msgstr "" msgid "Down" msgstr "Omlaag" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Download Codes (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu codes gedownload. (%lu toegevoegd)" @@ -1853,23 +1910,23 @@ msgstr "%lu codes gedownload. (%lu toegevoegd)" msgid "Drums" msgstr "Drums" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Pop" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Dump Geluid" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Dump EFB Doel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Dump Frames" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Dump texturen" @@ -1903,6 +1960,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1918,6 +1976,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Nederlands" @@ -1941,7 +2004,7 @@ msgstr "" "versie %d. %d -- Als je recentelijk Dolphin hebt geupgrade is het mogelijk " "dat je Windows moet herstarten om deze de driver te laten detecteren." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1957,7 +2020,7 @@ msgstr "Wijzig" msgid "Edit ActionReplay Code" msgstr "Wijzig ActionReplay Code" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Wijzig Configuratie" @@ -1969,8 +2032,8 @@ msgstr "Wijzig Patch" msgid "Edit current perspective" msgstr "Wijzig het huidige perspectief" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Wijzig..." @@ -2020,7 +2083,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Geëmuleerde Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Emulatie Staat:" @@ -2048,23 +2111,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activeer AR Logging" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Activeer Audio Throttle" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Activeer BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Activeer Block Merging" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2078,6 +2141,7 @@ msgstr "" msgid "Enable Cache" msgstr "Activeer Cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2087,51 +2151,54 @@ msgstr "Activeer Cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activeer Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Activeer DTK Muziek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Activeer Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Activeer Dual Core (verhoogt de snelheid)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Activeer Sneltoetsen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Activeer Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Activeer Idle Skipping (verhoogt de snelheid)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Activeer MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Activeer Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Activeer Schermbeveiliger" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Activeer BreedBeeld" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Activeer Wireframe" @@ -2149,7 +2216,7 @@ msgstr "" "\n" "In geval van twijfel selecteer 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2157,7 +2224,7 @@ msgstr "" "Activeer snelle schijf toegang. Nodig voor een aantal spelletjes. (AAN = " "Snel, UIT = Compatibel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Activeer Pagina's" @@ -2185,7 +2252,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2193,7 +2260,7 @@ msgstr "" "Activeer dit om The Legend of Zelda: Twilight Princess te versnellen. " "Uitschakelen voor elk ander spel." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2203,7 +2270,7 @@ msgstr "" "Management Unit. Nauwkeurig voor de hardware, maar langzaam te emuleren. " "(AAN = Compatibel, UIT = Snel)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Schakelt aangepaste projectie hack in" @@ -2220,7 +2287,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2242,6 +2309,7 @@ msgstr "" msgid "End" msgstr "Einde" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2257,6 +2325,11 @@ msgstr "Einde" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Engels" @@ -2287,6 +2360,7 @@ msgstr "Gelijk" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error (Fout)" @@ -2317,20 +2391,26 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Error (Fout)" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fout bij het laden van de geselecteerde taal. Dolphin zal terugvallen op de " "systeemtaal." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2365,7 +2445,7 @@ msgstr "Sluit Dolphin met emulator" msgid "Export Failed" msgstr "Exporteren Mislukt" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exporteer Bestand" @@ -2378,15 +2458,15 @@ msgstr "Exporteer Opname..." msgid "Export Recording..." msgstr "Exporteer Opname..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exporteer Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exporteer Wii save (Experimenteel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exporteer alle saves..." @@ -2402,7 +2482,7 @@ msgstr "Exporteer save als..." msgid "Extension" msgstr "Extensie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Externe Frame Buffer" @@ -2414,44 +2494,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Alle Bestanden Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Apploader Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "DOL Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Map Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Bestand Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Partitie Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "%s Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Alle Bestanden Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Uitpakken van de map" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Uitpakken..." @@ -2463,11 +2543,11 @@ msgstr "FIFO Byte" msgid "FIFO Player" msgstr "FIFO Speler" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "Frankrijk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST Groote:" @@ -2479,11 +2559,11 @@ msgstr "Verbinden Mislukt!" msgid "Failed to Listen!!" msgstr "Luisteren Mislukt!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Mislukt om de codes te downloaden." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Mislukt om naar %s uit te pakken!" @@ -2601,19 +2681,29 @@ msgstr "Het schrijven van header voor %s is mislukt" msgid "Failed to write header for file %d" msgstr "Het schrijven van header voor bestanden %d is mislukt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Snel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "Fast Mipmaps" msgstr "Laad Native Mipmaps" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Fifo Speler" @@ -2622,7 +2712,7 @@ msgstr "Fifo Speler" msgid "File Info" msgstr "Bestands Info" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Bestand bevat geen codes." @@ -2655,16 +2745,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:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Onbekende open mode: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Bestand systeem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Bestandstype 'ini' is onbekend! Kan niet openen!" @@ -2672,7 +2762,7 @@ msgstr "Bestandstype 'ini' is onbekend! Kan niet openen!" msgid "First Block" msgstr "Eerste Blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Herstel Checksums" @@ -2684,7 +2774,7 @@ msgstr "Forceer 16:9" msgid "Force 4:3" msgstr "Forceer 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Stel Console in als NTSC-J" @@ -2718,7 +2808,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2755,7 +2845,7 @@ msgstr "" msgid "Frame Advance" msgstr "Frame Geavanceerd" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Frame Dumps gebruiken FFV1" @@ -2767,7 +2857,7 @@ msgstr "Frame Bereik" msgid "Frame S&kipping" msgstr "Frame O&verslaan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Framelimiet:" @@ -2775,10 +2865,11 @@ msgstr "Framelimiet:" msgid "Frames To Record" msgstr "Frames om op te nemen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Vrije kijk" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2794,6 +2885,11 @@ msgstr "Vrije kijk" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Frans" @@ -2828,7 +2924,7 @@ msgstr "Logboek configuratie" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "Spel ID:" @@ -2844,15 +2940,15 @@ msgstr "Het spel draait niet!" msgid "Game not found!!" msgstr "Spel niet gevonden!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Spel Specifieke Instellingen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Spel Config" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2863,6 +2959,7 @@ msgstr "Gamecube &Pad Instellingen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2870,6 +2967,9 @@ msgstr "Gamecube &Pad Instellingen" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" @@ -2878,15 +2978,17 @@ msgid "Gamecube Pad settings" msgstr "Gamecube Pad Instellingen" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko Codes" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "GeckoCode kon niet draaien (CT%i CST%i) (%s)\n" "(ofwel een onjuiste code of het type code is nog niet ondersteund.)" @@ -2901,8 +3003,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Algemeen" @@ -2911,6 +3017,7 @@ msgstr "Algemeen" msgid "General Settings" msgstr "Algemene Instellingen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2926,6 +3033,11 @@ msgstr "Algemene Instellingen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Duits" @@ -2964,7 +3076,7 @@ msgstr "" "\n" "In geval van twijfel ingevuld laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grieks" @@ -2996,7 +3108,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Header checksum is mislukt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebreeuws" @@ -3065,12 +3177,16 @@ msgstr "Sneltoets Configuratie" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Hotkeys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hongaarse" @@ -3078,14 +3194,14 @@ msgstr "Hongaarse" msgid "Hybrid Wiimote" msgstr "Hybride Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3098,11 +3214,11 @@ msgstr "" "TitleID %016llx.\n" "Dolphin zal waarschijnlijk blijven hangen." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - onjuiste bestemming" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL Instellingen" @@ -3118,15 +3234,15 @@ msgstr "IR Aanwijzer" msgid "IR Sensitivity:" msgstr "IR Gevoeligheid:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO Details" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO Map" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITALIË" @@ -3134,23 +3250,25 @@ msgstr "ITALIË" msgid "Icon" msgstr "Icoon" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 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)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). 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),\n" @@ -3188,7 +3306,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importeer Save" @@ -3239,7 +3357,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "In Game" @@ -3248,7 +3366,7 @@ msgid "In-Game" msgstr "In-Game" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3268,7 +3386,7 @@ msgstr "Toevoegen" msgid "Insert Encrypted or Decrypted code here..." msgstr "Voer Gecodeerde of Gedecodeerde code hier in..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Schakel SD Card in" @@ -3280,7 +3398,7 @@ msgstr "Voeg naam hier toe" msgid "Install WAD" msgstr "Installeer WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Installeren in Wii-menu" @@ -3291,6 +3409,7 @@ msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3300,15 +3419,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD aan het installeren..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "Interface Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Interface Instellingen" @@ -3333,11 +3455,11 @@ msgstr "Interne LZO fout - lzo_init() is mislukt" msgid "Internal Resolution:" msgstr "Interne Resolutie:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreteer (Behoorlijk langzaam)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3354,7 +3476,7 @@ msgstr "Onjuiste waarde!" msgid "Invalid bat.map or dir entry" msgstr "Onjuiste bat.map of map vermelding" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Onjuist event type %i" @@ -3374,14 +3496,15 @@ msgstr "" "%s\n" "Wellicht moet je dit spel opnieuw dumpen" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Onjuist opname bestand" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Onjuiste staat" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3397,27 +3520,32 @@ msgstr "Onjuiste staat" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italië" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (aanbevolen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL experimentele recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japans" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3426,8 +3554,8 @@ msgstr "KOREA" msgid "Key" msgstr "Toets" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Koreaans" @@ -3445,7 +3573,7 @@ msgstr "L Knop" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Taal:" @@ -3498,7 +3626,7 @@ msgstr "" msgid "Less Than" msgstr "Minder dan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limiteer met behulp van FPS" @@ -3506,7 +3634,7 @@ msgstr "Limiteer met behulp van FPS" msgid "Load" msgstr "Laad" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Laad Aangepaste Textures" @@ -3554,6 +3682,7 @@ msgstr "Laad staat 8" msgid "Load State..." msgstr "Laad staat..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3563,10 +3692,14 @@ msgstr "Laad staat..." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Laad Wii System Menu(%d %c)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3576,6 +3709,9 @@ msgstr "Laad Wii System Menu(%d %c)" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Laad Wii System Menu(%d %c)" @@ -3602,7 +3738,7 @@ msgstr "Laad het opgegeven bestand (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Lokaal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Vergrendel Threads aan CPU cores" @@ -3614,11 +3750,11 @@ msgstr "Logboek" msgid "Log Configuration" msgstr "Logboek configuratie" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Log Types" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Logger Uitvoer" @@ -3648,7 +3784,7 @@ msgstr "" "Verkeerde MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Snelheids Hack" @@ -3670,11 +3806,11 @@ msgstr "MadCatz Gameshark bestanden(*.gcs)" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "Maker ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Maker:" @@ -3698,6 +3834,7 @@ msgstr "Geheugen Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3705,6 +3842,9 @@ msgstr "Geheugen Byte" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Geheugen Kaart" @@ -3741,7 +3881,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Microfoon" @@ -3750,11 +3890,11 @@ msgstr "Microfoon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Overig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Overige Instellingen" @@ -3775,7 +3915,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Niet-proportioneel (monospace) lettertype" @@ -3788,7 +3928,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3811,7 +3951,7 @@ msgstr "" msgid "Multiply" msgstr "Vermenigvuldigen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3903,6 +4043,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Omhoog" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3912,6 +4053,9 @@ msgstr "NP Omhoog" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3920,7 +4064,7 @@ msgstr "Naam:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Naam:" @@ -3934,7 +4078,7 @@ msgid "New Scan" msgstr "Nieuwe Scan" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Volgende Pagina" @@ -3946,7 +4090,7 @@ msgstr "Volgende Scan" msgid "Nickname :" msgstr "Gebruikersnaam :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Geen land (SDK)" @@ -3985,7 +4129,7 @@ msgstr "Geen save map gevonden voor titel %s" msgid "None" msgstr "Geen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Noorweegse Bokmaal" @@ -3993,8 +4137,8 @@ msgstr "Noorweegse Bokmaal" msgid "Not Equal" msgstr "Niet gelijk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Niet ingesteld" @@ -4014,7 +4158,7 @@ msgstr "Niet verbonden" msgid "Notes" msgstr "Opmerkingen" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Opmerkingen:" @@ -4052,7 +4196,7 @@ msgstr "" msgid "Object Range" msgstr "Object Bereik" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Uit" @@ -4078,11 +4222,11 @@ msgstr "Er zijn maar %d blocks beschikaarr" msgid "Open" msgstr "Open" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Open &bevattende map" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Open Wii &save map" @@ -4104,11 +4248,11 @@ msgstr "OpenAL: Kan geen geluids devices vinden" msgid "OpenAL: can't open device %s" msgstr "OpenAL: Kan device %s niet openen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decodeerder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decodeerder" @@ -4141,7 +4285,7 @@ msgstr "" "en importeer de saves naar een nieuwe geheugenkaart\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Overige" @@ -4193,19 +4337,20 @@ msgstr "Paragraaf" msgid "Parameters" msgstr "Parameters" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partitie %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Pad" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4218,6 +4363,10 @@ msgstr "Pad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauze" @@ -4226,7 +4375,7 @@ msgstr "Pauze" msgid "Per-Pixel Lighting" msgstr "Per-Pixel Belichting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfect" @@ -4239,6 +4388,7 @@ msgstr "Perspectief %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4249,6 +4399,10 @@ msgstr "Perspectief %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Speel" @@ -4262,7 +4416,7 @@ msgstr "Speel Opname" msgid "Play/Pause" msgstr "Spel/Pauze" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Speelbaar" @@ -4274,6 +4428,7 @@ msgstr "Terugspeel Opties" msgid "Players" msgstr "Spelers" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4283,6 +4438,9 @@ msgstr "Spelers" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -4294,23 +4452,23 @@ 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:309 msgid "Polish" msgstr "Pools" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Poort 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Poort 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Poort 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Poort 4" @@ -4319,11 +4477,11 @@ msgstr "Poort 4" msgid "Port :" msgstr "Poort :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugees" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugees (Braziliaans)" @@ -4331,17 +4489,17 @@ msgstr "Portugees (Braziliaans)" msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4354,7 +4512,7 @@ msgstr "Presets: " msgid "Prev Page" msgstr "Vorige Pagina" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Vorige Pagina" @@ -4405,7 +4563,7 @@ msgstr "" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSLAND" @@ -4418,7 +4576,7 @@ msgstr "Afstand" msgid "Read-only mode" msgstr "Alleen-lezen modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Echt" @@ -4495,6 +4653,7 @@ msgstr "Lijst Verversen" msgid "Refresh game list" msgstr "Ververs de speellijst" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4513,6 +4672,12 @@ msgstr "Ververs de speellijst" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Verwijder" @@ -4566,11 +4731,11 @@ msgstr "Rechter Stick" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Zet DSP LLE op een aparte core (niet aanbevolen)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russisch" @@ -4578,10 +4743,11 @@ msgstr "Russisch" msgid "Sa&ve State" msgstr "S&la Staat Op" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Opslaan" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4591,6 +4757,9 @@ msgstr "Opslaan" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Sample Rate:" @@ -4648,12 +4817,12 @@ msgstr "Sla Staat 8 Op" msgid "Save State..." msgstr "Sla staat op als..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Opslaan als..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Sla gecomprimeerde GCM / ISO op" @@ -4661,11 +4830,11 @@ msgstr "Sla gecomprimeerde GCM / ISO op" msgid "Save current perspective" msgstr "Sla huidige perspectief op" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Sla gedecomprimeerd GCM / ISO op" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, 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..." @@ -4675,6 +4844,7 @@ msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." msgid "Scaled EFB Copy" msgstr "EFB Verkleinde Kopie" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4684,15 +4854,18 @@ msgstr "EFB Verkleinde Kopie" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Scannen van %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Scannen voor ISO's" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Scannen..." @@ -4708,12 +4881,12 @@ msgstr "Scroll Slot" msgid "Search Filter" msgstr "Zoekfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Zoeken in submappen" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Sectie %s niet gevonden in SYSCONF" @@ -4723,6 +4896,7 @@ msgstr "Sectie %s niet gevonden in SYSCONF" msgid "Select" msgstr "Selecteer" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4747,6 +4921,14 @@ msgstr "Selecteer de opname Bestand" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Selecteer de opname Bestand" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" @@ -4772,16 +4954,21 @@ msgstr "Selecteer zwevende vensters" msgid "Select the file to load" msgstr "Selecteer het bestand om het te laden" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Selecteer het save - bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4801,6 +4988,9 @@ msgstr "Selecteer de Staat om te laden" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" @@ -4820,7 +5010,7 @@ msgstr "" "Force 4:3: Strek de afbeelding naar een beeldverhouding van 4:3\n" "Stretch naar het venster: Stretch de afbeelding naar je venster grootte." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Geselecteerde font" @@ -4869,11 +5059,11 @@ msgstr "Sensor Bar Positie:" msgid "Separator" msgstr "Scheidingsteken" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Servisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4883,11 +5073,11 @@ msgstr "" msgid "Set" msgstr "Stel" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Ingesteld als &standaard ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Ingesteld als standaard memcard% c" @@ -4898,7 +5088,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/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Instellingen..." @@ -4910,7 +5100,7 @@ msgstr "SetupWiiMem: Kan het instellingen bestand niet vinden" msgid "Shake" msgstr "Schudden" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Korte Naam:" @@ -4938,7 +5128,7 @@ msgstr "Toon &Toolbar" msgid "Show Drives" msgstr "Toon Schijven" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Weergeef EFB Kopie Regios" @@ -4954,7 +5144,7 @@ msgstr "Toon Frans" msgid "Show GameCube" msgstr "Toon Gamecube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Toon Input Venster" @@ -4970,7 +5160,7 @@ msgstr "Toon JAP" msgid "Show Korea" msgstr "Toon Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Toon Taal:" @@ -4990,7 +5180,7 @@ msgstr "Toon Platformen" msgid "Show Regions" msgstr "Toon Regio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Weergeef statistieken" @@ -5010,11 +5200,11 @@ msgstr "Toon Wad" msgid "Show Wii" msgstr "Toon Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -5024,23 +5214,23 @@ msgstr "" "Als je dit uitschakeld zie je geen irritante berichten, maar het betekend " "ook dat Dolphin spontaan uit kan vallen zonder enige reden." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Toon eerste blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Toon save blocks" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Toon save commentaar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Toon save icon" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Toon save titel" @@ -5078,7 +5268,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Zijdelings Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Vereenvoudigd Chinees" @@ -5086,11 +5276,11 @@ msgstr "Vereenvoudigd Chinees" msgid "Size" msgstr "Grootte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Sla BIOS Over" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Schakel Dest. Alpha Pass uit" @@ -5127,11 +5317,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5155,7 +5345,7 @@ msgstr "" "Weet je zeker dat je software rendering aan wil zetten? In geval van " "twijfel, selecteer 'Nee'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Geluids Instellingen" @@ -5173,6 +5363,7 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s" msgid "Space" msgstr "Ruimte" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5188,6 +5379,11 @@ msgstr "Ruimte" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spaans" @@ -5219,7 +5415,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Geef een video-plugin aan" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Versnel Disc Transfer Rate" @@ -5227,7 +5423,7 @@ msgstr "Versnel Disc Transfer Rate" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -5320,12 +5516,12 @@ msgstr "Succesvol save games geimporteerd" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Systeem Taal:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5364,7 +5560,7 @@ msgstr "Rechter Tabel" msgid "Take Screenshot" msgstr "Neem een Schermafdruk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5381,7 +5577,7 @@ msgstr "Textuur" msgid "Texture Cache" msgstr "Zuiveren van de Cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Textuur Formaat Overlay" @@ -5397,13 +5593,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "De gekozen map is al in de lijst" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5427,7 +5623,7 @@ msgid "The file %s was already open, the file header will not be written." msgstr "" "Het bestand %s was al open, de bestands header zal niet worden weggeschreven." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Het opgegeven bestand(%s) bestaat niet" @@ -5449,7 +5645,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5491,7 +5687,7 @@ msgstr "Het opgegeven bestand \"%s\" bestaat niet" msgid "The value is invalid" msgstr "De waarde is onjuist" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Thema" @@ -5499,7 +5695,7 @@ msgstr "Thema" msgid "Theme selection went wrong" msgstr "Thema selectie ging fout" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5507,7 +5703,7 @@ msgstr "" "Er moet een ticket zijn voor 00000001/00000002. Je NAND dump is " "waarschijnlijk incompleet." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5523,7 +5719,7 @@ msgstr "" "Deze action replay simulator ondersteund geen codes die de Action Replay " "zelf aanpassen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 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." @@ -5546,26 +5742,10 @@ msgstr "" "In geval van twijfel leeg laten." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Dit wordt gebruikt om de snelheid van het spel te bepalen via geluids " -"throttle. \n" -"Als je dit uitschakelt kan het abnormale snelheden veroorzaken, waardoor het " -"spel te snel afspeelt. \n" -"Maar soms veroorzaakt dit constante noise.\n" -"\n" -"Sneltoets : Houd ingedrukt om throttle gelijk uit te zetten." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Dit wordt gebruikt om muziek af te spelen, zoals achtergrondmuziek." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5577,7 +5757,7 @@ msgstr "" "Leidt tot grote snelheid verbeteringen op pc's met meer dan een kern, maar " "kan ook leiden tot crashes / glitches zo nu en dan." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Dit laat je handmatig het INI configuratie bestand wijzigen" @@ -5600,7 +5780,7 @@ msgstr "Titel" msgid "To" msgstr "Naar" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Zet Alle Log Types Aan" @@ -5620,6 +5800,7 @@ msgstr "Volledig Scherm Inschakelen" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5627,14 +5808,17 @@ msgstr "Volledig Scherm Inschakelen" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Boven" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chinees (Traditioneel)" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Poging tot het laden van een onbekend bestands type." @@ -5642,7 +5826,7 @@ msgstr "Poging tot het laden van een onbekend bestands type." msgid "Triggers" msgstr "" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Poging tot het inlezen van een ongeldige SYSCONF" @@ -5654,7 +5838,7 @@ msgstr "" "Poging tot het inlezen van een ongeldige SYSCONF\n" "Wiimote bt ids zijn niet beschikbaar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turks" @@ -5675,11 +5859,11 @@ msgstr "UDP Port:" msgid "UDP Wiimote" msgstr "UDP Wiimote " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "ONBEKEND" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5765,7 +5949,7 @@ msgstr "Update" msgid "Upright Wiimote" msgstr "Wiimote rechtop" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Gebruik EuRGB60 Mode (PAL60)" @@ -5777,7 +5961,7 @@ msgstr "Gebruik &Volledig Scherm" msgid "Use Hex" msgstr "Gebruik Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Gebruik Panic Handlers" @@ -5808,7 +5992,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Hulpprogramma" @@ -5832,25 +6016,29 @@ msgstr "Waarde:" msgid "Verbosity" msgstr "Breedsprakigheid" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtueel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, 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:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD installatie mislukt: fout bij het creëren van %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5869,15 +6057,15 @@ msgstr "" msgid "Warning" msgstr "Waarschuwing" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Waarschuwing - DOL wordt in de verkeerde console mode gestart!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Waarschuwing - ELF wordt in de verkeerde console mode gestart!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Waarschuwing - ISO wordt in de verkeerde console mode gestart!" @@ -5906,7 +6094,7 @@ msgstr "" "en heeft dezelfde naam als een bestand op je geheugenkaart\n" "Doorgaan?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5914,7 +6102,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5922,7 +6110,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5950,7 +6138,7 @@ msgstr "WaveFileWriter - bestand niet open." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Breedbeeld Hack" @@ -5958,15 +6146,15 @@ msgstr "Breedbeeld Hack" msgid "Width" msgstr "Breedte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii Console " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND basismap:" @@ -5974,6 +6162,7 @@ msgstr "Wii NAND basismap:" msgid "Wii Save Import" msgstr "Wii Save Importeren" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5983,6 +6172,9 @@ msgstr "Wii Save Importeren" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -6050,10 +6242,11 @@ msgstr "Venster Menu" msgid "Windows Right" msgstr "Venster Rechts" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Regelafbreking" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6069,6 +6262,11 @@ msgstr "Regelafbreking" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Werken..." @@ -6076,6 +6274,11 @@ msgstr "Werken..." msgid "Write to Console" msgstr "Schrijf naar Console" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Schrijf naar Bestand" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Schrijf naar Bestand" @@ -6129,7 +6332,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Je moet Dolphin herstarten voordat deze optie effect zal hebben." @@ -6152,7 +6355,7 @@ msgstr "" "Het zou 0x%04x moet zijn, maar is 0x%04llx \n" "Wil je een nieuwe genereren?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6221,7 +6424,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ERBIJ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "applader (.img)" @@ -6253,12 +6456,12 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "onbekend commando 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute retourneerde -1 bij het draaien van de applicatie!" @@ -6405,6 +6608,9 @@ msgstr "| OF" #~ msgid "Emulator Display Settings" #~ msgstr "Emulator Scherm Instellingen" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Activeer Audio Throttle" + #~ msgid "Enable CPU Access" #~ msgstr "Activeer CPU Toegang" @@ -6675,6 +6881,21 @@ msgstr "| OF" #~ msgid "The file " #~ msgstr "Het bestand" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Dit wordt gebruikt om de snelheid van het spel te bepalen via geluids " +#~ "throttle. \n" +#~ "Als je dit uitschakelt kan het abnormale snelheden veroorzaken, waardoor " +#~ "het spel te snel afspeelt. \n" +#~ "Maar soms veroorzaakt dit constante noise.\n" +#~ "\n" +#~ "Sneltoets : Houd ingedrukt om throttle gelijk uit te zetten." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "" #~ "Dit wordt meestal gebruikt om spraak-en geluidseffecten af te spelen." diff --git a/Languages/po/pl.po b/Languages/po/pl.po index 1da1a68e37..b4a21374be 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-08-12 17:04+0100\n" "Last-Translator: Krzysztof Baszczok \n" "Language-Team: Polish \n" @@ -57,9 +61,9 @@ msgstr "\"%s\" jest niewÅ‚aÅ›ciwym plikiem GMC/ISO lub to nie jest GC/Wii ISO" msgid "%1$sCopy%1$s" msgstr "%1$sKopiuj%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -155,7 +159,7 @@ msgstr "%sEksportuj GCI%s" msgid "%sImport GCI%s" msgstr "%sImportuj GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u wolnych bloków; %u wolnych wejść katalogowych" @@ -188,11 +192,11 @@ msgstr "&Menadżer cheatów" msgid "&DSP Settings" msgstr "&Ustawienia DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&UsuÅ„ ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&UsuÅ„ wybrane ISO..." @@ -256,7 +260,7 @@ msgstr "&Wstrzymaj" msgid "&Play" msgstr "&Play" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&WÅ‚aÅ›ciwoÅ›ci" @@ -300,7 +304,7 @@ msgstr "&Widok" msgid "&Wiimote Settings" msgstr "&Ustawienia Wiilota" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -344,7 +348,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -353,7 +357,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -408,13 +412,13 @@ msgstr "" "\n" "Wymagane jest przekierowanie portu TCP do hosta!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Kody AR" @@ -426,11 +430,11 @@ msgstr "O Dolphin" msgid "Acceleration" msgstr "Przyspieszenie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "DokÅ‚adność:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulacja Accurate VBeam" @@ -550,11 +554,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Dodaj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Dodaj kod ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Dodaj Å‚atkÄ™" @@ -562,6 +566,7 @@ msgstr "Dodaj Å‚atkÄ™" msgid "Add new pane" msgstr "Dodaj nowy panel" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -577,6 +582,11 @@ msgstr "Dodaj nowy panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Dodaj..." @@ -624,11 +634,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Reguluje siÅ‚Ä™ nacisku wymaganego do aktywacji przycisków." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Zaawansowane" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Ustawienia zaawansowane" @@ -636,14 +646,15 @@ msgstr "Ustawienia zaawansowane" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Wszystkie pliki GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Wszystkie obrazy GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -656,18 +667,22 @@ msgstr "Pliki GCM" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Wszystkie obrazy Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Spakowane obrazy GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Wszystkie pliki (*.*)|*.*" @@ -683,7 +698,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Emulowany Wiilot" @@ -704,7 +719,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -722,7 +737,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz (wyÅ‚Ä…czone)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabski" @@ -731,7 +746,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -739,10 +754,11 @@ msgstr "" "Czy jesteÅ› pewny by usunÄ…c te pliki?\n" "PrzepadnÄ… na zawsze!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -752,6 +768,9 @@ msgstr "Czy jesteÅ› pewny by usunÄ…c ten plik? Przepadnie na zawsze!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -760,18 +779,20 @@ msgstr "Proporcje ekranu:" msgid "At least one pane must remain open." msgstr "Przynajmniej jeden manel musi pozostać otwarty." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Audio Backend :" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: BÅ‚Ä…d otwarcia urzÄ…dzenia AO.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -781,6 +802,9 @@ msgstr "AudioCommon: BÅ‚Ä…d otwarcia urzÄ…dzenia AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -823,7 +847,7 @@ msgstr "" msgid "Back" msgstr "Wstecz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Ustawienia Backend'u" @@ -850,11 +874,11 @@ msgstr "ZÅ‚y nagłówek pliku" msgid "Banner" msgstr "Baner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Szczegóły banera" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Baner:" @@ -866,7 +890,7 @@ msgstr "Wajcha" msgid "Basic" msgstr "Podstawowy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Ustawienia podstawowe" @@ -897,6 +921,7 @@ msgstr "Niebieski prawo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -904,6 +929,9 @@ msgstr "Niebieski prawo" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Dół" @@ -912,7 +940,7 @@ msgstr "Dół" msgid "Bound Controls: %lu" msgstr "Bound Controls: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Zepsuty" @@ -928,7 +956,7 @@ msgstr "Szukaj folder do dodania" msgid "Browse for an ISO directory..." msgstr "Szukaj folder ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Szukaj folderu wyjÅ›ciowego" @@ -958,11 +986,11 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Silnik emulacji CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cache Display Lists" @@ -1010,7 +1038,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1021,7 +1049,7 @@ msgstr "" "%s\n" "nie jest wÅ‚aÅ›ciwym plikiem karty pamiÄ™ci GC" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1039,8 +1067,6 @@ msgstr "Nie można odnaleźć Wiilota po bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Nie można odnaleźć Wiilota przez handle poÅ‚Ä…czenia %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1050,7 +1076,7 @@ msgstr "Nie można odczytać z wtyczki DVD - Interfejs DVD: Poważny bÅ‚Ä…d" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "KataloÅ„ski" @@ -1075,7 +1101,7 @@ msgstr "ZmieÅ„ dysk" msgid "Change Game" msgstr "ZmieÅ„ grÄ™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1091,8 +1117,8 @@ 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 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 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!" @@ -1113,31 +1139,31 @@ msgstr "Szukaj cheatów" msgid "Cheats Manager" msgstr "Menadżer cheatów" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "ChiÅ„ski uproszczony" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinski (Tradycyjny)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Wybierz folder źródÅ‚owy DVD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Wybierz folder źródÅ‚owy NAND" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Wybierz domyÅ›lne ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Wybierz folder do dodania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Wybierz plik do otwarcia" @@ -1145,6 +1171,7 @@ msgstr "Wybierz plik do otwarcia" msgid "Choose a memory card:" msgstr "Wybierz kartÄ™ pamiÄ™ci:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 @@ -1154,6 +1181,9 @@ msgstr "Wybierz kartÄ™ pamiÄ™ci:" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1161,8 +1191,8 @@ msgstr "" "Wybierz plik używany jako apploader: (dotyczy dysków stworzonych tylko z " "folderów)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Wypakuj do" @@ -1174,14 +1204,14 @@ msgstr "Circle Stick" msgid "Classic" msgstr "Classic" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Wyczyść" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Czyszczenie nie powiodÅ‚o siÄ™." @@ -1197,6 +1227,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1205,6 +1236,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Zamknij" @@ -1228,20 +1263,20 @@ msgstr "Polecenie" msgid "Comment" msgstr "Komentarz" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Komentarz:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Kompresuj ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Kompresuj wybrane ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Kompresowanie ISO" @@ -1268,13 +1303,13 @@ msgstr "Konfiguracja padów" msgid "Configure..." msgstr "Konfiguruj..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Potwierdź nadpis pliku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Potwierdź przy zatrzymaniu" @@ -1283,7 +1318,7 @@ msgstr "Potwierdź przy zatrzymaniu" msgid "Connect" msgstr "PoÅ‚Ä…cz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "PodÅ‚Ä…cz klawiaturÄ™ USB" @@ -1340,12 +1375,12 @@ msgstr "Konwertuj do GCI" msgid "Copy failed" msgstr "Kopiowanie nie powiodÅ‚o siÄ™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Kopiuj do Memcard %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "RdzeÅ„" @@ -1375,7 +1410,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Nie rozpoznao pliku ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Nie można zapisać %s" @@ -1388,7 +1423,7 @@ 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 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1401,7 +1436,7 @@ msgstr "" "Uruchamiasz program z CD/DVD albo plik zapisu jest zabezpieczony przed " "zapisem?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Nie odnaleziono polecenia otwarcia dla rozszerzenia 'ini'!" @@ -1418,7 +1453,7 @@ msgstr "" msgid "Count:" msgstr "Ilość:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Kraj:" @@ -1432,10 +1467,11 @@ msgstr "Utwórz kod AR" msgid "Create new perspective" msgstr "Utwórz nowÄ… perspektywÄ™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Utworzone przez KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 @@ -1445,22 +1481,25 @@ msgstr "Utworzone przez KDE-Look.org" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Utworzone przez Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart." "com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Utworzone przez VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "Utworzone przez black_rider and published on ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Twórca:" @@ -1468,7 +1507,7 @@ msgstr "Twórca:" msgid "Critical" msgstr "Krytyczny" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "ObciÄ™cie" @@ -1491,7 +1530,7 @@ msgstr "Suwak" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Actualny folder zmieniono z %s na %s po wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Custom Projection Hack" @@ -1499,11 +1538,11 @@ msgstr "Custom Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Ustawienia Custom Projection Hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "WÅ‚asne parametry Orthographic Projection" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Czeski" @@ -1515,10 +1554,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1529,18 +1569,22 @@ msgstr "DSP Emulator Engine" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulacja (szybkie)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (wolne)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "WÄ…tek dla DSPLLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE rekompilator" @@ -1548,15 +1592,23 @@ msgstr "DSP LLE rekompilator" msgid "DSP settings" msgstr "Ustawienia DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "ŹródÅ‚o DVD:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Rozmiar danych" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Data:" @@ -1577,7 +1629,7 @@ msgstr "Dead Zone" msgid "Debug" msgstr "Debuguj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Debugowanie" @@ -1585,16 +1637,16 @@ msgstr "Debugowanie" msgid "Decimal" msgstr "DziesiÄ™tnie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Wypakuj ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Wypakuj wybrane ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Wypakowywanie ISO" @@ -1602,11 +1654,11 @@ msgstr "Wypakowywanie ISO" msgid "Default" msgstr "DomyÅ›lne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "DomyÅ›lne ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "DomyÅ›lna czcionka" @@ -1615,7 +1667,7 @@ msgstr "DomyÅ›lna czcionka" msgid "Delete" msgstr "UsuÅ„" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "UsuÅ„ zapis" @@ -1624,7 +1676,7 @@ msgstr "UsuÅ„ zapis" msgid "Delete the existing file '%s'?" msgstr "Usunąć istniejÄ…cy plik '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Opis" @@ -1632,8 +1684,8 @@ msgstr "Opis" msgid "Detect" msgstr "Wykryj" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1646,8 +1698,8 @@ msgstr "" msgid "Device" msgstr "UrzÄ…dzenie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Ustawienia urzÄ…dzenia" @@ -1672,23 +1724,23 @@ msgstr "" "folderu zapasowego nie powiodÅ‚a siÄ™" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "WyÅ‚Ä…cz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "WyÅ‚Ä…cz mgÅ‚Ä™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "WyÅ‚Ä…cz Å›wiatÅ‚a" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "WyÅ‚Ä…cz Per-Pixel Depth" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "WyÅ‚Ä…cz tekstury" @@ -1732,7 +1784,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Dysk" @@ -1759,6 +1811,7 @@ msgstr "" msgid "Divide" msgstr "Podziel" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1768,10 +1821,13 @@ msgstr "Podziel" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualnÄ… emulacjÄ™?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1796,6 +1852,7 @@ msgstr "Konfiguracja emulowanego Wiilota" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1820,6 +1877,14 @@ msgstr "Konfiguracja GCPad'a" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Konfiguracja GCPad'a" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" @@ -1868,11 +1933,11 @@ msgstr "" msgid "Down" msgstr "Dół" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "ÅšciÄ…gnij kody (baza WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Pobrano %lu kodów. (dodano %lu)" @@ -1881,23 +1946,23 @@ msgstr "Pobrano %lu kodów. (dodano %lu)" msgid "Drums" msgstr "Perkusja" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Atrapa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Zrzut Audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Zrzut EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Zrzut ramek" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Zrzut tekstur" @@ -1931,6 +1996,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1946,6 +2012,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holenderski" @@ -1969,7 +2040,7 @@ msgstr "" "%d -- JeÅ›li ostatnio aktualizowaÅ‚eÅ› program, ponowne uruchomienie systemu " "jest wymagane by sterownik zaczÄ…Å‚ dziaÅ‚ać." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "Europa" @@ -1985,7 +2056,7 @@ msgstr "Edycja" msgid "Edit ActionReplay Code" msgstr "Edytuj kody ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Edytuj konfiguracjÄ™" @@ -1997,8 +2068,8 @@ msgstr "Edytuj patch" msgid "Edit current perspective" msgstr "Edytuj bierzÄ…cÄ… perspektywÄ™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Edytuj..." @@ -2049,7 +2120,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulowany Wiilot" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Stan emulacji:" @@ -2077,23 +2148,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "WÅ‚Ä…cz log AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "WÅ‚Ä…cz Audio Throttle" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "WÅ‚Ä…cz BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "WÅ‚Ä…cz Å‚Ä…czenie bloków" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2106,6 +2177,7 @@ msgstr "" msgid "Enable Cache" msgstr "WÅ‚Ä…cz cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2115,51 +2187,54 @@ msgstr "WÅ‚Ä…cz cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "WÅ‚Ä…cz kody" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "WÅ‚Ä…cz muzykÄ™ DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "WÅ‚Ä…cz 2 rdzenie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "WÅ‚Ä…cz 2 rdzenie (przyspieszenie)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "WÅ‚Ä…cz skróty klawiszowe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "WÅ‚Ä…cz Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "WÅ‚Ä…cz Idle Skipping (przyspieszenie)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "WÅ‚Ä…cz MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "WÅ‚Ä…cz Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "WÅ‚Ä…cz wygaszacz ekranu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "WÅ‚Ä…cz WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "WÅ‚Ä…cz Wireframe" @@ -2177,7 +2252,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2185,7 +2260,7 @@ msgstr "" "WÅ‚Ä…cz szybki dostÄ™p do dysku. Wymagane dla kilku gier. (ON = szybko, OFF = " "kompatybilne)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "WÅ‚Ä…cz strony" @@ -2213,6 +2288,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 @@ -2222,6 +2298,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2229,7 +2308,7 @@ 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:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2239,7 +2318,7 @@ msgstr "" "DokÅ‚adne dla sprzetu, lecz powolne do emulacji. (ON = kompatybilne, OFF = " "szybko)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "WÅ‚Ä…cza Custom Projection Hack" @@ -2255,7 +2334,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2277,6 +2356,7 @@ msgstr "" msgid "End" msgstr "Koniec" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2292,6 +2372,11 @@ msgstr "Koniec" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Angielski" @@ -2322,6 +2407,7 @@ msgstr "Równy" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "BÅ‚Ä…d" @@ -2352,11 +2438,17 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "BÅ‚Ä…d" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" <<<<<<< HEAD @@ -2367,7 +2459,7 @@ msgid "" "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" ======= @@ -2403,7 +2495,7 @@ msgstr "WyjÅ›cie z Dolphina" msgid "Export Failed" msgstr "Eksportuj nieudany" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Eksportuj plik" @@ -2416,15 +2508,15 @@ msgstr "Eksportuj nagranie" msgid "Export Recording..." msgstr "Eksportuj nagranie..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Eksportuj zapis" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Eksportuj zapis Wii (eksperymentalne)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Eksportuj wszystkie zapisy" @@ -2440,7 +2532,7 @@ msgstr "Eksportuj zapis jako..." msgid "Extension" msgstr "Rozszerzenie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "External Frame Buffer" @@ -2452,44 +2544,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Wypakuj wszystkie pliki..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Wypakuj Apploader'a..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Wypakuj DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Wypakuj folder..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Wypakuj plik..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Wypakuj partycjÄ™..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Wypakowywanie %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Wypakowywanie wszystkich plików" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Wypakowywanie folderu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Wypakowywanie..." @@ -2501,11 +2593,11 @@ msgstr "Bajt FIFO" msgid "FIFO Player" msgstr "FIFO Player" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "Francja" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Rozmiar FST:" @@ -2517,11 +2609,11 @@ msgstr "PoÅ‚Ä…czenie nieudane!" msgid "Failed to Listen!!" msgstr "NasÅ‚uchiwanie nieudane!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Pobieranie kodów nieudane!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Wypakowanie do %s nie udaÅ‚o siÄ™!" @@ -2638,18 +2730,28 @@ msgstr "Zapis nagłówka do %s nie powiódÅ‚ siÄ™" msgid "Failed to write header for file %d" msgstr "BÅ‚Ä…d zapisu nagłówka do pliku %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Szybki" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Fast Mipmaps" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Fifo Player" @@ -2658,7 +2760,7 @@ msgstr "Fifo Player" msgid "File Info" msgstr "Informacja o pliku" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Plik nie zawiera kodów." @@ -2691,16 +2793,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:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Nieznany tryb otwarcia: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "System plików" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Nieznany plik typu 'ini'! Nie otworzy siÄ™!" @@ -2708,7 +2810,7 @@ msgstr "Nieznany plik typu 'ini'! Nie otworzy siÄ™!" msgid "First Block" msgstr "Blok pierwszy" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Napraw sumy kontrolne" @@ -2720,7 +2822,7 @@ msgstr "WymuÅ› 16:9" msgid "Force 4:3" msgstr "WymuÅ› 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "WymuÅ› konsolÄ™ jako NTSC-J" @@ -2752,7 +2854,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2788,7 +2890,7 @@ msgstr "Ramka" msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Zrzuty ramek używajÄ… FFV1" @@ -2800,7 +2902,7 @@ msgstr "ZasiÄ™g ramki" msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limit ramek:" @@ -2808,10 +2910,11 @@ msgstr "Limit ramek:" msgid "Frames To Record" msgstr "Ramki do nagrania" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Free Look" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2827,6 +2930,11 @@ msgstr "Free Look" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francuski" @@ -2860,7 +2968,7 @@ msgstr "Konfiguracja Logu" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID gry:" @@ -2876,15 +2984,15 @@ msgstr "Gra nie jest uruchomiona!" msgid "Game not found!!" msgstr "Gry nie odnaleziono!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Specyficzne ustawienia gry" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Konfiguracja gry" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2895,6 +3003,7 @@ msgstr "Ustawienia &pada GC" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2902,6 +3011,9 @@ msgstr "Ustawienia &pada GC" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamiÄ™ci GC (*.raw,*.gcp)" @@ -2910,15 +3022,17 @@ msgid "Gamecube Pad settings" msgstr "Ustawienia pada GC" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Kody Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "BÅ‚Ä…d uruchomienia GeckoCode (CT%i CST%i) (%s)\n" "(zÅ‚y kod albo typ kodu nie jest jeszcze wspierany)" @@ -2927,6 +3041,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2935,6 +3050,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Główne" @@ -2943,6 +3061,7 @@ msgstr "Główne" msgid "General Settings" msgstr "Ustawienia ogólne" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2958,6 +3077,11 @@ msgstr "Ustawienia ogólne" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Niemiecki" @@ -2995,7 +3119,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grecki" @@ -3027,7 +3151,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:303 msgid "Hebrew" msgstr "Hebrajski" @@ -3095,12 +3219,16 @@ msgstr "Konfiguracja skrótów klawiszowych" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Skróty klawiszowe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "WÄ™gierski" @@ -3108,13 +3236,13 @@ msgstr "WÄ™gierski" msgid "Hybrid Wiimote" msgstr "Hybrydowy Wiilot" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3127,11 +3255,11 @@ msgstr "" "TitleID %016llx.\n" "Program teraz chyba siÄ™ zawiesi :C" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - zÅ‚a Å›cieżka" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Ustawienia IPL" @@ -3147,15 +3275,15 @@ msgstr "Wskaźnik IR" msgid "IR Sensitivity:" msgstr "CzuÅ‚ość IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Szczegóły ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Foldery ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "WÅ‚ochy" @@ -3163,19 +3291,20 @@ msgstr "WÅ‚ochy" msgid "Icon" msgstr "Ikona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 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)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 @@ -3185,9 +3314,14 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). 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 limit ramek wiÄ™kszy niż peÅ‚na szybkość gry (NTSC:60, PAL:50), " "musisz także wyÅ‚Ä…czyc Audio Throttle w DSP dla peÅ‚nego efektu." @@ -3224,7 +3358,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importuj zapis" @@ -3274,7 +3408,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "W grze" @@ -3283,7 +3417,7 @@ msgid "In-Game" msgstr "W grze" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3303,7 +3437,7 @@ msgstr "Wstaw" msgid "Insert Encrypted or Decrypted code here..." msgstr "Wprowadź zaszyfrowany/zdeszyfrowany kod tutaj..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Włóż kartÄ™ SD" @@ -3315,7 +3449,7 @@ msgstr "Wprowadź nazwÄ™ tutaj..." msgid "Install WAD" msgstr "Zainstaluj WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Zainstaluj do Wii Menu" @@ -3325,6 +3459,7 @@ msgid "" msgstr "" "InstallExceptionHandler wywoÅ‚any, ale ta platforma nie wspiera go jeszcze." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3334,14 +3469,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instalacja WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interfejs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Ustawienia interfejsu" @@ -3366,11 +3504,11 @@ 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:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (BARDZO wolny)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3387,7 +3525,7 @@ msgstr "NiewÅ‚aÅ›ciwa wartość!" msgid "Invalid bat.map or dir entry" msgstr "NiewÅ‚aÅ›ciwe bat.map lub wejÅ›cie folderu" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "NiewÅ‚aÅ›ciwy typ zdarzenia %i" @@ -3407,14 +3545,15 @@ msgstr "" "%s\n" "BÄ™dziesz musiaÅ‚ ponownie zrzucić grÄ™." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "NewÅ‚aÅ›ciwy plik nagrania" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "NiewÅ‚aÅ›ciwy stan" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3430,27 +3569,32 @@ msgstr "NiewÅ‚aÅ›ciwy stan" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "WÅ‚oski" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "Japonia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Rekompilator JIT (zalecany)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Eksperymentalny rekompilator JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "JapoÅ„ski" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "Korea" @@ -3459,8 +3603,8 @@ msgstr "Korea" msgid "Key" msgstr "Klawisz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "KoreaÅ„ski" @@ -3478,7 +3622,7 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "JÄ™zyk:" @@ -3531,7 +3675,7 @@ msgstr "" msgid "Less Than" msgstr "Mniej niż" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limit FPS" @@ -3539,7 +3683,7 @@ msgstr "Limit FPS" msgid "Load" msgstr "Wczytaj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Wczytaj wÅ‚asne tekstury" @@ -3587,6 +3731,7 @@ msgstr "Wczytaj stan Slot 8" msgid "Load State..." msgstr "Wczytaj stan..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3608,6 +3753,13 @@ msgstr "Wczytaj Wii System Menu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Wczytaj Wii System Menu" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wczytaj Wii System Menu %d %c" @@ -3634,7 +3786,7 @@ msgstr "Wczytuje okreÅ›lony plik (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Lokalny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Przypisz wÄ…tki do rdzeni" @@ -3646,11 +3798,11 @@ msgstr "Log" msgid "Log Configuration" msgstr "Konfiguracja Logu" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Typy logów" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Logger Outputs" @@ -3680,7 +3832,7 @@ msgstr "" "MD5 niepoprawne\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3702,11 +3854,11 @@ msgstr "Pliki MadCatz Gameshark(*.gcs)" msgid "Main Stick" msgstr "Główna gaÅ‚ka" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID twórcy:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Twórca:" @@ -3730,6 +3882,7 @@ msgstr "Bajt pamiÄ™ci" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3737,6 +3890,9 @@ msgstr "Bajt pamiÄ™ci" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Karta pamiÄ™ci" @@ -3773,7 +3929,7 @@ msgstr "Wielkość pliku karty pamiÄ™ci nie odpowiada wielkoÅ›ci nagłówka" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mikrofon" @@ -3782,11 +3938,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Różne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Ustawienia różne" @@ -3807,7 +3963,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Nieproporcjonalna czcionka" @@ -3820,7 +3976,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3842,7 +3998,7 @@ msgstr "" msgid "Multiply" msgstr "Pomnóż" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3934,6 +4090,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3943,6 +4100,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3951,7 +4111,7 @@ msgstr "Nazwa:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nazwa:" @@ -3965,7 +4125,7 @@ msgid "New Scan" msgstr "Nowe skanowanie" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "NastÄ™pna strona" @@ -3977,7 +4137,7 @@ msgstr "NastÄ™pne skanowanie" msgid "Nickname :" msgstr "Ksywa:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "No Country (SDK)" @@ -4016,7 +4176,7 @@ msgstr "Nie odnaleziono folderu zapisu dla tytuÅ‚u %s" msgid "None" msgstr "Å»adne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norweski" @@ -4024,8 +4184,8 @@ msgstr "Norweski" msgid "Not Equal" msgstr "Nie równe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Nie ustawiono" @@ -4045,7 +4205,7 @@ msgstr "Nie poÅ‚Ä…czono" msgid "Notes" msgstr "Notatki" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notatki:" @@ -4083,7 +4243,7 @@ msgstr "Objekt" msgid "Object Range" msgstr "ZasiÄ™g objektu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "WyÅ‚Ä…czone" @@ -4109,11 +4269,11 @@ msgstr "DostÄ™pnych tylko %d bloków" msgid "Open" msgstr "Otwórz" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Otwórz &folder zawartoÅ›ci" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Otwórz folder &zapisów Wii" @@ -4135,11 +4295,11 @@ msgstr "OpenAL: nie można odnaleźć urzÄ…dzeÅ„ dźwiÄ™kowych" msgid "OpenAL: can't open device %s" msgstr "OpenAL: nie można otworzyć urzÄ…dzenia %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" @@ -4171,7 +4331,7 @@ msgstr "" "nastÄ™pnie zaimportuj te zapisy do nowej karty pamiÄ™ci\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "PozostaÅ‚e" @@ -4223,19 +4383,20 @@ msgstr "Paragraf" msgid "Parameters" msgstr "Paramerty" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partycja %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Åšcieżki" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4248,6 +4409,10 @@ msgstr "Åšcieżki" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4256,7 +4421,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Per-Pixel Lighting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfekcyjny" @@ -4269,6 +4434,7 @@ msgstr "Perspekrtywa %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4279,6 +4445,10 @@ msgstr "Perspekrtywa %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Play" @@ -4292,7 +4462,7 @@ msgstr "Odtwórz nagranie" msgid "Play/Pause" msgstr "Play/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Grywalny" @@ -4304,6 +4474,7 @@ msgstr "Opcje playback'u" msgid "Players" msgstr "Gracze" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4313,6 +4484,9 @@ msgstr "Gracze" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Potwierdź..." @@ -4324,23 +4498,23 @@ 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:309 msgid "Polish" msgstr "Polski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4349,11 +4523,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugalski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugalski (Brazylijski)" @@ -4361,17 +4535,17 @@ msgstr "Portugalski (Brazylijski)" msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4384,7 +4558,7 @@ msgstr "Presets: " msgid "Prev Page" msgstr "Poprzednia strona" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Poprzednia strona" @@ -4435,7 +4609,7 @@ msgstr "R-Analog" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "Rosja" @@ -4448,7 +4622,7 @@ msgstr "ZasiÄ™g" msgid "Read-only mode" msgstr "Tryb tylko do odczytu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Prawdziwy" @@ -4523,6 +4697,7 @@ msgstr "OdÅ›wież listÄ™" msgid "Refresh game list" msgstr "OdÅ›wież listÄ™ gier" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4541,6 +4716,12 @@ msgstr "OdÅ›wież listÄ™ gier" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "UsuÅ„" @@ -4593,11 +4774,11 @@ msgstr "GaÅ‚ka prawa" msgid "Rumble" msgstr "Wibracje" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Wykonuj DSPLLE na dedykowanym wÄ…tku (niezalecane)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Rosyjski" @@ -4605,10 +4786,11 @@ msgstr "Rosyjski" msgid "Sa&ve State" msgstr "Zapisz &stan" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Bezpieczny" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4618,6 +4800,9 @@ msgstr "Bezpieczny" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Wskaźnik próbkowania:" @@ -4675,12 +4860,12 @@ msgstr "Zapisz stan Slot 9" msgid "Save State..." msgstr "Zapisz stan..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Zapisz jako..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Zapisz spakowany GCM/ISO" @@ -4688,11 +4873,11 @@ msgstr "Zapisz spakowany GCM/ISO" msgid "Save current perspective" msgstr "Zapisz bierzÄ…cÄ… perspektywÄ™" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Zapisz wypakowany GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." @@ -4701,6 +4886,7 @@ msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4710,15 +4896,18 @@ msgstr "Scaled EFB Copy" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "SknaujÄ™ %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "PrzeszukujÄ™ obrazy ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "PrzeszukujÄ™" @@ -4734,12 +4923,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Filtr wyszukiwania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Przeszukuj podfoldery" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Nie odnaleziono sekcji %s w SYSCONF" @@ -4749,6 +4938,7 @@ msgstr "Nie odnaleziono sekcji %s w SYSCONF" msgid "Select" msgstr "Select" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4773,6 +4963,14 @@ msgstr "Wybierz plik nagrania" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Wybierz plik nagrania" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" @@ -4798,16 +4996,21 @@ msgstr "Select floating windows" msgid "Select the file to load" msgstr "Wybierz plik do wczytania" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Wybierz plik do zapisu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Wybierz stan do wczytania" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4827,6 +5030,9 @@ msgstr "Wybierz stan do wczytania" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Wybierz stan do zapisu" @@ -4848,7 +5054,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz Auto." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Wybrana czcionka" @@ -4895,10 +5101,11 @@ msgstr "Pozycja Sensor Bar'a" msgid "Separator" msgstr "Separator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbski" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 @@ -4908,6 +5115,9 @@ msgstr "Serbski" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +>>>>>>> Update the pot file to reflect recent changes in the code. 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" @@ -4916,11 +5126,11 @@ msgstr "Serial Port 1 - Port używany przez urzÄ…dzenia takie jak net adapter" msgid "Set" msgstr "Ustaw" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Ustaw jako domyÅ›lne ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Ustaw jako domyÅ›lnÄ… kartÄ™ pamiÄ™ci %c" @@ -4930,7 +5140,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/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Ustawienia..." @@ -4942,7 +5152,7 @@ msgstr "SetupWiiMem: Nie można odnaleźć pliku konfiguracyjnego" msgid "Shake" msgstr "WstrzÄ…s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Krótka nazwa:" @@ -4970,7 +5180,7 @@ msgstr "Pokaż pasek &narzÄ™dzi" msgid "Show Drives" msgstr "Pokaż napÄ™dy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Pokaż EFB Copy Regions" @@ -4986,7 +5196,7 @@ msgstr "Pokaż FrancjÄ™" msgid "Show GameCube" msgstr "Pokaż GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Pokaż Input Display" @@ -5002,7 +5212,7 @@ msgstr "Pokaż JaponiÄ™" msgid "Show Korea" msgstr "Pokaż KoreÄ™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Pokaż jÄ™zyk:" @@ -5022,7 +5232,7 @@ msgstr "Pokaż platformy" msgid "Show Regions" msgstr "Pokaż regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Pokaż statystyki" @@ -5042,11 +5252,11 @@ msgstr "Pokaż WAD" msgid "Show Wii" msgstr "Pokaż Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Pokazuje okno potwierdzenia przed zatrzymaniem gry." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -5056,23 +5266,23 @@ msgstr "" "WyÅ‚Ä…czenie tego pozwoli uniknąć denerwujÄ…cych i maÅ‚o ważnych wiadomoÅ›ci, ale " "może spowodować zamkniÄ™cie programu bez żadnego ostrzeżenia." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Pokaż pierwszy blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Pokaż bloki zapisu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Pokaż komentarz zapisu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Pokaż ikonÄ™ zapisu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Pokaż tytuÅ‚ zapisu" @@ -5109,7 +5319,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Willot bokiem" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "ChiÅ„ski uproszczony" @@ -5117,11 +5327,11 @@ msgstr "ChiÅ„ski uproszczony" msgid "Size" msgstr "Rozmiar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "PomiÅ„ BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "PomiÅ„ Dest. Alpha Pass" @@ -5163,11 +5373,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5191,7 +5401,7 @@ msgstr "" "Czy na pewno chcesz wÅ‚Ä…czyć renderowanie programowe? W razie wÄ…tpliwoÅ›ci, " "wybierz 'Nie'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Ustawienia dźwiÄ™ku" @@ -5209,6 +5419,7 @@ msgstr "Utworzenie bufora dźwiÄ™ku nie powiodÅ‚o siÄ™: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5224,6 +5435,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "HiszpaÅ„ski" @@ -5255,7 +5471,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Wybierz video backend" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Przyspiesz Disc Transfer Rate" @@ -5263,7 +5479,7 @@ msgstr "Przyspiesz Disc Transfer Rate" msgid "Square Stick" msgstr "Square Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Standard Controller" @@ -5361,12 +5577,12 @@ msgstr "Importowanie zapisów zakoÅ„czone powodzeniem" msgid "Swing" msgstr "Zamach" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "JÄ™zyk systemu:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "Taiwan" @@ -5405,7 +5621,7 @@ msgstr "Talerz prawo" msgid "Take Screenshot" msgstr "Zrób zdjÄ™cie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5421,7 +5637,7 @@ msgstr "Tekstura" msgid "Texture Cache" msgstr "Cache tekstur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Format pokrycia tekstur" @@ -5437,13 +5653,13 @@ msgstr "NieprawidÅ‚owy adres" msgid "The checksum was successfully fixed" msgstr "Suma kontrolna poprawnie naprawiona" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Wybrany folder jest już na liÅ›cie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5466,7 +5682,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Plik %s jest już otwarty, nagłówek pliku nie zostanie zapisany." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Plik, który wybraÅ‚eÅ› (%s) nie istnieje" @@ -5484,11 +5700,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Wynikowy odszyfrowany kod AR nie zawiera żadnych linii." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "Im bezpieczniejsze dasz ustawienia, tym mniej prawdopodobne, że emulator " "pominie aktualizacje tekstur z RAMu.\n" @@ -5531,7 +5748,7 @@ msgstr "Wskazany plik \"%s\" nie istnieje." msgid "The value is invalid" msgstr "NiewÅ‚aÅ›ciwa wartość" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Styl" @@ -5539,7 +5756,7 @@ msgstr "Styl" msgid "Theme selection went wrong" msgstr "Wybór stylu nieudany" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5547,7 +5764,7 @@ msgstr "" "Tutaj musi być ticket dla 00000001/00000002. Twój zrzut NAND jes " "prawdopodobnie niekompletny." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5563,7 +5780,7 @@ msgstr "" "Ten symulator action replay nie wspiera kodów, które modyfikujÄ… Action " "Replay'a." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Może powodować spowolnienie w Wii Menu i niektórych grach." @@ -5586,27 +5803,10 @@ msgstr "" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Ustawienia te wykorzystywane sÄ… do kontrolowania szybkoÅ›ci gry przez sound " -"throttle(spowalnianie dźwiÄ™ku).\n" -"WyÅ‚Ä…czenie tego może spowodować nienormalne dziaÅ‚anie gry, np. zbyt szybkie " -"dziaÅ‚anie.\n" -"Czasami powoduje staÅ‚y szum.\n" -"\n" -"Skrót klawiszowy : Przytrzymaj by natychmiastowo wyÅ‚Ä…czyc Audio " -"Throttle." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Jest to używane do odtwarzania muzyki, BGM." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5617,7 +5817,7 @@ msgstr "" "Znacznie zwiÄ™ksza wydajność na komputerach z wiÄ™cej niż jednym rdzeniem, ale " "powoduje także okazjonalne bÅ‚edy." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Pozwala na rÄ™cznÄ… edycjÄ™ pliku konfiguracyjnego." @@ -5640,7 +5840,7 @@ msgstr "TytuÅ‚" msgid "To" msgstr "Do" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "PrzeÅ‚Ä…cz wszystkie typy logów" @@ -5660,6 +5860,7 @@ msgstr "PrzeÅ‚Ä…cz na peÅ‚ny ekran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5667,14 +5868,17 @@ msgstr "PrzeÅ‚Ä…cz na peÅ‚ny ekran" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Góra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "ChiÅ„ski tradycyjny" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Próbowano odczytać nieznany typ pliku." @@ -5682,7 +5886,7 @@ msgstr "Próbowano odczytać nieznany typ pliku." msgid "Triggers" msgstr "Spusty" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Próba odczytu z niewÅ‚aÅ›ciwego SYSCONF" @@ -5694,7 +5898,7 @@ msgstr "" "Próba odczytu z niewÅ‚aÅ›ciwego SYSCONF\n" "bt id Wiilota niedostÄ™pne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turecki" @@ -5715,11 +5919,11 @@ msgstr "Port UDP:" msgid "UDP Wiimote" msgstr "UDP Wiilot" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "Nieznany" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5804,7 +6008,7 @@ msgstr "Aktualizuj" msgid "Upright Wiimote" msgstr "Willot pionowo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Użyj trybu EuRGB60 (PAL60)" @@ -5816,7 +6020,7 @@ msgstr "Użyj trybu peÅ‚noekranowego" msgid "Use Hex" msgstr "Użyj HEX" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Użyj Panic Handlers" @@ -5847,7 +6051,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "NarzÄ™dzie" @@ -5871,25 +6075,29 @@ msgstr "Wartość:" msgid "Verbosity" msgstr "Verbosity" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Wideo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Wirtualny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Poziom" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, 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:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Instalacja WAD nie powiodÅ‚a siÄ™: bÅ‚Ä…d tworzenia %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5908,15 +6116,15 @@ msgstr "" msgid "Warning" msgstr "Ostrzeżenie" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Ostrzeżenie - uruchomienie DOL w zÅ‚ym trybie konsoli!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Ostrzeżenie - uruchomienie ELF w zÅ‚ym trybie konsoli!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Ostrzeżenie - uruchomienie ISO w zÅ‚ym trybie konsoli!" @@ -5944,7 +6152,7 @@ msgstr "" "i majÄ… takÄ… samÄ… nazwÄ™ jak plik na Twojej karcie pamiÄ™ci\n" "Kontynuować?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5952,7 +6160,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5960,7 +6168,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5988,7 +6196,7 @@ msgstr "WaveFileWriter - plik nie jest otwarty." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Widescreen Hack" @@ -5996,15 +6204,15 @@ msgstr "Widescreen Hack" msgid "Width" msgstr "Szerokość" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Konsola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "ŹródÅ‚o Wii NAND:" @@ -6012,6 +6220,7 @@ msgstr "ŹródÅ‚o Wii NAND:" msgid "Wii Save Import" msgstr "Import zapisów Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6021,6 +6230,9 @@ msgstr "Import zapisów Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -6087,10 +6299,11 @@ msgstr "Windows Menu" msgid "Windows Right" msgstr "Windows Right" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Zawijanie wierszy" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6106,6 +6319,11 @@ msgstr "Zawijanie wierszy" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "PracujÄ™..." @@ -6113,6 +6331,11 @@ msgstr "PracujÄ™..." msgid "Write to Console" msgstr "Wpisz do konsoli" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Wpisz do pliku" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Wpisz do pliku" @@ -6169,7 +6392,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "Musisz wprowadzić poprawnÄ… nazwÄ™ profilu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Musisz ponownie uruchomić program w celu zaaplikowania zmian." @@ -6192,7 +6415,7 @@ msgstr "" "Powinno być 0x%04x (jest 0x%04llx)\n" "Czy chcesz wygenerować nowy?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6263,7 +6486,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6294,12 +6517,12 @@ msgstr "to nie jest zapis Wii lub bÅ‚Ä…d odczytu rozmiaru nagłówka pliku %x" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "nieznane polecenie 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute zwróciÅ‚ -1 przy uruchamianiu programu!" @@ -6508,6 +6731,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Ustawienia ekranu emulatora" +#~ msgid "Enable Audio Throttle" +#~ msgstr "WÅ‚Ä…cz Audio Throttle" + #~ msgid "Enable CPU Access" #~ msgstr "WÅ‚Ä…cz dostÄ™p CPU" @@ -6830,6 +7056,22 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "Plik" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Ustawienia te wykorzystywane sÄ… do kontrolowania szybkoÅ›ci gry przez " +#~ "sound throttle(spowalnianie dźwiÄ™ku).\n" +#~ "WyÅ‚Ä…czenie tego może spowodować nienormalne dziaÅ‚anie gry, np. zbyt " +#~ "szybkie dziaÅ‚anie.\n" +#~ "Czasami powoduje staÅ‚y szum.\n" +#~ "\n" +#~ "Skrót klawiszowy : Przytrzymaj by natychmiastowo wyÅ‚Ä…czyc Audio " +#~ "Throttle." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "To zazwyczaj jest używane do odtwarza gÅ‚osów i efektów dźwiÄ™kowych." diff --git a/Languages/po/pt.po b/Languages/po/pt.po index 89c344c8b5..1cee620d50 100644 --- a/Languages/po/pt.po +++ b/Languages/po/pt.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-07-23 15:53-0000\n" "Last-Translator: Zilaan \n" "Language-Team: Zilaan \n" @@ -59,9 +63,9 @@ msgstr "\"%s\" Ficheiro GCM/ISO inválido, ou não é um ISO de GC/Wii." msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -154,7 +158,7 @@ msgstr "%sExportar GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Blocos livres; %u Entradas de directórios livres" @@ -187,11 +191,11 @@ msgstr "&Gestor de Cheats" msgid "&DSP Settings" msgstr "&Definições de DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Eliminar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Eliminar ISOs seleccionados..." @@ -255,7 +259,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Começar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Propriedades" @@ -299,7 +303,7 @@ msgstr "&Ver" msgid "&Wiimote Settings" msgstr "&Definições Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -343,7 +347,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -352,7 +356,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -409,13 +413,13 @@ msgstr "" "\n" "Tem que fazer forward TCP para ser host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Códigos AR" @@ -427,11 +431,11 @@ msgstr "Sobre o Dolphin" msgid "Acceleration" msgstr "Aceleração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Precisão:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulação VBeam precisa" @@ -552,11 +556,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Adicionar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Adicionar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Adicionar Patch" @@ -564,6 +568,7 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -579,6 +584,11 @@ msgstr "Adicionar novo painel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Adicionar..." @@ -627,11 +637,11 @@ msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Ajustar a pressão de controlo analógico necessária para activar os botões." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avançadas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Definições avançadas" @@ -639,14 +649,15 @@ msgstr "Definições avançadas" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Todos os ficheiros GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Todos os ficheiros Gamecube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -659,18 +670,22 @@ msgstr "Todos os ficheiros Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Todos os ficheiros Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos os ficheiros GC/Wii ISO comprimidos (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Todos os ficheiros (*.*)|*.*" @@ -686,7 +701,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Wiimote Emulado" @@ -707,7 +722,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -725,7 +740,7 @@ msgstr "" "\n" "Em caso de dúvida, seleccione (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Ãrabe" @@ -734,7 +749,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -742,12 +757,13 @@ msgstr "" "Tem a certeza que quer apagar estes ficheiros?\n" "Serão eliminados permanentemente!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -757,6 +773,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -765,18 +784,20 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Ãudio Backend :" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -786,6 +807,9 @@ msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -829,7 +853,7 @@ msgstr "" msgid "Back" msgstr "Trás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Definições Backend" @@ -856,11 +880,11 @@ msgstr "Cabeçalho de ficheiro inválido" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Detalhes de Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -872,7 +896,7 @@ msgstr "Barra" msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Definições Básicas" @@ -903,6 +927,7 @@ msgstr "Azul Direita" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -910,6 +935,9 @@ msgstr "Azul Direita" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Inferior" @@ -918,7 +946,7 @@ msgstr "Inferior" msgid "Bound Controls: %lu" msgstr "Controlos agregados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Inactivo" @@ -934,7 +962,7 @@ msgstr "Procurar por uma pasta para adicionar" msgid "Browse for an ISO directory..." msgstr "Procurar por uma pasta de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Procurar por pasta de destino" @@ -964,11 +992,11 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Motor de emulador de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cache de listas de Visualização" @@ -1021,7 +1049,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1031,7 +1059,7 @@ msgstr "" "Não é possível utilizar o ficheiro como cartão de memória.\n" "Está a tentar utilizar o mesmo ficheiro nas duas slots?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1050,8 +1078,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "Não foi possível encontrar WiiMote por esta conexão %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1061,7 +1087,7 @@ msgstr "Não foi possível ler através do DVD_Plugin - DVD-Interface: Erro fata msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalão" @@ -1086,7 +1112,7 @@ msgstr "Mudar Disco" msgid "Change Game" msgstr "Mudar de Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1102,8 +1128,8 @@ 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 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 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!" @@ -1124,31 +1150,31 @@ msgstr "Procura de Cheats" msgid "Cheats Manager" msgstr "Gestor de Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinês (Simplificado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Escolha uma pasta de raiz do DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Escolha uma pasta de raiz NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Escolha um ISO padrão:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Escolha uma pasta para adicionar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Escolha um ficheiro para abrir" @@ -1156,7 +1182,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:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1164,8 +1190,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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Escolha a pasta para extrair" @@ -1177,14 +1203,14 @@ msgstr "Stick circular" msgid "Classic" msgstr "Clássico" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Limpar" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Limpeza falhou" @@ -1200,6 +1226,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1208,6 +1235,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Fechar" @@ -1231,20 +1262,20 @@ msgstr "Comando" msgid "Comment" msgstr "Comentário" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Comentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "A comprimir ISO" @@ -1271,13 +1302,13 @@ msgstr "Configuração de Comandos" msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Confirmar Substituição de Ficheiro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmar Ao Parar" @@ -1286,7 +1317,7 @@ msgstr "Confirmar Ao Parar" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" @@ -1343,12 +1374,12 @@ msgstr "Converter para GCI" msgid "Copy failed" msgstr "Cópia Falhou" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar para o Cartão de memória %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Core" @@ -1378,7 +1409,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Não foi possível reconhecer ficheiro ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Não foi possível guardar %s" @@ -1392,7 +1423,7 @@ msgstr "" "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 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1405,7 +1436,7 @@ msgstr "" "Está a correr o Dolphin através de CD/DVD, ou o ficheiro de jogo guardado " "está com protecção contra escrita?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Não foi possível encontrar comando aberto para a extensão 'ini'!" @@ -1422,7 +1453,7 @@ msgstr "" msgid "Count:" msgstr "Contador:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "País" @@ -1436,25 +1467,25 @@ msgstr "Criar um código AR" msgid "Create new perspective" msgstr "Criar nova perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Criado por Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Criado por VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Criado por black_rider e publicado em ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Criador:" @@ -1462,7 +1493,7 @@ msgstr "Criador:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Recortar" @@ -1485,7 +1516,7 @@ msgstr "Desvanecimento cruzado" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "A pasta actual mudou de %s para %s depois wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Hack de projecção personalizada" @@ -1493,11 +1524,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:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizar alguns parâmetros de Projecção Ortogonal." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Checo" @@ -1509,10 +1540,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Motor de Emulador DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1523,18 +1555,22 @@ msgstr "Motor de Emulador DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulação de DSP HLE (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Interpretador DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE em thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilador de DSP LLE" @@ -1542,15 +1578,23 @@ msgstr "Recompilador de DSP LLE" msgid "DSP settings" msgstr "Definições de DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Raiz de DVD:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Dimensão de Dados" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Data:" @@ -1571,7 +1615,7 @@ msgstr "Zona morta" msgid "Debug" msgstr "Depuração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Depuração" @@ -1579,16 +1623,16 @@ msgstr "Depuração" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "A descomprimir ISO" @@ -1596,11 +1640,11 @@ msgstr "A descomprimir ISO" msgid "Default" msgstr "Padrão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO Padrão:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Tipo de letra Padrão" @@ -1609,7 +1653,7 @@ msgstr "Tipo de letra Padrão" msgid "Delete" msgstr "Apagar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Apagar Jogo Guardado" @@ -1618,7 +1662,7 @@ msgstr "Apagar Jogo Guardado" msgid "Delete the existing file '%s'?" msgstr "Apagar o ficheiro existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Descrição" @@ -1626,8 +1670,8 @@ msgstr "Descrição" msgid "Detect" msgstr "Detectar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1640,8 +1684,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Definições de Dispositivo" @@ -1666,23 +1710,23 @@ msgstr "" " e verificação da cópia de segurança de pasta falhou" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Desactivar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Desactivar Nevoeiro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Desactivar Luminosidade" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Desactivar Profundidade por Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Desactivar Texturas" @@ -1726,7 +1770,7 @@ msgstr "" "\n" "Em caso de duvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disco" @@ -1753,6 +1797,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1762,10 +1807,13 @@ msgstr "Dividir" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1790,6 +1838,7 @@ msgstr "Configuração da emulação de Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1814,6 +1863,14 @@ msgstr "Configuração de GCPad " #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Configuração de GCPad " + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" @@ -1846,11 +1903,11 @@ msgstr "" msgid "Down" msgstr "Baixo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Download de Códigos (Base de dados WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Descarregados %lu códigos. (adicionados %lu)" @@ -1859,23 +1916,23 @@ msgstr "Descarregados %lu códigos. (adicionados %lu)" msgid "Drums" msgstr "Tambores" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Depositar Ãudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Depositar Alvo EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Depositar Quadros" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Depositar Texturas" @@ -1910,6 +1967,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1925,6 +1983,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandês" @@ -1949,7 +2012,7 @@ msgstr "" "reiniciar o computador para que o Windows possa reconhecer o novo " "controlador." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1965,7 +2028,7 @@ msgstr "Editar" msgid "Edit ActionReplay Code" msgstr "Editar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editar Configuração" @@ -1977,8 +2040,8 @@ msgstr "Editar Patch" msgid "Edit current perspective" msgstr "Editar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Editar..." @@ -2028,7 +2091,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote Emulado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Estado da Emulação:" @@ -2056,23 +2119,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activar Execução de relatórios AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Activar Regulador Ãudio" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Activar BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Activar Fusão de blocos" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2085,6 +2148,7 @@ msgstr "" msgid "Enable Cache" msgstr "Activar Cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2094,51 +2158,54 @@ msgstr "Activar Cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activar Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Activar Música DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Activar Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Activar Dual Core (aumento de desempenho)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Activar Teclas de Atalho" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Activar Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Activar Idle Skipping (aumento de desempenho)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Activar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Activar Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Activar Protector de Ecrã" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Activar Ecrã Panorâmico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Activar Wireframe" @@ -2156,7 +2223,7 @@ msgstr "" "\n" "Em caso de dúvida, seleccione 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2164,7 +2231,7 @@ msgstr "" "Activar acesso rápido ao disco. Necessário para alguns jogos. (ON = Rápido, " "OFF = Compatível)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Activar Páginas" @@ -2193,7 +2260,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2201,7 +2268,7 @@ msgstr "" "Activar isto para aumentar desempenho no The Legend of Zelda: Twilight " "Princess. Desactive para qualquer outro jogo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2211,7 +2278,7 @@ msgstr "" "Gestão de Memória. Precisa para o hardware, mas lenta para emular. (ON = " "Compatível, OFF = Rápida)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Hack de projecção customizada" @@ -2227,7 +2294,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2249,6 +2316,7 @@ msgstr "" msgid "End" msgstr "Fim" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2264,6 +2332,11 @@ msgstr "Fim" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglês" @@ -2294,6 +2367,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" @@ -2324,20 +2398,26 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Erro" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Erro ao carregar o idioma seleccionado. Será revertido para o idioma padrão " "do sistema." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2372,7 +2452,7 @@ msgstr "Sair do Dolphin com emulador" msgid "Export Failed" msgstr "A Exportação Falhou" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exportar Ficheiro" @@ -2385,15 +2465,15 @@ msgstr "Exportar Gravação" msgid "Export Recording..." msgstr "Exportar Gravação..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exportar Jogo Guardado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exportar jogo guardado Wii (Experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exportar todos os jogos guardados" @@ -2409,7 +2489,7 @@ msgstr "Exportar guardar como..." msgid "Extension" msgstr "Extensão" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Frame Buffer externo" @@ -2421,44 +2501,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Extrair Todos os Ficheiros..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Extrair Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Extrair DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Extrair Pasta..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Extrair Ficheiro..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Extrair Partição..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "A Extrair %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "A Extrair Todos os Ficheiros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "A Extrair Pasta" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "A Extrair..." @@ -2470,11 +2550,11 @@ msgstr "FIFO Byte" msgid "FIFO Player" msgstr "Reprodutor FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Tamanho FST:" @@ -2486,11 +2566,11 @@ msgstr "A Conexão Falhou!" msgid "Failed to Listen!!" msgstr "A Escuta Falhou!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Falha ao descarregar códigos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Falha ao extrair para %s!" @@ -2609,18 +2689,28 @@ msgstr "Falha ao escrever cabeçalho para %s" msgid "Failed to write header for file %d" msgstr "Falha ao escrever cabeçalho para o ficheiro %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Mipmaps rápidos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Reprodutor Fifo" @@ -2629,7 +2719,7 @@ msgstr "Reprodutor Fifo" msgid "File Info" msgstr "Informação de Ficheiro" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "O ficheiro não continha códigos." @@ -2662,16 +2752,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:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modo aberto desconhecido : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Sistema de ficheiros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipo de ficheiro 'ini' é desconhecido! Não será aberto!" @@ -2679,7 +2769,7 @@ msgstr "Tipo de ficheiro 'ini' é desconhecido! Não será aberto!" msgid "First Block" msgstr "Primeiro Bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Corrigir Checksums" @@ -2691,7 +2781,7 @@ msgstr "Forçar 16:9" msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Definir a consola como NTSC-J" @@ -2724,7 +2814,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2760,7 +2850,7 @@ msgstr "Quadro" msgid "Frame Advance" msgstr "Avançar Quadro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Depósitos de Quadros usam FFV1" @@ -2772,7 +2862,7 @@ msgstr "Alcance de Quadros" msgid "Frame S&kipping" msgstr "S&altar Quadros" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limite de Quadros:" @@ -2780,10 +2870,11 @@ msgstr "Limite de Quadros:" msgid "Frames To Record" msgstr "Quadros para Gravar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Vista Livre" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2799,6 +2890,11 @@ msgstr "Vista Livre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francês" @@ -2832,7 +2928,7 @@ msgstr "Configuração de Relatório" msgid "GCPad" msgstr "ComandoGC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID do Jogo:" @@ -2848,15 +2944,15 @@ msgstr "O jogo não está a correr!" msgid "Game not found!!" msgstr "Jogo não encontrado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Definições específicas por jogo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configuração de Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2867,6 +2963,7 @@ msgstr "Definições de Comando &Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2874,6 +2971,9 @@ msgstr "Definições de Comando &Gamecube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" @@ -2882,15 +2982,17 @@ msgid "Gamecube Pad settings" msgstr "Definições de Comando Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Códigos Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "GeckoCode falhou ao executar (CT%i CST%i) (%s)\n" "(Ou é um código com erros ou o tipo de código não é suportado.)" @@ -2899,6 +3001,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2907,6 +3010,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2915,6 +3021,7 @@ msgstr "Geral" msgid "General Settings" msgstr "Definições Gerais" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2930,6 +3037,11 @@ msgstr "Definições Gerais" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemão" @@ -2967,7 +3079,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grego" @@ -2999,7 +3111,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:303 msgid "Hebrew" msgstr "Hebraico" @@ -3068,12 +3180,16 @@ msgstr "Configuração de Teclas de atalho" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Teclas de Atalho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Húngaro" @@ -3081,14 +3197,14 @@ msgstr "Húngaro" msgid "Hybrid Wiimote" msgstr "Wiimote Hibrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3101,11 +3217,11 @@ msgstr "" "TitleID %016llx.\n" " O Dolphin irá provavelmente bloquear agora" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destino inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Definições IPL" @@ -3121,15 +3237,15 @@ msgstr "Ponteiro Infra Vermelho" msgid "IR Sensitivity:" msgstr "Sensibilidade de Infra Vermelhos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Detalhes ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Pastas ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "Itália" @@ -3137,23 +3253,25 @@ msgstr "Itália" msgid "Icon" msgstr "Ãcone" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 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)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "Se definir o limite de Quadros, superior à velocidade completa do jogo " "(NTSC:60, PAL:50), também terá que desactivar o Regulador Ãudio em DSP para " @@ -3191,7 +3309,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importar Jogo Guardado" @@ -3242,7 +3360,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Em Jogo" @@ -3251,7 +3369,7 @@ msgid "In-Game" msgstr "Em-Jogo" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Informação" @@ -3271,7 +3389,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:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Inserir Cartão SD" @@ -3283,7 +3401,7 @@ msgstr "Introduza o nome aqui..." msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Instalar para o Menu Wii" @@ -3293,6 +3411,7 @@ msgid "" msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3302,14 +3421,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "A Instalar WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Iinterface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Definições de interface" @@ -3334,11 +3456,11 @@ msgstr "Erro interno de LZO - lzo_init() falhou" msgid "Internal Resolution:" msgstr "Resolução Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpretador (Muito lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3355,7 +3477,7 @@ msgstr "Valor inválido!" msgid "Invalid bat.map or dir entry" msgstr "bat.map inválido ou entrada de pasta" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Tipo de evento inválido %i" @@ -3375,14 +3497,15 @@ msgstr "" "%s\n" " Poderá ter que refazer o depósito deste jogo." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Ficheiro de Gravação inválido" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Estado Inválido" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3398,27 +3521,32 @@ msgstr "Estado Inválido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPÃO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Recompilador experimental JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonês" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "COREIA" @@ -3427,8 +3555,8 @@ msgstr "COREIA" msgid "Key" msgstr "Tecla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coreano" @@ -3446,7 +3574,7 @@ msgstr "Botão L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Idioma:" @@ -3499,7 +3627,7 @@ msgstr "" msgid "Less Than" msgstr "Inferior que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limitar por FPS" @@ -3507,7 +3635,7 @@ msgstr "Limitar por FPS" msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Carregar Texturas Personalizadas" @@ -3555,6 +3683,7 @@ msgstr "Carregar Estado Slot 8" msgid "Load State..." msgstr "Carregar Estado..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3576,6 +3705,13 @@ msgstr "Carregar Sistema de Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Carregar Sistema de Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Sistema de Menu Wii %d%c" @@ -3602,7 +3738,7 @@ msgstr "Carrega o ficheiro especifico (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Bloqueia as threads aos núcleos" @@ -3614,11 +3750,11 @@ msgstr "Relatório" msgid "Log Configuration" msgstr "Configuração de Relatório" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipos de Relatório" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Saídas de Gerador de Relatórios" @@ -3648,7 +3784,7 @@ msgstr "" "MD5 não combina\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Hack de velocidade" @@ -3670,11 +3806,11 @@ msgstr "ficheiros MadCatz Gameshark(*.gcs)" msgid "Main Stick" msgstr "Stick Principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID do autor:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Fabricante:" @@ -3698,6 +3834,7 @@ msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3705,6 +3842,9 @@ msgstr "Byte de Memória" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Cartão de memória" @@ -3741,7 +3881,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mic" @@ -3750,11 +3890,11 @@ msgstr "Mic" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Diversos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Configurações Diversas" @@ -3775,7 +3915,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Tipo de letra monoespaçada" @@ -3788,7 +3928,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3811,7 +3951,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplicar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3903,6 +4043,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3912,6 +4053,9 @@ msgstr "NP Cima" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3920,7 +4064,7 @@ msgstr "Nome:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nome:" @@ -3934,7 +4078,7 @@ msgid "New Scan" msgstr "Nova procura" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Próxima Página" @@ -3946,7 +4090,7 @@ msgstr "Próxima Procura" msgid "Nickname :" msgstr "Alcunha :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Sem País (SDK)" @@ -3985,7 +4129,7 @@ msgstr "Não foi encontrada a pasta de jogo guardado para o título %s" msgid "None" msgstr "Nenhum" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Bokmaal Norueguês" @@ -3993,8 +4137,8 @@ msgstr "Bokmaal Norueguês" msgid "Not Equal" msgstr "Não igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Não definido" @@ -4014,7 +4158,7 @@ msgstr "Não conectado" msgid "Notes" msgstr "Notas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notas:" @@ -4052,7 +4196,7 @@ msgstr "Objecto" msgid "Object Range" msgstr "Alcance de Objecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Desligado" @@ -4078,11 +4222,11 @@ msgstr "Apenas %d blocos disponíveis" msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Abrir &Pasta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Abrir Pasta de &Jogo guardado Wii " @@ -4104,11 +4248,11 @@ msgstr "OpenAL: não foram encontrados dispositivos de som" msgid "OpenAL: can't open device %s" msgstr "OpenAL: não foi possível abrir dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "Descodificador de Textura OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "Descodificador de Textura OpenMP" @@ -4140,7 +4284,7 @@ msgstr "" "e importe os jogos guardados para um novo cartão de memória\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Outro" @@ -4192,19 +4336,20 @@ msgstr "Parágrafo" msgid "Parameters" msgstr "Parâmetros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partição %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Caminhos" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4217,6 +4362,10 @@ msgstr "Caminhos" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4225,7 +4374,7 @@ msgstr "Pausa" msgid "Per-Pixel Lighting" msgstr "Iluminação por Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfeito" @@ -4238,6 +4387,7 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4248,6 +4398,10 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Começar" @@ -4261,7 +4415,7 @@ msgstr "Tocar Gravação" msgid "Play/Pause" msgstr "Começar/Pausar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Jogável" @@ -4273,6 +4427,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4282,6 +4437,9 @@ msgstr "Jogadores" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Por favor confirme..." @@ -4293,23 +4451,23 @@ 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:309 msgid "Polish" msgstr "Polaco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4318,11 +4476,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Português" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Português (Brasileiro)" @@ -4330,17 +4488,17 @@ msgstr "Português (Brasileiro)" msgid "Post-Processing Effect:" msgstr "Efeito de Pós-Processamento" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4353,7 +4511,7 @@ msgstr "Predefinições:" msgid "Prev Page" msgstr "Pág Anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Página Anterior" @@ -4404,7 +4562,7 @@ msgstr "R-Analógico" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSSIA" @@ -4417,7 +4575,7 @@ msgstr "Alcance" msgid "Read-only mode" msgstr "Modo só de leitura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Real" @@ -4494,6 +4652,7 @@ msgstr "Actualizar Lista" msgid "Refresh game list" msgstr "Actualizar lista de Jogos" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4512,6 +4671,12 @@ msgstr "Actualizar lista de Jogos" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Remover" @@ -4564,11 +4729,11 @@ msgstr "Stick Direito" msgid "Rumble" msgstr "Vibração" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Correr DSP LLE numa thread dedicada (não recomendado)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russo" @@ -4576,10 +4741,11 @@ msgstr "Russo" msgid "Sa&ve State" msgstr "Gua&rdar Estado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4589,6 +4755,9 @@ msgstr "Seguro" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4646,12 +4815,12 @@ msgstr "Guardar Estado Slot 8" msgid "Save State..." msgstr "Guardar Estado..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Guardar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Guardar GCM/ISO comprimido" @@ -4659,11 +4828,11 @@ msgstr "Guardar GCM/ISO comprimido" msgid "Save current perspective" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Jogo guardado descomprimido GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, 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..." @@ -4672,6 +4841,7 @@ msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..." msgid "Scaled EFB Copy" msgstr "Cópia EFB Escalada" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4681,15 +4851,18 @@ msgstr "Cópia EFB Escalada" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "A procurar %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "A procurar ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Em Analise..." @@ -4705,12 +4878,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Filtro de Pesquisa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Procurar em Sub-Pastas" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Selecção %s não encontrada em SYSCONF" @@ -4720,6 +4893,7 @@ msgstr "Selecção %s não encontrada em SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4744,6 +4918,14 @@ msgstr "Seleccione o Ficheiro de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Seleccione o Ficheiro de Gravação" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" @@ -4769,6 +4951,7 @@ msgstr "Seleccionar janelas flutuantes" msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4785,19 +4968,26 @@ msgstr "Seleccione o estado para carregar" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Seleccione o estado para carregar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Seleccione o estado para gravar" @@ -4819,7 +5009,7 @@ msgstr "" "da sua proporção.\n" "Em caso de dúvida, seleccione Automático." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Tipo de letra seleccionado" @@ -4867,11 +5057,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:313 msgid "Serbian" msgstr "Sérvio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4882,11 +5072,11 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Definir como ISO &padrão" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Definir como cartão de memória padrão %c" @@ -4896,7 +5086,7 @@ 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/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Definições..." @@ -4908,7 +5098,7 @@ msgstr "SetupWiiMem: Não consegue encontrar o ficheiro de definições" msgid "Shake" msgstr "Abanar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Abreviatura:" @@ -4936,7 +5126,7 @@ msgstr "Mostrar Barra de Ferramen&tas" msgid "Show Drives" msgstr "Mostrar Unidades" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Mostrar Regiões de Cópia EFB" @@ -4952,7 +5142,7 @@ msgstr "Mostrar França" msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Mostrar visualização de Entradas" @@ -4968,7 +5158,7 @@ msgstr "Mostrar Japão" msgid "Show Korea" msgstr "Mostrar Coreia" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Mostrar Idioma:" @@ -4988,7 +5178,7 @@ msgstr "Mostrar Plataformas" msgid "Show Regions" msgstr "Mostrar Regiões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Mostrar Estatísticas" @@ -5008,11 +5198,11 @@ msgstr "Mostrar Wad" msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -5022,23 +5212,23 @@ msgstr "" "Desactivar isto poderá evitar mensagens irritantes e não-fatais, mas também " "poderá não explicar o motivo pelo qual o Dolphin crashe de repente." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Mostrar primeiro bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Mostrar blocos de guardar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Mostrar guardar comentário" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Mostrar ícone de guardar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Mostrar o título de jogo guardado" @@ -5076,7 +5266,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote na horizontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Chinês Simplificado" @@ -5084,11 +5274,11 @@ msgstr "Chinês Simplificado" msgid "Size" msgstr "Dimensão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Saltar Bios" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Saltar Dest. Alpha Pass" @@ -5131,11 +5321,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5160,7 +5350,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:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Definições de Som" @@ -5178,6 +5368,7 @@ msgstr "Criação do buffer de som falhou: %s" msgid "Space" msgstr "Espaço" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5193,6 +5384,11 @@ msgstr "Espaço" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espanhol" @@ -5224,7 +5420,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Especifique um plugin de vídeo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Aumente a taxa de transferência do disco" @@ -5232,7 +5428,7 @@ msgstr "Aumente a taxa de transferência do disco" msgid "Square Stick" msgstr "Stick quadrado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Comando padrão" @@ -5330,12 +5526,12 @@ msgstr "Sucesso na importação de ficheiros de jogo guardado" msgid "Swing" msgstr "Balanço" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Idioma do sistema:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5374,7 +5570,7 @@ msgstr "Table Direita" msgid "Take Screenshot" msgstr "Tirar Screenshot" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5390,7 +5586,7 @@ msgstr "Textura" msgid "Texture Cache" msgstr "Cache de Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Formato da textura" @@ -5406,13 +5602,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "A pasta escolhida já está na lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5437,7 +5633,7 @@ msgstr "" "O ficheiro %s já estava aberto, o cabeçalho do ficheiro não poderá ser " "escrito." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "O ficheiro que especificou (%s) não existe" @@ -5455,11 +5651,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "O resultado do código AR desencriptado não contém quaisquer linhas." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "Quanto mais seguro o ajuste, menos o emulador irá falhar actualizações de " "texturas através da RAM.\n" @@ -5504,7 +5701,7 @@ msgstr "O ficheiro especificado \"%s\" não existe" msgid "The value is invalid" msgstr "O valor é inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" @@ -5512,7 +5709,7 @@ msgstr "Tema" msgid "Theme selection went wrong" msgstr "Selecção de tema correu mal" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5520,7 +5717,7 @@ msgstr "" "Tem que existir um ticket para 00000001/00000002. O seu NAND depositado está " "provavelmente incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5536,7 +5733,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:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 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." @@ -5561,26 +5758,10 @@ msgstr "" "Em caso de dúvida, mantenha esta opção desactivada." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Isto é usado para controlar a velocidade do jogo através da regulação por " -"áudio.\n" -"Desactivar isto poderá causar velocidades excessivas nos jogos.\n" -"Mas por vezes activar isto poderá causar ruído constante.\n" -"\n" -"Tecla de Atalho : Pressione continuamente para desactivar " -"instantaneamente o Regulador Ãudio." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Isto é usado para tocar faixas de música, como BGM (Música de fundo)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5592,7 +5773,7 @@ msgstr "" "Provoca aumentos significativos de velocidade em PCs com mais de um núcleo, " "mas também poderá causar crashes ou falhas." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Isto permite a edição manual do ficheiro de configuração INI" @@ -5615,7 +5796,7 @@ msgstr "Título" msgid "To" msgstr "Para" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Alternar Todos os Tipos de Relatório" @@ -5635,6 +5816,7 @@ msgstr "Alternar Ecrã Inteiro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5642,14 +5824,17 @@ msgstr "Alternar Ecrã Inteiro" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Topo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chinês Tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Tentou carregar um tipo de ficheiro desconhecido." @@ -5657,7 +5842,7 @@ msgstr "Tentou carregar um tipo de ficheiro desconhecido." msgid "Triggers" msgstr "Gatilhos" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Tentativa de leitura inválida de SYSCONF" @@ -5669,7 +5854,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:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turco" @@ -5690,11 +5875,11 @@ msgstr "Porta UDP:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "DESCONHECIDO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "EUA" @@ -5779,7 +5964,7 @@ msgstr "Actualizar" msgid "Upright Wiimote" msgstr "Wiimote na vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" @@ -5791,7 +5976,7 @@ msgstr "Utilizar Ecrã Inteiro" msgid "Use Hex" msgstr "Usar Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Usar Manipuladores de Pânico" @@ -5823,7 +6008,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Utilidade" @@ -5847,25 +6032,29 @@ msgstr "Valor: " msgid "Verbosity" msgstr "Verbosidade" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Instalação WAD falhou: erro ao criar %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Instalação WAD falhou: erro ao criar %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5885,15 +6074,15 @@ msgstr "" msgid "Warning" msgstr "Aviso" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Aviso - a começar DOL em modo errado de consola!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Aviso - A iniciar um ELF em modo errado de consola!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Aviso - A iniciar um ISO em modo errado de consola!" @@ -5922,7 +6111,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:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5930,7 +6119,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5938,7 +6127,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5966,7 +6155,7 @@ msgstr "WaveFileWriter - ficheiro não aberto." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack de Ecrã Panorâmico" @@ -5974,15 +6163,15 @@ msgstr "Hack de Ecrã Panorâmico" msgid "Width" msgstr "Largura" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Raiz de NAND Wii:" @@ -5990,6 +6179,7 @@ msgstr "Raiz de NAND Wii:" msgid "Wii Save Import" msgstr "Importação de Jogo Guardado Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5999,6 +6189,9 @@ msgstr "Importação de Jogo Guardado Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -6067,10 +6260,11 @@ msgstr "Menu de Janelas" msgid "Windows Right" msgstr "Janelas Direita" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Moldar o texto" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6086,6 +6280,11 @@ msgstr "Moldar o texto" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "A trabalhar..." @@ -6093,6 +6292,11 @@ msgstr "A trabalhar..." msgid "Write to Console" msgstr "Escrever para Consola" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Escrever para Ficheiro" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Escrever para Ficheiro" @@ -6146,7 +6350,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 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" @@ -6169,7 +6373,7 @@ msgstr "" "Deveria ser 0x%04x (mas é 0x%04llx)\n" "Pretende gerar um novo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6241,7 +6445,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6273,12 +6477,12 @@ msgstr "" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "cmd desconhecido 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute devolveu -1 quando a aplicação executou!" @@ -6432,6 +6636,9 @@ msgstr "| OU" #~ msgid "Emulator Display Settings" #~ msgstr "Definições de Visualização do Emulador" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Activar Regulador Ãudio" + #~ msgid "Enable CPU Access" #~ msgstr "Activar acesso ao CPU" @@ -6702,6 +6909,21 @@ msgstr "| OU" <<<<<<< HEAD ======= >>>>>>> Update from master branch. +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Isto é usado para controlar a velocidade do jogo através da regulação por " +#~ "áudio.\n" +#~ "Desactivar isto poderá causar velocidades excessivas nos jogos.\n" +#~ "Mas por vezes activar isto poderá causar ruído constante.\n" +#~ "\n" +#~ "Tecla de Atalho : Pressione continuamente para desactivar " +#~ "instantaneamente o Regulador Ãudio." + #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 6dc3dd9b7b..d12775657f 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -9,7 +9,11 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-18 13:38-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -60,9 +64,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -157,7 +161,7 @@ msgstr "%sExportar GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Blocos Livres; %u Entradas de Diretórios Livres" @@ -190,11 +194,11 @@ msgstr "Gerenciador de &Cheats" msgid "&DSP Settings" msgstr "Configurações do &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Deletar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Deletar ISOs selecionadas..." @@ -258,7 +262,7 @@ msgstr "&Pausar" msgid "&Play" msgstr "&Jogar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Propriedades" @@ -302,7 +306,7 @@ msgstr "&Ver" msgid "&Wiimote Settings" msgstr "Configurações de &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -346,7 +350,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -355,7 +359,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -413,13 +417,13 @@ msgstr "" "\n" "Você deve redirecionar as portas TCP para ser o Host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Códigos AR" @@ -431,11 +435,11 @@ msgstr "Sobre o Dolphin" msgid "Acceleration" msgstr "Aceleração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Precisão:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulção precisa de VBeam" @@ -556,11 +560,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Adicionar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Adicionar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Adicionar Patch" @@ -568,6 +572,7 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painél" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -583,6 +588,11 @@ msgstr "Adicionar novo painél" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Adicionar..." @@ -630,11 +640,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Ajustar o controle de pressão análogo requerido para ativar os botões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avançado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Configurações Avançadas" @@ -642,14 +652,15 @@ msgstr "Configurações Avançadas" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Todos os arquivos de GC/WII (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Todas as imagens CG/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Todos os arquivos Gamecube CGM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -662,18 +673,22 @@ msgstr "Todos os arquivos Gamecube CGM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Todos os Arquivos ISO Wii" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos os arquivos ISO GC/Wii comprimidos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Todos os arquivos (*.*)|*.*" @@ -689,7 +704,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Emular Wiimote" @@ -710,7 +725,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -728,7 +743,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione (desligado)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Ãrabe" @@ -737,7 +752,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -745,12 +760,13 @@ msgstr "" "Você tem certeza que deseja apagar estes arquivos?\n" "Eles estarão perdidos para sempre!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -760,6 +776,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -768,18 +787,20 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Backend de Audio" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -789,6 +810,9 @@ msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -832,7 +856,7 @@ msgstr "" msgid "Back" msgstr "Voltar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Configurações do Backend" @@ -859,11 +883,11 @@ msgstr "Header de Arquivo Ruim" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Detalhes de Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -875,7 +899,7 @@ msgstr "Alavanca" msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Configurações Básicas" @@ -906,6 +930,7 @@ msgstr "Azul Direito" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -913,6 +938,9 @@ msgstr "Azul Direito" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Embaixo" @@ -921,7 +949,7 @@ msgstr "Embaixo" msgid "Bound Controls: %lu" msgstr "Controles Acoplados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Quebrado" @@ -937,7 +965,7 @@ msgstr "Procurar por um diretório para adicionar" msgid "Browse for an ISO directory..." msgstr "Procurar por um diretório ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Procurar por um diretório de saída" @@ -967,11 +995,11 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Engine de Emulação do CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cache das Listas de Display" @@ -1022,7 +1050,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1033,7 +1061,7 @@ msgstr "" "%s\n" "não é um arquivo de Memory Card válido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1053,8 +1081,6 @@ msgid "Cant find WiiMote by connection handle %02x" msgstr "" "Não foi possível encontrar o Wiimote pelo identificador de conexão %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1064,7 +1090,7 @@ msgstr "Não é possível ler de DVD_Plugin - DVD-Interface: Erro Fatal" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalão" @@ -1089,7 +1115,7 @@ msgstr "Mudar o Disco" msgid "Change Game" msgstr "Mudar Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1105,8 +1131,8 @@ 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 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 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!" @@ -1126,31 +1152,31 @@ msgstr "Procura de Cheat" msgid "Cheats Manager" msgstr "Gerenciador de Cheat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinês (Simplificado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Escolher um diretório raiz de DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Escolha um diretório raíz para o NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Escolher uma ISO padrão:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Escolher um diretório para adicionar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Escolher um arquivo para abrir" @@ -1158,6 +1184,7 @@ msgstr "Escolher um arquivo para abrir" msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 @@ -1167,6 +1194,9 @@ msgstr "Escolher um cartão de memória:" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1174,8 +1204,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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Escolha a pasta para extrair" @@ -1187,14 +1217,14 @@ msgstr "Analógico Circular" msgid "Classic" msgstr "Clássico" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Limpar" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Falha na liberação." @@ -1210,6 +1240,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1218,6 +1249,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Fechar" @@ -1241,20 +1276,20 @@ msgstr "Comandos" msgid "Comment" msgstr "Comentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Comentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs selecionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Comprimindo ISO" @@ -1281,13 +1316,13 @@ msgstr "Configurar Controles" msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Confirmar sobrescrição de arquivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmar ao Parar" @@ -1296,7 +1331,7 @@ msgstr "Confirmar ao Parar" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" @@ -1353,12 +1388,12 @@ msgstr "Converter para GCI" msgid "Copy failed" msgstr "Falha na Cópia" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar para Cartão de Memória %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Núcleo" @@ -1388,7 +1423,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Não foi possível reconhecer o arquivo ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Não foi possível salvar %s" @@ -1402,7 +1437,7 @@ msgstr "" "no momento!\n" "(Definir os controles durante o jogo ainda não é suportado)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1415,7 +1450,7 @@ msgstr "" "Você está executando o Dolphin de um CD/DVD, ou talvez o arquivo de salva " "seja somente-leitura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Não foi possível encontrar comando de abertura para a extensão 'ini'!" @@ -1432,7 +1467,7 @@ msgstr "" msgid "Count:" msgstr "Contagem:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "País:" @@ -1446,10 +1481,11 @@ msgstr "Criar Código AR" msgid "Create new perspective" msgstr "Criar nova perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 @@ -1459,20 +1495,23 @@ msgstr "Criado por KDE-Look.org" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Criado por Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Criado por VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Criado por black_rider e publicado no ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Criador:" @@ -1480,7 +1519,7 @@ msgstr "Criador:" msgid "Critical" msgstr "Crítico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Cortar" @@ -1503,7 +1542,7 @@ msgstr "Crossfade" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "O diretório atual mudou de %s para %s depois do wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Hack de Projeção Customizado" @@ -1511,11 +1550,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:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Cuztomize alguns parâmetros de Projeção Ortográfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tcheco" @@ -1527,10 +1566,11 @@ msgstr "Direcional Digital" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Engine de Emulação do DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1541,18 +1581,22 @@ msgstr "Engine de Emulação do DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulação HLE do DSP (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Interpretador LLE do DSP (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE em Segmento" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilador LLE do DSP" @@ -1560,15 +1604,23 @@ msgstr "Recompilador LLE do DSP" msgid "DSP settings" msgstr "Configurações de Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Raiz do DVD:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Tamanho de Arquivo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Data:" @@ -1589,7 +1641,7 @@ msgstr "Zona Morta" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Debugging" @@ -1597,16 +1649,16 @@ msgstr "Debugging" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs selecionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Descomprimindo ISO" @@ -1614,11 +1666,11 @@ msgstr "Descomprimindo ISO" msgid "Default" msgstr "Padrão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO Padrão:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Fonte Padrão" @@ -1627,7 +1679,7 @@ msgstr "Fonte Padrão" msgid "Delete" msgstr "Excluir" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Deletar Save" @@ -1636,7 +1688,7 @@ msgstr "Deletar Save" msgid "Delete the existing file '%s'?" msgstr "Apagar o arquivo existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Descrição" @@ -1644,8 +1696,8 @@ msgstr "Descrição" msgid "Detect" msgstr "Detectar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1658,8 +1710,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Configurações de Dispositivo" @@ -1684,23 +1736,23 @@ msgstr "" " e a checagem de Backup de Diretório falhou" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Desativar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Desativar Neblina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Desativar Iluminação" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Desativar Profundidade por Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Desativar Texturas" @@ -1744,7 +1796,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disco" @@ -1771,6 +1823,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1780,10 +1833,13 @@ msgstr "Dividir" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1808,6 +1864,7 @@ msgstr "Configuração de Wiimote Emulado do Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1832,6 +1889,14 @@ msgstr "Configuração do GCPad do Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Configuração do GCPad do Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS Dolphin (*.dtm)" @@ -1880,11 +1945,11 @@ msgstr "" msgid "Down" msgstr "Para Baixo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Download de Códigos (Banco de Dados WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Códigos %lu baixados. (Adicionados %lu)" @@ -1893,23 +1958,23 @@ msgstr "Códigos %lu baixados. (Adicionados %lu)" msgid "Drums" msgstr "Bateria" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Extrair Ãudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Extrair Código EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Extrair Quadros" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Extrair Texturas" @@ -1943,6 +2008,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1958,6 +2024,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandês" @@ -1982,7 +2053,7 @@ msgstr "" "PC é provavelmente necessário no momento para que o Windows veja o novo " "driver." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1998,7 +2069,7 @@ msgstr "Editar" msgid "Edit ActionReplay Code" msgstr "Editar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editar Configuração" @@ -2010,8 +2081,8 @@ msgstr "Editar Patch" msgid "Edit current perspective" msgstr "Editar perspectiva atual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Editar..." @@ -2061,7 +2132,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emular Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Estado de Emulação" @@ -2089,23 +2160,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Ativar Registro AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Ativar Throttle de Ãudio" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Ativar BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Ativar Block Merging" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2118,6 +2189,7 @@ msgstr "" msgid "Enable Cache" msgstr "Ativar Cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2127,51 +2199,54 @@ msgstr "Ativar Cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Ativar Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Ativar Música DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Ativar Núcleo Duplo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Ativar Núcleo Duplo (Aumento na velocidade)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Ativar Hotkeys" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Ativar Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Ativar Idle Skipping (Aumento na velocidade)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Ativar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Ativar Varredura Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Ativar Salva-Tela" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Ativar WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Ativar Wireframe" @@ -2190,7 +2265,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2198,7 +2273,7 @@ msgstr "" "Ativar acesso rápido de disco. Necessário para alguns jogos.(ON = Rapido, " "OFF = Compativel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Ativar Paginas" @@ -2226,6 +2301,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 @@ -2235,6 +2311,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2242,7 +2321,7 @@ 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:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2252,7 +2331,7 @@ msgstr "" "gerenciamento de memoria. Precisão para o hardware, mas devagar para ser " "emulado (ON = Compativel, OFF = Rapido)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Ativa Hack de Projeção Personalizado" @@ -2268,7 +2347,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2290,6 +2369,7 @@ msgstr "" msgid "End" msgstr "Fim" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2305,6 +2385,11 @@ msgstr "Fim" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglês" @@ -2335,6 +2420,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" @@ -2365,21 +2451,35 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Erro" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." +<<<<<<< HEAD #: Source/Core/Common/Src/ChunkFile.h:180 <<<<<<< HEAD ======= +======= +#: Source/Core/Common/Src/ChunkFile.h:194 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 >>>>>>> Update from master branch. +======= +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" <<<<<<< HEAD @@ -2424,7 +2524,7 @@ msgstr "Sair do Dolphin com o emulador" msgid "Export Failed" msgstr "Falha na Exportação" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exportar Arquivo" @@ -2437,15 +2537,15 @@ msgstr "Exportar Gravação" msgid "Export Recording..." msgstr "Exportar Gravação..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exportar Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exportar save do Wii (Experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exportar todos os saves" @@ -2461,7 +2561,7 @@ msgstr "Exportar Salvar como..." msgid "Extension" msgstr "Extensão" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Frame Buffer Externo" @@ -2473,44 +2573,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Extrair Todos os arquivos..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Extrair Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Extrair DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Extrair diretorio..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Extrair Arquivo..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Extrair Partição..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Extraindo %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Extraindo todos os arquivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Extraindo diretorio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Extraindo..." @@ -2522,11 +2622,11 @@ msgstr "Byte do FIFO" msgid "FIFO Player" msgstr "FIFO Player" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Tamanho FST:" @@ -2538,11 +2638,11 @@ msgstr "Falha ao Conectar\"" msgid "Failed to Listen!!" msgstr "Não foi possível Ouvir!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Falha ao dazer o download de códigos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Falha ao extrair %s!" @@ -2659,18 +2759,28 @@ msgstr "Falha ao escrever o header para %s" msgid "Failed to write header for file %d" msgstr "Falha ao escrever o header para o arquivo %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Mipmaps Rápidos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Fifo Player" @@ -2679,7 +2789,7 @@ msgstr "Fifo Player" msgid "File Info" msgstr "Informações do Arquivo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "O arquivo não contém códigos." @@ -2712,16 +2822,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:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modo de abertura desconhecido : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Arquivo de sistema" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipo do arquivo 'ini' desconhecido! Não vai abrir!" @@ -2729,7 +2839,7 @@ msgstr "Tipo do arquivo 'ini' desconhecido! Não vai abrir!" msgid "First Block" msgstr "Primeiro Bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Corrigir Checksums" @@ -2741,7 +2851,7 @@ msgstr "Forçar 16:9" msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Forçar Console para NTSC-J" @@ -2774,7 +2884,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2810,7 +2920,7 @@ msgstr "Quadro" msgid "Frame Advance" msgstr "Avançar Quadro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Extração de Quadros usam FFV1" @@ -2822,7 +2932,7 @@ msgstr "Alcanço do Quadro" msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limitador de FPS:" @@ -2830,10 +2940,11 @@ msgstr "Limitador de FPS:" msgid "Frames To Record" msgstr "QUadros para Capturar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Olhar Livre" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2849,6 +2960,11 @@ msgstr "Olhar Livre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francês" @@ -2882,7 +2998,7 @@ msgstr "Configuração do Log" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID do jogo:" @@ -2898,15 +3014,15 @@ msgstr "O jogo não está rodando!" msgid "Game not found!!" msgstr "Jogo não encontrado!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Opções especificas do jogo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Opçõesdojogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2917,6 +3033,7 @@ msgstr "Configurações de &Controle de Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2924,6 +3041,9 @@ msgstr "Configurações de &Controle de Gamecube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" @@ -2932,15 +3052,17 @@ msgid "Gamecube Pad settings" msgstr "Configurações do controle de Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Códigos Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Falha ao rodar o GeckoCode (CT%i CST%i) (%s)\n" "(É um código ruim ou um tipo de código não suportado.)" @@ -2955,8 +3077,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2965,6 +3091,7 @@ msgstr "Geral" msgid "General Settings" msgstr "Configurações Gerais" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2980,6 +3107,11 @@ msgstr "Configurações Gerais" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemão" @@ -3017,7 +3149,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grego" @@ -3049,7 +3181,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:303 msgid "Hebrew" msgstr "Hebreu" @@ -3119,12 +3251,16 @@ msgstr "Configuração de hotkey" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Hotkeys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Húngaro" @@ -3132,13 +3268,13 @@ msgstr "Húngaro" msgid "Hybrid Wiimote" msgstr "Wiimote Hibrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3151,11 +3287,11 @@ msgstr "" "TitleID %016llx.\n" " O Dolphin vai provavelmente travar agora" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Destino ruim" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Definições de IPL" @@ -3171,15 +3307,15 @@ msgstr "Ponteiro IR" msgid "IR Sensitivity:" msgstr "Sensibilidade IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Detalhes da ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Diretórios de ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITÃLIA" @@ -3187,19 +3323,20 @@ msgstr "ITÃLIA" msgid "Icon" msgstr "Icone" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 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)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 @@ -3209,9 +3346,14 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). 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), você também vai precisar desativar o Throttle de " @@ -3249,7 +3391,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importar Save" @@ -3300,7 +3442,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe esta opção desativada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Funciona" @@ -3309,7 +3451,7 @@ msgid "In-Game" msgstr "In-Game" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3329,7 +3471,7 @@ msgstr "Inserir" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserir Código Encryptado ou Decriptado aqui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Insira cartão SD" @@ -3341,7 +3483,7 @@ msgstr "Insira nome aqui.." msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Instalar para o menu do WII" @@ -3352,6 +3494,7 @@ msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3361,14 +3504,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instalando WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Opções de interface" @@ -3393,11 +3539,11 @@ msgstr "Erro Interno do LZO - lzo_init() falhou" msgid "Internal Resolution:" msgstr "Resolução Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpretador (MUITO lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3414,7 +3560,7 @@ msgstr "Valor Inválido!" msgid "Invalid bat.map or dir entry" msgstr "Bat.map ou entrada de Diretório inválidas" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Tipo de evento %i inválido" @@ -3434,14 +3580,15 @@ msgstr "" "%s\n" "Você pode precisar refazer o dump deste jogo." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Arquivo de gravação inválido" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Estado Salvo Inválido" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3457,27 +3604,32 @@ msgstr "Estado Salvo Inválido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPÃO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT recompilador (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL recompilador experimental" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonês" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "CORÉIA" @@ -3486,8 +3638,8 @@ msgstr "CORÉIA" msgid "Key" msgstr "Chave" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coreano" @@ -3505,7 +3657,7 @@ msgstr "Botão L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Linguagem:" @@ -3558,7 +3710,7 @@ msgstr "" msgid "Less Than" msgstr "Menor que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limitar por FPS" @@ -3566,7 +3718,7 @@ msgstr "Limitar por FPS" msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Carregar Texturas Personalizadas" @@ -3614,6 +3766,7 @@ msgstr "Carregar Estado do Slot 8" msgid "Load State..." msgstr "Carregar State..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3635,6 +3788,13 @@ msgstr "Carregar Menu de Sistema do Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Carregar Menu de Sistema do Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Menu de Sistema do Wii %d %c" @@ -3662,7 +3822,7 @@ msgstr "Carrega o arquivo especificado (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Separar tarefas em núcleos" @@ -3674,11 +3834,11 @@ msgstr "Log" msgid "Log Configuration" msgstr "Configuração do Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipo de Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Resposta do Logger" @@ -3708,7 +3868,7 @@ msgstr "" "Incompatibilidade do MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Hack de velocidade MMU" @@ -3730,11 +3890,11 @@ msgstr "Arquivos de Gameshark MadCatz(*.gcs)" msgid "Main Stick" msgstr "Analógico Principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID da fabricante:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Fabricante:" @@ -3758,6 +3918,7 @@ msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3765,6 +3926,9 @@ msgstr "Byte de Memória" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Cartão de memoria" @@ -3801,7 +3965,7 @@ msgstr "O tamanho do arquivo do Memory Card é diferente do tamanho do header" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Microfone" @@ -3810,11 +3974,11 @@ msgstr "Microfone" msgid "Min" msgstr "Mínimo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Diversas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Opções diversas" @@ -3836,7 +4000,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Fonte Monospaced" @@ -3849,7 +4013,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3871,7 +4035,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplicar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3963,6 +4127,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3972,6 +4137,9 @@ msgstr "NP Cima" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3980,7 +4148,7 @@ msgstr "Nome:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nome:" @@ -3994,7 +4162,7 @@ msgid "New Scan" msgstr "Nova Busca" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Próxima Página" @@ -4006,7 +4174,7 @@ msgstr "Próxima Busca" msgid "Nickname :" msgstr "Nick:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Sem região (SDK)" @@ -4045,7 +4213,7 @@ msgstr "Nenhuma pasta de salva encontrada para o título %s" msgid "None" msgstr "Nenhum" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norueguês Bokmaal" @@ -4053,8 +4221,8 @@ msgstr "Norueguês Bokmaal" msgid "Not Equal" msgstr "Não igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Indefinido" @@ -4074,7 +4242,7 @@ msgstr "Não conectado" msgid "Notes" msgstr "Notas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notas:" @@ -4112,7 +4280,7 @@ msgstr "Objeto" msgid "Object Range" msgstr "Alcance do Objeto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Desligado" @@ -4138,11 +4306,11 @@ msgstr "Apenas %d blocos disponíveis" msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Abrir &conteúdo da pasta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Abrir pasta do &save do WII" @@ -4164,11 +4332,11 @@ msgstr "OpenAL: Não foi possível encontrar dispositivos de som" msgid "OpenAL: can't open device %s" msgstr "OpenAL: não foi possível abrir o dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "Decodificador de Texturas OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "Decodificador de Texturas OpenMP" @@ -4200,7 +4368,7 @@ msgstr "" "e importe-os para um novo Memory Card\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Outros" @@ -4252,19 +4420,20 @@ msgstr "Parágrafo" msgid "Parameters" msgstr "Parâmetros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partição %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Diretórios" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4277,6 +4446,10 @@ msgstr "Diretórios" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausar" @@ -4285,7 +4458,7 @@ msgstr "Pausar" msgid "Per-Pixel Lighting" msgstr "Iluminação Por Pixels" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfeito" @@ -4298,6 +4471,7 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4308,6 +4482,10 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Executar" @@ -4321,7 +4499,7 @@ msgstr "Reproduzir Gravação" msgid "Play/Pause" msgstr "Executar/Pausar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Jogável" @@ -4333,6 +4511,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4342,6 +4521,9 @@ msgstr "Jogadores" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Favor confirmar..." @@ -4353,23 +4535,23 @@ 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:309 msgid "Polish" msgstr "Polonês" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Porta 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Porta 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Porta 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Porta 4" @@ -4378,11 +4560,11 @@ msgstr "Porta 4" msgid "Port :" msgstr "Porta:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Português" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Português (Brasil)" @@ -4390,17 +4572,17 @@ msgstr "Português (Brasil)" msgid "Post-Processing Effect:" msgstr "Efeito Pós-Processamento" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4413,7 +4595,7 @@ msgstr "Predefinidos:" msgid "Prev Page" msgstr "Pág. Anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Página Anterior" @@ -4464,7 +4646,7 @@ msgstr "R-Analógico" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "Russia" @@ -4477,7 +4659,7 @@ msgstr "Alcance" msgid "Read-only mode" msgstr "Modo Somente Leitura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Real" @@ -4552,6 +4734,7 @@ msgstr "Atualizar Lista" msgid "Refresh game list" msgstr "Atualizar a lista de jogos" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4570,6 +4753,12 @@ msgstr "Atualizar a lista de jogos" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Remover" @@ -4622,11 +4811,11 @@ msgstr "Analógico Direito" msgid "Rumble" msgstr "Vibração" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Executar o DSP LLE em um segmento dedicado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russo" @@ -4634,10 +4823,11 @@ msgstr "Russo" msgid "Sa&ve State" msgstr "Sal&var estado atual" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4647,6 +4837,9 @@ msgstr "Seguro" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4704,12 +4897,12 @@ msgstr "Salvar Estado Atual no Slot 8" msgid "Save State..." msgstr "Salvar estado atual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Salvar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Salvar GCM/ISO comprimido" @@ -4717,11 +4910,11 @@ msgstr "Salvar GCM/ISO comprimido" msgid "Save current perspective" msgstr "Salvar perspectiva atual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Salvar GCM/ISO descomprimido" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." @@ -4730,6 +4923,7 @@ msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." msgid "Scaled EFB Copy" msgstr "Cópia Escalada do EFB" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4739,15 +4933,18 @@ msgstr "Cópia Escalada do EFB" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Escaneando %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Procurando por ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Escaneando..." @@ -4763,12 +4960,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Filtro de Busca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Procurar em sub-pastas" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "A seção %s não foi encontrada no SYSCONF" @@ -4778,6 +4975,7 @@ msgstr "A seção %s não foi encontrada no SYSCONF" msgid "Select" msgstr "Selecionar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4802,6 +5000,14 @@ msgstr "Selecione o arquivo de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Selecione o arquivo de Gravação" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" @@ -4826,6 +5032,7 @@ msgstr "Selecionar Janelas flutuantes" msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4842,19 +5049,26 @@ msgstr "Selecione um estado para carregar" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Selecione o arquivo de salva" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Selecione um estado para carregar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Selecione um estado para salvar" @@ -4876,7 +5090,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione Automático." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Fonte Selecionada" @@ -4924,10 +5138,11 @@ msgstr "Posição da Sensor Bar:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Sérvio" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 @@ -4937,6 +5152,9 @@ msgstr "Sérvio" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4947,11 +5165,11 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Definir como ISO &padrão" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Definir como Memory Card padrão%c" @@ -4962,7 +5180,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/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Configurações..." @@ -4974,7 +5192,7 @@ msgstr "SetupWiiMem: Arquivo de configuração não encontrado" msgid "Shake" msgstr "Sacudir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Nome Curto:" @@ -5002,7 +5220,7 @@ msgstr "Show Barra de &Ferramentas" msgid "Show Drives" msgstr "Mostrar Drives" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Mostrar Regiões de Cópia do EFB" @@ -5018,7 +5236,7 @@ msgstr "Mostrar França" msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Mostrar" @@ -5034,7 +5252,7 @@ msgstr "Mostrar JAP" msgid "Show Korea" msgstr "Mostrar Coréia" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Mostrar Idioma:" @@ -5054,7 +5272,7 @@ msgstr "Mostrar Plataformas" msgid "Show Regions" msgstr "Mostrar Regiões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Mostrar Estatísticas" @@ -5074,11 +5292,11 @@ msgstr "Mostrar Wad" msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -5088,23 +5306,23 @@ msgstr "" "Desabilitar isso pode evitar menssagens irritantes e não-fatais, mas também " "pode fazer com que o Dolphin trave sem nenhuma explicação." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Mostrar o primeiro bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Mostrar blocos de save" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Mostar comentário do save" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Mostrar ícone do salva" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Mostrar título do salva" @@ -5142,7 +5360,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote na Horizontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Chinês Simplificado" @@ -5150,11 +5368,11 @@ msgstr "Chinês Simplificado" msgid "Size" msgstr "Tamanho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Pular a BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Não fazer o Dest. Alpha Pass" @@ -5197,11 +5415,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5225,7 +5443,7 @@ msgstr "" "Você realmente quer utilizar o Renderizador por Software? Se estiver em " "dúvida, pressione 'Não'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Configurações de Som" @@ -5243,6 +5461,7 @@ msgstr "Falha na criação do buffer de som: %s" msgid "Space" msgstr "Barra de Espaço" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5258,6 +5477,11 @@ msgstr "Barra de Espaço" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espanhol" @@ -5289,7 +5513,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Especifique um Backend de Vídeo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Aumentar a velocidade de transferência do disco" @@ -5297,7 +5521,7 @@ msgstr "Aumentar a velocidade de transferência do disco" msgid "Square Stick" msgstr "Analógico Quadrado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Controle Padrão" @@ -5395,12 +5619,12 @@ msgstr "Arquivos de salva importados com sucesso" msgid "Swing" msgstr "Balançar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Idioma do Systema:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5439,7 +5663,7 @@ msgstr "Direita da Mesa" msgid "Take Screenshot" msgstr "Capturar Tela" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5455,7 +5679,7 @@ msgstr "Textura" msgid "Texture Cache" msgstr "Cache de Texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Sobreposição Formato das Texturas" @@ -5471,13 +5695,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "O diretório escolhido já está na lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5500,7 +5724,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "O Arquivo %s já foi aberto, o header do arquivo não será escrito." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "O arquivo que você especificou (%s) não existe" @@ -5518,11 +5742,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "O código AR resultante da derciptação não contém nenhuma linha." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "Quanto mais Seguro, menor será a probabilidade do emulador perder alguma " "atualização de textura da RAM.\n" @@ -5567,7 +5792,7 @@ msgstr "O arquivo especificado \"%s\" não existe" msgid "The value is invalid" msgstr "O valor é inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" @@ -5575,7 +5800,7 @@ msgstr "Tema" msgid "Theme selection went wrong" msgstr "A seleção do tema deu errado" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5583,7 +5808,7 @@ msgstr "" "É necessário um ticket para 00000001/00000002. O seu Dump do NAND está " "provavelmente incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5599,7 +5824,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:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 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." @@ -5624,25 +5849,10 @@ msgstr "" "Se estiver em dúvida, deixe isto desativado." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Isto é usado para controlar a velocidade do jogo por throttle de som.\n" -"Desativar isso pode causar velocidade de jogo anormal, ás vezes muito " -"rápido.\n" -"Mas algumas vezes ativar isso pode causar ruído constante.\n" -"\n" -"Atalho de Teclado : Segure para instantaneamente desativar o Throttle." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Isto é usado para tocar trilhas sonoras de jogos, como BGM" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5654,7 +5864,7 @@ msgstr "" "Dá um grande aumento de velocidade para PCs com mais de um núcleo, mas " "também pode causar travamentos/erros ocasionais." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Isto vai deixar você editar manualmente o arquivo de configuração .INI" @@ -5677,7 +5887,7 @@ msgstr "Título" msgid "To" msgstr "Para" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Ligar/Desligar Todos os Logs" @@ -5697,6 +5907,7 @@ msgstr "Ir para Tela Cheia" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5704,14 +5915,17 @@ msgstr "Ir para Tela Cheia" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Topo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chinês Tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Houve a tentativa de carregar um tipo de arquivo desconhecido." @@ -5719,7 +5933,7 @@ msgstr "Houve a tentativa de carregar um tipo de arquivo desconhecido." msgid "Triggers" msgstr "Gatilhos" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Tentando ler de um SYSCONF inválido" @@ -5731,7 +5945,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:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turco" @@ -5752,11 +5966,11 @@ msgstr "Porta UDP:" msgid "UDP Wiimote" msgstr "Wiimote UDP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "DESCONHECIDO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "EUA" @@ -5842,7 +6056,7 @@ msgstr "Atualizar" msgid "Upright Wiimote" msgstr "Wiimote na Vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" @@ -5854,7 +6068,7 @@ msgstr "Usar Tela Cheia" msgid "Use Hex" msgstr "Usar Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Usar Panic Handlers" @@ -5886,7 +6100,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Utilitário" @@ -5910,25 +6124,29 @@ msgstr "Valor:" msgid "Verbosity" msgstr "Verbosidade" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, 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:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Falha na instalação da WAD: Erro na criação de %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5947,15 +6165,15 @@ msgstr "" msgid "Warning" msgstr "Aviso" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Aviso - Inicializando DOL no modo de console errado!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Aviso - Inicializando ELF no modo de console errado!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Aviso - Inicializando ISO no modo de console errado!" @@ -5985,7 +6203,7 @@ msgstr "" "que tenham o mesmo nome de um arquivo do Memory Card\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5993,7 +6211,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -6001,7 +6219,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -6029,7 +6247,7 @@ msgstr "WaveFileWriter - Arquivo não aberto." msgid "Whammy" msgstr "Distorção" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack de Widescreen" @@ -6037,15 +6255,15 @@ msgstr "Hack de Widescreen" msgid "Width" msgstr "Largura" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Console do Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Raiz do Wii NAND" @@ -6053,6 +6271,7 @@ msgstr "Raiz do Wii NAND" msgid "Wii Save Import" msgstr "Importar Save de Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6062,6 +6281,9 @@ msgstr "Importar Save de Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Arquivos de Salva do Wii (*.bin)|*.bin" @@ -6128,10 +6350,11 @@ msgstr "Menu de Janelas" msgid "Windows Right" msgstr "Janelas da Direita" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6147,6 +6370,11 @@ msgstr "Word Wrap" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Funcionando..." @@ -6154,6 +6382,11 @@ msgstr "Funcionando..." msgid "Write to Console" msgstr "Escrever no Console" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Escrever para o Arquivo" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Escrever para o Arquivo" @@ -6210,7 +6443,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 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." @@ -6233,7 +6466,7 @@ msgstr "" "Ele deveria ter 0x%04x (mas tem 0x%04llx)\n" "Você gostaria de gerar um novo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "Hack do ZTB" @@ -6305,7 +6538,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6338,12 +6571,12 @@ msgstr "" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "Cmd 0x%08x desconhecido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute devolveu -1 ao rodar o aplicativo!" @@ -6503,6 +6736,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Configurações de Display do Emulador" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Ativar Throttle de Ãudio" + #~ msgid "Enable CPU Access" #~ msgstr "Ativar Acesso da CPU" @@ -6803,6 +7039,21 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "O arquivo" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Isto é usado para controlar a velocidade do jogo por throttle de som.\n" +#~ "Desativar isso pode causar velocidade de jogo anormal, ás vezes muito " +#~ "rápido.\n" +#~ "Mas algumas vezes ativar isso pode causar ruído constante.\n" +#~ "\n" +#~ "Atalho de Teclado : Segure para instantaneamente desativar o " +#~ "Throttle." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Isto é geralmente usado para efeitos de som e voz." diff --git a/Languages/po/ru.po b/Languages/po/ru.po index 31745e4349..c882cf9f5b 100644 --- a/Languages/po/ru.po +++ b/Languages/po/ru.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-20 14:40+0300\n" "Last-Translator: firnis \n" "Language-Team: Russian <>\n" @@ -59,9 +63,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sКопировать%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Гц" @@ -153,7 +157,7 @@ msgstr "%sЭкÑпоритровать GCI%s" msgid "%sImport GCI%s" msgstr "%sИмпортировать GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, fuzzy, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%d Ñвободных блоков; %d Ñвободных запиÑей каталогов" @@ -187,11 +191,11 @@ msgstr "Менеджер &читов" msgid "&DSP Settings" msgstr "&Опции аудио" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Удалить ISO-файл..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Удалить выбранные ISO-файлы..." @@ -257,7 +261,7 @@ msgstr "&Пауза" msgid "&Play" msgstr "&ЗапуÑтить" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&СвойÑтва" @@ -301,7 +305,7 @@ msgstr "&Вид" msgid "&Wiimote Settings" msgstr "Опц&ии Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -346,7 +350,7 @@ msgstr "<Введите название>" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<Ðичего>" @@ -355,7 +359,7 @@ msgstr "<Ðичего>" msgid "" msgstr "<Ðажмите кнопку>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<СиÑтемный>" @@ -411,13 +415,13 @@ msgstr "" "\n" "Ð”Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¸Ð³Ñ€Ñ‹ вам необходимо открыть указанный порт на вашем роутере!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR-коды" @@ -429,11 +433,11 @@ msgstr "Об ÑмулÑторе Dolphin" msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" @@ -535,11 +539,11 @@ msgstr "Ðдаптер:" msgid "Add" msgstr "Добавить" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Добавление ActionReplay-кода" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Добавление патча" @@ -547,6 +551,7 @@ msgstr "Добавление патча" msgid "Add new pane" msgstr "Добавить панель" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -562,6 +567,11 @@ msgstr "Добавить панель" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Добавить..." @@ -595,11 +605,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "РаÑширенные наÑтройки" @@ -608,14 +618,15 @@ msgstr "РаÑширенные наÑтройки" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Ð’Ñе GC/Wii-файлы (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Ð’Ñе образа от GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Ð’Ñе GCM-файлы Gamecube (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -628,18 +639,22 @@ msgstr "Ð’Ñе GCM-файлы Gamecube (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Файлы быÑтрых Ñохранений (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Файлы образов Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Сжатые образа диÑков GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Ð’Ñе файлы (*.*)|*.*" @@ -651,7 +666,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Эмулируемый Wiimote" @@ -672,7 +687,7 @@ msgstr "Загрузчик неверноего размера... Ñто точ msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Загрузчик:" @@ -687,7 +702,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -696,7 +711,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "Ð’Ñ‹ уверены, что хотите удалить \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -704,10 +719,11 @@ msgstr "" "Ð’Ñ‹ уверены, что хотите удалить Ñти файлы?\n" "Они иÑчезнут навÑегда!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтот файл? Он иÑчезнет навÑегда!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -717,6 +733,9 @@ msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтот фай ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Соотношение Ñторон:" @@ -725,19 +744,21 @@ msgstr "Соотношение Ñторон:" msgid "At least one pane must remain open." msgstr "Ð¥Ð¾Ñ‚Ñ Ð±Ñ‹ одна панель должна быть открыта." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 #, fuzzy msgid "Audio Backend:" msgstr "СиÑтема вывода" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва вывода звука.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -747,6 +768,9 @@ msgstr "AudioCommon: Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва выво ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Ðвто" @@ -787,7 +811,7 @@ msgstr "" msgid "Back" msgstr "Ðазад" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 #, fuzzy msgid "Backend Settings" msgstr "ОÑновные наÑтройки" @@ -816,11 +840,11 @@ msgstr "Ðеверный заголовок файла" msgid "Banner" msgstr "Логотип" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Данные логотипа" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Логотип:" @@ -832,7 +856,7 @@ msgstr "Панель" msgid "Basic" msgstr "ОÑновные" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "ОÑновные наÑтройки" @@ -863,6 +887,7 @@ msgstr "СинÑÑ Ñправа" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -870,6 +895,9 @@ msgstr "СинÑÑ Ñправа" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Ñнизу" @@ -878,7 +906,7 @@ msgstr "Ñнизу" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Ðе работает" @@ -894,7 +922,7 @@ msgstr "Выберите папку Ñ Ð¾Ð±Ñ€Ð°Ð·Ð°Ð¼Ð¸ игр" msgid "Browse for an ISO directory..." msgstr "Выбор папки Ñ ISO-файлами..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Укажите папку Ð´Ð»Ñ ÑохранениÑ" @@ -924,11 +952,11 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Режим ÑмулÑции CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "" @@ -967,7 +995,7 @@ msgstr "Ðе удалоÑÑŒ открыть %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -977,7 +1005,7 @@ msgstr "" "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать Ñтот файл, как карту памÑти\n" "Ð’Ñ‹ пытаетеÑÑŒ иÑпользовать один файл в обоих Ñлотах?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -995,8 +1023,6 @@ msgstr "Ðе получаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ WiiMote по адреÑу: %02x:%02 msgid "Cant find WiiMote by connection handle %02x" msgstr "Ðе получаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ WiiMote по деÑкриптору %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1006,7 +1032,7 @@ msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð· DVD_Plugin - DVD-Interface: Критич msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -1032,7 +1058,7 @@ msgstr "Сменить &диÑк..." msgid "Change Game" msgstr "Сменить игру" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1048,8 +1074,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ опции вÑтупÑÑ‚ в Ñилу только поÑле перезапуÑка ÑмулÑтора." @@ -1070,33 +1096,33 @@ msgstr "ПоиÑк кодов" msgid "Cheats Manager" msgstr "Менеджер чит-кодов" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 #, fuzzy msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Выберите оÑновной DVD-диÑк:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Выберите оÑновной DVD-диÑк:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Выберите файл образа:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Выберите папку Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² ÑпиÑок" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Выберите файл карты памÑти" @@ -1104,14 +1130,14 @@ msgstr "Выберите файл карты памÑти" msgid "Choose a memory card:" msgstr "Выберите карту памÑти:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Выберите папку Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²" @@ -1123,14 +1149,14 @@ msgstr "" msgid "Classic" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "ОчиÑтить" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "" @@ -1146,6 +1172,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1154,6 +1181,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Закрыть" @@ -1177,20 +1208,20 @@ msgstr "" msgid "Comment" msgstr "Комментарий" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Комментарий:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Сжать ISO-файл..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Сжать выбранные ISO-файлы..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Сжатие образа" @@ -1217,13 +1248,13 @@ msgstr "ÐаÑтроить контроллеры" msgid "Configure..." msgstr "ÐаÑтройка ÑмулÑтора..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "Потверждение при оÑтановке ÑмулÑции" @@ -1233,7 +1264,7 @@ msgstr "Потверждение при оÑтановке ÑмулÑции" msgid "Connect" msgstr "ПодключитьÑÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Подключить USB-клавиатуру" @@ -1290,12 +1321,12 @@ msgstr "Конвертировать в GCI" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Копировать на карту памÑти %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Ядро" @@ -1325,7 +1356,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Ðе удалоÑÑŒ определить ISO образ %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Ðе удалоÑÑŒ Ñохранить %s" @@ -1336,7 +1367,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1348,7 +1379,7 @@ msgstr "" "\n" "Ð’Ñ‹ запуÑтили Dolphin Ñ CD/DVD, или файл защищен от запиÑи?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1363,7 +1394,7 @@ msgstr "" msgid "Count:" msgstr "Счетчик:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Страна:" @@ -1377,26 +1408,26 @@ msgstr "Создать новый AR-код" msgid "Create new perspective" msgstr "Создать новую точку обозрениÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Стиль от KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Стиль от Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Стиль от VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "Стиль Ñоздан black_rider'ом и опубликован на ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Создатель:" @@ -1404,7 +1435,7 @@ msgstr "Создатель:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "обрезать" @@ -1424,7 +1455,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° ÑменилаÑÑŒ Ñ %s на %s поÑле wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 #, fuzzy msgid "Custom Projection Hack" msgstr "Projection-хак: " @@ -1434,11 +1465,11 @@ msgstr "Projection-хак: " msgid "Custom Projection Hack Settings" msgstr "Projection-хак: " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" @@ -1450,11 +1481,12 @@ msgstr "" msgid "DSP" msgstr "Ðудио" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 #, fuzzy msgid "DSP Emulator Engine" msgstr "Режим ÑмулÑции CPU" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1465,20 +1497,24 @@ msgstr "Режим ÑмулÑции CPU" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 #, fuzzy msgid "DSP LLE interpreter (slow)" msgstr "Интерпретатор (ОЧЕÐЬ медленный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 #, fuzzy msgid "DSP LLE on Thread" msgstr "Обрабатывать DSP LLE отдельным потоком" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" @@ -1486,15 +1522,23 @@ msgstr "" msgid "DSP settings" msgstr "ÐаÑтройка аудио (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD-диÑк:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Размер данных" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Дата:" @@ -1515,7 +1559,7 @@ msgstr "ÐœÐµÑ€Ñ‚Ð²Ð°Ñ Ð·Ð¾Ð½Ð°" msgid "Debug" msgstr "Отладка" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Debugging" msgstr "Отладка" @@ -1524,16 +1568,16 @@ msgstr "Отладка" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "СнÑÑ‚ÑŒ Ñжатие Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… ISO-файлов..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "" @@ -1541,11 +1585,11 @@ msgstr "" msgid "Default" msgstr "СброÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Образ по умолчанию:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Шрифт по умолчанию" @@ -1554,7 +1598,7 @@ msgstr "Шрифт по умолчанию" msgid "Delete" msgstr "Удалить" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Удалить Ñохранение" @@ -1563,7 +1607,7 @@ msgstr "Удалить Ñохранение" msgid "Delete the existing file '%s'?" msgstr "Удалить ÑущеÑтвующий файл '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 #, fuzzy msgid "Description" msgstr "ВопроÑ" @@ -1572,8 +1616,8 @@ msgstr "ВопроÑ" msgid "Detect" msgstr "Определить" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1584,8 +1628,8 @@ msgstr "" msgid "Device" msgstr "УÑтройÑтво" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "ÐаÑтройки уÑтройÑтв" @@ -1608,25 +1652,25 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "Отключить туман" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Отключить туман" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Отключить оÑвещение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "Глубина пикÑелÑ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Отключить текÑтуры" @@ -1656,7 +1700,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "ДиÑк" @@ -1680,6 +1724,7 @@ msgstr "" msgid "Divide" msgstr "/" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1689,10 +1734,13 @@ msgstr "/" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Ð’Ñ‹ хотите оÑтановить ÑмулÑцию?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1718,6 +1766,7 @@ msgstr "ÐаÑтройки Ñмулируемого Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1742,6 +1791,14 @@ msgstr "ÐаÑтройки Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "ÐаÑтройки Dolphin GCPad" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1774,11 +1831,11 @@ msgstr "" msgid "Down" msgstr "Вниз" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Скачать готовые коды (база WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Скачано %lu кодов. (добавлено %lu)" @@ -1787,23 +1844,23 @@ msgstr "Скачано %lu кодов. (добавлено %lu)" msgid "Drums" msgstr "Барабаны" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "" @@ -1829,6 +1886,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1844,6 +1902,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Dutch" msgstr "Dutch" @@ -1869,7 +1932,7 @@ msgstr "" "%d -- ЕÑли вы недавно обновили Dolphin , то Ñкорее вÑего необходимо " "перегрузить компьютер, чтобы Windows обнаружил новыйдрайвер." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "ЕВРОПÐ" @@ -1885,7 +1948,7 @@ msgstr "Изменить" msgid "Edit ActionReplay Code" msgstr "Изменить код ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Править вручную" @@ -1897,8 +1960,8 @@ msgstr "" msgid "Edit current perspective" msgstr "Изменить точку" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Изменить..." @@ -1937,7 +2000,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Эмулируемый Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "КачеÑтво ÑмулÑции:" @@ -1959,23 +2022,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Включить логирование AR-Ñобытий" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Включить аудиотроттлинг" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Включить BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Включить Ñовмещение блоков" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1989,6 +2052,7 @@ msgstr "" msgid "Enable Cache" msgstr "кÑшировать" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1998,52 +2062,55 @@ msgstr "кÑшировать" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Включить чит-коды" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Включить DTK-музыку" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Включить DualCore-режим" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Включить DualCore-режим (уÑкорение)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Включить горÑчие клавиши" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Включить IdleSkipping-режим" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Включить IdleSkipping-режим (уÑкорение)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Включить MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Включить прогреÑÑивную развертку" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "Включить широкий Ñкран" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Включить широкий Ñкран" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Включить ÐºÐ°Ñ€ÐºÐ°Ñ Ð¼Ð¾Ð´ÐµÐ»ÐµÐ¹" @@ -2060,7 +2127,7 @@ msgstr "" "Повышает визуальное качеÑтво текÑтур, находÑщихÑÑ Ð¿Ð¾Ð´ наклоном\n" "к углу обзора." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2068,7 +2135,7 @@ msgstr "" "Ðктивирует режим быÑтрого доÑтуп к диÑку, необходим Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… игр " "(отключите Ð´Ð»Ñ Ð¿Ð¾Ð²Ñ‹ÑˆÐµÐ½Ð¸Ñ ÑовмеÑтимоÑти)." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "" @@ -2088,7 +2155,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2096,7 +2163,7 @@ msgstr "" "УÑкорÑет игру The Legend of Zelda: Twilight Princess. Ð”Ð»Ñ Ð»ÑŽÐ±Ð¾Ð¹ ДРУГОЙ игры " "данный хак должен быть ОТКЛЮЧЕÐ." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2105,7 +2172,7 @@ msgstr "" "Ðктивирует Ñмещение адреÑа блока (Block Address Translation, BAT), одну из " "функций MMU. Повышает точноÑÑ‚ÑŒ ÑмулÑции ценой ÑÐ½Ð¸Ð¶ÐµÐ½Ð¸Ñ ÑкороÑти." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 #, fuzzy msgid "Enables Custom Projection Hack" msgstr "Projection-хак: " @@ -2118,7 +2185,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2138,6 +2205,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2153,6 +2221,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "English" msgstr "English" @@ -2184,6 +2257,7 @@ msgstr "Равно" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Ошибки" @@ -2214,18 +2288,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Ошибки" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Ошибка загрузки выбранного Ñзыка. ВозвращаемÑÑ Ðº Ñтандартному." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2261,7 +2341,7 @@ msgstr "Закрыть Dolphin Ñ ÑмулÑтором" msgid "Export Failed" msgstr "ЭкÑпортирование файла" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "ЭкÑпортирование файла" @@ -2275,15 +2355,15 @@ msgstr "&ЭкÑпортировать запиÑÑŒ процеÑÑа" msgid "Export Recording..." msgstr "&ЭкÑпортировать запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "ЭкÑпортировать Ñохранение" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "ЭкÑпортировать Ñохранение Wii (ÑкÑперемент)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "ЭкÑпортировать вÑе ÑохранениÑ" @@ -2300,7 +2380,7 @@ msgstr "&ЭкÑпортировать Ñохранение как..." msgid "Extension" msgstr "РаÑширение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "" @@ -2312,44 +2392,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Извлечь вÑе файлы..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Извлечь apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Извлечь DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "ИзвлеÑÑŒ папку..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Извлечь файл..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Извлечь раздел..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Извлечение %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Извлечение вÑех файлов" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Извлечение папки" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Подождите..." @@ -2361,11 +2441,11 @@ msgstr "" msgid "FIFO Player" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "ФРÐÐЦИЯ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Размер ТФС:" @@ -2377,11 +2457,11 @@ msgstr "Ошибка подключаниÑ!" msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Ошибка ÑÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð´Ð¾Ð²." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Ошибка Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ð² %s!" @@ -2478,18 +2558,28 @@ msgstr "Ошибка запиÑи заголовка Ð´Ð»Ñ %s" msgid "Failed to write header for file %d" msgstr "Ошибка запиÑи заголовка Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "быÑтрое" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Более быÑÑ‚Ñ€Ð°Ñ Ð²ÐµÑ€Ñи MMU (работает не Ñо вÑеми играми)." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "" @@ -2499,7 +2589,7 @@ msgstr "" msgid "File Info" msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ коде" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Файл не Ñодержит кодов." @@ -2532,16 +2622,16 @@ msgstr "" msgid "File not compressed" msgstr "Файл не Ñжат" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: неизвеÑтный режим Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2549,7 +2639,7 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "ИÑправить контрольную Ñумму" @@ -2561,7 +2651,7 @@ msgstr "16:9" msgid "Force 4:3" msgstr "4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "УÑтановить регион конÑоли как NTSC-J" @@ -2587,7 +2677,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2623,7 +2713,7 @@ msgstr "РаÑширенные" msgid "Frame Advance" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "" @@ -2636,7 +2726,7 @@ msgstr "РаÑширенные" msgid "Frame S&kipping" msgstr "&ПропуÑк кадров" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Лимит кадров:" @@ -2644,10 +2734,11 @@ msgstr "Лимит кадров:" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Свободный обзор" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2663,6 +2754,11 @@ msgstr "Свободный обзор" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "French" msgstr "French" @@ -2698,7 +2794,7 @@ msgstr "ÐаÑтройка \"горÑчих\" клавиш" msgid "GCPad" msgstr "ДжойÑтик" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID игры:" @@ -2714,15 +2810,15 @@ msgstr "Игра не запущена!" msgid "Game not found!!" msgstr "Игра не найдена!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "ПерÑональные наÑтройки игр" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "ÐаÑтройки игры" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2734,6 +2830,7 @@ msgstr "Опции &контроллера Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2741,6 +2838,9 @@ msgstr "Опции &контроллера Gamecube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памÑти Gamecube (*.raw,*.gcp)" @@ -2749,15 +2849,17 @@ msgid "Gamecube Pad settings" msgstr "ÐаÑтройка контроллера GameCube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko-коды" -#: Source/Core/Core/Src/GeckoCode.cpp:139 +#: Source/Core/Core/Src/GeckoCode.cpp:222 #, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 @@ -2770,8 +2872,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Общие" @@ -2781,6 +2887,7 @@ msgstr "Общие" msgid "General Settings" msgstr "ÐаÑтройки интерфейÑа" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2796,6 +2903,11 @@ msgstr "ÐаÑтройки интерфейÑа" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "German" msgstr "German" @@ -2828,7 +2940,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 #, fuzzy msgid "Greek" msgstr "Greek" @@ -2861,7 +2973,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Ошибка контрольной Ñуммы заголовка" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 #, fuzzy msgid "Hebrew" msgstr "Hebrew" @@ -2932,12 +3044,16 @@ msgstr "ÐаÑтройка \"горÑчих\" клавиш" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Клавиши" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 #, fuzzy msgid "Hungarian" msgstr "Hungarian" @@ -2946,12 +3062,12 @@ msgstr "Hungarian" msgid "Hybrid Wiimote" msgstr "Гибридный Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2964,11 +3080,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin cкорее вÑего завиÑнет" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "ÐаÑтройки конÑоли (IPL)" @@ -2984,15 +3100,15 @@ msgstr "ИК указатель" msgid "IR Sensitivity:" msgstr "ЧувÑтвительноÑÑ‚ÑŒ IR-Ñигнала:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Данные образа" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Папки Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸ образов" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ИТÐЛИЯ" @@ -3000,13 +3116,13 @@ msgstr "ИТÐЛИЯ" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 #, fuzzy msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -3014,11 +3130,12 @@ msgstr "" "Ðктивирует уÑтройÑтво ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¼Ñтью, требуетÑÑ Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… игр " "(Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð²Ñ‹ÑˆÐ°ÐµÑ‚ ÑовмеÑтимоÑÑ‚ÑŒ, Ð´ÐµÐ°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ - ÑкороÑÑ‚ÑŒ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). 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)\n" @@ -3049,7 +3166,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Импортировать Ñохранение" @@ -3098,7 +3215,7 @@ msgstr "" "Отключение оÑÐ²ÐµÑ‰ÐµÐ½Ð¸Ñ ÑƒÐ»ÑƒÑ‡ÑˆÐ°ÐµÑ‚ производительноÑÑ‚ÑŒ, но оÑвещение полноÑтью " "пропадет в играх, которые его иÑпользуют." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Почти играбельна" @@ -3107,7 +3224,7 @@ msgid "In-Game" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "ИнформациÑ" @@ -3127,7 +3244,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "Ð’Ñтавьте Ñюда Ñам код (шифрованный или нешифрованный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Ð’Ñтавить SD-карту" @@ -3140,7 +3257,7 @@ msgstr "Введите Ð¸Ð¼Ñ ÐºÐ¾Ð´Ð°..." msgid "Install WAD" msgstr "УÑтановка Wii-меню" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "УÑтановить в меню Wii" @@ -3150,6 +3267,7 @@ msgid "" msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3159,16 +3277,19 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "УÑтанавливаетÑÑ WAD в меню Wii..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "ÐаÑтройки интерфейÑа" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "ÐаÑтройки интерфейÑа" @@ -3194,11 +3315,11 @@ msgstr "ВнутренÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° LZO - ошибка в lzo_init()" msgid "Internal Resolution:" msgstr "Разрешение полноÑкранного режима:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Интерпретатор (ОЧЕÐЬ медленный)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "ЗаÑтавка" @@ -3215,7 +3336,7 @@ msgstr "Ðеверное значение!" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Ðеверный тип ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ %i" @@ -3235,14 +3356,15 @@ msgstr "" "%s\n" " Лучше Ñделать новую копию игры." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Ðеверный файл запиÑи" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Ðеверное Ñохранение" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3258,29 +3380,34 @@ msgstr "Ðеверное Ñохранение" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Italian" msgstr "Italian" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "ЯПОÐИЯ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT-рекомпилÑтор (рекомендуетÑÑ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL-рекомпилÑтор (ÑкÑпериментальный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 #, fuzzy msgid "Japanese" msgstr "Japanese" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "КОРЕЯ" @@ -3289,8 +3416,8 @@ msgstr "КОРЕЯ" msgid "Key" msgstr "КомбинациÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 #, fuzzy msgid "Korean" msgstr "Korean" @@ -3310,7 +3437,7 @@ msgstr "" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Язык" @@ -3358,7 +3485,7 @@ msgstr "" msgid "Less Than" msgstr "Меньше чем" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3366,7 +3493,7 @@ msgstr "" msgid "Load" msgstr "Загр." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 #, fuzzy msgid "Load Custom Textures" msgstr "Load Hi-Res Textures" @@ -3423,6 +3550,7 @@ msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" msgid "Load State..." msgstr "Загрузить игру..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3432,10 +3560,14 @@ msgstr "Загрузить игру..." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Загрузить Wii System Menu (%d %c)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3445,6 +3577,9 @@ msgstr "Загрузить Wii System Menu (%d %c)" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Загрузить Wii System Menu (%d %c)" @@ -3470,7 +3605,7 @@ msgstr "Загружает указанный файл (DOL, ELF, WAD, GCM, ISO) msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "\"ПривÑзать\" потоки данных к Ñдрам" @@ -3484,12 +3619,12 @@ msgstr "Лог" msgid "Log Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 #, fuzzy msgid "Log Types" msgstr "Тип:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" @@ -3519,7 +3654,7 @@ msgstr "" "MD5 не Ñовпадает\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "УÑкорить MMU (Ñпидхак)" @@ -3541,11 +3676,11 @@ msgstr "Файлы Gameshark MadCatz (*.gcs)" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID ÑоздателÑ:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Создатель:" @@ -3570,6 +3705,7 @@ msgstr "Па&мÑÑ‚ÑŒ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3577,6 +3713,9 @@ msgstr "Па&мÑÑ‚ÑŒ" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Карта памÑти" @@ -3605,7 +3744,7 @@ msgstr "" msgid "Menu" msgstr "Меню" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Мик." @@ -3615,11 +3754,11 @@ msgstr "Мик." msgid "Min" msgstr "Мик." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Разное" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Разное" @@ -3636,7 +3775,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Моноширный шрифт" @@ -3649,7 +3788,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3664,7 +3803,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3754,6 +3893,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Вверх" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3763,6 +3903,9 @@ msgstr "NP Вверх" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3771,7 +3914,7 @@ msgstr "ИмÑ:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "ИмÑ:" @@ -3785,7 +3928,7 @@ msgid "New Scan" msgstr "Ðовый поиÑк" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "След. Ñтраница" @@ -3797,7 +3940,7 @@ msgstr "ИÑкать далее" msgid "Nickname :" msgstr "Ðик :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "" @@ -3837,7 +3980,7 @@ msgstr "Ðе найдена папка Ñ ÑохранениÑми Ð´Ð»Ñ %s" msgid "None" msgstr "ОтÑутÑтвует" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 #, fuzzy msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" @@ -3846,8 +3989,8 @@ msgstr "Norwegian Bokmaal" msgid "Not Equal" msgstr "Ðе равно" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "ÐеизвеÑтно" @@ -3867,7 +4010,7 @@ msgstr "Ðе подключено" msgid "Notes" msgstr "ПримечаниÑ" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "ПримечаниÑ:" @@ -3905,7 +4048,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Выкл" @@ -3931,11 +4074,11 @@ msgstr "ДоÑтупно только %d блоков" msgid "Open" msgstr "Открыть" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Открыть &папку Ñ Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Открыть папку Ñ &ÑохранениÑми Wii" @@ -3957,11 +4100,11 @@ msgstr "OpenAL: не найдена аудио-карта" msgid "OpenAL: can't open device %s" msgstr "OpenAL: ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3990,7 +4133,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -4040,19 +4183,20 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Раздел %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Патчи" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Папки" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4065,6 +4209,10 @@ msgstr "Папки" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Пауза" @@ -4074,7 +4222,7 @@ msgstr "Пауза" msgid "Per-Pixel Lighting" msgstr "ОÑвещение пикÑелÑ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Отлично" @@ -4087,6 +4235,7 @@ msgstr "Точка %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4097,6 +4246,10 @@ msgstr "Точка %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "ЗапуÑк" @@ -4111,7 +4264,7 @@ msgstr "Про&играть запиÑÑŒ процеÑÑа" msgid "Play/Pause" msgstr "Старт/Пауза" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Играбельна" @@ -4124,6 +4277,7 @@ msgstr "Опции" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4133,6 +4287,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4144,27 +4301,27 @@ msgstr "ПожалуйÑта, Ñоздайте точку обозрениÑ, п msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 #, fuzzy msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 #, fuzzy msgid "Port 1" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 #, fuzzy msgid "Port 2" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 #, fuzzy msgid "Port 3" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 #, fuzzy msgid "Port 4" msgstr "Порт :" @@ -4174,12 +4331,12 @@ msgstr "Порт :" msgid "Port :" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 #, fuzzy msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 #, fuzzy msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" @@ -4189,17 +4346,17 @@ msgstr "Portuguese (Brazilian)" msgid "Post-Processing Effect:" msgstr "Шейдер поÑÑ‚-обработки:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4213,7 +4370,7 @@ msgstr "<Ðажмите кнопку>" msgid "Prev Page" msgstr "Пред. Ñтраница" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Пред. Ñтраница" @@ -4265,7 +4422,7 @@ msgstr "R-Analog" msgid "RAM" msgstr "ПамÑÑ‚ÑŒ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "РОССИЯ" @@ -4278,7 +4435,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "ÐаÑтоÑщий" @@ -4357,6 +4514,7 @@ msgstr "&Обновить ÑпиÑок игр" msgid "Refresh game list" msgstr "Обновление ÑпиÑка игр" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4375,6 +4533,12 @@ msgstr "Обновление ÑпиÑка игр" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Удалить" @@ -4427,11 +4591,11 @@ msgstr "" msgid "Rumble" msgstr "ВидбрациÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "ЗапуÑкает обработку DSP LLE в отдельном потоке (не рекомендуетÑÑ)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "РуÑÑкий" @@ -4439,10 +4603,11 @@ msgstr "РуÑÑкий" msgid "Sa&ve State" msgstr "БыÑтрое &Ñохранение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "безопаÑное" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4452,6 +4617,9 @@ msgstr "безопаÑное" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Sample Rate:" msgstr "ЧаÑтота" @@ -4518,12 +4686,12 @@ msgstr "БыÑтрое &Ñохранение" msgid "Save State..." msgstr "Сохранить игру как..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Сохранить как..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñжатого GCM/ISO-образа" @@ -4531,11 +4699,11 @@ msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñжатого G msgid "Save current perspective" msgstr "Сохранить точку" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð½ÐµÑжатого GCM/ISO-образа" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4544,6 +4712,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4553,15 +4722,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "ПоиÑк..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "ПоиÑк образов диÑков" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "ПоиÑк..." @@ -4577,12 +4749,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Фильтр поиÑка" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "ИÑкать в подпапках" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Ð¡ÐµÐºÑ†Ð¸Ñ %s не найдена в SYSCONF" @@ -4592,6 +4764,7 @@ msgstr "Ð¡ÐµÐºÑ†Ð¸Ñ %s не найдена в SYSCONF" msgid "Select" msgstr "Выбрать" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4616,6 +4789,14 @@ msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового проц #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°" @@ -4642,16 +4823,21 @@ msgstr "" msgid "Select the file to load" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Выберите файл Ñохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4671,6 +4857,9 @@ msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Выберите или укажите файл Ð´Ð»Ñ Ð±Ñ‹Ñтрого ÑохранениÑ" @@ -4691,7 +4880,7 @@ msgstr "" "4:3: ПодравнÑÑ‚ÑŒ картинку к Ñоотношению 4:3.\n" "РаÑÑ‚Ñнуть по окну: Размер картинки ÑоответÑтвует размеру окна." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Выбранный шрифт" @@ -4727,11 +4916,11 @@ msgstr "МеÑтораÑположение ÑенÑора:" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4742,11 +4931,11 @@ msgstr "" msgid "Set" msgstr "Выбрать" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Сделать &игрой по умолчанию" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "УÑтановить картой памÑти по умолчанию %c" @@ -4756,7 +4945,7 @@ msgstr "УÑтановить картой памÑти по умолчанию % msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 #, fuzzy msgid "Settings..." msgstr "ÐаÑтройки конÑоли (IPL)" @@ -4769,7 +4958,7 @@ msgstr "SetupWiiMem: Файл наÑтроек не найден" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Короткое имÑ:" @@ -4799,7 +4988,7 @@ msgstr "Отображать панель &инÑтрументов" msgid "Show Drives" msgstr "Отображать игры на DVD" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 #, fuzzy msgid "Show EFB Copy Regions" msgstr "Регионы копии EFB" @@ -4816,7 +5005,7 @@ msgstr "Франции" msgid "Show GameCube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 #, fuzzy msgid "Show Input Display" msgstr "Италии" @@ -4833,7 +5022,7 @@ msgstr "JAP" msgid "Show Korea" msgstr "Кореи" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Отображать Ñзык:" @@ -4854,7 +5043,7 @@ msgstr "Отображать игры платформ..." msgid "Show Regions" msgstr "Отображать игры регионов..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Show Statistics" msgstr "Ð Ð°Ð·Ð»Ð¸Ñ‡Ð½Ð°Ñ ÑтатиÑтика" @@ -4875,11 +5064,11 @@ msgstr "WAD-файлы" msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Ðктивирует Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¾Ð± оÑтановке процеÑÑа ÑмулÑции игры." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 #, fuzzy msgid "" "Show a message box when a potentially serious error has occured.\n" @@ -4892,24 +5081,24 @@ msgstr "" "во Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð³Ñ€Ñ‹, однако в Ñлучае вылета ÑмулÑтора вы не увидите никакой " "информации." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 #, fuzzy msgid "Show first block" msgstr "Показать блоки" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Показать блоки" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Показать комментарий" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Показать иконку" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Показать заголовок" @@ -4941,7 +5130,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Реальный Wimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 #, fuzzy msgid "Simplified Chinese" msgstr "Simplified Chinese" @@ -4950,12 +5139,12 @@ msgstr "Simplified Chinese" msgid "Size" msgstr "Размер" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "Пропуcтить загрузку BIOS'а GC" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4987,12 +5176,12 @@ msgstr "" msgid "Slot %i" msgstr "Слот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 #, fuzzy msgid "Slot A" msgstr "Слот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 #, fuzzy msgid "Slot B" msgstr "Слот" @@ -5013,7 +5202,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "ÐаÑтройки ÑмулÑции звука" @@ -5031,6 +5220,7 @@ msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð°ÑƒÐ´Ð¸Ð¾-буфера %s." msgid "Space" msgstr "Пробел" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5046,6 +5236,11 @@ msgstr "Пробел" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Spanish" msgstr "Spanish" @@ -5071,7 +5266,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Ðазначает видео-плагин" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "УÑкорить чтение Ñ Ð´Ð¸Ñка" @@ -5079,7 +5274,7 @@ msgstr "УÑкорить чтение Ñ Ð´Ð¸Ñка" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -5174,12 +5369,12 @@ msgstr "Сохранение уÑпешно импортировано" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Язык ÑиÑтемы:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "ТÐЙВÐÐЬ" @@ -5218,7 +5413,7 @@ msgstr "ÐŸÑ€Ð°Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ" msgid "Take Screenshot" msgstr "Сделать Ñкриншот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5235,7 +5430,7 @@ msgstr "ТекÑтура" msgid "Texture Cache" msgstr "ОчиÑтить кÑш" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 #, fuzzy msgid "Texture Format Overlay" msgstr "Формат текÑтур" @@ -5252,13 +5447,13 @@ msgstr "Ðеверный адреÑ" msgid "The checksum was successfully fixed" msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñумма уÑпешно иÑправлена" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Ð’Ñ‹Ð±Ð¿Ð²Ð½Ð½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° уже в ÑпиÑке" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, fuzzy, c-format msgid "" "The file %s already exists.\n" @@ -5281,7 +5476,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Файл %s уже открыт, Ð½ÐµÐ»ÑŒÐ·Ñ Ð·Ð°Ð¿Ð¸Ñать заголовок." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Указанный файл (%s) не ÑущеÑтвует" @@ -5303,7 +5498,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5342,7 +5537,7 @@ msgstr "Указанный файл \"%s\" не ÑущеÑтвует" msgid "The value is invalid" msgstr "Ðеверное значение" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Стиль" @@ -5350,7 +5545,7 @@ msgstr "Стиль" msgid "Theme selection went wrong" msgstr "Ошибка выбора темы" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5358,7 +5553,7 @@ msgstr "" "Ðе найден билет Ð´Ð»Ñ 00000001/00000002. Ваша ÐºÐ¾Ð¿Ð¸Ñ NAND Ñкорее вÑего не " "полнаÑ." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5378,7 +5573,7 @@ msgstr "" "СимулÑтор action replay не поддерживает коды, которые менÑÑŽÑ‚ Ñам Action " "Replay. " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ опции может привеÑти к замедлению ÑмулÑции в Wii-меню и " @@ -5396,26 +5591,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Ð”Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñет включить ограничение ÑмулÑции ÑкороÑти игры\n" -"поÑредÑтвом \"подгонки\" оной к ÑкороÑти звука.\n" -"Отключение данной опции может вызвать уÑкорение игрового процеÑÑа.\n" -"Включение данной опции может вызвать Ñффект шума на фоне (редко).\n" -"\n" -"Удерживайте клавишу Ð´Ð»Ñ Ð±Ñ‹Ñтрого Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ опции в игре." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" "Ð”Ð°Ð½Ð½Ð°Ñ Ð¾Ñ†Ð¿Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡Ð°ÐµÑ‚ обработку музыкальных Ñ‚Ñ€Ñков (BGM, Ñ„Ð¾Ð½Ð¾Ð²Ð°Ñ Ð¼ÑƒÐ·Ñ‹ÐºÐ°)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 #, fuzzy msgid "" "This splits the Video and CPU threads, so they can be run on separate " @@ -5428,7 +5608,7 @@ msgstr "" "ÑмулÑтора на многоÑдерных ÑиÑтемах. Побочным Ñффектом данной опции\n" "ÑвлÑетÑÑ Ð¿Ð¾ÑÐ²Ð»ÐµÐ½Ð¸Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… багов и/или ошибок в ÑмулÑции." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Это позволит вам вручную править INI файл Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÐµÐ¹" @@ -5452,7 +5632,7 @@ msgstr "Ðазвание" msgid "To" msgstr "Ñверху" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 #, fuzzy msgid "Toggle All Log Types" msgstr "Включить вÑе" @@ -5473,6 +5653,7 @@ msgstr "Включение полноÑкранного режима" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5480,15 +5661,18 @@ msgstr "Включение полноÑкранного режима" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Ñверху" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 #, fuzzy msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Попытка загрузить неизвеÑтный тип файла." @@ -5496,7 +5680,7 @@ msgstr "Попытка загрузить неизвеÑтный тип файл msgid "Triggers" msgstr "" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Попытка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð· неверного SYSCONF" @@ -5506,7 +5690,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 #, fuzzy msgid "Turkish" msgstr "Turkish" @@ -5528,11 +5712,11 @@ msgstr "Порт UDP:" msgid "UDP Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "ÐЕИЗВЕСТÐО" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "СШÐ" @@ -5613,7 +5797,7 @@ msgstr "Обновить" msgid "Upright Wiimote" msgstr "Гибридный Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "ИÑпользовать EuRGB60-режим (PAL60)" @@ -5626,7 +5810,7 @@ msgstr "&ПолноÑкранный режим" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Показывать panic-ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ (ошибки)" @@ -5647,7 +5831,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Утилиты" @@ -5671,25 +5855,29 @@ msgstr "" msgid "Verbosity" msgstr "Глубина анализа" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Видео" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Виртуальный" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "ГромкоÑÑ‚ÑŒ" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Ошибка уÑтановки WAD: ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Ошибка уÑтановки WAD: ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5704,15 +5892,15 @@ msgstr "" msgid "Warning" msgstr "Предупреждение" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Предупреждение: запуÑк DOL в неправильном режиме!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Предупреждение: запуÑк ELF в неправильном режиме!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Предупреждение: запуÑк ISO в неправильном режиме!" @@ -5739,7 +5927,7 @@ msgstr "" "Ñ Ñовпадающими именами будут перепиÑаны\n" "Продолжить?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5747,7 +5935,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5755,7 +5943,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5783,7 +5971,7 @@ msgstr "WaveFileWriter - файл не открыт." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "" @@ -5791,15 +5979,15 @@ msgstr "" msgid "Width" msgstr "Ширина" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD-диÑк:" @@ -5808,6 +5996,7 @@ msgstr "DVD-диÑк:" msgid "Wii Save Import" msgstr "Импорт Ñохранений Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5817,6 +6006,9 @@ msgstr "Импорт Ñохранений Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы Ñохранений Wii (*.bin)|*.bin" @@ -5883,10 +6075,11 @@ msgstr "Windows Menu" msgid "Windows Right" msgstr "Windows Right" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5902,6 +6095,11 @@ msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Подождите..." @@ -5909,6 +6107,11 @@ msgstr "Подождите..." msgid "Write to Console" msgstr "Выводить в конÑоль" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "СохранÑÑ‚ÑŒ в файл" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "СохранÑÑ‚ÑŒ в файл" @@ -5963,7 +6166,7 @@ msgstr "Ðужно ввеÑти деÑÑтичное или шеÑтнадцат msgid "You must enter a valid profile name." msgstr "Введите правильное Ð¸Ð¼Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Ðеобходимо перезапуÑтить Dolphin, чтобы Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ñтупили в Ñилу." @@ -5984,7 +6187,7 @@ msgid "" msgstr "" "Ваш файл SYSCONF неверного размера (0x%2$04llx), а должен быть 0x%1$04x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "Включить ZTP-хак" @@ -6039,7 +6242,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "загрузчик (.img)" @@ -6070,12 +6273,12 @@ msgstr "Ñто Ñохранение не от Wii или ошибка чтени msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "неизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute вернул -1 при запуÑке приложениÑ!" @@ -6245,6 +6448,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "ÐаÑтройки изображениÑ" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Включить аудиотроттлинг" + #~ msgid "Enable CPU Access" #~ msgstr "Включить доÑтуп CPU к EFB" @@ -6450,6 +6656,20 @@ msgstr "| OR" #~ msgid "Take Screenshot\t" #~ msgstr "Сделать Ñкриншот\t" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Ð”Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñет включить ограничение ÑмулÑции ÑкороÑти игры\n" +#~ "поÑредÑтвом \"подгонки\" оной к ÑкороÑти звука.\n" +#~ "Отключение данной опции может вызвать уÑкорение игрового процеÑÑа.\n" +#~ "Включение данной опции может вызвать Ñффект шума на фоне (редко).\n" +#~ "\n" +#~ "Удерживайте клавишу Ð´Ð»Ñ Ð±Ñ‹Ñтрого Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ опции в игре." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "" #~ "Ð”Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡Ð°ÐµÑ‚ обработку голоÑовых и SFX-Ñффектов (проÑтые звуки)." diff --git a/Languages/po/sr.po b/Languages/po/sr.po index c90b7828e7..62ec55ce59 100644 --- a/Languages/po/sr.po +++ b/Languages/po/sr.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-03-02 21:58+0100\n" "Last-Translator: nikolassj\n" "Language-Team: \n" @@ -58,9 +62,9 @@ msgstr "\"%s\"je GCM/ISO fajl, ili nije GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sKopiraj%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -145,7 +149,7 @@ msgstr "%sExportuj GCI%s" msgid "%sImport GCI%s" msgstr "%sImportuj GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -178,11 +182,11 @@ msgstr "&Chit Meneger " msgid "&DSP Settings" msgstr "&DSP Opcije" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Obrisi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Obrisi oznacene ISO fajlove..." @@ -246,7 +250,7 @@ msgstr "&Pauza" msgid "&Play" msgstr "&Pokreni" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Pribor/Opcije" @@ -290,7 +294,7 @@ msgstr "&Pogledaj" msgid "&Wiimote Settings" msgstr "&Wiimote Opcije" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -334,7 +338,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -343,7 +347,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -382,13 +386,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Kodovi" @@ -400,11 +404,11 @@ msgstr "O Dolphin-u" msgid "Acceleration" msgstr "Ubrzanje" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Tacna VBeam emulacija" @@ -504,11 +508,11 @@ msgstr "Adapter" msgid "Add" msgstr "Dodaj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Dodaj ActionReplay kod" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Dodaj Patch " @@ -516,6 +520,7 @@ msgstr "Dodaj Patch " msgid "Add new pane" msgstr "Dodaj nova okna" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -531,6 +536,11 @@ msgstr "Dodaj nova okna" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Dodaj..." @@ -564,11 +574,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "" @@ -576,14 +586,15 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -596,18 +607,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "" @@ -619,7 +634,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "" @@ -639,7 +654,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" @@ -654,7 +669,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -663,7 +678,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -671,10 +686,11 @@ msgstr "" "Jeste li sigurni da zelite da obrisete ove fajlove?\n" "Nestace zauvek!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -684,6 +700,9 @@ msgstr "Jesi li siguran da zelis da obrises ovaj fajl? Nestace zauvek!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -692,18 +711,20 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Zvuk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -713,6 +734,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -750,7 +774,7 @@ msgstr "" msgid "Back" msgstr "Nazad " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "" @@ -778,11 +802,11 @@ msgstr "" msgid "Banner" msgstr "Baner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Detalji o Baneru" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Baner:" @@ -794,7 +818,7 @@ msgstr "Bar" msgid "Basic" msgstr "Osnovno/ni/ne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Osnovne opcije" @@ -825,6 +849,7 @@ msgstr "Blue right " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -832,6 +857,9 @@ msgstr "Blue right " ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Donji deo/dno" @@ -840,7 +868,7 @@ msgstr "Donji deo/dno" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Ostecen/a/nje..." @@ -856,7 +884,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "Trazi ISO direktoriju" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "" @@ -887,11 +915,11 @@ msgstr "C-Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU Emulacije \"Engine\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "" @@ -930,7 +958,7 @@ msgstr "Nemoze otvoriti %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -938,7 +966,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -954,8 +982,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -965,7 +991,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -990,7 +1016,7 @@ msgstr "Promeni Disk" msgid "Change Game" msgstr "Promeni Igru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1006,8 +1032,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" @@ -1027,31 +1053,31 @@ msgstr "Trazi Chit" msgid "Cheats Manager" msgstr "Chit Meneger" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Kineski (pojednostavljen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Kineski (tradicionalan)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Biraj fajl da otvoris " @@ -1059,14 +1085,14 @@ msgstr "Biraj fajl da otvoris " msgid "Choose a memory card:" msgstr "Biraj memorisku karticu:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Biraj folder u kome zelis da ekstraktujes " @@ -1078,14 +1104,14 @@ msgstr "" msgid "Classic" msgstr "Klasik/a" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Ocisti" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "\"Clear\" nije uspeo " @@ -1101,6 +1127,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1109,6 +1136,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Zatvori" @@ -1132,20 +1163,20 @@ msgstr "Komanda" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Koment:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Kompresuj ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Kompresuj oznaceni ISO fajlovi..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Kompresivanje ISO fajla u toku" @@ -1172,13 +1203,13 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "" @@ -1187,7 +1218,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "" @@ -1244,12 +1275,12 @@ msgstr "Konvertuj u GCI" msgid "Copy failed" msgstr "Kopiranje neuspesno " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Kopiraj na memorisku karticu %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "" @@ -1276,7 +1307,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "" @@ -1287,7 +1318,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1296,7 +1327,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1311,7 +1342,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Zemlja:" @@ -1325,24 +1356,24 @@ msgstr "Kreiraj AR Kod" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Kreator " @@ -1350,7 +1381,7 @@ msgstr "Kreator " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Izseci" @@ -1370,7 +1401,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "" @@ -1378,11 +1409,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" @@ -1394,10 +1425,11 @@ msgstr "" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1408,18 +1440,22 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" @@ -1427,15 +1463,23 @@ msgstr "" msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "" @@ -1456,7 +1500,7 @@ msgstr "Mrtva Zona " msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "" @@ -1464,16 +1508,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "" @@ -1481,11 +1525,11 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "" @@ -1494,7 +1538,7 @@ msgstr "" msgid "Delete" msgstr "Obrisi" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Obrisi save" @@ -1503,7 +1547,7 @@ msgstr "Obrisi save" msgid "Delete the existing file '%s'?" msgstr "Obrisi postojeci fajl '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 #, fuzzy msgid "Description" msgstr "Pitanje " @@ -1512,8 +1556,8 @@ msgstr "Pitanje " msgid "Detect" msgstr "Detekuj" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1524,8 +1568,8 @@ msgstr "" msgid "Device" msgstr "Uredjaj " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Opcije Uredjaja " @@ -1548,24 +1592,24 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "Onemoguci \"Fog\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Onemoguci \"Fog\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Onemoguci \"Lighting\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Onemoguci \"Textures\" " @@ -1595,7 +1639,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disk" @@ -1619,6 +1663,7 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1628,10 +1673,13 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1657,6 +1705,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1681,6 +1730,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1709,11 +1766,11 @@ msgstr "" msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1722,23 +1779,23 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "" @@ -1763,6 +1820,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1778,6 +1836,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1798,7 +1861,7 @@ msgid "" "driver." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "" @@ -1814,7 +1877,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1826,8 +1889,8 @@ msgstr "" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "" @@ -1866,7 +1929,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "" @@ -1888,23 +1951,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1917,6 +1980,7 @@ msgstr "" msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1926,51 +1990,54 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "" @@ -1983,13 +2050,13 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "" @@ -2009,20 +2076,20 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "" @@ -2034,7 +2101,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2051,6 +2118,7 @@ msgstr "" msgid "End" msgstr "Kraj" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2066,6 +2134,11 @@ msgstr "Kraj" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2096,6 +2169,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2126,18 +2200,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Error" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2169,7 +2249,7 @@ msgstr "" msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "" @@ -2182,15 +2262,15 @@ msgstr "" msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "" @@ -2206,7 +2286,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "" @@ -2218,44 +2298,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "" @@ -2267,11 +2347,11 @@ msgstr "" msgid "FIFO Player" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "" @@ -2283,11 +2363,11 @@ msgstr "" msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2383,19 +2463,29 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Brzo " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "Fast Mipmaps" msgstr "Ucitaj Native Mipmaps" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "" +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "" @@ -2405,7 +2495,7 @@ msgstr "" msgid "File Info" msgstr "Informacija o kodu " -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "" @@ -2434,16 +2524,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2451,7 +2541,7 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "" @@ -2463,7 +2553,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" @@ -2487,7 +2577,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2518,7 +2608,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "" @@ -2530,7 +2620,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" @@ -2538,10 +2628,11 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2557,6 +2648,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2591,7 +2687,7 @@ msgstr "Dolphin podesavanja/konfiguracija" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "" @@ -2607,15 +2703,15 @@ msgstr "Igra nije pokrenuta!" msgid "Game not found!!" msgstr "Igra nije pronadjena " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube " @@ -2626,6 +2722,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2633,6 +2730,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2641,21 +2741,24 @@ msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" -#: Source/Core/Core/Src/GeckoCode.cpp:139 +#: Source/Core/Core/Src/GeckoCode.cpp:222 #, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2664,6 +2767,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2673,6 +2779,7 @@ msgstr "" msgid "General Settings" msgstr "Opcije Uredjaja " +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2688,6 +2795,11 @@ msgstr "Opcije Uredjaja " #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Nemacki " @@ -2719,7 +2831,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "" @@ -2751,7 +2863,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2813,12 +2925,16 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "" @@ -2826,12 +2942,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2840,11 +2956,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2860,15 +2976,15 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO Detalji " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "" @@ -2876,21 +2992,22 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 @@ -2915,7 +3032,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "" @@ -2959,7 +3076,7 @@ msgstr "" "Onemoguci \"lighting\". Poboljsava performans/brzinu ali uzrokuje da " "\"lightning\" nestane u igrama koje ga koriste." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "" @@ -2968,7 +3085,7 @@ msgid "In-Game" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info " @@ -2988,7 +3105,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "" @@ -3001,7 +3118,7 @@ msgstr "Ubaci ime ovde..." msgid "Install WAD" msgstr "Instaliraj Wii Meni " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "" @@ -3010,6 +3127,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3019,14 +3137,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "" @@ -3050,11 +3171,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "Rezolucija punog ekrana " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Uvod" @@ -3071,7 +3192,7 @@ msgstr "" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "" @@ -3088,14 +3209,15 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3111,27 +3233,32 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italianski " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (preporucljivo)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japanski " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA " @@ -3140,8 +3267,8 @@ msgstr "KOREA " msgid "Key" msgstr "Taster " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Korejski " @@ -3159,7 +3286,7 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "" @@ -3205,7 +3332,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3213,7 +3340,7 @@ msgstr "" msgid "Load" msgstr "Ucitaj " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 #, fuzzy msgid "Load Custom Textures" msgstr "Ucitaj Hi-Res Textures " @@ -3262,6 +3389,7 @@ msgstr "Ucitaj State Slot 8" msgid "Load State..." msgstr "Ucitaj State" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3271,10 +3399,14 @@ msgstr "Ucitaj State" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Ucitaj Wii Sistem Meni (%d %c)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3284,6 +3416,9 @@ msgstr "Ucitaj Wii Sistem Meni (%d %c)" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Ucitaj Wii Sistem Meni (%d %c)" @@ -3307,7 +3442,7 @@ msgstr "" msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3319,11 +3454,11 @@ msgstr "" msgid "Log Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" @@ -3351,7 +3486,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3373,11 +3508,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "" @@ -3402,6 +3537,7 @@ msgstr "&Memorija" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3409,6 +3545,9 @@ msgstr "&Memorija" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3437,7 +3576,7 @@ msgstr "" msgid "Menu" msgstr "Meni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "" @@ -3446,11 +3585,11 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "" @@ -3467,7 +3606,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "" @@ -3480,7 +3619,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3495,7 +3634,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3585,6 +3724,7 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3594,6 +3734,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3602,7 +3745,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "" @@ -3616,7 +3759,7 @@ msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "" @@ -3628,7 +3771,7 @@ msgstr "" msgid "Nickname :" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "" @@ -3667,7 +3810,7 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" @@ -3675,8 +3818,8 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "" @@ -3696,7 +3839,7 @@ msgstr "" msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "" @@ -3734,7 +3877,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Izskljucen/o" @@ -3760,11 +3903,11 @@ msgstr "" msgid "Open" msgstr "Otvori " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "" @@ -3786,11 +3929,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3819,7 +3962,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -3869,19 +4012,20 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -3894,6 +4038,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauza " @@ -3903,7 +4051,7 @@ msgstr "Pauza " msgid "Per-Pixel Lighting" msgstr "Onemoguci \"Lighting\"" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfektno " @@ -3916,6 +4064,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -3926,6 +4075,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Pokreni " @@ -3939,7 +4092,7 @@ msgstr "Pokreni snimanje " msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "" @@ -3952,6 +4105,7 @@ msgstr "Opcije " msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -3961,6 +4115,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3972,23 +4129,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polski " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -3997,11 +4154,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugalski " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "" @@ -4009,17 +4166,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4032,7 +4189,7 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "" @@ -4083,7 +4240,7 @@ msgstr "" msgid "RAM" msgstr "RAM " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "Rusija" @@ -4096,7 +4253,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "" @@ -4168,6 +4325,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4186,6 +4344,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4235,11 +4399,11 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "" @@ -4247,10 +4411,11 @@ msgstr "" msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Siguran " +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4260,6 +4425,9 @@ msgstr "Siguran " ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4317,12 +4485,12 @@ msgstr "Snimaj State Slot 8" msgid "Save State..." msgstr "Snimaj state..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Snimaj kao..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Snimaj kompresovani GCM/ISO" @@ -4330,11 +4498,11 @@ msgstr "Snimaj kompresovani GCM/ISO" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4343,6 +4511,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4352,15 +4521,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Skeniranje..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Skeniranje za ISO fajlove " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Skeniranje..." @@ -4376,12 +4548,12 @@ msgstr "" msgid "Search Filter" msgstr "Trazi Filter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Trazi Subfoldere " -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "" @@ -4391,6 +4563,7 @@ msgstr "" msgid "Select" msgstr "Izaberi " +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4415,6 +4588,14 @@ msgstr "Izaberi Snimani fajl" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Izaberi Snimani fajl" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " @@ -4441,16 +4622,21 @@ msgstr "" msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4470,6 +4656,9 @@ msgstr "Izaberi state za ucitavanje " ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" @@ -4484,7 +4673,7 @@ msgid "" "If unsure, select Auto." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Odabrani font" @@ -4520,11 +4709,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4533,11 +4722,11 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4547,7 +4736,7 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "" @@ -4559,7 +4748,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "" @@ -4588,7 +4777,7 @@ msgstr "" msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "" @@ -4604,7 +4793,7 @@ msgstr "" msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "" @@ -4620,7 +4809,7 @@ msgstr "" msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "" @@ -4640,7 +4829,7 @@ msgstr "" msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "" @@ -4660,34 +4849,34 @@ msgstr "" msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "" @@ -4718,7 +4907,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "" @@ -4726,12 +4915,12 @@ msgstr "" msgid "Size" msgstr "Velicina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "Preskoci GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4763,11 +4952,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "" @@ -4787,7 +4976,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "" @@ -4805,6 +4994,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -4820,6 +5010,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -4843,7 +5038,7 @@ msgstr "" msgid "Specify a video backend" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4851,7 +5046,7 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -4944,12 +5139,12 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "" @@ -4988,7 +5183,7 @@ msgstr "" msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5006,7 +5201,7 @@ msgstr "Tacan \"Texture Cache\"" msgid "Texture Cache" msgstr "Tacan \"Texture Cache\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "" @@ -5022,13 +5217,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5047,7 +5242,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -5069,7 +5264,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5107,7 +5302,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" @@ -5115,13 +5310,13 @@ msgstr "" msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5133,7 +5328,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -5149,19 +5344,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5169,7 +5355,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -5192,7 +5378,7 @@ msgstr "" msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "" @@ -5212,6 +5398,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5219,14 +5406,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "" @@ -5234,7 +5424,7 @@ msgstr "" msgid "Triggers" msgstr "" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "" @@ -5244,7 +5434,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "" @@ -5265,11 +5455,11 @@ msgstr "" msgid "UDP Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "" @@ -5347,7 +5537,7 @@ msgstr "Updejt " msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5360,7 +5550,7 @@ msgstr "&Pun Ekran" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" @@ -5381,7 +5571,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "" @@ -5405,25 +5595,28 @@ msgstr "" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Video " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Jacina zvuka " -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +msgid "WAD installation failed: error creating ticket" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5438,15 +5631,15 @@ msgstr "" msgid "Warning" msgstr "Upozorenje " -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Upozorenje - pokrece se DOL u pogresan konzol mod!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Upozorenje - pokrece se ELF u pogresan konzol mod!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Upozorenje - pogretanje ISO fajla u pogresan konzol mod!" @@ -5472,7 +5665,7 @@ msgstr "" "koji imaju isto ime kao i fajlovi na vasoj memoriskoj kartici\n" " Nastavi?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5480,7 +5673,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5488,7 +5681,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5516,7 +5709,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "" @@ -5524,15 +5717,15 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "" @@ -5540,6 +5733,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5549,6 +5743,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5612,10 +5809,11 @@ msgstr "" msgid "Windows Right" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5631,6 +5829,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Radi..." @@ -5638,6 +5841,10 @@ msgstr "Radi..." msgid "Write to Console" msgstr "" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +msgid "Write to Debugger" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "" @@ -5691,7 +5898,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5709,7 +5916,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "" @@ -5763,7 +5970,7 @@ msgstr "" msgid "^ ADD" msgstr "^ DODAJ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5794,12 +6001,12 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/tr.po b/Languages/po/tr.po index a3e5d84924..890dd90043 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -19,6 +20,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Clean up Turkish translation file. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-20 19:22+0200\n" >>>>>>> Update Hungarian and Turkish translations. "Last-Translator: nlgzrgn \n" @@ -65,9 +69,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sKopyala%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -161,7 +165,7 @@ msgstr "%sGCI Ver%s" msgid "%sImport GCI%s" msgstr "%sGCI Al%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u BoÅŸ Blok; %u BoÅŸ Dizin GiriÅŸi" @@ -194,11 +198,11 @@ msgstr "Hile Yöneti&cisi" msgid "&DSP Settings" msgstr "Ses Ayarları (&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "Kalıbı Sil... (&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "Seçilen Kalıpları Sil... (&D)" @@ -262,7 +266,7 @@ msgstr "Duraklat (&P)" msgid "&Play" msgstr "Oynat (&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "Özellikler (&P)" @@ -306,7 +310,7 @@ msgstr "Görünüm (&V)" msgid "&Wiimote Settings" msgstr "&Wiimote Ayarları" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -350,7 +354,7 @@ msgstr "" msgid "" msgstr "<Çözünürlük bulunamadı>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -359,7 +363,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -415,13 +419,13 @@ msgstr "" "\n" "TCP baÄŸlantı noktanızı barındırıcıya yönlendirmelisiniz!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Kodları" @@ -433,11 +437,11 @@ msgstr "Dolphin Hakkında" msgid "Acceleration" msgstr "Hızlandırma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "DoÄŸruluk:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "DoÄŸru VBeam Emülasyonu" @@ -553,11 +557,11 @@ msgstr "Dönüştürücü:" msgid "Add" msgstr "Ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Action Replay Kodu Ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Yama Ekle" @@ -565,6 +569,7 @@ msgstr "Yama Ekle" msgid "Add new pane" msgstr "Bölme ekle" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -580,6 +585,11 @@ msgstr "Bölme ekle" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Ekle..." @@ -629,11 +639,11 @@ msgstr "" "Düğmeleri etkinleÅŸtirmek için gerekli olan analog denetim basıncını " "ayarlayın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "GeliÅŸmiÅŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "GeliÅŸmiÅŸ Ayarlar" @@ -641,14 +651,15 @@ msgstr "GeliÅŸmiÅŸ Ayarlar" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tüm GC/Wii dosyaları (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Tüm GC/Wii kalıpları (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -661,18 +672,22 @@ msgstr "Tüm GameCube GCM Dosyaları (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Tüm Wii kalıpları (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 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:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Tüm dosyalar (*.*)|*.*" @@ -688,7 +703,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "Alternatif Wiimote Zamanlaması" @@ -708,7 +723,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -726,7 +741,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, kapalı seçin." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arapça" @@ -735,7 +750,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -743,12 +758,13 @@ msgstr "" "Bu dosyaları gerçekten silmek istiyor musunuz?\n" "Silindikten sonra bu dosyaları geri döndüremezsiniz!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -758,6 +774,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -766,18 +785,20 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Ses" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Ses Çözücüsü:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO sürücüyü açarken hata.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -787,6 +808,9 @@ msgstr "AudioCommon: AO sürücüyü açarken hata.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Otomatik" @@ -829,7 +853,7 @@ msgstr "" msgid "Back" msgstr "Geri" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Çözücü Ayarları" @@ -856,11 +880,11 @@ msgstr "Kötü Dosya Başı" msgid "Banner" msgstr "AfiÅŸ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "AfiÅŸ Ayrıntıları" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "AfiÅŸ:" @@ -872,7 +896,7 @@ msgstr "Çubuk" msgid "Basic" msgstr "Temel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Temel Ayarlar" @@ -903,6 +927,7 @@ msgstr "Mavi SaÄŸ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -910,6 +935,9 @@ msgstr "Mavi SaÄŸ" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Alt" @@ -918,7 +946,7 @@ msgstr "Alt" msgid "Bound Controls: %lu" msgstr "BaÄŸlı Denetimler: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Bozuk" @@ -934,7 +962,7 @@ msgstr "Eklemek için bir klasöre gözat" msgid "Browse for an ISO directory..." msgstr "Bir kalıp konumu için gözat..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Çıkış klasörü için gözat" @@ -964,11 +992,11 @@ msgstr "C ÇubuÄŸu" msgid "C-Stick" msgstr "C ÇubuÄŸu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU Emülatör Motoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Görüntü Listelerini Önbellekle" @@ -1019,7 +1047,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1030,7 +1058,7 @@ msgstr "" "%s\n" "Geçerli bir Gamecube hafıza kartı dosyası deÄŸil." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1048,8 +1076,6 @@ msgstr "BD ile WiiMote bulunamadı: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Sap baÄŸlantısı ile Wiimote bulunamadı: %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1059,7 +1085,7 @@ msgstr "DVD Eklentisinden okunamıyor - DVD-Arabirimi : Önemli Hata" msgid "Caps Lock" msgstr "Büyük Harf Kilidi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Katalanca" @@ -1084,7 +1110,7 @@ msgstr "Diski DeÄŸiÅŸtir" msgid "Change Game" msgstr "Oyunu DeÄŸiÅŸtir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1100,8 +1126,8 @@ 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 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 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!" @@ -1122,31 +1148,31 @@ msgstr "Hile Arama" msgid "Cheats Manager" msgstr "Hile Yöneticisi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Çince (Basit)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Çince (Geleneksel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "DVD kök dizinini seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "NAND kök dizinini seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Varsayılan kalıbı seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Eklemek için bir konum seçin" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Açmak için bir dosya seçin" @@ -1154,7 +1180,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:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1162,8 +1188,8 @@ msgstr "" "Apploader olarak bir dosya seçin: (Sadece konumlardan yapılan disklere " "uygulanır)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "GeniÅŸletmek için bir klasör seçin" @@ -1175,14 +1201,14 @@ msgstr "Çember Çubuk" msgid "Classic" msgstr "Klasik" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Temizle" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Temizleme baÅŸarısız." @@ -1198,6 +1224,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1206,6 +1233,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Kapat" @@ -1229,20 +1260,20 @@ msgstr "Komut" msgid "Comment" msgstr "Yorum" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Yorum:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Kalıbı sıkıştır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Seçili kalıpları sıkıştır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Kalıp sıkıştırılıyor..." @@ -1269,13 +1300,13 @@ msgstr "Kolları Yapılandır" msgid "Configure..." msgstr "Yapılandır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Dosyanın Ãœzerine Yazmaya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Durdurma Onayı Ä°ste" @@ -1284,7 +1315,7 @@ msgstr "Durdurma Onayı Ä°ste" msgid "Connect" msgstr "BaÄŸlan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USB Klavye BaÄŸla" @@ -1341,12 +1372,12 @@ msgstr "GCI'ya dönüştür" msgid "Copy failed" msgstr "Kopyalama baÅŸarısız." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Hafıza kartı %c 'ye kopyala" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Çekirdek" @@ -1376,7 +1407,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Kalıp dosyası %s tanınamadı." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "%s kaydedilemedi." @@ -1389,7 +1420,7 @@ 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 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1401,7 +1432,7 @@ msgstr "" "\n" "Dolphin'i bir CD/DVD'den çalıştırıyorsunuz veya kayıt dosyası yazma korumalı." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Uzantı 'ini' için açma komutu bulunamadı." @@ -1418,7 +1449,7 @@ msgstr "" msgid "Count:" msgstr "Sayı:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Ãœlke:" @@ -1432,28 +1463,28 @@ msgstr "AR Kodu OluÅŸtur" msgid "Create new perspective" msgstr "Yeni perspektif oluÅŸtur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "KDE-Look.org tarafından oluÅŸturulmuÅŸtur." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com] tarafından " "oluÅŸturulmuÅŸtur." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "VistaIcons.com tarafından oluÅŸturulmuÅŸtur." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "black_rider tarafından oluÅŸturulup ForumW.org > Web Developments 'da " "yayınlanmıştır." -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "OluÅŸturan:" @@ -1461,7 +1492,7 @@ msgstr "OluÅŸturan:" msgid "Critical" msgstr "Önemli" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Kırp" @@ -1485,7 +1516,7 @@ msgid "Current dir 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Özel Görüntüleme Hilesi" @@ -1493,11 +1524,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:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Bazı ortografik projeksiyon parametrelerini özelleÅŸtir." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Çekçe" @@ -1509,10 +1540,11 @@ msgstr "Yön TuÅŸları" msgid "DSP" msgstr "Ses" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Ses Emülatörü Motoru" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1523,18 +1555,22 @@ msgstr "Ses Emülatörü Motoru" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emülasyonu (Hızlı)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Yorumlayıcı (Çok YavaÅŸ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "Ä°ÅŸlem Birimi Ãœzerinde DSP LLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE Yeniden Derleyici" @@ -1542,15 +1578,23 @@ msgstr "DSP LLE Yeniden Derleyici" msgid "DSP settings" msgstr "Ses ayarları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD Kök Dizini:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Veri Boyutu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Tarih:" @@ -1571,7 +1615,7 @@ msgstr "Ölü Bölge" msgid "Debug" msgstr "Hata ayıklama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Hata ayıklama" @@ -1579,16 +1623,16 @@ msgstr "Hata ayıklama" msgid "Decimal" msgstr "Onluk taban" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Kalıbı geniÅŸlet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Seçili kalıpları geniÅŸlet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Kalıp geniÅŸletiliyor..." @@ -1596,11 +1640,11 @@ msgstr "Kalıp geniÅŸletiliyor..." msgid "Default" msgstr "Varsayılan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Varsayılan kalıp:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Varsayılan yazı tipi" @@ -1609,7 +1653,7 @@ msgstr "Varsayılan yazı tipi" msgid "Delete" msgstr "Sil" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Kaydı sil" @@ -1618,7 +1662,7 @@ msgstr "Kaydı sil" msgid "Delete the existing file '%s'?" msgstr "'%s' dosyasını silmek istediÄŸinizden emin misiniz?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Açıklama" @@ -1626,8 +1670,8 @@ msgstr "Açıklama" msgid "Detect" msgstr "Belirle" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1639,8 +1683,8 @@ msgstr "" msgid "Device" msgstr "Sürücü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Sürücü Ayarları" @@ -1665,23 +1709,23 @@ msgstr "" "ve konum yedeÄŸi doÄŸrulama da baÅŸarısız." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Ä°ptal et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Sisi Ä°ptal Et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Işıklandırmayı Ä°ptal Et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Piksel DerinliÄŸini Ä°ptal Et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Dokuları Ä°ptal Et" @@ -1725,7 +1769,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disk" @@ -1752,6 +1796,7 @@ msgstr "" msgid "Divide" msgstr "Böl" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1761,10 +1806,13 @@ msgstr "Böl" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1789,6 +1837,7 @@ msgstr "Dolphin Taklit Wiimote Yapılandırması" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1813,6 +1862,14 @@ msgstr "Dolphin GC Kolu Yapılandırması" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC Kolu Yapılandırması" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" @@ -1845,11 +1902,11 @@ msgstr "" msgid "Down" msgstr "AÅŸağı" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Kodları Ä°ndir (WiiRD Veritabanı)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu kod indirildi. (%lu eklendi.)" @@ -1858,23 +1915,23 @@ msgstr "%lu kod indirildi. (%lu eklendi.)" msgid "Drums" msgstr "Davullar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Kukla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Sesi Dök" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "EFB Hedef Dökümü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Kareleri Dök" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Dokuları Dök" @@ -1909,6 +1966,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1924,6 +1982,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Flemenkçe" @@ -1947,7 +2010,7 @@ msgstr "" "azından %d.%d sürümü olmalıdır. --- EÄŸer Dolphin'i sürekli güncelliyorsanız, " "Windows'un sürücüyü görmesi için yeniden baÅŸlatma gerekebilir." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "AVRUPA" @@ -1963,7 +2026,7 @@ msgstr "Düzen" msgid "Edit ActionReplay Code" msgstr "Action Replay Kodunu Düzenle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Yapılandırmayı Düzenle" @@ -1975,8 +2038,8 @@ msgstr "Yamayı Düzenle" msgid "Edit current perspective" msgstr "Åžu anki perspektifi düzenle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Düzenle..." @@ -2026,7 +2089,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Taklit Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Emülasyon Durumu:" @@ -2054,18 +2117,15 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR GeçmiÅŸine Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Ses Hızlandırmasına Ä°zin Ver" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT'a Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Blok BirleÅŸimine Ä°zin Ver" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 @@ -2076,6 +2136,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Sınırlayıcı Kutu Hesaplama'yı EtkinleÅŸtir" @@ -2084,6 +2147,7 @@ msgstr "Sınırlayıcı Kutu Hesaplama'yı EtkinleÅŸtir" msgid "Enable Cache" msgstr "Ön BelleÄŸe Ä°zin Ver" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2093,51 +2157,54 @@ msgstr "Ön BelleÄŸe Ä°zin Ver" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Hilelere Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "DTK MüziÄŸine Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Çift ÇekirdeÄŸe Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Çift ÇekirdeÄŸe Ä°zin Ver (hızı artırır)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Kısayol TuÅŸlarına Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "BoÅŸta Atlamaya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "BoÅŸta Atlamaya Ä°zin Ver (hızı artırır)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU'ya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Progresif Taramaya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Ekran Koruyucusuna Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "GeniÅŸ Ekrana Ä°zin Ver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "GeniÅŸ Çerçeveye Ä°zin Ver" @@ -2155,7 +2222,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, 1x seçin." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2163,7 +2230,7 @@ msgstr "" "Disk eriÅŸimini hızlandırır. Bazı oyunlarda gereklidir. (Açık = Hızlı, Kapalı " "= Uyumlu)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Sayfalara izin ver" @@ -2193,7 +2260,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2201,7 +2268,7 @@ 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:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2211,7 +2278,7 @@ msgstr "" "iÅŸlevidir. GerçekçiliÄŸi artırır ama performansı düşürür. (Açık = Uyumlu, " "Kapalı = Hızlı)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Özel Gösterim Hilesini EtkinleÅŸtirir" @@ -2227,7 +2294,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2249,6 +2316,7 @@ msgstr "" msgid "End" msgstr "Son" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2264,6 +2332,11 @@ msgstr "Son" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Ä°ngilizce" @@ -2294,6 +2367,7 @@ msgstr "EÅŸit" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hata" @@ -2326,11 +2400,17 @@ msgstr "" "Ãœzgünüz, Wii kaydında geçici hasar var." >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Hata" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 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." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " @@ -2342,7 +2422,7 @@ msgstr "" "yüklemesinden vazgeçiliyor..." >>>>>>> Clean up Turkish translation file. -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2376,7 +2456,7 @@ msgstr "Dolphin Emülatöründen Çık" msgid "Export Failed" msgstr "Verme baÅŸarısız." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Dosya Ver" @@ -2389,15 +2469,15 @@ msgstr "Çekimi Ver" msgid "Export Recording..." msgstr "Çekimi Ver..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Kaydı Ver" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Wii Kayıtlı Oyununu Ver (Deneme Amaçlı)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Tüm Kayıtları Ver" @@ -2413,7 +2493,7 @@ msgstr "Kaydı farklı ver..." msgid "Extension" msgstr "Uzantı" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Harici Çerçeve Tamponu" @@ -2425,44 +2505,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Tüm Dosyaları GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Apploader'i GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "DOL'ü GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Konumu GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Dosyayı GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Bölüntüyü GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "%s GeniÅŸletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Tüm Dosyalar GeniÅŸletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Konum GeniÅŸletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "GeniÅŸletiliyor..." @@ -2474,11 +2554,11 @@ msgstr "FIFO Bayt'ı" msgid "FIFO Player" msgstr "FIFO Oynatıcısı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANSA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST Boyutu:" @@ -2490,11 +2570,11 @@ msgstr "BaÄŸlantı baÅŸarısız!" msgid "Failed to Listen!!" msgstr "Dinleme baÅŸarısız!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Kod indirme baÅŸarısız." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "%s 'ye geniÅŸletme baÅŸarısız!" @@ -2611,18 +2691,28 @@ msgstr "%s için baÅŸlık yazılamadı." msgid "Failed to write header for file %d" msgstr "%d dosyası için baÅŸlık yazılamadı." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Hızlı" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Hızlı MipMap'ler" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Fifo Oynatıcısı" @@ -2631,7 +2721,7 @@ msgstr "Fifo Oynatıcısı" msgid "File Info" msgstr "Dosya Bilgisi" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Dosya kod içermemektedir." @@ -2664,16 +2754,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:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Bilinmeyen açma modu : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Dosya sistemi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Dosya türü 'ini' bilinmiyor! Açılmayacaktır!" @@ -2681,7 +2771,7 @@ msgstr "Dosya türü 'ini' bilinmiyor! Açılmayacaktır!" msgid "First Block" msgstr "Ä°lk Blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "SaÄŸlamayı Düzelt" @@ -2693,7 +2783,7 @@ msgstr "16:9 'a zorla" msgid "Force 4:3" msgstr "4:3 'e zorla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Konsolu NTSC-J Olmaya Zorla" @@ -2725,7 +2815,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2761,7 +2851,7 @@ msgstr "Çerçeve" msgid "Frame Advance" msgstr "GeliÅŸmiÅŸ Çerçeveleme" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Çerçeve dökümünde FFV1 kullan" @@ -2773,7 +2863,7 @@ msgstr "Çerçeve Aralığı" msgid "Frame S&kipping" msgstr "Çerçeve Atlama(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Çerçeve Sınırı:" @@ -2781,10 +2871,11 @@ msgstr "Çerçeve Sınırı:" msgid "Frames To Record" msgstr "Çekilecek Çerçeveler" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Serbest Bakış" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2800,6 +2891,11 @@ msgstr "Serbest Bakış" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Fransızca" @@ -2838,7 +2934,7 @@ msgstr "GCMic Yapılandırması" msgid "GCPad" msgstr "GC Kolu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "Oyun ID'si:" @@ -2854,15 +2950,15 @@ msgstr "Oyun çalışmıyor!" msgid "Game not found!!" msgstr "Oyun bulunamadı!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Oyuna Özel Ayarlar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Oyun Yapılandırması" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "GameCube" @@ -2873,6 +2969,7 @@ msgstr "Gamecube Kolu Ayarları (&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2880,6 +2977,9 @@ msgstr "Gamecube Kolu Ayarları (&P)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" @@ -2888,15 +2988,17 @@ msgid "Gamecube Pad settings" msgstr "GameCube Kolu Ayarları" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko Kodları" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Gecko Kodu çalışmadı: (CT%i CST%i) (%s)\n" "(kötü bir kod veya türü henüz desteklenmiyor.)" @@ -2911,8 +3013,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Genel" @@ -2921,6 +3027,7 @@ msgstr "Genel" msgid "General Settings" msgstr "Genel Ayarlar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2936,6 +3043,11 @@ msgstr "Genel Ayarlar" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Almanca" @@ -2972,7 +3084,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Yunanca" @@ -3004,7 +3116,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:303 msgid "Hebrew" msgstr "Ä°branice" @@ -3073,12 +3185,16 @@ msgstr "Kısayol TuÅŸu Yapılandırması" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "TuÅŸlar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Macarca" @@ -3086,12 +3202,12 @@ msgstr "Macarca" msgid "Hybrid Wiimote" msgstr "Karışık Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3104,11 +3220,11 @@ msgstr "" "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:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - kötü durak" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL Ayarları" @@ -3124,15 +3240,15 @@ msgstr "Kızılötesi Ä°ÅŸaretleyici" msgid "IR Sensitivity:" msgstr "Kızılötesi Hassasiyeti:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Kalıp Ayrıntıları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Kalıp Konumları" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "Ä°TALYA" @@ -3140,7 +3256,7 @@ msgstr "Ä°TALYA" msgid "Icon" msgstr "Simge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3151,17 +3267,19 @@ msgstr "" "Mario oyunları tarafından kullanılır." >>>>>>> Clean up Turkish translation file. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 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ı)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). 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), ses " "ayarlarında Ses hızlandırmasını da iptal ederek bunu daha etkili " @@ -3199,7 +3317,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Kayıt Al" @@ -3250,7 +3368,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Oyun İçi" @@ -3259,7 +3377,7 @@ msgid "In-Game" msgstr "Oyun-İçi" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Bilgi" @@ -3279,7 +3397,7 @@ msgstr "Ekle" msgid "Insert Encrypted or Decrypted code here..." msgstr "Åžifreli veya ÅŸifresiz kodu buraya ekleyin..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD Kart Ekle" @@ -3291,7 +3409,7 @@ msgstr "Adı buraya yazın..." msgid "Install WAD" msgstr "WAD Kur" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Wii Menüsüne kur" @@ -3302,6 +3420,7 @@ msgstr "" "Kurulum Özel Durum Ä°ÅŸleyici çaÄŸrıldı, ama bu platform henüz bunu " "desteklemiyor." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3311,14 +3430,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD kuruluyor..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Arabirim" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Arabirim Ayarları" @@ -3343,11 +3465,11 @@ msgstr "İç LZO Hatası - lzo_init() baÅŸarısız." msgid "Internal Resolution:" msgstr "İç Çözünürlük:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Yorumlayıcı (Çok YavaÅŸ)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Ä°ntro" @@ -3364,7 +3486,7 @@ msgstr "Hatalı DeÄŸer!" msgid "Invalid bat.map or dir entry" msgstr "Hatalı bat.map veya konum giriÅŸi" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Hatalı olay türü: %i" @@ -3384,14 +3506,15 @@ msgstr "" "%s\n" "Oyunu yeniden dökmeniz gerekebilir." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Hatalı çekim dosyası" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Hatalı durum" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3407,27 +3530,32 @@ msgstr "Hatalı durum" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Ä°talyanca" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPONYA" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Yeniden Derleyici (önerilen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL Deneysel Yeniden Derleyici" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonca" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KORE" @@ -3436,8 +3564,8 @@ msgstr "KORE" msgid "Key" msgstr "TuÅŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Korece" @@ -3455,7 +3583,7 @@ msgstr "L Düğmesi" msgid "L-Analog" msgstr "L Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Dil:" @@ -3508,7 +3636,7 @@ msgstr "" msgid "Less Than" msgstr "Daha Az" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "FPS Sınırlaması" @@ -3516,7 +3644,7 @@ msgstr "FPS Sınırlaması" msgid "Load" msgstr "Yükle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Özel Dokuları Yükle" @@ -3564,6 +3692,7 @@ msgstr "Durumu Yükle : 8" msgid "Load State..." msgstr "Durumu Yükle..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3585,6 +3714,13 @@ msgstr "Wii Sistem Menüsünü Yükle" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Wii Sistem Menüsünü Yükle" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii Sistem Menüsünü Yükle %d%c" @@ -3611,7 +3747,7 @@ msgstr "Belirtilen dosyayı yükler (DOL,ELF,WAD,GCM,ISO)" msgid "Local" msgstr "Yerel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Ä°ÅŸlem Birimlerini Çekirdeklere Kilitle" @@ -3623,11 +3759,11 @@ msgstr "GeçmiÅŸ" msgid "Log Configuration" msgstr "GeçmiÅŸ Yapılandırması" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "GeçmiÅŸ Türü" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "GeçmiÅŸ Çıkışı" @@ -3657,7 +3793,7 @@ msgstr "" "MD5 eÅŸleÅŸmiyor\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Hız Hilesi" @@ -3679,11 +3815,11 @@ msgstr "MadCatz Gameshark dosyaları(*.gcs)" msgid "Main Stick" msgstr "Ana Çubuk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "Yapımcı ID'si:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Yapımcı:" @@ -3707,6 +3843,7 @@ msgstr "Hafıza Baytı" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3714,6 +3851,9 @@ msgstr "Hafıza Baytı" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Hafıza Kartı" @@ -3750,7 +3890,7 @@ msgstr "Hafıza kartı dosya boyutu baÅŸlık boyutuyla eÅŸleÅŸmiyor" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mikrofon" @@ -3759,11 +3899,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "En az" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "ÇeÅŸitli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "ÇeÅŸitli Ayarlar" @@ -3784,7 +3924,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "BoÅŸluklu yazı" @@ -3797,7 +3937,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3819,7 +3959,7 @@ msgstr "" msgid "Multiply" msgstr "Çarp" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3911,6 +4051,7 @@ msgstr "NP Sekme" msgid "NP Up" msgstr "NP Yukarı" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3920,6 +4061,9 @@ msgstr "NP Yukarı" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3928,7 +4072,7 @@ msgstr "Ä°sim:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Ä°sim:" @@ -3942,7 +4086,7 @@ msgid "New Scan" msgstr "Yeni Tarama" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Sonraki Sayfa" @@ -3954,7 +4098,7 @@ msgstr "Sonraki Tarama" msgid "Nickname :" msgstr "Takma Ad :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Ãœlke Yok (SDK)" @@ -3993,7 +4137,7 @@ msgstr "BaÅŸlık %s için kayıt klasörü bulunamadı" msgid "None" msgstr "Hiçbiri" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norveççe (Bokmaal Lehçesi)" @@ -4001,8 +4145,8 @@ msgstr "Norveççe (Bokmaal Lehçesi)" msgid "Not Equal" msgstr "EÅŸit DeÄŸil" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Ayarlanmamış" @@ -4022,7 +4166,7 @@ msgstr "BaÄŸlı deÄŸil" msgid "Notes" msgstr "Notlar" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notlar:" @@ -4060,7 +4204,7 @@ msgstr "Nesne" msgid "Object Range" msgstr "Nesne Aralığı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Kapalı" @@ -4086,11 +4230,11 @@ msgstr "Sadece %d blok kullanılabilir" msgid "Open" msgstr "Aç" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Dosya konumunu aç (&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Wii kayıt kla&sörünü aç" @@ -4112,11 +4256,11 @@ msgstr "OpenAL: Ses sürücüleri bulunamıyor" msgid "OpenAL: can't open device %s" msgstr "OpenAL: Sürücü %s açılamıyor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Doku Çözücü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Doku Çözücü" @@ -4148,7 +4292,7 @@ msgstr "" "ve kayıtları yeni bir hafıza kartına alın.\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "DiÄŸer" @@ -4200,19 +4344,20 @@ msgstr "Paragraf" msgid "Parameters" msgstr "Parametreler" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Bölüntü %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Yamalar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Yollar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4225,6 +4370,10 @@ msgstr "Yollar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Duraklat" @@ -4233,7 +4382,7 @@ msgstr "Duraklat" msgid "Per-Pixel Lighting" msgstr "Piksel Aydınlatması" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Mükemmel" @@ -4246,6 +4395,7 @@ msgstr "Perspektif %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4256,6 +4406,10 @@ msgstr "Perspektif %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Oynat" @@ -4269,7 +4423,7 @@ msgstr "Çekimi Oynat" msgid "Play/Pause" msgstr "Oynat/Duraklat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Oynanabilir" @@ -4281,6 +4435,7 @@ msgstr "Oynatma Seçenekleri" msgid "Players" msgstr "Oyuncular" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4290,6 +4445,9 @@ msgstr "Oyuncular" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -4301,23 +4459,23 @@ 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:309 msgid "Polish" msgstr "Lehçe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "BaÄŸ. Nok. 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "BaÄŸ. Nok. 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "BaÄŸ. Nok. 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "BaÄŸ. Nok. 4:" @@ -4326,11 +4484,11 @@ msgstr "BaÄŸ. Nok. 4:" msgid "Port :" msgstr "BaÄŸ. Nok. :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portekizce" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portekizce (Brezilya)" @@ -4338,7 +4496,7 @@ msgstr "Portekizce (Brezilya)" msgid "Post-Processing Effect:" msgstr "Geç Ä°ÅŸleme Etkisi:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" <<<<<<< HEAD @@ -4347,7 +4505,7 @@ msgstr "" msgstr "PlayController'da erken kayıt bitiÅŸi. %u + 8 > %u" >>>>>>> Clean up Turkish translation file. -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" <<<<<<< HEAD @@ -4356,7 +4514,7 @@ msgstr "" msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u + %d > %u" >>>>>>> Clean up Turkish translation file. -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" <<<<<<< HEAD @@ -4373,7 +4531,7 @@ msgstr "Önayarlar:" msgid "Prev Page" msgstr "Önceki Sayfa" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Önceki Sayfa" @@ -4424,7 +4582,7 @@ msgstr "R Analog" msgid "RAM" msgstr "Anabellek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSYA" @@ -4437,7 +4595,7 @@ msgstr "Aralık" msgid "Read-only mode" msgstr "Salt Okunur Mod" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Gerçek" @@ -4512,6 +4670,7 @@ msgstr "Listeyi Yenile" msgid "Refresh game list" msgstr "Oyun Listesini Yenile" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4530,6 +4689,12 @@ msgstr "Oyun Listesini Yenile" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Kaldır" @@ -4582,11 +4747,11 @@ msgstr "SaÄŸ Çubuk" msgid "Rumble" msgstr "Gümbürtü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSPLLE'yi ayrı iÅŸlem biriminde çalıştır (önerilmez)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Rusça" @@ -4594,10 +4759,11 @@ msgstr "Rusça" msgid "Sa&ve State" msgstr "Durumu Kaydet (&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Güvenli" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4607,6 +4773,9 @@ msgstr "Güvenli" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Örnek Oran:" @@ -4664,12 +4833,12 @@ msgstr "Durumu Kaydet : 8" msgid "Save State..." msgstr "Durumu Kaydet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Farklı kaydet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Sıkıştırılan GCM/ISO'yu kaydet" @@ -4677,11 +4846,11 @@ msgstr "Sıkıştırılan GCM/ISO'yu kaydet" msgid "Save current perspective" msgstr "Åžu anki perspektifi kaydet" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "GeniÅŸletilen GCM/ISO'yu kaydet" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." @@ -4690,6 +4859,7 @@ msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." msgid "Scaled EFB Copy" msgstr "Boyutlandırılmış EFB Kopyası" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4699,15 +4869,18 @@ msgstr "Boyutlandırılmış EFB Kopyası" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Taranıyor %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Kalıplar taranıyor" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Taranıyor..." @@ -4723,12 +4896,12 @@ msgstr "Kaydırma Kilidi" msgid "Search Filter" msgstr "Arama Filtresi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Alt Klasörleri Ara" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "SYSCONF içinde %s bölümü bulunamadı" @@ -4738,6 +4911,7 @@ msgstr "SYSCONF içinde %s bölümü bulunamadı" msgid "Select" msgstr "Seç" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4762,6 +4936,14 @@ msgstr "Çekim Dosyasını Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Çekim Dosyasını Seç" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" @@ -4787,6 +4969,7 @@ msgstr "Sabit olmayan pencereyi seçin" msgid "Select the file to load" msgstr "Yüklemek için dosyayı seçin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4803,19 +4986,26 @@ msgstr "Yüklemek için durum seçin" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Kayıt dosyasını seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Yüklemek için durum seçin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" @@ -4837,7 +5027,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, otomatik seçin." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Seçilen yazı tipi" @@ -4885,11 +5075,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:313 msgid "Serbian" msgstr "Sırpça" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4899,11 +5089,11 @@ msgstr "" msgid "Set" msgstr "Ayarla" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Varsayılan Kalıp Olarak Ayarla (&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Varsayılan Hafıza Kartı %c olarak ayarla" @@ -4913,7 +5103,7 @@ 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/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Ayarlar..." @@ -4925,7 +5115,7 @@ msgstr "SetupWiiMem: Ayar dosyası bulunamadı" msgid "Shake" msgstr "Sallama" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Kısa Ä°sim:" @@ -4953,7 +5143,7 @@ msgstr "Araç ÇubuÄŸunu Gös&ter" msgid "Show Drives" msgstr "Aygıtları Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "EFB Bölge Kopyalamasını Göster" @@ -4969,7 +5159,7 @@ msgstr "Fransızları Göster" msgid "Show GameCube" msgstr "GameCube'leri Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Görüntü GiriÅŸini Göster" @@ -4985,7 +5175,7 @@ msgstr "Japonları Göster" msgid "Show Korea" msgstr "Korelileri Göster" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Gösterme Dili:" @@ -5005,7 +5195,7 @@ msgstr "Platformları Göster" msgid "Show Regions" msgstr "Bölgeleri Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Ä°statistikleri Göster" @@ -5025,11 +5215,11 @@ msgstr "WAD'ları Göster" msgid "Show Wii" msgstr "Wii'leri Göster" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -5039,23 +5229,23 @@ msgstr "" "Bunu iptal ederseniz, hata mesajları almazsınız ama Dolphin çöktüğünde " "hiçbir uyarı vermeden aniden kapanır." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Ä°lk bloÄŸu göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Kayıt bloklarını göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Kayıt yorumunu göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Kayıt simgesini göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Kayıt baÅŸlığını göster" @@ -5093,7 +5283,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Yatay Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "BasitleÅŸtirilmiÅŸ Çince" @@ -5101,11 +5291,11 @@ msgstr "BasitleÅŸtirilmiÅŸ Çince" msgid "Size" msgstr "Boyut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "BIOS'u Geç" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Hedef Alpha GeçiÅŸini Atla" @@ -5145,11 +5335,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5173,7 +5363,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:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Ses Ayarları" @@ -5191,6 +5381,7 @@ msgstr "Ses tamponu oluÅŸturulamadı: %s" msgid "Space" msgstr "BoÅŸluk" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5206,6 +5397,11 @@ msgstr "BoÅŸluk" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Ä°spanyolca" @@ -5237,7 +5433,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Bir görüntü arka ucu belirtin" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Disk Aktarım Oranını Hızlandır" @@ -5245,7 +5441,7 @@ msgstr "Disk Aktarım Oranını Hızlandır" msgid "Square Stick" msgstr "Kare Çubuk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Varsayılan Denetim Aygıtı" @@ -5343,12 +5539,12 @@ msgstr "Kayıt dosyaları baÅŸarıyla alındı" msgid "Swing" msgstr "Hareket" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Sistem Dili:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAYVAN" @@ -5387,7 +5583,7 @@ msgstr "Tablo SaÄŸ" msgid "Take Screenshot" msgstr "Ekran Görüntüsü Al" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" <<<<<<< HEAD msgstr "" @@ -5407,7 +5603,7 @@ msgstr "Doku" msgid "Texture Cache" msgstr "Doku Ön BelleÄŸi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Doku Biçimi Kaplaması" @@ -5423,13 +5619,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Seçilen konum zaten listede" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5452,7 +5648,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Dosya %s zaten açık, dosya baÅŸlığı yazılmayacaktır." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Belirtilen dosya (%s) bulunamadı" @@ -5470,11 +5666,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Ortaya çıkan ÅŸifresi çözülmüş AR kodu herhangi bir satır içermiyor." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "Bunu güvenli bir ÅŸekilde ayarlamanız, emülatörün RAM'den doku güncellemesi " "kaybetme oranını azaltacaktır. \n" @@ -5518,7 +5715,7 @@ msgstr "Belirtilen dosya \"%s\" bulunamadı" msgid "The value is invalid" msgstr "DeÄŸer hatalı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" @@ -5526,7 +5723,7 @@ msgstr "Tema" msgid "Theme selection went wrong" msgstr "Tema seçiminde hata" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5534,7 +5731,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:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5549,7 +5746,7 @@ msgid "" msgstr "" "Bu Action Replay simülatörü, kodların kendisini düzenlemesini desteklemiyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 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." @@ -5572,25 +5769,10 @@ msgstr "" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Bu seçenek oyun hızının sesle denetlenmesini saÄŸlar. \n" -"Ä°ptal ederseniz oyun hızında anormallik olabilir,mesela oyun çok hızlı " -"çalışabilir. \n" -"Ama bazen bunu iÅŸaretlemek gürültüye neden olabilir. \n" -"\n" -"Klavye Kısayolu : Hızlandırmayı anında iptal etmek için basılı tutun." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Arka plan müziklerini oynatmak için kullanılır." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5602,7 +5784,7 @@ msgstr "" "Bilgisayarınızda çift çekirdek varsa hızınızı büyük oranda artırır,ama bazı " "çökme ve hatalara neden olabilir." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "INI Yapılandırma dosyasını elle düzenlemeye izin verir." @@ -5625,7 +5807,7 @@ msgstr "BaÅŸlık" msgid "To" msgstr "Buraya" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Tüm GeçmiÅŸ Türlerini Seç" @@ -5645,6 +5827,7 @@ msgstr "Tam Ekran Moduna Geç" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5652,14 +5835,17 @@ msgstr "Tam Ekran Moduna Geç" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Ãœst" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Geleneksel Çince" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Bilinmeyen bir dosya türünü yüklemeyi denedi." @@ -5667,7 +5853,7 @@ msgstr "Bilinmeyen bir dosya türünü yüklemeyi denedi." msgid "Triggers" msgstr "Tetikler" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Geçersiz SYSCONF'tan okumayı deniyor" @@ -5679,7 +5865,7 @@ msgstr "" "Geçersiz SYSCONF'tan okumayı deniyor\n" "Wiimote BT ID'leri mevcut deÄŸil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Türkçe" @@ -5700,11 +5886,11 @@ msgstr "UDP BaÄŸ.Nok.:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "BÄ°LÄ°NMEYEN" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "AMERÄ°KA" @@ -5789,7 +5975,7 @@ msgstr "Güncelle" msgid "Upright Wiimote" msgstr "Dik Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modunu Kullan (PAL60)" @@ -5801,7 +5987,7 @@ msgstr "Tam Ekran Kullan" msgid "Use Hex" msgstr "HEX Kullan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Önemli Hataları Bildir" @@ -5831,7 +6017,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Gereçler" @@ -5855,25 +6041,29 @@ msgstr "DeÄŸer:" msgid "Verbosity" msgstr "Duyuru/Hata/Uyarı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Görüntü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Sanal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Ses" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, 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:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD kurulumu baÅŸarısız: %s oluÅŸturmada hata" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5892,15 +6082,15 @@ msgstr "" msgid "Warning" msgstr "Uyarı" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Uyarı - DOL yanlış konsol modunda baÅŸlatılıyor!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Uyarı - ELF yanlış konsol modunda baÅŸlatılıyor!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Uyarı - Kalıp yanlış konsol modunda baÅŸlatılıyor!" @@ -5929,7 +6119,7 @@ msgstr "" "ve hafıza kartınızdaki dosyayla aynı adda olacak.\n" "Devam?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5944,7 +6134,7 @@ msgstr "" "taktirde, büyük bir ihtimalle, senkronizasyon sorunu yaÅŸayacaksınız." >>>>>>> Clean up Turkish translation file. -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5959,7 +6149,7 @@ msgstr "" "senkronizasyon sorunu yaÅŸayacaksınız." >>>>>>> Clean up Turkish translation file. -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -6005,7 +6195,7 @@ msgstr "WaveFileWriter - dosya açılamadı." msgid "Whammy" msgstr "Darbe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "GeniÅŸ Ekran Hilesi" @@ -6013,15 +6203,15 @@ msgstr "GeniÅŸ Ekran Hilesi" msgid "Width" msgstr "GeniÅŸlik" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii Konsolu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND Kök Dizini:" @@ -6029,6 +6219,7 @@ msgstr "Wii NAND Kök Dizini:" msgid "Wii Save Import" msgstr "Wii Kaydı Al" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6038,6 +6229,9 @@ msgstr "Wii Kaydı Al" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -6104,10 +6298,11 @@ msgstr "Pencere Menüsü" msgid "Windows Right" msgstr "Pencereleri SaÄŸa Döşe" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Heceleme" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6123,6 +6318,11 @@ msgstr "Heceleme" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Çalışıyor..." @@ -6130,6 +6330,11 @@ msgstr "Çalışıyor..." msgid "Write to Console" msgstr "Konsola Yaz" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Dosyaya Yaz" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Dosyaya Yaz" @@ -6185,7 +6390,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 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." @@ -6208,7 +6413,7 @@ msgstr "" "0x%04x olmalıdır (sizinki: 0x%04llx) \n" "Yenisini oluÅŸturmak ister misiniz?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP Hilesi" @@ -6278,7 +6483,7 @@ msgstr "" msgid "^ ADD" msgstr "^ EKLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6309,12 +6514,12 @@ msgstr "Bir Wii kaydı deÄŸil veya bu baÅŸlık boyutu için okuma hatası: %x" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "Bilinmeyen komut 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute uygulama çalışırken -1'e düştü!" @@ -6551,6 +6756,9 @@ msgstr "| VEYA" #~ msgid "Emulator Display Settings" #~ msgstr "Emülatör Görüntü Ayarları" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Ses Hızlandırmasına Ä°zin Ver" + #, fuzzy #~ msgid "Enable CPU Access" #~ msgstr "Ön BelleÄŸe Ä°zin Ver" @@ -6614,6 +6822,13 @@ msgstr "| VEYA" #~ msgid "Error allocating buffer" #~ msgstr "Tampon ayırma hatası" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "PlayWiimote'da hata. %u != %u, byte %d.\n" +#~ "Ãœzgünüz, Wii kaydında geçici hasar var." + #~ msgid "Error loading %s: can't read info" #~ msgstr "%s yüklenirken hata: Bilgi okunamıyor." @@ -6912,6 +7127,20 @@ msgstr "| VEYA" #~ msgid "The file " #~ msgstr "Dosya" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Bu seçenek oyun hızının sesle denetlenmesini saÄŸlar. \n" +#~ "Ä°ptal ederseniz oyun hızında anormallik olabilir,mesela oyun çok hızlı " +#~ "çalışabilir. \n" +#~ "Ama bazen bunu iÅŸaretlemek gürültüye neden olabilir. \n" +#~ "\n" +#~ "Klavye Kısayolu : Hızlandırmayı anında iptal etmek için basılı tutun." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Ses efektlerini oynatmak için kullanılır." diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index 4a55b8ea04..f7bb9c4575 100644 --- a/Languages/po/zh_CN.po +++ b/Languages/po/zh_CN.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-09 13:55-0800\n" "Last-Translator: thegfw \n" "Language-Team: \n" @@ -57,9 +61,9 @@ msgstr "\"%s\" ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ GCM/ISO 文件, 或者ä¸æ˜¯ä¸€ä¸ª GC/Wii msgid "%1$sCopy%1$s" msgstr "%1$så¤åˆ¶%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -151,7 +155,7 @@ msgstr "%s导出 GCI%s" msgid "%sImport GCI%s" msgstr "%s导入 GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u 空闲区å—; %u 空闲目录项目" @@ -184,11 +188,11 @@ msgstr "作弊ç ç®¡ç†å™¨(&C)" msgid "&DSP Settings" msgstr "音频设置(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "删除镜åƒ(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "删除所选镜åƒ(&D)" @@ -252,7 +256,7 @@ msgstr "æš‚åœæ¸¸æˆ(&P)" msgid "&Play" msgstr "开始游æˆ(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "属性(&P)" @@ -296,7 +300,7 @@ msgstr "视图(&V)" msgid "&Wiimote Settings" msgstr "&Wiimote 设置" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "百科(&W)" @@ -340,7 +344,7 @@ msgstr "<在这里æ’å…¥å称>" msgid "" msgstr "<未找到分辨率>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<æ— >" @@ -349,7 +353,7 @@ msgstr "<æ— >" msgid "" msgstr "<按任æ„é”®>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<系统>" @@ -405,13 +409,13 @@ msgstr "" "\n" "You must forward TCP port to host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-基æ¿" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "动作回放代ç " @@ -423,11 +427,11 @@ msgstr "关于 Dolphin" msgid "Acceleration" msgstr "加速器" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "精确脉冲染料激光模拟" @@ -532,11 +536,11 @@ msgstr "适é…器:" msgid "Add" msgstr "添加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "添加动作回放代ç " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "添加补ä¸" @@ -544,6 +548,7 @@ msgstr "添加补ä¸" msgid "Add new pane" msgstr "添加新é¢æ¿" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -559,6 +564,11 @@ msgstr "添加新é¢æ¿" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "添加..." @@ -592,11 +602,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "调整摇æ†æŽ§åˆ¶éœ€è¦æ´»åŠ¨çš„按钮." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "高级" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "高级设置" @@ -604,14 +614,15 @@ msgstr "高级设置" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "所有 GC/Wii 文件 (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "所有 GC/Wii é•œåƒ (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -624,18 +635,22 @@ msgstr "所有 Gamecube GCM 文件 (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "æ‰€æœ‰å­˜æ¡£çŠ¶æ€ (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "所有 Wii é•œåƒæ–‡ä»¶ (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "所有压缩的 GC/Wii é•œåƒæ–‡ä»¶ (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "所有文件 (*.*)|*.*" @@ -647,7 +662,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "模拟 Wiimote" @@ -668,7 +683,7 @@ msgstr "应用程åºè½½å…¥å™¨å¤§å°é”™è¯¯...这真是一个应用程åºè½½å…¥å™¨ msgid "Apploader unable to load from file" msgstr "应用程åºè½½å…¥å™¨ä¸èƒ½ä»Žæ–‡ä»¶è½½å…¥" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "应用载入器:" @@ -683,7 +698,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -692,7 +707,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "您确定è¦åˆ é™¤ \"%s\" ?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -700,10 +715,11 @@ msgstr "" "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?\n" "这将是永久性的删除!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?这将是永久性的删除!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -713,6 +729,9 @@ msgstr "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?这将是永久性的删除!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "高宽比:" @@ -721,18 +740,20 @@ msgstr "高宽比:" msgid "At least one pane must remain open." msgstr "必须有一个窗å£ä¿æŒæ‰“å¼€" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "音频" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "音频åŽç«¯:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: 打开 AO 设备错误.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -742,6 +763,9 @@ msgstr "AudioCommon: 打开 AO 设备错误.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自动" @@ -780,7 +804,7 @@ msgstr "" msgid "Back" msgstr "Back" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "åŽç«¯è®¾ç½®" @@ -808,11 +832,11 @@ msgstr "无效文件头" msgid "Banner" msgstr "标志" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "标志详细信æ¯" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "标志:" @@ -824,7 +848,7 @@ msgstr "Bar" msgid "Basic" msgstr "基本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "基本 设置" @@ -855,6 +879,7 @@ msgstr "è“ å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -862,6 +887,9 @@ msgstr "è“ å³" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "底部" @@ -870,7 +898,7 @@ msgstr "底部" msgid "Bound Controls: %lu" msgstr "绑定控制器: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "æŸå" @@ -886,7 +914,7 @@ msgstr "æµè§ˆè¦æ·»åŠ çš„目录" msgid "Browse for an ISO directory..." msgstr "æµè§ˆé•œåƒç›®å½•" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "æµè§ˆè¾“出目录" @@ -917,11 +945,11 @@ msgstr "C-摇æ†" msgid "C-Stick" msgstr "C-摇æ†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU 模拟引擎" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 #, fuzzy msgid "Cache Display Lists" msgstr "å¯ç”¨æ˜¾ç¤ºåˆ—表缓存" @@ -961,7 +989,7 @@ msgstr "ä¸èƒ½æ‰“å¼€ %s" msgid "Cannot unregister events with events pending" msgstr "事件未决时ä¸èƒ½å注册事件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -971,7 +999,7 @@ msgstr "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -989,8 +1017,6 @@ msgstr "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "ä¸èƒ½æŒ‰ç…§è¿žæŽ¥å¥æŸ„ %02x 找到 WiiMote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1000,7 +1026,7 @@ msgstr "ä¸èƒ½ä»Ž DVDæ’件 - DVD接å£è¯»å–æ•°æ®: 严é‡é”™è¯¯" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -1025,7 +1051,7 @@ msgstr "切æ¢å…‰ç›˜" msgid "Change Game" msgstr "切æ¢æ¸¸æˆ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1041,8 +1067,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Changing this will have no effect while the emulator is running!" @@ -1062,32 +1088,32 @@ msgstr "作弊ç æœç´¢" msgid "Cheats Manager" msgstr "金手指管ç†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "简体中文" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "ç¹ä½“中文" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "选择一个DVD根目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Choose a NAND root directory:" msgstr "选择一个DVD根目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "选择一个默认镜åƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "选择一个è¦æ·»åŠ çš„目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "选择è¦æ‰“开的文件" @@ -1095,7 +1121,7 @@ msgstr "选择è¦æ‰“开的文件" msgid "Choose a memory card:" msgstr "选择一个内存å¡" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1103,8 +1129,8 @@ msgstr "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "选择解压缩到的文件夹" @@ -1116,14 +1142,14 @@ msgstr "Circle Stick" msgid "Classic" msgstr "ç»å…¸" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "清除" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "清除失败" @@ -1139,6 +1165,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1147,6 +1174,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "关闭" @@ -1170,20 +1201,20 @@ msgstr "命令" msgid "Comment" msgstr "注释" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "注释:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "压缩镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "压缩所选镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "压缩镜åƒä¸­" @@ -1210,13 +1241,13 @@ msgstr "设置手柄" msgid "Configure..." msgstr "设置..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "确认文件覆盖" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "åœæ­¢æ—¶ç¡®è®¤" @@ -1226,7 +1257,7 @@ msgstr "åœæ­¢æ—¶ç¡®è®¤" msgid "Connect" msgstr "连接" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "连接 USB 键盘" @@ -1283,12 +1314,12 @@ msgstr "转æ¢åˆ° GCI" msgid "Copy failed" msgstr "å¤åˆ¶å¤±è´¥" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "å¤åˆ¶åˆ°å†…å­˜å¡ %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "核心" @@ -1318,7 +1349,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "ä¸èƒ½è¯†åˆ« ISO 文件 %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "ä¸èƒ½ä¿å­˜ %s" @@ -1331,7 +1362,7 @@ 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 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1343,7 +1374,7 @@ msgstr "" "\n" "您是ä¸æ˜¯åœ¨CD/DVD上è¿è¡Œçš„Dolphin?或者存档文件带有写入ä¿æŠ¤?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Couldn't find open command for extension 'ini'!" @@ -1360,7 +1391,7 @@ msgstr "" msgid "Count:" msgstr "æ•°é‡:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "国家:" @@ -1374,25 +1405,25 @@ msgstr "创建动作回放代ç " msgid "Create new perspective" msgstr "创建新布局" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Created by KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Created by VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Created by black_rider and published on ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "创建者:" @@ -1400,7 +1431,7 @@ msgstr "创建者:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "è£åˆ‡" @@ -1420,7 +1451,7 @@ msgstr "淡入淡出" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Current dir changed from %s to %s after wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "自定义投影修正" @@ -1428,11 +1459,11 @@ msgstr "自定义投影修正" msgid "Custom Projection Hack Settings" msgstr "自定义投影修正设置" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "自定义一些正交投影å‚æ•°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "æ·å…‹è¯­" @@ -1444,10 +1475,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP音频" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "音频模拟引擎" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1458,19 +1490,23 @@ msgstr "音频模拟引擎" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "音频 HLE 模拟(很快)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "音频 LLE 解释(很慢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE 于线程" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "音频 LLE é‡ç¼–译器" @@ -1478,15 +1514,23 @@ msgstr "音频 LLE é‡ç¼–译器" msgid "DSP settings" msgstr "音频设置" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD 根目录:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "æ•°æ®å¤§å°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "日期:" @@ -1507,7 +1551,7 @@ msgstr "死区" msgid "Debug" msgstr "调试" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Debugging" msgstr "调试" @@ -1516,16 +1560,16 @@ msgstr "调试" msgid "Decimal" msgstr "å进制" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "解压缩镜åƒä¸­..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "解压缩所选镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "解压缩镜åƒä¸­" @@ -1533,11 +1577,11 @@ msgstr "解压缩镜åƒä¸­" msgid "Default" msgstr "默认" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "默认镜åƒ:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "默认字体" @@ -1546,7 +1590,7 @@ msgstr "默认字体" msgid "Delete" msgstr "删除" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "删除存档" @@ -1555,7 +1599,7 @@ msgstr "删除存档" msgid "Delete the existing file '%s'?" msgstr "删除已ç»å­˜åœ¨çš„文件 '%s' 么?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 #, fuzzy msgid "Description" msgstr "询问" @@ -1564,8 +1608,8 @@ msgstr "询问" msgid "Detect" msgstr "检测" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1578,8 +1622,8 @@ msgstr "" msgid "Device" msgstr "设备" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "设备设置" @@ -1604,25 +1648,25 @@ msgstr "" "和目录备份校检失败" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "ç¦ç”¨é›¾åŒ–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "ç¦ç”¨é›¾åŒ–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "ç¦ç”¨å…‰çº¿" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "åƒç´ æ·±åº¦" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "ç¦ç”¨æè´¨" @@ -1652,7 +1696,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "光盘" @@ -1677,6 +1721,7 @@ msgstr "按模拟器显示输入读å–" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1686,10 +1731,13 @@ msgstr "Divide" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "您确定是å¦åœæ­¢å½“å‰æ¨¡æ‹Ÿ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1715,6 +1763,7 @@ msgstr "Dolphin 模拟 Wiimote 设置" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1739,6 +1788,14 @@ msgstr "Dolphin GC 手柄设置" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC 手柄设置" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" @@ -1767,11 +1824,11 @@ msgstr "Dolphin 当å‰è®¾ç½®äº†éšè—所有游æˆ. åŒå‡»è¿™é‡Œæ˜¾ç¤ºæ‰€æœ‰æ¸¸ msgid "Down" msgstr "下" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "ä¸‹è½½ä»£ç  (WiiRD æ•°æ®åº“)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "已下载 %lu 代ç (已添加 %lu)" @@ -1780,23 +1837,23 @@ msgstr "已下载 %lu 代ç (已添加 %lu)" msgid "Drums" msgstr "鼓" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "虚拟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "转储音频" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "转储 EFB 目标" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "转储框架" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "转储æè´¨" @@ -1822,6 +1879,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1837,6 +1895,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "è·å…°è¯­" @@ -1862,7 +1925,7 @@ msgstr "" "reboot is probably required at this point to get Windows to see the new " "driver." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "欧版" @@ -1878,7 +1941,7 @@ msgstr "编辑" msgid "Edit ActionReplay Code" msgstr "编辑动作回放代ç " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "编辑设置" @@ -1890,8 +1953,8 @@ msgstr "编辑补ä¸" msgid "Edit current perspective" msgstr "编辑当å‰å¤–观" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "编辑..." @@ -1930,7 +1993,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "模拟 Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "模拟器状æ€: " @@ -1952,23 +2015,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "å¯ç”¨åŠ¨ä½œå›žæ”¾è®°å½•" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "å¯ç”¨éŸ³é¢‘调节" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "å¯ç”¨ BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "å¯ç”¨åŒºå—åˆå¹¶" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1982,6 +2045,7 @@ msgstr "" msgid "Enable Cache" msgstr "å¯ç”¨ç¼“å­˜" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1991,52 +2055,55 @@ msgstr "å¯ç”¨ç¼“å­˜" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "å¯ç”¨ä½œå¼Š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "å¯ç”¨ DTK 音ä¹" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "å¯ç”¨å¤šæ ¸å¤„ç†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "å¯ç”¨å¤šæ ¸å¤„ç†(加速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "å¯ç”¨çƒ­é”®" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "å¯ç”¨ç©ºé—²æ­¥è¿›" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "å¯ç”¨ç©ºé—²æ­¥è¿›(加速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "å¯ç”¨ MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "å¯ç”¨é€è¡Œæ‰«æ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "å¯ç”¨å®½å±" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "å¯ç”¨å®½å±" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "å¯ç”¨çº¿æ¡†" @@ -2052,13 +2119,13 @@ msgstr "" "Enables anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "å¯ç”¨å¿«é€Ÿå…‰ç›˜è®¿é—®. 部分游æˆéœ€è¦. (ON = 快速, OFF = 兼容)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Enable pages" @@ -2078,7 +2145,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2086,7 +2153,7 @@ msgstr "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2096,7 +2163,7 @@ msgstr "" "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "å¯ç”¨è‡ªå®šä¹‰æŠ•å½±ä¿®æ­£" @@ -2108,7 +2175,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2125,6 +2192,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2140,6 +2208,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "英语" @@ -2170,6 +2243,7 @@ msgstr "等于" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "错误" @@ -2200,18 +2274,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "错误" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Error loading selected language. Falling back to system default." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2245,7 +2325,7 @@ msgstr "Exit Dolphin with emulator" msgid "Export Failed" msgstr "导出失败" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "导出文件" @@ -2258,15 +2338,15 @@ msgstr "导出录制" msgid "Export Recording..." msgstr "导出录制..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "导出存档" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "导出 Wii 存档 (实验性)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "导出所有存档" @@ -2282,7 +2362,7 @@ msgstr "导出存档为..." msgid "Extension" msgstr "扩展" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 #, fuzzy msgid "External Frame Buffer" msgstr "外部å‚æ•°" @@ -2295,44 +2375,44 @@ msgstr "外部å‚æ•°" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "解压缩所有文件..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "解压缩 Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "解压缩 DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "解压缩目录..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "解压缩文件..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "解压缩分区..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "解压缩 %s 中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "解压缩所有文件中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "解压缩目录中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "解压缩中..." @@ -2345,11 +2425,11 @@ msgstr "" msgid "FIFO Player" msgstr "玩家" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "法国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST 大å°:" @@ -2361,11 +2441,11 @@ msgstr "连接失败!" msgid "Failed to Listen!!" msgstr "监å¬å¤±è´¥!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "下载代ç å¤±è´¥." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "解压缩到 %s 失败!" @@ -2475,19 +2555,29 @@ msgstr "写入文件头到 %s 失败" msgid "Failed to write header for file %d" msgstr "写入文件头失败 %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "快速" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "Fast Mipmaps" msgstr "载人原始纹ç†" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU 快速版本. 任何游æˆéƒ½ä¸èƒ½å·¥ä½œ" +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 #, fuzzy msgid "Fifo Player" @@ -2498,7 +2588,7 @@ msgstr "玩家" msgid "File Info" msgstr "代ç ä¿¡æ¯" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "文件未包å«ä»£ç ." @@ -2531,16 +2621,16 @@ msgstr "文件ä¸èƒ½è¢«è¯†åˆ«æˆå†…å­˜å¡" msgid "File not compressed" msgstr "文件ä¸æ˜¯å·²åŽ‹ç¼©æ–‡ä»¶" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: æœªçŸ¥æ‰“å¼€æ¨¡å¼ : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "文件系统" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "文件类型 'ini' 未知! ä¸èƒ½æ‰“å¼€!" @@ -2548,7 +2638,7 @@ msgstr "文件类型 'ini' 未知! ä¸èƒ½æ‰“å¼€!" msgid "First Block" msgstr "第一个区å—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "修正校检和" @@ -2560,7 +2650,7 @@ msgstr "强制 16:9" msgid "Force 4:3" msgstr "强制 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "设置终端为 NTSC-J" @@ -2593,7 +2683,7 @@ msgstr "" "Force the game to output graphics for widescreen resolutions.\n" "Note that this might cause graphical glitches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2628,7 +2718,7 @@ msgstr "Frame Advance" msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "帧转储使用 FFV1" @@ -2642,7 +2732,7 @@ msgstr "Frame Advance" msgid "Frame S&kipping" msgstr "帧数跳跃(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "帧数é™åˆ¶:" @@ -2650,10 +2740,11 @@ msgstr "帧数é™åˆ¶:" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "自由视点" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2669,6 +2760,11 @@ msgstr "自由视点" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "法语" @@ -2703,7 +2799,7 @@ msgstr "记录设置" msgid "GCPad" msgstr "手柄" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "æ¸¸æˆ ID:" @@ -2719,15 +2815,15 @@ msgstr "游æˆæ²¡æœ‰è¿è¡Œ!" msgid "Game not found!!" msgstr "游æˆæ²¡æ‰¾åˆ°!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "游æˆç‰¹æ®Šè®¾ç½®" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "游æˆé…ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2738,6 +2834,7 @@ msgstr "Gamecube 手柄设置(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2745,6 +2842,9 @@ msgstr "Gamecube 手柄设置(&P)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube å†…å­˜å¡ (*.raw,*.gcp)" @@ -2753,15 +2853,17 @@ msgid "Gamecube Pad settings" msgstr "Gamecube 手柄设置" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko 代ç " -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" "(either a bad code or the code type is not yet supported.)" @@ -2770,6 +2872,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2778,6 +2881,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "常规" @@ -2787,6 +2893,7 @@ msgstr "常规" msgid "General Settings" msgstr "ç•Œé¢è®¾ç½®" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2802,6 +2909,11 @@ msgstr "ç•Œé¢è®¾ç½®" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "德语" @@ -2833,7 +2945,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "希腊语" @@ -2865,7 +2977,7 @@ msgstr "" msgid "Header checksum failed" msgstr "头部校检失败" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "希伯æ¥è¯­" @@ -2932,12 +3044,16 @@ msgstr "热键设置" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "热键" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "匈牙利语" @@ -2945,12 +3061,12 @@ msgstr "匈牙利语" msgid "Hybrid Wiimote" msgstr "æ··åˆ Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2963,11 +3079,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin will likely hang now" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL 设置" @@ -2983,15 +3099,15 @@ msgstr "IR 指针" msgid "IR Sensitivity:" msgstr "红外çµæ•åº¦:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "é•œåƒè¯¦ç»†ä¿¡æ¯" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "é•œåƒç›®å½•" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "æ„大利" @@ -2999,22 +3115,24 @@ msgstr "æ„大利" msgid "Icon" msgstr "图标" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." @@ -3042,7 +3160,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "导入存档" @@ -3091,7 +3209,7 @@ msgstr "" "Disable lighting. Improves performance but causes lighting to disappear in " "games which use it." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "进游æˆ" @@ -3100,7 +3218,7 @@ msgid "In-Game" msgstr "进游æˆ" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "ä¿¡æ¯" @@ -3120,7 +3238,7 @@ msgstr "æ’å…¥" msgid "Insert Encrypted or Decrypted code here..." msgstr "在这里æ’入加密的或者解密的代ç ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "æ’å…¥SDå¡" @@ -3133,7 +3251,7 @@ msgstr "在这里æ’å…¥å称..." msgid "Install WAD" msgstr "安装 Wii èœå•" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "安装到Wiièœå•" @@ -3143,6 +3261,7 @@ msgid "" msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3152,16 +3271,19 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "安装 WAD 到 Wii èœå•ä¸­..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "ç•Œé¢è®¾ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "ç•Œé¢è®¾ç½®" @@ -3187,11 +3309,11 @@ msgstr "内部 LZO 错误 - lzo_init() 失败" msgid "Internal Resolution:" msgstr "å…¨å±åˆ†è¾¨çŽ‡:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "解释器 (éžå¸¸æ…¢)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "片头" @@ -3208,7 +3330,7 @@ msgstr "无效值!" msgid "Invalid bat.map or dir entry" msgstr "无效 bat.map 或 目录项目" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "无效事件类型 %i" @@ -3228,14 +3350,15 @@ msgstr "" "%s\n" " You may need to redump this game." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "无效录制文件" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Invalid state" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3251,27 +3374,32 @@ msgstr "Invalid state" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "æ„大利语" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "日本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT é‡ç¼–译器 (推è)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL 实验性é‡ç¼–译器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "日语" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "韩国" @@ -3280,8 +3408,8 @@ msgstr "韩国" msgid "Key" msgstr "按键" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "韩语" @@ -3299,7 +3427,7 @@ msgstr "L é”®" msgid "L-Analog" msgstr "L-摇æ†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "语言:" @@ -3352,7 +3480,7 @@ msgstr "" msgid "Less Than" msgstr "å°äºŽ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3360,7 +3488,7 @@ msgstr "" msgid "Load" msgstr "载入" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 #, fuzzy msgid "Load Custom Textures" msgstr "载入精细æè´¨" @@ -3409,6 +3537,7 @@ msgstr "载入存档æ’槽 8" msgid "Load State..." msgstr "载入状æ€..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3418,10 +3547,14 @@ msgstr "载入状æ€..." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "载入 Wii 系统èœå•(%d %c)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3431,6 +3564,9 @@ msgstr "载入 Wii 系统èœå•(%d %c)" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "载入 Wii 系统èœå•(%d %c)" @@ -3455,7 +3591,7 @@ msgstr "载入指定文件 (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "本地" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "é”定线程到核心" @@ -3468,11 +3604,11 @@ msgstr "日志" msgid "Log Configuration" msgstr "记录设置" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "记录类型" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "记录输出" @@ -3502,7 +3638,7 @@ msgstr "" "MD5 ä¸åŒ¹é…\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU 速度破解" @@ -3524,11 +3660,11 @@ msgstr "MadCatz Gameshark 文件(*.gcs)" msgid "Main Stick" msgstr "主摇æ†" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "制作者ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "制作者:" @@ -3553,6 +3689,7 @@ msgstr "内存(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3560,6 +3697,9 @@ msgstr "内存(&M)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "内存å¡" @@ -3594,7 +3734,7 @@ msgstr "" msgid "Menu" msgstr "èœå•" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mic" @@ -3604,11 +3744,11 @@ msgstr "Mic" msgid "Min" msgstr "Mic" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "其它" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "其它设置" @@ -3625,7 +3765,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "等宽字体" @@ -3638,7 +3778,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "马达" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3653,7 +3793,7 @@ msgstr "" msgid "Multiply" msgstr "多人游æˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3743,6 +3883,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3752,6 +3893,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3760,7 +3904,7 @@ msgstr "å称:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "å称:" @@ -3774,7 +3918,7 @@ msgid "New Scan" msgstr "新建扫æ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "下一页" @@ -3786,7 +3930,7 @@ msgstr "下一扫æ" msgid "Nickname :" msgstr "昵称 :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "无国家 (SDK)" @@ -3826,7 +3970,7 @@ msgstr "No save folder found for title %s" msgid "None" msgstr "æ— " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "挪å¨è¯­" @@ -3834,8 +3978,8 @@ msgstr "挪å¨è¯­" msgid "Not Equal" msgstr "ä¸ç­‰äºŽ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "未设置" @@ -3855,7 +3999,7 @@ msgstr "未连接" msgid "Notes" msgstr "说明" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "说明: " @@ -3893,7 +4037,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "关闭" @@ -3919,11 +4063,11 @@ msgstr "åªæœ‰ %d 区å—有效" msgid "Open" msgstr "打开" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "打开包å«æ–‡ä»¶å¤¹(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "打开 Wii 存档目录(&S)" @@ -3945,11 +4089,11 @@ msgstr "OpenAL: ä¸èƒ½æ‰¾åˆ°éŸ³é¢‘设备" msgid "OpenAL: can't open device %s" msgstr "OpenAL: ä¸èƒ½æ‰“开设备 %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3981,7 +4125,7 @@ msgstr "" "and import the the saves to a new memcard\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -4033,19 +4177,20 @@ msgstr "Paragraph" msgid "Parameters" msgstr "å‚æ•°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "分区 %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "è¡¥ä¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "路径" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4058,6 +4203,10 @@ msgstr "路径" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "æš‚åœ" @@ -4067,7 +4216,7 @@ msgstr "æš‚åœ" msgid "Per-Pixel Lighting" msgstr "åƒç´ å…‰çº¿" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "完美" @@ -4080,6 +4229,7 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4090,6 +4240,10 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "开始" @@ -4103,7 +4257,7 @@ msgstr "播放录制" msgid "Play/Pause" msgstr "开始/æš‚åœ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "å¯ä»¥çŽ©" @@ -4116,6 +4270,7 @@ msgstr "选项" msgid "Players" msgstr "玩家" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4125,6 +4280,9 @@ msgstr "玩家" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "请确认..." @@ -4136,23 +4294,23 @@ 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:309 msgid "Polish" msgstr "波兰语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "ç«¯å£ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "ç«¯å£ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "ç«¯å£ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "ç«¯å£ 4" @@ -4161,11 +4319,11 @@ msgstr "ç«¯å£ 4" msgid "Port :" msgstr "ç«¯å£ :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "è‘¡è„牙语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "è‘¡è„牙语(巴西)" @@ -4174,17 +4332,17 @@ msgstr "è‘¡è„牙语(巴西)" msgid "Post-Processing Effect:" msgstr "Post-Processing Shader:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4197,7 +4355,7 @@ msgstr "预置: " msgid "Prev Page" msgstr "上一页" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "上一页" @@ -4248,7 +4406,7 @@ msgstr "R-摇æ†" msgid "RAM" msgstr "内存" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "俄语" @@ -4261,7 +4419,7 @@ msgstr "范围" msgid "Read-only mode" msgstr "åªè¯»æ¨¡å¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "真实" @@ -4339,6 +4497,7 @@ msgstr "刷新列表" msgid "Refresh game list" msgstr "刷新游æˆåˆ—表" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4357,6 +4516,12 @@ msgstr "刷新游æˆåˆ—表" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "移除" @@ -4409,11 +4574,11 @@ msgstr "å³æ‘‡æ†" msgid "Rumble" msgstr "震动" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Run DSP LLE on a dedicated thread (not recommended)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "俄语" @@ -4421,10 +4586,11 @@ msgstr "俄语" msgid "Sa&ve State" msgstr "ä¿å­˜çŠ¶æ€(&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "安全" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4434,6 +4600,9 @@ msgstr "安全" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "采样率:" @@ -4491,12 +4660,12 @@ msgstr "存档æ’槽 8" msgid "Save State..." msgstr "ä¿å­˜çŠ¶æ€..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "å¦å­˜ä¸º..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "ä¿å­˜åŽ‹ç¼©çš„GCM/é•œåƒ" @@ -4504,11 +4673,11 @@ msgstr "ä¿å­˜åŽ‹ç¼©çš„GCM/é•œåƒ" msgid "Save current perspective" msgstr "ä¿å­˜å½“å‰è§†è§’" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "ä¿å­˜è§£åŽ‹ç¼©çš„GCM/é•œåƒ" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s is corrupted, movie recording stopping..." @@ -4518,6 +4687,7 @@ msgstr "Savestate movie %s is corrupted, movie recording stopping..." msgid "Scaled EFB Copy" msgstr "EFB 比例å¤åˆ¶" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4527,15 +4697,18 @@ msgstr "EFB 比例å¤åˆ¶" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "扫æ中..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "扫æé•œåƒä¸­" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "扫æ中..." @@ -4551,12 +4724,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "æœç´¢è¿‡æ»¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "æœç´¢å­ç›®å½•" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Section %s not found in SYSCONF" @@ -4566,6 +4739,7 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "选择" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4590,6 +4764,14 @@ msgstr "选择录制文件" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "选择录制文件" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "选择è¦å¯¼å…¥çš„存档" @@ -4616,16 +4798,21 @@ msgstr "选择浮动窗å£" msgid "Select the file to load" msgstr "选择è¦è½½å…¥çš„文件" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "选择一个存档文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "选择è¦è½½å…¥çš„状æ€" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4645,6 +4832,9 @@ msgstr "选择è¦è½½å…¥çš„状æ€" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "选择è¦ä¿å­˜çš„状æ€" @@ -4665,7 +4855,7 @@ msgstr "" "Force 4:3: Stretch the picture to an aspect ratio of 4:3.\n" "Stretch to window: Stretch the picture to the window size." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "所选字体" @@ -4701,11 +4891,11 @@ msgstr "传感器æ ä½ç½®" msgid "Separator" msgstr "分割" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "塞尔维亚语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4715,11 +4905,11 @@ msgstr "" msgid "Set" msgstr "设置" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "设置为默认镜åƒ(&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "è®¾ç½®ä¸ºé»˜è®¤å†…å­˜å¡ %c" @@ -4729,7 +4919,7 @@ 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/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "设置..." @@ -4741,7 +4931,7 @@ msgstr "安装Wii内存: ä¸èƒ½æ‰¾åˆ°è®¾ç½®æ–‡ä»¶" msgid "Shake" msgstr "震动" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "短å称:" @@ -4770,7 +4960,7 @@ msgstr "显示工具æ (&T)" msgid "Show Drives" msgstr "显示驱动器" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB å¤åˆ¶èŒƒå›´" @@ -4787,7 +4977,7 @@ msgstr "显示法国" msgid "Show GameCube" msgstr "显示 GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "显示输入显示" @@ -4803,7 +4993,7 @@ msgstr "显示日本" msgid "Show Korea" msgstr "显示韩国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "显示语言:" @@ -4823,7 +5013,7 @@ msgstr "显示平å°" msgid "Show Regions" msgstr "显示国家" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Show Statistics" msgstr "å„ç§ç»Ÿè®¡æ•°æ®" @@ -4844,11 +5034,11 @@ msgstr "显示 Wad" msgid "Show Wii" msgstr "显示 Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "åœæ­¢æ¸¸æˆæ—¶æ˜¾ç¤ºç¡®è®¤å¯¹è¯æ¡†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4858,23 +5048,23 @@ msgstr "" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "显示第一区å—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "显示存档区å—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "显示存档注释" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "显示存档图标" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "显示存档标题" @@ -4905,7 +5095,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Sideways Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "简体中文" @@ -4913,12 +5103,12 @@ msgstr "简体中文" msgid "Size" msgstr "大å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "跳过 GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "ç¦ç”¨ç›®æ ‡é€æ˜Žé€šé“" @@ -4951,11 +5141,11 @@ msgstr "" msgid "Slot %i" msgstr "æ’槽 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "æ’槽 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "æ’槽 B" @@ -4975,7 +5165,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "声音设置" @@ -4993,6 +5183,7 @@ msgstr "声音缓冲区创建失败: %s" msgid "Space" msgstr "空格" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5008,6 +5199,11 @@ msgstr "空格" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "西ç­ç‰™è¯­" @@ -5031,7 +5227,7 @@ msgstr "" msgid "Specify a video backend" msgstr "指定一个视频åŽç«¯" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "æå‡å…‰ç›˜ä¼ è¾“率" @@ -5039,7 +5235,7 @@ msgstr "æå‡å…‰ç›˜ä¼ è¾“率" msgid "Square Stick" msgstr "æ–¹å—é”®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "标准控制器" @@ -5132,12 +5328,12 @@ msgstr "æˆåŠŸå¯¼å…¥å­˜æ¡£æ–‡ä»¶" msgid "Swing" msgstr "Swing" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "系统语言" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "å°æ¹¾" @@ -5177,7 +5373,7 @@ msgstr "Table Right" msgid "Take Screenshot" msgstr "å±å¹•æˆªå›¾(&T)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5194,7 +5390,7 @@ msgstr "æè´¨" msgid "Texture Cache" msgstr "清除缓存" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 #, fuzzy msgid "Texture Format Overlay" msgstr "æ质格å¼" @@ -5211,13 +5407,13 @@ msgstr "地å€æ— æ•ˆ" msgid "The checksum was successfully fixed" msgstr "校检和æˆåŠŸä¿®å¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "选择的目录已ç»å­˜åœ¨äºŽåˆ—表" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5240,7 +5436,7 @@ msgstr "" 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." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "您指定的文件 %s ä¸å­˜åœ¨" @@ -5262,7 +5458,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5302,7 +5498,7 @@ msgstr "指定的文件 \"%s\" ä¸å­˜åœ¨" msgid "The value is invalid" msgstr "这个值无效" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "主题" @@ -5310,7 +5506,7 @@ msgstr "主题" msgid "Theme selection went wrong" msgstr "选择主题出现错误" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5318,7 +5514,7 @@ msgstr "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5334,7 +5530,7 @@ msgstr "" "This action replay simulator does not support codes that modify Action " "Replay itself." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "This could cause slow down in Wii Menu and some games." @@ -5350,24 +5546,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "这用于播放音ä¹éŸ³è½¨,比如背景音ä¹." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5379,7 +5561,7 @@ msgstr "" "Causes major speed improvements on PCs with more than one core, but can also " "cause occasional crashes/glitches." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "This will let you Manually Edit the INI config file" @@ -5403,7 +5585,7 @@ msgstr "标题" msgid "To" msgstr "顶部" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "切æ¢æ‰€æœ‰æ—¥å¿—类型" @@ -5423,6 +5605,7 @@ msgstr "切æ¢å…¨å±" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5430,14 +5613,17 @@ msgstr "切æ¢å…¨å±" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "顶部" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "ç¹ä½“中文" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "å·²ç»å°è¯•è½½å…¥æœªçŸ¥æ–‡ä»¶ç±»åž‹." @@ -5445,7 +5631,7 @@ msgstr "å·²ç»å°è¯•è½½å…¥æœªçŸ¥æ–‡ä»¶ç±»åž‹." msgid "Triggers" msgstr "扳机" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Trying to read from invalid SYSCONF" @@ -5457,7 +5643,7 @@ msgstr "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "土耳其语" @@ -5478,11 +5664,11 @@ msgstr "UDP 端å£:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "未知" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "美国" @@ -5562,7 +5748,7 @@ msgstr "æ›´æ–°" msgid "Upright Wiimote" msgstr "ç›´æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 æ¨¡å¼ (PAL60)" @@ -5575,7 +5761,7 @@ msgstr "切æ¢å…¨å±(&F)" msgid "Use Hex" msgstr "使用å六进制" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "使用警告程åº" @@ -5596,7 +5782,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "实用扩展" @@ -5620,25 +5806,29 @@ msgstr "值: " msgid "Verbosity" msgstr "详细" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "视频" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "虚拟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "音é‡" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD 安装失败: 创建 %s 错误" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD 安装失败: 创建 %s 错误" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5653,15 +5843,15 @@ msgstr "" msgid "Warning" msgstr "警告" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Warning - starting DOL in wrong console mode!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Warning - starting ELF in wrong console mode!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Warning - starting ISO in wrong console mode!" @@ -5689,7 +5879,7 @@ msgstr "" "and have the same name as a file on your memcard\n" "Continue?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5697,7 +5887,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5705,7 +5895,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5733,7 +5923,7 @@ msgstr "波形文件写入器 - 文件未打开." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "宽å±ç ´è§£" @@ -5741,15 +5931,15 @@ msgstr "宽å±ç ´è§£" msgid "Width" msgstr "宽度" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii控制å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD 根目录:" @@ -5758,6 +5948,7 @@ msgstr "DVD 根目录:" msgid "Wii Save Import" msgstr "导入 Wii 存档" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5767,6 +5958,9 @@ msgstr "导入 Wii 存档" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5834,10 +6028,11 @@ msgstr "窗å£èœå•" msgid "Windows Right" msgstr "窗å£å³ä¾§" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "自动æ¢è¡Œ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5853,6 +6048,11 @@ msgstr "自动æ¢è¡Œ" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "工作中..." @@ -5860,6 +6060,11 @@ msgstr "工作中..." msgid "Write to Console" msgstr "写入到控制å°" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "写入到文件" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "写入到文件" @@ -5913,7 +6118,7 @@ msgstr "您必须输入一个å进制或者å六进制值." msgid "You must enter a valid profile name." msgstr "您必须输入一个有效的é…置文件å称." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "You must restart Dolphin in order for the change to take effect." @@ -5934,7 +6139,7 @@ msgid "" msgstr "" "Your SYSCONF file is the wrong size - should be 0x%04x (but is 0x%04llx)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP 破解" @@ -5988,7 +6193,7 @@ msgstr "" msgid "^ ADD" msgstr "^ 加" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "应用程åºè½½å…¥å™¨ (.img)" @@ -6019,12 +6224,12 @@ msgstr "not a wii save or read failure for file header size %x" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "未知命令 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -6223,6 +6428,9 @@ msgstr "| 或" #~ msgid "Emulator Display Settings" #~ msgstr "模拟器显示设置" +#~ msgid "Enable Audio Throttle" +#~ msgstr "å¯ç”¨éŸ³é¢‘调节" + #~ msgid "Enable CPU Access" #~ msgstr "å¯ç”¨CPU访问" @@ -6558,6 +6766,19 @@ msgstr "| 或" #~ msgid "The file " #~ msgstr "The file " +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "This is usually used to play voice and sound effects." diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index d171170136..e0384728e6 100644 --- a/Languages/po/zh_TW.po +++ b/Languages/po/zh_TW.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-03-15 02:51+0800\n" "Last-Translator: khiav \n" "Language-Team: khiav&yrbn \n" @@ -57,9 +61,9 @@ msgstr "\"%s\" 為無效的 GCM/ISO æª”æ¡ˆï¼Œæˆ–éž GC/Wii ISO。" msgid "%1$sCopy%1$s" msgstr "%1$s複製%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -151,7 +155,7 @@ msgstr "%s匯出 GCI%s" msgid "%sImport GCI%s" msgstr "%s匯入 GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "剩餘 %u 個å€å¡Šï¼›å‰©é¤˜ %u 個目錄項目" @@ -184,11 +188,11 @@ msgstr "作弊檔管ç†å™¨(&C)" msgid "&DSP Settings" msgstr "DSP 設定(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "刪除 ISO 檔(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "刪除已é¸å–çš„ ISO 檔(&D)..." @@ -252,7 +256,7 @@ msgstr "æš«åœ(&P)" msgid "&Play" msgstr "執行(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "屬性(&P)" @@ -296,7 +300,7 @@ msgstr "檢視(&V)" msgid "&Wiimote Settings" msgstr "Wiimote 設定(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -340,7 +344,7 @@ msgstr "<æ’å…¥å稱>" msgid "" msgstr "<無解æžåº¦è¨­å®š>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<ç„¡>" @@ -349,7 +353,7 @@ msgstr "<ç„¡>" msgid "" msgstr "<按任æ„éµ>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<系統>" @@ -403,13 +407,13 @@ msgstr "" "\n" "您必須至主機的 TCP 埠å£é€²è¡Œè¨­å®šï¼ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR 代碼" @@ -421,11 +425,11 @@ msgstr "關於 Dolphin" msgid "Acceleration" msgstr "加速" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "精確的 VBeam 模擬" @@ -532,11 +536,11 @@ msgstr "é…接器：" msgid "Add" msgstr "新增" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "新增 ActionReplay 代碼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "新增修正" @@ -544,6 +548,7 @@ msgstr "新增修正" msgid "Add new pane" msgstr "新增é¢ç‰ˆ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -559,6 +564,11 @@ msgstr "新增é¢ç‰ˆ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "新增..." @@ -605,11 +615,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "調整模擬æ–桿控制壓力需è¦æ´»å‹•çš„按鈕。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "進階" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "進階設定" @@ -617,14 +627,15 @@ msgstr "進階設定" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "所有 GC/Wii 檔案 (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "所有 GC/Wii 映åƒæª” (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -637,18 +648,22 @@ msgstr "所有 Gamecube GCM 檔案 (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "所有å³æ™‚存檔 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "所有 Wii ISO 檔案 (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "所有已壓縮的 GC/Wii ISO 檔案 (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "所有檔案 (*.*)|*.*" @@ -660,7 +675,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "模擬 Wiimote" @@ -681,7 +696,7 @@ msgstr "程å¼è®€å–器為錯誤的大å°...它是程å¼è®€å–器嗎？" msgid "Apploader unable to load from file" msgstr "程å¼è®€å–器無法從檔案中讀å–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "程å¼è®€å–器：" @@ -696,7 +711,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -705,7 +720,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "是å¦ç¢ºèªåˆªé™¤ \"%s\" ？" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -713,10 +728,11 @@ msgstr "" "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？\n" "刪了之後就回ä¸ä¾†äº†å“¦ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？刪了之後就回ä¸ä¾†äº†å“¦ï¼" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -726,6 +742,9 @@ msgstr "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？刪了之後就回ä¸ä¾†äº†å“¦ï¼" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "ç•«é¢æ¯”例：" @@ -734,18 +753,20 @@ msgstr "ç•«é¢æ¯”例：" msgid "At least one pane must remain open." msgstr "必須剩餘至少一個é¢æ¿ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "è²éŸ³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "è²éŸ³è£ç½®ï¼š" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon：開啟 AO è£ç½®å‡ºéŒ¯ã€‚\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -755,6 +776,9 @@ msgstr "AudioCommon：開啟 AO è£ç½®å‡ºéŒ¯ã€‚\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -793,7 +817,7 @@ msgstr "" msgid "Back" msgstr "返回" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "è£ç½®è¨­å®š" @@ -821,11 +845,11 @@ msgstr "æ壞的檔頭" msgid "Banner" msgstr "æ©«å¹…" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "圖示明細" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "橫幅：" @@ -837,7 +861,7 @@ msgstr "Bar" msgid "Basic" msgstr "基本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "基本設定" @@ -868,6 +892,7 @@ msgstr "è— å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -875,6 +900,9 @@ msgstr "è— å³" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "下方" @@ -883,7 +911,7 @@ msgstr "下方" msgid "Bound Controls: %lu" msgstr "ç¶å®šæŽ§åˆ¶å™¨ï¼š%lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "ç ´æ" @@ -899,7 +927,7 @@ msgstr "ç€è¦½è¦æ–°å¢žçš„資料夾" msgid "Browse for an ISO directory..." msgstr "ç€è¦½ ISO 資料夾..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "ç€è¦½è¼¸å‡ºçš„資料夾" @@ -930,11 +958,11 @@ msgstr "C-æ–æ¡¿" msgid "C-Stick" msgstr "C-æ–æ¡¿" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU 模擬引擎" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 #, fuzzy msgid "Cache Display Lists" msgstr "開啟顯示列表快å–" @@ -974,7 +1002,7 @@ msgstr "無法開啟 %s" msgid "Cannot unregister events with events pending" msgstr "事件未決定時無法註銷事件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -984,7 +1012,7 @@ msgstr "" "無法使用此檔案作為記憶å¡ã€‚\n" "您è¦åœ¨ç›¸åŒçš„æ’槽中使用相åŒçš„檔案嗎？" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1002,8 +1030,6 @@ msgstr "找ä¸åˆ° WiiMote ä¾ bd： %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "找ä¸åˆ° WiiMote ä¾é€£æŽ¥é … %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1013,7 +1039,7 @@ msgstr "無法讀å–從 DVD_Plugin - DVD-ç•Œé¢ï¼šåš´é‡éŒ¯èª¤" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -1038,7 +1064,7 @@ msgstr "æ›´æ›å…‰ç¢Ÿ" msgid "Change Game" msgstr "æ›´æ›éŠæˆ²" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1054,8 +1080,8 @@ 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 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "更改此é¸é …在模擬器執行時沒有效果ï¼" @@ -1075,32 +1101,32 @@ msgstr "尋找作弊代碼" msgid "Cheats Manager" msgstr "作弊代碼管ç†å™¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "é¸æ“‡ä¸€å€‹ DVD 根目錄：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Choose a NAND root directory:" msgstr "é¸æ“‡ä¸€å€‹ DVD 根目錄：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "é¸æ“‡ä¸€å€‹é è¨­ ISO：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "é¸æ“‡ä¸€å€‹è¦æ·»åŠ çš„資料夾" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "é¸æ“‡ä¸€å€‹è¦é–‹å•Ÿçš„檔案" @@ -1108,14 +1134,14 @@ msgstr "é¸æ“‡ä¸€å€‹è¦é–‹å•Ÿçš„檔案" msgid "Choose a memory card:" msgstr "é¸æ“‡ä¸€å€‹è¨˜æ†¶å¡ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "é¸æ“‡ä½œç‚ºç¨‹å¼è®€å–器的檔案：(åƒ…ç”¨æ–¼ä¾†è®€å– å…‰ç¢Ÿçš„ç›®éŒ„çµæ§‹)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "é¸æ“‡æå–的資料夾存放ä½ç½®" @@ -1127,14 +1153,14 @@ msgstr "Circle Stick" msgid "Classic" msgstr "Classic" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "清除" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "清除失敗。" @@ -1148,6 +1174,7 @@ msgstr "在éŠæˆ²åŸ·è¡Œæ™‚客戶端斷開連接ï¼ï¼ç¶²è·¯å°æˆ°å·²ç¶“被關閉 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1156,6 +1183,10 @@ msgstr "在éŠæˆ²åŸ·è¡Œæ™‚客戶端斷開連接ï¼ï¼ç¶²è·¯å°æˆ°å·²ç¶“被關閉 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "關閉" @@ -1179,20 +1210,20 @@ msgstr "命令" msgid "Comment" msgstr "註釋" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "註釋：" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "壓縮 ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "壓縮é¸æ“‡çš„ ISO 檔..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "正在壓縮 ISO" @@ -1219,13 +1250,13 @@ msgstr "設定控制器" msgid "Configure..." msgstr "模擬器設定..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "確èªæª”案覆蓋" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "確èªåœæ­¢" @@ -1235,7 +1266,7 @@ msgstr "確èªåœæ­¢" msgid "Connect" msgstr "連接" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "連接 USB éµç›¤" @@ -1292,12 +1323,12 @@ msgstr "轉æ›ç‚º GCI" msgid "Copy failed" msgstr "複製失敗" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "è¤‡è£½è‡³è¨˜æ†¶å¡ %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "核心" @@ -1327,7 +1358,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "無法識別 ISO 檔案 %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "無法儲存 %s" @@ -1340,7 +1371,7 @@ msgstr "" "無法設置控制器。有玩家存留或者éŠæˆ²æ­£åœ¨åŸ·è¡Œï¼\n" "(é‚„ä¸æ”¯æ´åœ¨éŠæˆ²åŸ·è¡Œæ™‚設定控制器)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1352,7 +1383,7 @@ msgstr "" "\n" "請確èªæ˜¯å¦ç¶“ç”± CD/DVD 執行 Dolphin，或者是檔案具有唯讀的屬性？" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "找ä¸åˆ°å‰¯æª”å 'ini' 的開啟命令ï¼" @@ -1369,7 +1400,7 @@ msgstr "" msgid "Count:" msgstr "數é‡ï¼š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "國別：" @@ -1383,24 +1414,24 @@ msgstr "建立 AR 代碼" msgid "Create new perspective" msgstr "建立一個新的é€æª¢è¦–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "ç”± KDE-Look.org 製åš" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "ç”± Milosz Wlazlo è£½åš [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "ç”± VistaIcons.com 製åš" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "ç”± black_rider 製åšä¸¦ç™¼ä½ˆæ–¼ ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "作者：" @@ -1408,7 +1439,7 @@ msgstr "作者：" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "剪è£" @@ -1428,7 +1459,7 @@ msgstr "Crossfade" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "ç›®å‰çš„目錄在 wxFileSelector 後從 %s 更改至 %s ï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "自訂投影修正" @@ -1436,11 +1467,11 @@ msgstr "自訂投影修正" msgid "Custom Projection Hack Settings" msgstr "自訂投影修正設定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "自訂一些直線投影åƒæ•¸ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Czech" @@ -1452,10 +1483,11 @@ msgstr "åå­—æ–¹å‘éµ" msgid "DSP" msgstr "è²éŸ³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSP 模擬引擎" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1466,19 +1498,23 @@ msgstr "DSP 模擬引擎" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 模擬器 (å¿«)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE 解釋器 (æ…¢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE å–®ç¨ç·šç¨‹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE é‡ç·¨è­¯å™¨ (æ…¢)" @@ -1486,15 +1522,23 @@ msgstr "DSP LLE é‡ç·¨è­¯å™¨ (æ…¢)" msgid "DSP settings" msgstr "è²éŸ³è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD 根：" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "資料大å°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "日期：" @@ -1515,7 +1559,7 @@ msgstr "éžä½œç”¨å€" msgid "Debug" msgstr "除錯" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Debugging" msgstr "除錯" @@ -1524,16 +1568,16 @@ msgstr "除錯" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "解壓 ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "解壓é¸æ“‡çš„ ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "ISO 解壓中" @@ -1541,11 +1585,11 @@ msgstr "ISO 解壓中" msgid "Default" msgstr "é è¨­å€¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "é è¨­çš„ ISO：" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "é è¨­çš„å­—åž‹" @@ -1554,7 +1598,7 @@ msgstr "é è¨­çš„å­—åž‹" msgid "Delete" msgstr "刪除" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "刪除存檔" @@ -1563,7 +1607,7 @@ msgstr "刪除存檔" msgid "Delete the existing file '%s'?" msgstr "刪除已存在的檔案 '%s' ？" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 #, fuzzy msgid "Description" msgstr "å•é¡Œ" @@ -1572,8 +1616,8 @@ msgstr "å•é¡Œ" msgid "Detect" msgstr "檢測" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1586,8 +1630,8 @@ msgstr "" msgid "Device" msgstr "è£ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "è£ç½®è¨­å®š" @@ -1612,25 +1656,25 @@ msgstr "" " 並且目錄備份校驗失敗" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "關閉霧化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "關閉霧化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "關閉光æº" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "åƒç´ æ·±åº¦" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "關閉紋ç†" @@ -1660,7 +1704,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "光碟" @@ -1685,6 +1729,7 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1694,10 +1739,13 @@ msgstr "Divide" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "您è¦åœæ­¢ç›®å‰çš„模擬嗎？" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1723,6 +1771,7 @@ msgstr "Dolphin 模擬 Wiimote 設定" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1747,6 +1796,14 @@ msgstr "Dolphin GC 控制器設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC 控制器設定" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" @@ -1775,11 +1832,11 @@ msgstr "Dolphin ç›®å‰è¢«è¨­å®šç‚ºéš±è—所有éŠæˆ²ã€‚按兩下這裡顯示所 msgid "Down" msgstr "下" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "下載代碼 (WiiRD 數據庫)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "已下載 %lu æ¢ä»£ç¢¼ã€‚ (已添加 %lu æ¢)" @@ -1788,23 +1845,23 @@ msgstr "已下載 %lu æ¢ä»£ç¢¼ã€‚ (已添加 %lu æ¢)" msgid "Drums" msgstr "Drums" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "空" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "轉儲è²éŸ³" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "轉儲 EFB 目標" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "轉儲畫格" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "轉儲紋ç†" @@ -1830,6 +1887,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1845,6 +1903,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Dutch" @@ -1868,7 +1931,7 @@ msgstr "" "錯誤：這個版本 Dolphin 需è¦çš„ TAP-Win32 驅動至少為 版本 %d.%d -- 如果最近曾更" "改 Dolphin 組件，é‡æ–°å•Ÿå‹•å¾Œä¹Ÿè¨±å¯ä»¥çœ‹åˆ° Windows 新增驅動。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPE" @@ -1884,7 +1947,7 @@ msgstr "編輯" msgid "Edit ActionReplay Code" msgstr "編輯 ActionReplay 代碼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "編輯 ini 設定檔" @@ -1896,8 +1959,8 @@ msgstr "編輯修正" msgid "Edit current perspective" msgstr "編輯目å‰ç‰ˆå¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "編輯..." @@ -1936,7 +1999,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "模擬 Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "模擬狀態：" @@ -1958,23 +2021,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "é–‹å•Ÿ AR 日誌" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "é–‹å•Ÿè²éŸ³ç¯€æµé–¥" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "é–‹å•Ÿ BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "é–‹å•Ÿå¡Šåˆä½µ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1988,6 +2051,7 @@ msgstr "" msgid "Enable Cache" msgstr "é–‹å•Ÿå¿«å–" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1997,52 +2061,55 @@ msgstr "é–‹å•Ÿå¿«å–" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "開啟作弊" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "é–‹å•Ÿ DTK 音樂" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "開啟雙核心" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "開啟雙核心 (加速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "é–‹å•Ÿå¿«æ·éµ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "é–‹å•Ÿç•¥éŽç©ºé–’" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "é–‹å•Ÿç•¥éŽç©ºé–’ (加速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "é–‹å•Ÿ MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "é–‹å•Ÿé€è¡ŒæŽƒçž„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "開啟寬螢幕" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "開啟寬螢幕" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "開啟線框" @@ -2058,13 +2125,13 @@ msgstr "" "é–‹å•Ÿå„ç•°å‘性éŽæ¿¾ã€‚\n" "通éŽæŸ”化å¯è¦‹çš„多邊形增強紋ç†çš„視覺å“質。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "開啟快速光碟存å–。部份éŠæˆ²éœ€è¦ã€‚(ON = 兼容ã€OFF = 快速)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "開啟分é ç€è¦½" @@ -2084,13 +2151,13 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "é–‹å•Ÿæ­¤é¸é …將加速塞爾é”傳說：曙光公主，請勿在其它éŠæˆ²ä¸­ä½¿ç”¨ã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2099,7 +2166,7 @@ msgstr "" "é–‹å•Ÿå¡Šä½å€è½‰æ› (BAT)：一個記憶體管ç†å–®å…ƒçš„函數。用來更精確的執行，相å°çš„模擬" "速度會變慢。(ON = 兼容ã€OFF = 快速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "開啟自訂投影修正" @@ -2111,7 +2178,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2128,6 +2195,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2143,6 +2211,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "English" @@ -2173,6 +2246,7 @@ msgstr "等於" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "錯誤" @@ -2203,18 +2277,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "錯誤" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "讀å–é¸æ“‡çš„語系出錯。返回使用系統é è¨­å€¼ã€‚" -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2247,7 +2327,7 @@ msgstr "離開 Dolphin" msgid "Export Failed" msgstr "匯出失敗" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "匯出檔案" @@ -2260,15 +2340,15 @@ msgstr "匯出錄åƒ" msgid "Export Recording..." msgstr "匯出錄åƒ..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "匯出存檔" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "匯出 Wii 存檔 (實驗性)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "匯出所有存檔" @@ -2284,7 +2364,7 @@ msgstr "匯出存檔為..." msgid "Extension" msgstr "æ“´å……" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 #, fuzzy msgid "External Frame Buffer" msgstr "é¡å¤–åƒæ•¸" @@ -2297,44 +2377,44 @@ msgstr "é¡å¤–åƒæ•¸" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "僅在 ''銀河戰士：å¦ä¸€å€‹ M'' 中有效的é¡å¤–åƒæ•¸ã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "æå–所有檔案..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "æå–程å¼è®€å–器..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "æå– DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "æå–資料夾..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "æå–檔案..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "æå–分割å€..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "%s æå–中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "所有檔案æå–中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "資料夾æå–中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "æå–中..." @@ -2347,11 +2427,11 @@ msgstr "" msgid "FIFO Player" msgstr "玩家" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANCE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST 大å°" @@ -2363,11 +2443,11 @@ msgstr "連接失敗ï¼" msgid "Failed to Listen!!" msgstr "監è½å¤±æ•—ï¼ï¼" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "下載代碼失敗。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "æå–至 %s 失敗ï¼" @@ -2477,19 +2557,29 @@ msgstr "檔案 %s 寫入檔頭失敗" msgid "Failed to write header for file %d" msgstr "檔案 %d 寫入檔頭失敗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "快速" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "Fast Mipmaps" msgstr "讀å–原始紋ç†" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "快速版本的 MMU。å¯èƒ½ç„¡æ³•åœ¨æ‰€æœ‰éŠæˆ²ä¸ŠåŸ·è¡Œã€‚" +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 #, fuzzy msgid "Fifo Player" @@ -2500,7 +2590,7 @@ msgstr "玩家" msgid "File Info" msgstr "代碼訊æ¯" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "檔案未å«æœ‰ä»£ç¢¼ã€‚" @@ -2533,16 +2623,16 @@ msgstr "檔案未被識別為一張記憶å¡" msgid "File not compressed" msgstr "檔案未壓縮" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO：未知開啟模å¼ï¼š 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "檔案系統" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "檔案類型 'ini' æœªçŸ¥ï¼ ç„¡æ³•é–‹å•Ÿï¼" @@ -2550,7 +2640,7 @@ msgstr "檔案類型 'ini' æœªçŸ¥ï¼ ç„¡æ³•é–‹å•Ÿï¼" msgid "First Block" msgstr "首數據å€å¡Š" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "修正校驗" @@ -2562,7 +2652,7 @@ msgstr "強制 16:9" msgid "Force 4:3" msgstr "強制 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "設定主機為 NTSC-J" @@ -2594,7 +2684,7 @@ msgstr "" "強制éŠæˆ²è¼¸å‡ºå¯¬èž¢å¹•è§£æžåº¦çš„å½±åƒã€‚\n" "注æ„這å¯èƒ½å°Žè‡´åœ–å½¢å•é¡Œ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 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 +2719,7 @@ msgstr "畫格步進" msgid "Frame Advance" msgstr "畫格步進" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "FFV1 畫格轉儲" @@ -2643,7 +2733,7 @@ msgstr "畫格步進" msgid "Frame S&kipping" msgstr "ç•«æ ¼çœç•¥(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "畫格速é™åˆ¶ï¼š" @@ -2651,10 +2741,11 @@ msgstr "畫格速é™åˆ¶ï¼š" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "自由視點" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2670,6 +2761,11 @@ msgstr "自由視點" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "French" @@ -2704,7 +2800,7 @@ msgstr "記錄設定" msgid "GCPad" msgstr "GC 控制器" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "éŠæˆ² ID ：" @@ -2720,15 +2816,15 @@ msgstr "éŠæˆ²æœªåŸ·è¡Œï¼" msgid "Game not found!!" msgstr "找ä¸åˆ°éŠæˆ²ï¼ï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "éŠæˆ²è¦æ ¼è¨­å®š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "éŠæˆ²è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2739,6 +2835,7 @@ msgstr "Gamecube 控制器設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2746,6 +2843,9 @@ msgstr "Gamecube 控制器設定(&P)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube è¨˜æ†¶å¡ (*.raw,*.gcp)" @@ -2754,15 +2854,17 @@ msgid "Gamecube Pad settings" msgstr "Gamecube 控制器設定" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko 代碼" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "GeckoCode 無法執行 (CT%i CST%i) (%s)\n" "(一個æ毀的代碼或ä¸æ”¯æ´çš„代碼類型。)" @@ -2771,6 +2873,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2779,6 +2882,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2788,6 +2894,7 @@ msgstr "一般" msgid "General Settings" msgstr "ç•Œé¢è¨­å®š" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2803,6 +2910,11 @@ msgstr "ç•Œé¢è¨­å®š" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "German" @@ -2834,7 +2946,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Greek" @@ -2866,7 +2978,7 @@ msgstr "" msgid "Header checksum failed" msgstr "檔頭校驗失敗" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebrew" @@ -2933,12 +3045,16 @@ msgstr "å¿«æ·éµè¨­å®š" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "å¿«æ·éµ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hungarian" @@ -2946,12 +3062,12 @@ msgstr "Hungarian" msgid "Hybrid Wiimote" msgstr "æ··åˆ Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2963,11 +3079,11 @@ msgstr "" "標題 ID %016llx.\n" " Dolphin å¯èƒ½æœƒç•¶" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - æ毀的目標" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL 設定" @@ -2983,15 +3099,15 @@ msgstr "IR 指示器" msgid "IR Sensitivity:" msgstr "IR éˆæ•åº¦ï¼š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO 明細" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO 資料夾" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITALY" @@ -2999,21 +3115,23 @@ msgstr "ITALY" msgid "Icon" msgstr "圖示" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "開啟記憶體管ç†å–®å…ƒï¼ŒæŸäº›éŠæˆ²éœ€è¦ã€‚(ON = 兼容ã€OFF = 快速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). 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 " "中的è²éŸ³ç¯€æµé–¥æ‰èƒ½ä½¿å…¶ç”Ÿæ•ˆã€‚" @@ -3041,7 +3159,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "匯入存檔" @@ -3086,7 +3204,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "關閉光æºã€‚改善效能，但是如果在éŠæˆ²ä¸­éœ€è¦ä½¿ç”¨å…‰ç…§æ•ˆæžœå‰‡æœƒç„¡æ³•ä½œç”¨ã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "éŠæˆ²ä¸­" @@ -3095,7 +3213,7 @@ msgid "In-Game" msgstr "éŠæˆ²ä¸­" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "訊æ¯" @@ -3115,7 +3233,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "在這裡æ’入被加密或已解密的代碼..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "æ’å…¥ SD å¡" @@ -3127,7 +3245,7 @@ msgstr "在這裡æ’å…¥å稱.." msgid "Install WAD" msgstr "å®‰è£ WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "安è£è‡³ Wii é¸å–®" @@ -3136,6 +3254,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler，但是這個平å°å°šæœªæ”¯æ´æ­¤åŠŸèƒ½ã€‚" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3145,15 +3264,18 @@ msgstr "調用 InstallExceptionHandler，但是這個平å°å°šæœªæ”¯æ´æ­¤åŠŸèƒ½ ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "æ­£åœ¨å®‰è£ WAD 至 Wii é¸å–®..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "ç•Œé¢è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "ç•Œé¢è¨­å®š" @@ -3179,11 +3301,11 @@ msgstr "內部 LZO 錯誤 - lzo_init() 失敗" msgid "Internal Resolution:" msgstr "全螢幕顯示解æžåº¦ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "解釋器 (éžå¸¸ç·©æ…¢)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "標題" @@ -3200,7 +3322,7 @@ msgstr "無效的數值ï¼" msgid "Invalid bat.map or dir entry" msgstr "無效的 bat.map 或目錄項目" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "無效的事件類型 %i" @@ -3220,14 +3342,15 @@ msgstr "" "%s\n" " å¯èƒ½éœ€è¦é‡æ–°è½‰å„²é€™å€‹éŠæˆ²ã€‚" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "無效的錄åƒæª”" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "無效的狀態" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3243,27 +3366,32 @@ msgstr "無效的狀態" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italian" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT é‡ç·¨è­¯å™¨ (推薦)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL 實驗性é‡ç·¨è­¯å™¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japanese" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3272,8 +3400,8 @@ msgstr "KOREA" msgid "Key" msgstr "éµ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Korean" @@ -3291,7 +3419,7 @@ msgstr "L 鈕" msgid "L-Analog" msgstr "L-類比" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "語系：" @@ -3344,7 +3472,7 @@ msgstr "" msgid "Less Than" msgstr "å°æ–¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3352,7 +3480,7 @@ msgstr "" msgid "Load" msgstr "讀å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 #, fuzzy msgid "Load Custom Textures" msgstr "讀å–高解æžåº¦ç´‹ç†" @@ -3401,6 +3529,7 @@ msgstr "讀å–儲存格 8" msgid "Load State..." msgstr "讀å–進度檔..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3410,10 +3539,14 @@ msgstr "讀å–進度檔..." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3423,6 +3556,9 @@ msgstr "è®€å– Wii 系統é¸å–® (%d%c)" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" @@ -3447,7 +3583,7 @@ msgstr "讀å–指定檔案 (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "本地" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "鎖定線程至內核" @@ -3460,11 +3596,11 @@ msgstr "記錄" msgid "Log Configuration" msgstr "記錄設定" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "記錄類型" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "記錄輸出" @@ -3494,7 +3630,7 @@ msgstr "" "MD5 ä¸ç¬¦åˆ\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU 速度修正" @@ -3516,11 +3652,11 @@ msgstr "MadCatz Gameshark 檔案(*.gcs)" msgid "Main Stick" msgstr "主æ–æ¡¿" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "廠商 ID：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "廠商：" @@ -3545,6 +3681,7 @@ msgstr "記憶å¡(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3552,6 +3689,9 @@ msgstr "記憶å¡(&M)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "記憶å¡" @@ -3586,7 +3726,7 @@ msgstr "" msgid "Menu" msgstr "é¸å–®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "麥克風" @@ -3596,11 +3736,11 @@ msgstr "麥克風" msgid "Min" msgstr "麥克風" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "雜項" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "其它設定" @@ -3617,7 +3757,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "等寬字型" @@ -3630,7 +3770,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "馬é”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3645,7 +3785,7 @@ msgstr "" msgid "Multiply" msgstr "多é‡åˆ†æ’" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3735,6 +3875,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3744,6 +3885,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3752,7 +3896,7 @@ msgstr "å稱：" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "å稱：" @@ -3766,7 +3910,7 @@ msgid "New Scan" msgstr "æ–°çš„æœå°‹" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "下一é " @@ -3778,7 +3922,7 @@ msgstr "尋找下一個" msgid "Nickname :" msgstr "暱稱：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "無國家 (SDK)" @@ -3818,7 +3962,7 @@ msgstr "找ä¸åˆ°æ¨™é¡Œ %s 的存檔資料夾" msgid "None" msgstr "ç„¡" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" @@ -3826,8 +3970,8 @@ msgstr "Norwegian Bokmaal" msgid "Not Equal" msgstr "ä¸ç›¸ç­‰" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "未設定" @@ -3847,7 +3991,7 @@ msgstr "未連接" msgid "Notes" msgstr "註釋" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "注æ„：" @@ -3885,7 +4029,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "關閉" @@ -3911,11 +4055,11 @@ msgstr "僅 %d 個å€å¡Šå¯ç”¨" msgid "Open" msgstr "é–‹å•Ÿ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "開啟內容資料夾(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "é–‹å•Ÿ Wii 存檔資料夾(&S)" @@ -3937,11 +4081,11 @@ msgstr "OpenAL：找ä¸åˆ°è²éŸ³è£ç½®" msgid "OpenAL: can't open device %s" msgstr "OpenAL：無法開啟è£ç½® %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3973,7 +4117,7 @@ msgstr "" "並匯入存檔至一張新的記憶å¡ä¸­\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -4023,19 +4167,20 @@ msgstr "段è½" msgid "Parameters" msgstr "åƒæ•¸" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "åˆ†å‰²å€ %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "修正" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "路徑" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4048,6 +4193,10 @@ msgstr "路徑" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "æš«åœ" @@ -4057,7 +4206,7 @@ msgstr "æš«åœ" msgid "Per-Pixel Lighting" msgstr "åƒç´ å…‰æº" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "完美" @@ -4070,6 +4219,7 @@ msgstr "ç‰ˆå¼ %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4080,6 +4230,10 @@ msgstr "ç‰ˆå¼ %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "執行" @@ -4093,7 +4247,7 @@ msgstr "播放錄åƒ" msgid "Play/Pause" msgstr "執行/æš«åœ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "å¯çŽ©" @@ -4106,6 +4260,7 @@ msgstr "é¸é …" msgid "Players" msgstr "玩家" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4115,6 +4270,9 @@ msgstr "玩家" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "請確èª..." @@ -4126,23 +4284,23 @@ msgstr "請在儲存å‰å»ºç«‹ä¸€å€‹æ–°çš„é€æª¢è¦–" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "åŸ å£ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "åŸ å£ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "åŸ å£ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "åŸ å£ 4" @@ -4151,11 +4309,11 @@ msgstr "åŸ å£ 4" msgid "Port :" msgstr "埠å£ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" @@ -4164,17 +4322,17 @@ msgstr "Portuguese (Brazilian)" msgid "Post-Processing Effect:" msgstr "後期處ç†è‘—色器：" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4187,7 +4345,7 @@ msgstr "é è¨­ï¼š" msgid "Prev Page" msgstr "上一é " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "上一é " @@ -4238,7 +4396,7 @@ msgstr "R-類比" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSSIA" @@ -4251,7 +4409,7 @@ msgstr "範åœ" msgid "Read-only mode" msgstr "唯讀模å¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "實體" @@ -4328,6 +4486,7 @@ msgstr "更新列表" msgid "Refresh game list" msgstr "æ›´æ–°éŠæˆ²åˆ—表" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4346,6 +4505,12 @@ msgstr "æ›´æ–°éŠæˆ²åˆ—表" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "移除" @@ -4398,11 +4563,11 @@ msgstr "å³ æ–æ¡¿" msgid "Rumble" msgstr "震動" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "在ç¨ç«‹çš„線程中執行 DSP LLE (ä¸æŽ¨è–¦)。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russian" @@ -4410,10 +4575,11 @@ msgstr "Russian" msgid "Sa&ve State" msgstr "儲存進度(&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "安全" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4423,6 +4589,9 @@ msgstr "安全" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "å–樣率：" @@ -4480,12 +4649,12 @@ msgstr "儲存至儲存格 8" msgid "Save State..." msgstr "å¦å­˜é€²åº¦..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "å¦å­˜ç‚º..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "儲存已壓縮的 GCM/ISO" @@ -4493,11 +4662,11 @@ msgstr "儲存已壓縮的 GCM/ISO" msgid "Save current perspective" msgstr "儲存目å‰ç‰ˆå¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "儲存已解壓縮的 GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "儲存的影片 %s 是æ毀的，影片錄製åœæ­¢..." @@ -4507,6 +4676,7 @@ msgstr "儲存的影片 %s 是æ毀的，影片錄製åœæ­¢..." msgid "Scaled EFB Copy" msgstr "EFB 縮放複製" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4516,15 +4686,18 @@ msgstr "EFB 縮放複製" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "正在掃瞄..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "正在掃瞄 ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "正在掃瞄..." @@ -4540,12 +4713,12 @@ msgstr "滾動鎖定" msgid "Search Filter" msgstr "æœç´¢ç¯©é¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "æœå°‹å­è³‡æ–™å¤¾" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "é …ç›® %s 在 SYSCONF 中找ä¸åˆ°" @@ -4555,6 +4728,7 @@ msgstr "é …ç›® %s 在 SYSCONF 中找ä¸åˆ°" msgid "Select" msgstr "é¸æ“‡" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4579,6 +4753,14 @@ msgstr "é¸æ“‡å·²éŒ„製的檔案" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "é¸æ“‡å·²éŒ„製的檔案" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "é¸æ“‡è¦å®‰è£çš„ Wii WAD" @@ -4604,16 +4786,21 @@ msgstr "é¸æ“‡æµ®å‹•è¦–窗" msgid "Select the file to load" msgstr "é¸æ“‡è¦è®€å–的檔案" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "é¸æ“‡å­˜æª”" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "é¸æ“‡è¦è®€å–的進度" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4633,6 +4820,9 @@ msgstr "é¸æ“‡è¦è®€å–的進度" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "é¸æ“‡è¦å„²å­˜çš„進度" @@ -4653,7 +4843,7 @@ msgstr "" "強制 4:3：拉伸畫é¢è‡³ 4:3。\n" "拉伸至視窗：拉伸畫é¢å……滿視窗。" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "é¸æ“‡å­—åž‹" @@ -4689,11 +4879,11 @@ msgstr "傳感器ä½ç½®ï¼š" msgid "Separator" msgstr "分離器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbian" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "åŸ å£ 1 - 這是類似於網å¡ç­‰è£ç½®ä½¿ç”¨çš„埠å£ã€‚" @@ -4702,11 +4892,11 @@ msgstr "åŸ å£ 1 - 這是類似於網å¡ç­‰è£ç½®ä½¿ç”¨çš„埠å£ã€‚" msgid "Set" msgstr "設定" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "設為é è¨­ ISO (&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "設定為é è¨­è¨˜æ†¶å¡ %c" @@ -4716,7 +4906,7 @@ msgstr "設定為é è¨­è¨˜æ†¶å¡ %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive：索引大於 ar ä»£ç¢¼åˆ—è¡¨å¤§å° %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "設定..." @@ -4728,7 +4918,7 @@ msgstr "SetupWiiMem：無法找到設定檔" msgid "Shake" msgstr "æ–晃" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "短å：" @@ -4757,7 +4947,7 @@ msgstr "顯示工具列(&T)" msgid "Show Drives" msgstr "顯示è£ç½®" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB 複製範åœ" @@ -4774,7 +4964,7 @@ msgstr "顯示 France" msgid "Show GameCube" msgstr "顯示 GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "輸入顯示" @@ -4790,7 +4980,7 @@ msgstr "顯示 JAP" msgid "Show Korea" msgstr "顯示 Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "顯示語系：" @@ -4810,7 +5000,7 @@ msgstr "顯示平å°" msgid "Show Regions" msgstr "顯示å€åŸŸ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Show Statistics" msgstr "å„種統計數據" @@ -4831,11 +5021,11 @@ msgstr "顯示 Wad" msgid "Show Wii" msgstr "顯示 Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "在åœæ­¢éŠæˆ²å¾Œé¡¯ç¤ºä¸€å€‹ç¢ºèªæ¡†ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4845,23 +5035,23 @@ msgstr "" "關閉此é¸é …å¯ä»¥é˜»æ­¢å…¨éƒ¨éžé—œéµçš„錯誤訊æ¯ï¼Œä½†æ˜¯å®ƒå¯èƒ½å°Žè‡´ Dolphin 在沒有任何徵兆" "的情æ³ä¸‹å´©æ½°ã€‚" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "顯示第一個å€å¡Š" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "顯示存檔å€å¡Š" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "顯示存檔æè¿°" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "顯示存檔圖示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "顯示存檔標題" @@ -4892,7 +5082,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "æ©«æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Simplified Chinese" @@ -4900,12 +5090,12 @@ msgstr "Simplified Chinese" msgid "Size" msgstr "大å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "ç•¥éŽ GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "關閉 Dest. Alpha 通é“" @@ -4938,11 +5128,11 @@ msgstr "" msgid "Slot %i" msgstr "儲存格 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "æ’槽 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "æ’槽 B" @@ -4962,7 +5152,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "è²éŸ³è¨­å®š" @@ -4980,6 +5170,7 @@ msgstr "è²éŸ³ç·©è¡å»ºç«‹å¤±æ•—：%s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -4995,6 +5186,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanish" @@ -5018,7 +5214,7 @@ msgstr "" msgid "Specify a video backend" msgstr "指定影åƒæ’件" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "加速光碟傳輸率" @@ -5026,7 +5222,7 @@ msgstr "加速光碟傳輸率" msgid "Square Stick" msgstr "Square Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "標準控制器" @@ -5119,12 +5315,12 @@ msgstr "æˆåŠŸåŒ¯å…¥å­˜æª”" msgid "Swing" msgstr "æ®èˆž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "系統語系：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5164,7 +5360,7 @@ msgstr "Table å³" msgid "Take Screenshot" msgstr "截å–ç•«é¢" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5181,7 +5377,7 @@ msgstr "ç´‹ç†" msgid "Texture Cache" msgstr "清ç†å¿«å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 #, fuzzy msgid "Texture Format Overlay" msgstr "ç´‹ç†æ ¼å¼" @@ -5198,13 +5394,13 @@ msgstr "ä½å€ç„¡æ•ˆ" msgid "The checksum was successfully fixed" msgstr "校驗已經被æˆåŠŸä¿®å¾©" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "é¸å–的資料夾已經在列表中" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5225,7 +5421,7 @@ msgstr "檔案 %s 無法開啟進行寫入。請確èªæ˜¯å¦æœ‰åˆ¥çš„程å¼æ­£ msgid "The file %s was already open, the file header will not be written." msgstr "檔案 %s 已經開啟，檔頭無法被寫入。" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "指定的檔案 (%s) ä¸å­˜åœ¨" @@ -5247,7 +5443,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5285,7 +5481,7 @@ msgstr "指定的檔案 \"%s\" ä¸å­˜åœ¨" msgid "The value is invalid" msgstr "這個數值無效" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "佈景主題" @@ -5293,13 +5489,13 @@ msgstr "佈景主題" msgid "Theme selection went wrong" msgstr "佈景主題é¸æ“‡éŒ¯èª¤" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 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:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5313,7 +5509,7 @@ msgid "" "Replay itself." msgstr "Action replay 模擬器ä¸æ”¯æ´è¢« Action Replay 自身修改的代碼。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "這å¯èƒ½æœƒä½¿ Wii Menu 和部分éŠæˆ²é™é€Ÿã€‚" @@ -5329,24 +5525,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -msgid "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"這是用來控制éŠæˆ²é€Ÿåº¦çš„è²éŸ³ç¯€æµé–¥ã€‚\n" -"關閉這個å¯èƒ½æœƒå°Žè‡´éŠæˆ²é€Ÿåº¦ä¸æ­£å¸¸ï¼Œå¦‚速度éŽå¿«ä¹‹é¡žã€‚\n" -"但開啟時也許會使部份éŠæˆ²ç”¢ç”Ÿé›œéŸ³ã€‚\n" -"\n" -"éµç›¤å¿«æ·éµ ：按ä½å¯ä»¥ç«‹å³é—œé–‰ç¯€æµé–¥ã€‚" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "這是用來播放音樂曲目，如背景音樂 (BGM) 。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5356,7 +5538,7 @@ msgstr "" "這將分離影åƒå’Œ CPU 線程，所以它們å¯ä»¥åŸ·è¡Œæ–¼ç¨ç«‹çš„內核中。\n" "å¯ä»¥åœ¨å¤šæ ¸å¿ƒçš„ PC 上å–å¾—éžå¸¸å¤§çš„加速，但是也å¯èƒ½å°Žè‡´å¶çˆ¾å´©æ½°æˆ–圖片å•é¡Œã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "這將å…許您手工編輯 INI 設定檔案" @@ -5380,7 +5562,7 @@ msgstr "標題" msgid "To" msgstr "上方" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "å…¨é¸/全部å–消" @@ -5400,6 +5582,7 @@ msgstr "切æ›å…¨èž¢å¹•" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5407,14 +5590,17 @@ msgstr "切æ›å…¨èž¢å¹•" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "上方" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "已嘗試讀å–從未知的檔案類型。" @@ -5422,7 +5608,7 @@ msgstr "已嘗試讀å–從未知的檔案類型。" msgid "Triggers" msgstr "扳機" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "嘗試讀å–從無效的 SYSCONF" @@ -5434,7 +5620,7 @@ msgstr "" "嘗試讀å–從無效的 SYSCONF\n" "Wiimote bt ids 是無效的" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turkish" @@ -5455,11 +5641,11 @@ msgstr "UDP 埠å£ï¼š" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "未知" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5539,7 +5725,7 @@ msgstr "æ›´æ–°" msgid "Upright Wiimote" msgstr "ç›´æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 æ¨¡å¼ (PAL60)" @@ -5552,7 +5738,7 @@ msgstr "全螢幕(&F)" msgid "Use Hex" msgstr "使用 Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "顯示錯誤æ示" @@ -5573,7 +5759,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "工具" @@ -5597,25 +5783,29 @@ msgstr "數值：" msgid "Verbosity" msgstr "事件" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "å½±åƒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "虛擬" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "音é‡" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD installation 失敗：錯誤於建立 %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD installation 失敗：錯誤於建立 %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5630,15 +5820,15 @@ msgstr "" msgid "Warning" msgstr "警告" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "警告 - DOL 啟動於錯誤的主機模å¼ï¼" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "警告 - ELF 啟動於錯誤的主機模å¼ï¼" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "警告 - ISO 啟動於錯誤的主機模å¼ï¼" @@ -5666,7 +5856,7 @@ msgstr "" "以åŠåœ¨æ‚¨è¨˜æ†¶å¡ä¸­ 相åŒæª”案å的檔案\n" "è¦ç¹¼çºŒå—Žï¼Ÿ" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5674,7 +5864,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5682,7 +5872,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5710,7 +5900,7 @@ msgstr "WaveFileWriter - 檔案無法開啟。" msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "寬螢幕修正" @@ -5718,15 +5908,15 @@ msgstr "寬螢幕修正" msgid "Width" msgstr "寬度" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii 主機" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD 根：" @@ -5735,6 +5925,7 @@ msgstr "DVD 根：" msgid "Wii Save Import" msgstr "匯入 Wii 存檔" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5744,6 +5935,9 @@ msgstr "匯入 Wii 存檔" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5811,10 +6005,11 @@ msgstr "視窗 é¸å–®" msgid "Windows Right" msgstr "視窗 å³" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "自動æ›è¡Œ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5830,6 +6025,11 @@ msgstr "自動æ›è¡Œ" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "執行中..." @@ -5837,6 +6037,11 @@ msgstr "執行中..." msgid "Write to Console" msgstr "寫入至控制å°" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "寫入至檔案" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "寫入至檔案" @@ -5890,7 +6095,7 @@ msgstr "您必須輸入一個有效的å進制，å六進制或八進制的數 msgid "You must enter a valid profile name." msgstr "您必須輸入一個有效的設定檔å稱。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "You must restart Dolphin in order for the change to take effect." @@ -5913,7 +6118,7 @@ msgstr "" "應該是 0x%04x (è€Œéž 0x%04llx)\n" "是å¦è¦å»ºç«‹æ–°çš„檔案？" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP 修正" @@ -5967,7 +6172,7 @@ msgstr "" msgid "^ ADD" msgstr "^ 新增" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "程å¼è®€å–器 (.img)" @@ -5998,12 +6203,12 @@ msgstr "ä¸æ˜¯ä¸€å€‹ wii 存檔或讀å–檔案頭部大å°å¤±æ•— %x" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "未知的 cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute 返回 -1 在應用程å¼åŸ·è¡Œæ™‚ï¼" @@ -6188,6 +6393,9 @@ msgstr "| 或" #~ msgid "Emulator Display Settings" #~ msgstr "模擬器顯示設定" +#~ msgid "Enable Audio Throttle" +#~ msgstr "é–‹å•Ÿè²éŸ³ç¯€æµé–¥" + #~ msgid "Enable CPU Access" #~ msgstr "é–‹å•Ÿ CPU å­˜å–" @@ -6497,6 +6705,19 @@ msgstr "| 或" #~ msgid "The file " #~ msgstr "檔案" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "這是用來控制éŠæˆ²é€Ÿåº¦çš„è²éŸ³ç¯€æµé–¥ã€‚\n" +#~ "關閉這個å¯èƒ½æœƒå°Žè‡´éŠæˆ²é€Ÿåº¦ä¸æ­£å¸¸ï¼Œå¦‚速度éŽå¿«ä¹‹é¡žã€‚\n" +#~ "但開啟時也許會使部份éŠæˆ²ç”¢ç”Ÿé›œéŸ³ã€‚\n" +#~ "\n" +#~ "éµç›¤å¿«æ·éµ ：按ä½å¯ä»¥ç«‹å³é—œé–‰ç¯€æµé–¥ã€‚" + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "這通常是用來播放è²éŸ³å’Œè²éŸ³æ•ˆæžœã€‚" From a7d142bed976166a157d1913a73cf882f03d8e17 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Fri, 9 Mar 2012 17:46:58 -0600 Subject: [PATCH 048/185] Rebase in preparation for merge. --- Languages/po/ar.po | 908 ------------------- Languages/po/ca.po | 703 --------------- Languages/po/cs.po | 1260 -------------------------- Languages/po/de.po | 694 -------------- Languages/po/dolphin-emu.pot | 692 -------------- Languages/po/el.po | 1649 ---------------------------------- Languages/po/en.po | 692 -------------- Languages/po/es.po | 898 ------------------ Languages/po/fr.po | 1248 ------------------------- Languages/po/he.po | 692 -------------- Languages/po/hu.po | 895 ------------------ Languages/po/it.po | 694 -------------- Languages/po/ja.po | 738 --------------- Languages/po/ko.po | 700 --------------- Languages/po/nb.po | 694 -------------- Languages/po/nl.po | 694 -------------- Languages/po/pl.po | 776 ---------------- Languages/po/pt.po | 703 --------------- Languages/po/pt_BR.po | 792 ---------------- Languages/po/ru.po | 694 -------------- Languages/po/sr.po | 692 -------------- Languages/po/tr.po | 747 --------------- Languages/po/zh_CN.po | 694 -------------- Languages/po/zh_TW.po | 694 -------------- 24 files changed, 19643 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 08cfb17be9..38454acd02 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -7,29 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -"PO-Revision-Date: 2011-10-16 11:25-0500\n" -"Last-Translator: mansoor\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -<<<<<<< HEAD -"PO-Revision-Date: 2011-07-20 13:33+0300\n" -"Last-Translator: \n" ->>>>>>> Update translation files for recent changes in the code. -======= -"PO-Revision-Date: 2011-10-16 11:25-0500\n" -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-27 08:27-0600\n" ->>>>>>> Update from master branch. "Last-Translator: mansoor\n" ->>>>>>> Update Arabic and Japanese translations. "Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" @@ -440,13 +420,6 @@ msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -558,27 +531,9 @@ msgstr "أض٠باتش" msgid "Add new pane" msgstr "إضاÙØ© جزء جديد" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "أضÙ" @@ -632,23 +587,8 @@ msgstr "All GC/Wii images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملÙات الجيم كيوب (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Ø­Ùظ جميع الحالات (sav, s##)" @@ -676,24 +616,9 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -<<<<<<< HEAD -msgid "Alternate Wiimote Timing" -msgstr "بديل ويموت" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "محاكاة ويموت" ->>>>>>> Update translation files for recent changes in the code. -======= -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "بديل ويموت" ->>>>>>> Update Arabic and Japanese translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -748,19 +673,7 @@ msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙØŸ " msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙات؟" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -782,19 +695,7 @@ msgstr "صوت الخلÙية :" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "تلقائي" @@ -909,19 +810,7 @@ msgid "Blue Right" msgstr "اليمين أزرق" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "أسÙÙ„" @@ -954,15 +843,7 @@ msgstr "لاستعراض الدليل الإخراج" msgid "Buffer:" msgstr "العازلة :" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1026,33 +907,11 @@ msgstr "إلغاء" msgid "Cannot open %s" msgstr "لا يمكن Ùتح %s" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." - ->>>>>>> Update Arabic and Japanese translations. -======= ->>>>>>> Update from master branch. #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 ->>>>>>> Update Arabic and Japanese translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1225,21 +1084,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "إغلاق" @@ -1347,15 +1193,7 @@ msgstr "توصيل ويموت 3" msgid "Connect Wiimote 4" msgstr "توصيل ويموت 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "توصيل" @@ -1547,21 +1385,8 @@ msgstr "الصوت" msgid "DSP Emulator Engine" msgstr "محرك محاكي الصوت" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulation (سريع)" @@ -1798,19 +1623,7 @@ msgstr "" msgid "Divide" msgstr "انقسام" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" @@ -1839,39 +1652,12 @@ msgstr "إعدادات تحكم الوي" msgid "Dolphin FIFO" msgstr "دولÙين" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "إعدادات تحكم الجيم كيوب" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "إعدادات تحكم الجيم كيوب" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "إعدادات تحكم الجيم كيوب" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "إعدادات تحكم الجيم كيوب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1965,27 +1751,9 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Dutch" @@ -2117,41 +1885,15 @@ msgstr "BAT تمكين" msgid "Enable Block Merging" msgstr "تمكين منع الدمج" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -msgid "Enable Bounding Box Calculation" -msgstr "" - -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "تمكين تنظيم حساب الإطار" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "تمكين التخزين المؤقت" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "تمكين الاسرار " @@ -2299,27 +2041,9 @@ msgstr "" msgid "End" msgstr "نهاية" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "English" @@ -2348,45 +2072,10 @@ msgstr "المساواة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "خطأ" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "خطأ" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "خطأ" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "خطأ" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "خطأ ÙÙŠ تحميل اللغة المختارة. يتراجع إلى النظام الاÙتراضية." @@ -2831,27 +2520,9 @@ msgstr "إطارات لتسجيل" msgid "Free Look" msgstr "تحكم بكاميرا اللعبة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "French" @@ -2880,11 +2551,6 @@ msgstr "GCI File(*.gci)" msgid "GCMic Configuration" msgstr "GCMic اعدادات" -#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 -#, fuzzy -msgid "GCMic Configuration" -msgstr "سجل الإعدادات" - #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "تحكم الجيم كيوب" @@ -2922,19 +2588,7 @@ msgid "Gamecube &Pad Settings" msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " @@ -2959,21 +2613,8 @@ msgstr "" "(إما غير رمز سيئة أو نوع رمز غير مدعومة حتى الآن.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "عام" @@ -2982,27 +2623,9 @@ msgstr "عام" msgid "General Settings" msgstr "الإعدادات العامة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "German" @@ -3024,13 +2647,6 @@ msgid "Greater Than" msgstr "أكبر من" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3139,21 +2755,8 @@ msgid "Hotkey Configuration" msgstr "إعدادات الاختصارات" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "الاختصارات" @@ -3220,11 +2823,8 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -<<<<<<< HEAD -======= "إذا كانت محددة، سيتم تحديث سجلات المربع المحيط. المستخدمة من قبل لعبه بابير " "ماريو" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" @@ -3369,19 +2969,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "wad تثبيت" @@ -3460,27 +3048,9 @@ msgstr "تسجيل المل٠غير صالح" msgid "Invalid state" msgstr "غير صالح حالة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italian" @@ -3633,35 +3203,11 @@ msgstr "8 تحميل حالة" msgid "Load State..." msgstr "تحميل حالة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "تحميل قائمة نظام الوي" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "تحميل قائمة نظام الوي" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "تحميل قائمة نظام الوي" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "تحميل قائمة نظام الوي" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "تحميل قائمة نظام الوي %d%c" @@ -3741,15 +3287,7 @@ msgstr "MMU سرعة هاك" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "العصا الأيسر" @@ -3780,19 +3318,7 @@ msgid "Memory Byte" msgstr "ذاكرة بايت" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "بطاقة الذاكرة" @@ -3988,19 +3514,7 @@ msgstr "التبويب" msgid "NP Up" msgstr "Ùوق" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4087,15 +3601,7 @@ msgstr "لا يساوي" msgid "Not Set" msgstr "غير مجموعة" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "غير متصل" @@ -4156,14 +3662,7 @@ msgstr "Ùقط %d كتل متاحة" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Ùتح" @@ -4294,23 +3793,8 @@ msgstr "باتش" msgid "Paths" msgstr "مسارات" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "وقÙØ©" @@ -4330,23 +3814,8 @@ msgstr "مشهد %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "بدأ اللعبه" @@ -4372,19 +3841,7 @@ msgstr "خيارات التشغيل" msgid "Players" msgstr "لاعبين" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -4595,31 +4052,10 @@ msgstr "تحديث قائمة" msgid "Refresh game list" msgstr "تحديث القائمة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "إزالة" @@ -4638,14 +4074,7 @@ msgid "Render to Main Window" msgstr "تقدم إلى الشاشة الرئيسية" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "إعادة ضبط" @@ -4688,19 +4117,7 @@ msgstr "Ø­Ùظ الحالة" msgid "Safe" msgstr "آمنة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "معدل العينة :" @@ -4782,26 +4199,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" -<<<<<<< HEAD -<<<<<<< HEAD msgstr "EFB Copia a escala" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -<<<<<<< HEAD -======= -msgstr "" -======= -msgstr "EFB Copia a escala" ->>>>>>> Update Arabic and Japanese translations. - -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Ùحص %s" @@ -4841,39 +4241,12 @@ msgstr "" msgid "Select" msgstr "حدد" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "اختر مل٠تسجيل" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "اختر مل٠تسجيل" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "اختر مل٠تسجيل" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "اختر مل٠تسجيل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملÙ" @@ -4899,13 +4272,7 @@ msgstr "اختر النواÙØ° العائمة" msgid "Select the file to load" msgstr "حدد المل٠لتحميل" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "حدد Ø­Ùظ الملÙ" @@ -4913,29 +4280,7 @@ msgstr "حدد Ø­Ùظ الملÙ" msgid "Select the state to load" msgstr "حدد حالة التحميل" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "حدد Ø­Ùظ الملÙ" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "حدد حالة التحميل" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "حدد حالة الحÙظ" @@ -5309,27 +4654,9 @@ msgstr "Ùشل إنشاء المخزن المؤقت الصوت : %s" msgid "Space" msgstr "مجال" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanish" @@ -5373,15 +4700,7 @@ msgstr "مربع العصا" msgid "Standard Controller" msgstr "وحدة تحكم القياسية" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5416,14 +4735,7 @@ msgstr "عصا" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "اغلق اللعبه" @@ -5500,57 +4812,25 @@ msgstr "الجدول الأيمن" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "اخذ لقطه من الشاشه" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" -<<<<<<< HEAD -msgstr "" -======= msgstr "TaruKonga (Bongos)" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "اختبار" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 -<<<<<<< HEAD -<<<<<<< HEAD msgid "Texture" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" -<<<<<<< HEAD -msgstr "" -======= -#, fuzzy -======= ->>>>>>> Update Arabic and Japanese translations. -msgid "Texture" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 -msgid "Texture Cache" -<<<<<<< HEAD -msgstr "إزالة التخزين المؤقت" ->>>>>>> Update translation files for recent changes in the code. -======= -msgstr "" ->>>>>>> Update Arabic and Japanese translations. -======= msgstr "Texture Cache" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" @@ -5752,31 +5032,12 @@ msgstr "تبديل جميع أنواع السجل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "اللعب بالشاشة كاملة" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "أعلى" @@ -5883,21 +5144,6 @@ msgstr "تلقى رسالة مجهولة مع معر٠: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"مؤشر غير معرو٠%#08x\n" -"مواصلة?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6055,44 +5301,6 @@ msgstr "" "%s\n" "ولها Ù†Ùس اسم المل٠على بطاقة ذاكرة الخاصة بك\n" "تستمر?" -<<<<<<< HEAD - -#: Source/Core/Core/Src/Movie.cpp:629 -#, c-format -msgid "" -"Warning: You loaded a save that's after the end of the current movie. (byte " -"%u > %u) (frame %u > %u). You should load another save before continuing, or " -"load this state with read-only mode off." -msgstr "" - -#: Source/Core/Core/Src/Movie.cpp:646 -#, c-format -msgid "" -"Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " -"should load another save before continuing, or load this state with read-" -"only mode off. Otherwise you'll probably get a desync." -msgstr "" - -#: Source/Core/Core/Src/Movie.cpp:655 -#, c-format -msgid "" -"Warning: You loaded a save whose movie mismatches on frame %d. You should " -"load another save before continuing, or load this state with read-only mode " -"off. Otherwise you'll probably get a desync.\n" -"\n" -"More information: The current movie is %d frames long and the savestate's " -"movie is %d frames long.\n" -"\n" -"On frame %d, the current movie presses:\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" -"On frame %d, the savestate's movie presses:\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" -msgstr "" -======= ->>>>>>> Update Arabic and Japanese translations. #: Source/Core/Core/Src/Movie.cpp:667 #, c-format @@ -6162,19 +5370,7 @@ msgstr "Wii NAND Root:" msgid "Wii Save Import" msgstr "استيراد Ø­Ùظ الوي" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "ملÙات Ø­Ùظ الوي (*.bin)|*.bin" @@ -6205,15 +5401,7 @@ msgstr "" "أو ربما هو بسبب الخمول وقت مستقطع أو لسبب آخر.\n" "هل تريد إعادة الاتصال على الÙور?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "ويموت متصل" @@ -6245,27 +5433,9 @@ msgstr "نواÙØ° اليمين" msgid "Word Wrap" msgstr "كلمة ختامية" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "العمل" @@ -6501,19 +5671,10 @@ msgstr "أو" #~ msgid "< as Default Profile >" #~ msgstr "< الوضع الاÙتراضي >" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "AOSound" #~ msgstr "&الصوت" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Accurate Texture Cache" #~ msgstr "دقة المظهر السطحي المؤقت" @@ -6551,10 +5712,6 @@ msgstr "أو" #~ "the EFB scale.\n" #~ "ومن الأÙضل Ù„ تعيين نسبة العرض إلى الارتÙاع لتمتد عند استخدامه." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Bad gameini filename" #~ msgstr "Nombre de archivo gameini incorrecto" @@ -6582,27 +5739,13 @@ msgstr "أو" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "No se puede abrir %s, no tiene una función" -<<<<<<< HEAD -<<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." -======= ->>>>>>> Update Arabic and Japanese translations. -======= -#~ msgid "Cannot record movies in read-only mode." -#~ msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." - ->>>>>>> Update from master branch. #, fuzzy #~ msgid "Config..." #~ msgstr "إعدادات" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Configuration profile" #~ msgstr "التكوين الشخصي" @@ -6706,10 +5849,6 @@ msgstr "أو" #~ msgid "Enable CPU Access" #~ msgstr "CPU Access تمكين" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Enable Copy to EFB" #~ msgstr "Habilitar Copiado al EFB" @@ -6725,21 +5864,12 @@ msgstr "أو" #~ msgid "Enable JIT Dynarec" #~ msgstr "تمكين صÙحات" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Enable OpenCL" #~ msgstr "OpenCL تمكين " #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "تمكين شاشة التوقÙ" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" @@ -6813,11 +5943,6 @@ msgstr "أو" #~ msgid "Force Bi/Trilinear Filtering" #~ msgstr "Forzar Filtro Bi/Tri-linear" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Fractional" #~ msgstr "جزئي" @@ -6960,10 +6085,6 @@ msgstr "أو" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "اللازمة لاستعمال الخط القرص اليابانية." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "Run" #~ msgstr "Enter" @@ -6971,11 +6092,6 @@ msgstr "أو" #~ msgid "Running script...\n" #~ msgstr "Ejecutando script...\n" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Scale:" #~ msgstr "النطاق :" @@ -7033,10 +6149,6 @@ msgstr "أو" #~ "عرض إحصاءات مختلÙØ©.\n" #~ "وهذا Ù…Ùيد Ùقط لأغراض التصحيح." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" @@ -7076,21 +6188,12 @@ msgstr "أو" #~ msgid "Specify an audio plugin" #~ msgstr "حدد الخلÙية مل٠Ùيديو" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Start Renderer in Fullscreen" #~ msgstr "بدء ÙÙŠ كمال ملء الشاشة" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "بدء التقديم ÙÙŠ إطار وضع ملء الشاشة." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "The file " #~ msgstr "El archivo " @@ -7117,10 +6220,6 @@ msgstr "أو" #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "Configuración de tipo %d no soportado en el plugin %s" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -7128,13 +6227,6 @@ msgstr "أو" #~ "مؤشر غير معرو٠%#08x\n" #~ "مواصلة?" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. -======= ->>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "لحد عدد الاطارات" diff --git a/Languages/po/ca.po b/Languages/po/ca.po index 2cdcaf6800..25d8f756a8 100644 --- a/Languages/po/ca.po +++ b/Languages/po/ca.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-08-19 08:36-0500\n" "Last-Translator: Jordi Coma \n" "Language-Team: Catalan \n" @@ -576,27 +564,9 @@ msgstr "Afegeix Pegat" msgid "Add new pane" msgstr "Afegeix un nou panell" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Afegir ..." @@ -664,23 +634,8 @@ msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tots els fitxers GameCube GCM (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tots els Estats (savi, s##\")" @@ -769,19 +724,7 @@ 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à irrecuperable!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -803,19 +746,7 @@ msgstr "Suport d'àudio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error en obrir el dispositiu AO \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -931,19 +862,7 @@ msgid "Blue Right" msgstr "Blau dret" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Abaix" @@ -976,15 +895,7 @@ msgstr "Examineu el directori de sortida" msgid "Buffer:" msgstr "Buffer:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1239,21 +1150,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Tancar" @@ -1361,15 +1259,7 @@ msgstr "Connectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Connectar Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Connectant ..." @@ -1559,21 +1449,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Motor d'emulació DSP" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulació DSP HLE (ràpid)" @@ -1812,19 +1689,7 @@ msgstr "" msgid "Divide" msgstr "Divideix" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" @@ -1853,39 +1718,12 @@ msgstr "Configuració de Wiimote emulat" msgid "Dolphin FIFO" msgstr "FIFO Dolphin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuració del control GC Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Configuració del control GC Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuració del control GC Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Configuració del control GC Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" @@ -1982,27 +1820,9 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandès" @@ -2143,40 +1963,15 @@ msgstr "Habilitar les millors tècniques disponibles" msgid "Enable Block Merging" msgstr "Habilitar fusió de Bloc" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Habilitar memòria cau" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activar Trucs" @@ -2329,27 +2124,9 @@ msgstr "" msgid "End" msgstr "Fi" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Anglès" @@ -2378,45 +2155,10 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Error" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Error" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Error" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Error" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2885,27 +2627,9 @@ msgstr "Imatges a Enregistrar" msgid "Free Look" msgstr "Visió lliure" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francès" @@ -2972,19 +2696,7 @@ msgid "Gamecube &Pad Settings" msgstr "Configuració control «&Gamecube»" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" @@ -3009,21 +2721,8 @@ msgstr "" "(Pot ser un codi incorrecte o el tipus de codi encara no està suportat.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -3032,27 +2731,9 @@ msgstr "General" msgid "General Settings" msgstr "Configuració General" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemany" @@ -3186,21 +2867,8 @@ msgid "Hotkey Configuration" msgstr "Tecla d'accés de configuració" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tecles d'accés" @@ -3427,19 +3095,7 @@ msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instal·lant WAD ..." @@ -3521,27 +3177,9 @@ msgstr "Enregistrament de fitxer invàlid" msgid "Invalid state" msgstr "Estat invàlid" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italià" @@ -3699,35 +3337,11 @@ msgstr "Carregar ranura d'estat 8" msgid "Load State..." msgstr "Carregar Estat..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Carregar el menú del sistema Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Carregar el menú del sistema Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Carregar el menú del sistema Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Carregar el menú del sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar menú del sistema Wii %d%c" @@ -3809,15 +3423,7 @@ msgstr "Modificació de velocitat MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arxius MadCatz Gameshark (*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Palanca principal" @@ -3848,19 +3454,7 @@ msgid "Memory Byte" msgstr "Byte de memòria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Targeta de memòria" @@ -4060,19 +3654,7 @@ msgstr "NP Tabulador" msgid "NP Up" msgstr "NP Amunt" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4159,15 +3741,7 @@ msgstr "No igual" msgid "Not Set" msgstr "Sense establir" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "No està connectat" @@ -4228,14 +3802,7 @@ msgstr "Només queden %d blocs disponibles" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Obrir" @@ -4366,23 +3933,8 @@ msgstr "Pegats" msgid "Paths" msgstr "Camins" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4402,23 +3954,8 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Executar" @@ -4444,19 +3981,7 @@ msgstr "Opcions de reproducció" msgid "Players" msgstr "Jugadors" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Confirmeu ..." @@ -4668,31 +4193,10 @@ msgstr "Actualitzar llista" msgid "Refresh game list" msgstr "Actualitza la llista de jocs" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Treure" @@ -4711,14 +4215,7 @@ msgid "Render to Main Window" msgstr "Renderitzar a la finestra principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4761,19 +4258,7 @@ msgstr "&Desa l'estat" msgid "Safe" msgstr "Segur" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Freqüència de mostreig:" @@ -4857,19 +4342,7 @@ msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." msgid "Scaled EFB Copy" msgstr "Copia EFB escalada" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Escanejant %s" @@ -4909,39 +4382,12 @@ msgstr "La secció %s no trobada a SYSCONF" msgid "Select" msgstr "Seleccionar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Seleccionar el fitxer de gravació" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Seleccionar el fitxer de gravació" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Seleccionar el fitxer de gravació" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Seleccionar el fitxer de gravació" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleccionar un fitxer WAD de Wii per instal·lar" @@ -4966,26 +4412,7 @@ msgstr "Seleccioneu finestres flotants" msgid "Select the file to load" msgstr "Seleccioneu el fitxer a carregar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Seleccioneu el fitxer de partida desada" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Seleccioneu l'estat a carregar" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Seleccioneu el fitxer de partida desada" @@ -4993,16 +4420,7 @@ msgstr "Seleccioneu el fitxer de partida desada" msgid "Select the state to load" msgstr "Seleccioneu l'estat a carregar" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Seleccioneu l'estat a desar" @@ -5385,27 +4803,9 @@ msgstr "Ha fallat la creació del buffer de so: %s" msgid "Space" msgstr "Espai" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espanyol" @@ -5450,15 +4850,7 @@ msgstr "Palanca quadrada" msgid "Standard Controller" msgstr "Control estàndard" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5493,14 +4885,7 @@ msgstr "Palanca" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Aturar" @@ -5577,14 +4962,7 @@ msgstr "Taula dreta" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Capturar pantalla" @@ -5817,31 +5195,12 @@ msgstr "Activar tots els tipus de registre de Log" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Activar pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Dalt" @@ -5951,21 +5310,6 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Missatge desconegut amb id: %d rebut des del jugador: Expulsant jugador %d!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Punter desconegud %#08x\n" -"Voleu continuar?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6195,19 +5539,7 @@ msgstr "Arrel de la NAND:" msgid "Wii Save Import" msgstr "Importar partida guardada Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -6238,15 +5570,7 @@ msgstr "" "o potser és perquè l'esteu fent servir fora de temps o una altra raó. \n" "Vols tornar a connectar-lo immediatament?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote connectat" @@ -6278,27 +5602,9 @@ msgstr "Finestra dreta" msgid "Word Wrap" msgstr "Envoltant de paraula" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Treballant ..." @@ -6878,10 +6184,6 @@ msgstr "| O" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Iniciar la finestra de renderitzat a pantalla completa." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -6902,11 +6204,6 @@ msgstr "| O" #~ "Punter desconegud %#08x\n" #~ "Voleu continuar?" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "Limitar imatges/s (FPS)" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index d9d24e6b40..597af6dc22 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -7,35 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -<<<<<<< HEAD -"PO-Revision-Date: 2011-10-15 14:50+0100\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -"PO-Revision-Date: 2011-08-10 20:37+0100\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-08-10 08:30-0500\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> The actual update of the Greek and Czech translations. The last commit -"PO-Revision-Date: 2011-10-15 14:50+0100\n" ->>>>>>> Update Greek and Czech translations -======= -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-19 07:39+0100\n" ->>>>>>> Update Czeck translation. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -"PO-Revision-Date: 2011-12-19 07:39+0100\n" ->>>>>>> Update from master branch. "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" "Language: Czech\n" @@ -453,19 +426,7 @@ msgstr "PÅ™esnost:" msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -======= -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 ->>>>>>> Update Greek and Czech translations -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -591,39 +552,9 @@ msgstr "PÅ™idat Záplatu" msgid "Add new pane" msgstr "PÅ™idat nový panel" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "PÅ™idat..." @@ -691,33 +622,8 @@ msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" @@ -745,33 +651,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. -msgid "Alternate Wiimote Timing" -msgstr "Střídat Äasování Wiimote" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Emulovaný Wiimote" ->>>>>>> Update translation files for recent changes in the code. - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Alternate Wiimote Timing" msgstr "Střídat Äasování Wiimote" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Anisotropic Filtering:" msgstr "Anizotropní Filtrování:" @@ -826,28 +710,8 @@ msgstr "" 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!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 ->>>>>>> Update Greek and Czech translations -======= -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" msgstr "PomÄ›r Stran:" @@ -868,28 +732,8 @@ msgstr "Backend Zvuku:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Chyba pÅ™i otevírání zařízení zvukového výstupu.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 ->>>>>>> Update Greek and Czech translations -======= -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" msgstr "Auto" @@ -1002,30 +846,8 @@ msgstr "Modrá vlevo" msgid "Blue Right" msgstr "Modrá vpravo" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Dole" @@ -1058,25 +880,7 @@ msgstr "Procházet pro výstupní adresář" msgid "Buffer:" msgstr "Vyrovnávací paměť:" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1317,29 +1121,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 ->>>>>>> Update Greek and Czech translations -======= -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Zavřít" @@ -1447,23 +1230,7 @@ msgstr "PÅ™ipojit Wiimote 3" msgid "Connect Wiimote 4" msgstr "PÅ™ipojit Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:608 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "PÅ™ipojuji..." @@ -1652,31 +1419,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" @@ -1915,27 +1659,7 @@ msgstr "" msgid "Divide" msgstr "RozdÄ›lit" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" @@ -1964,55 +1688,12 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Nastavení" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Nastavení" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Nastavení" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -2108,39 +1789,9 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "NizozemÅ¡tina" @@ -2279,49 +1930,15 @@ msgstr "Zapnout BAT" msgid "Enable Block Merging" msgstr "Zapnout SluÄování Bloků" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Povolit výpoÄet ohraniÄujícího rámeÄku" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Povolit vyrovnávací paměť" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -======= ->>>>>>> Update Greek and Czech translations -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Povolit Cheaty" @@ -2477,39 +2094,9 @@ msgstr "" msgid "End" msgstr "End" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "AngliÄtina" @@ -2536,66 +2123,13 @@ msgstr "Záznam 1/%d" msgid "Equal" msgstr "Rovná se" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Chyba" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" -"Chyba v PlayWiimote. %u != %u, bajt %d.\n" -"Je nám líto, nahrávání Wii je doÄasnÄ› nefunkÄní." - -======= -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Chyba" - -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" -"Chyba v PlayWiimote. %u != %u, bajt %d.\n" -"Je nám líto, nahrávání Wii je doÄasnÄ› nefunkÄní." - ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/Main.cpp:346 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:356 ->>>>>>> Update Greek and Czech translations -======= -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Chyba" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 ->>>>>>> The actual update of the Greek and Czech translations. The last commit 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." @@ -3063,39 +2597,9 @@ msgstr "Snímky k Nahrání" msgid "Free Look" msgstr "Rozhlížení pomocí myÅ¡i" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "FrancouzÅ¡tina" @@ -3160,30 +2664,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -3207,31 +2689,10 @@ msgstr "" "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n" "(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován.)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "General" msgstr "Obecné" @@ -3239,39 +2700,9 @@ msgstr "Obecné" msgid "General Settings" msgstr "Obecná Nastavení" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "NÄ›mÄina" @@ -3292,19 +2723,7 @@ msgstr "Grafická nastavení" msgid "Greater Than" msgstr "VÄ›tší než" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -======= -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 ->>>>>>> Update Greek and Czech translations -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3412,32 +2831,9 @@ msgstr "Hostovat" msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Klávesové zkratky" @@ -3662,27 +3058,7 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " "nepodporuje." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3764,39 +3140,9 @@ msgstr "Neplatný soubor s nahrávkou" msgid "Invalid state" msgstr "Neplatný stav" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "ItalÅ¡tina" @@ -3954,51 +3300,11 @@ msgstr "Nahrát Slot Stavu 8" msgid "Load State..." msgstr "Nahrát Stav..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Nahrát Systémové Menu Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Nahrát Systémové Menu Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 -msgid "Load Wii System Menu" -msgstr "Nahrát Systémové Menu Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Nahrát Systémové Menu Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Nahrát Systémové Menu Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" @@ -4080,23 +3386,7 @@ msgstr "MMU Hack Rychlosti" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Soubory MadCatz Gameshark (*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hlavní Stick" @@ -4126,30 +3416,8 @@ msgstr "Pam. karta již otevÅ™ena" msgid "Memory Byte" msgstr "Bajt PamÄ›ti" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Paměťová karta" @@ -4347,26 +3615,7 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4453,23 +3702,7 @@ msgstr "Nerovná se" msgid "Not Set" msgstr "Nenastaven" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:607 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "NepÅ™ipojen" @@ -4528,24 +3761,9 @@ msgstr "Logická Adresa:" msgid "Only %d blocks available" msgstr "Pouze bloky %d jsou dostupné" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 ->>>>>>> Update Greek and Czech translations -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Otevřít" @@ -4675,31 +3893,8 @@ msgstr "Záplaty" msgid "Paths" msgstr "Cesty" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pozastavit" @@ -4717,37 +3912,10 @@ msgstr "Dokonalá" msgid "Perspective %d" msgstr "Perspektiva %d" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 ->>>>>>> Update Greek and Czech translations -======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Spustit" @@ -4773,27 +3941,7 @@ msgstr "Možnosti PÅ™ehrávání" msgid "Players" msgstr "HráÄi" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -5004,45 +4152,10 @@ msgstr "Obnovit Seznam" msgid "Refresh game list" msgstr "Obnovit seznam her" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Odstranit" @@ -5060,18 +4173,6 @@ msgstr "" msgid "Render to Main Window" msgstr "Vykreslit do Hlavního okna" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 @@ -5112,36 +4213,11 @@ msgstr "RuÅ¡tina" msgid "Sa&ve State" msgstr "Uložit Sta&v" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 -msgid "Safe" -msgstr "BezpeÄná" - -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -======= ->>>>>>> Update Greek and Czech translations -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "BezpeÄná" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" @@ -5221,32 +4297,11 @@ msgstr "Uložit dekomprimované GCM/ISO" msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Uložený stav filmu %s je poÅ¡kozen, nahrávání filmu je zastaveno..." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -======= ->>>>>>> Update Greek and Czech translations -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Skenuji %s" @@ -5286,47 +4341,12 @@ msgstr "Sekce %s nebyla v SYSCONF nalezena" msgid "Select" msgstr "Vybrat" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Vyberte Soubor s Nahrávkou" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Vyberte Soubor s Nahrávkou" - -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Vyberte Soubor s Nahrávkou" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -5352,34 +4372,7 @@ msgstr "Vybrat plovoucí okna" msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Vyberte soubor s uloženou hrou" - -#: 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:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" @@ -5387,24 +4380,7 @@ msgstr "Vyberte soubor s uloženou hrou" msgid "Select the state to load" msgstr "Vyberte stav k nahrání" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -5783,39 +4759,9 @@ msgstr "VytvoÅ™ení vyrovnávací pamÄ›ti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" @@ -5859,22 +4805,7 @@ msgstr "ÄŒtvercový Stick" msgid "Standard Controller" msgstr "Standardní OvladaÄ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5906,26 +4837,10 @@ msgstr "Ukládání stavu" msgid "Stick" msgstr "Stick" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 ->>>>>>> Update Greek and Czech translations -======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Zastavit" @@ -6001,22 +4916,8 @@ msgstr "Deska vpravo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "VytvoÅ™it Snímek Obrazovky" @@ -6245,25 +5146,6 @@ msgstr "Do" msgid "Toggle All Log Types" msgstr "Zapnout VÅ¡echny Typy Záznamů" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -msgid "Toggle Fullscreen" -msgstr "PÅ™epnout na Celou Obrazovku" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 @@ -6271,19 +5153,7 @@ msgid "Toggle Fullscreen" msgstr "PÅ™epnout na Celou Obrazovku" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "NahoÅ™e" @@ -6392,29 +5262,6 @@ msgstr "PÅ™ijata neznámá zpráva s id : %d" 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!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Neznámý ukazatel %#08x\n" -"PokraÄovat?" - -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6663,27 +5510,7 @@ msgstr "Wii KoÅ™en NAND:" msgid "Wii Save Import" msgstr "Import uložených pozic Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -6714,23 +5541,7 @@ msgstr "" "nebo je to vyprÅ¡ení limitu neaktivity, nebo z jiného důvodu.\n" "Chcete ho hned znovu pÅ™ipojit?" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:609 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote PÅ™ipojen" @@ -6762,35 +5573,9 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Pracuji..." @@ -7419,12 +6204,6 @@ msgstr "| NEBO" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -7446,45 +6225,6 @@ msgstr "| NEBO" #~ "Neznámý ukazatel %#08x\n" #~ "PokraÄovat?" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#~ msgid "" -#~ "Store EFB copies in GPU texture objects.\n" -#~ "This is not so accurate, but it works well enough for most games and " -#~ "gives a great speedup over EFB to RAM.\n" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Ukládat EFB kopie do objektů textury grafického procesoru.\n" -#~ "Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává " -#~ "vÄ›tší zrychlení než EFB do RAM.\n" -#~ "\n" -#~ "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." - -#~ msgid "Texture" -#~ msgstr "Textura" - -#~ msgid "Texture Cache" -#~ msgstr "Vyrovnávací Paměť Textur" - -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ msgstr "" -#~ "Čím bezpeÄnÄ›jší toto bude, tím bude ménÄ› pravdÄ›podobné, že emulátoru " -#~ "budou chybÄ›t jakékoliv aktualizace textur z RAM.\n" -#~ "\n" -#~ "Pokud si nejste jisti, použijte druhou nejrychlejší hodnotu zprava." - ->>>>>>> Update Greek and Czech translations -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "Použít SzS pro Omezení" diff --git a/Languages/po/de.po b/Languages/po/de.po index 6ed4fa1ca7..c37a4a9f10 100644 --- a/Languages/po/de.po +++ b/Languages/po/de.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-02-17 01:23+0100\n" "Last-Translator: LucasX \n" "Language-Team: \n" @@ -563,27 +551,9 @@ msgstr "Patch hinzufügen" msgid "Add new pane" msgstr "Neue Palette hinzufügen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Hinzufügen..." @@ -652,23 +622,8 @@ msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM Dateien (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" @@ -751,19 +706,7 @@ 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." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -785,19 +728,7 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisch" @@ -911,19 +842,7 @@ msgid "Blue Right" msgstr "Blau rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Unten" @@ -956,15 +875,7 @@ msgstr "Ausgabeverzeichnis auswählen" msgid "Buffer:" msgstr "Buffer:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1201,21 +1112,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Schließen" @@ -1324,15 +1222,7 @@ msgstr "Wiimote 3 verbinden" msgid "Connect Wiimote 4" msgstr "Wiimote 4 verbinden" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Verbinden..." @@ -1523,21 +1413,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emulation (schnell)" @@ -1762,19 +1639,7 @@ msgstr "" msgid "Divide" msgstr "Dividieren" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" @@ -1804,39 +1669,12 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen" msgid "Dolphin FIFO" msgstr "Dolphin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Konfiguration" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Konfiguration" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Konfiguration" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Konfiguration" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" @@ -1924,27 +1762,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holländisch" @@ -2068,41 +1888,16 @@ msgstr "BAT aktivieren" msgid "Enable Block Merging" msgstr "Blockvereinigung aktivieren" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Cache verwenden" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Cheats aktivieren" @@ -2241,27 +2036,9 @@ msgstr "" msgid "End" msgstr "Ende" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Englisch" @@ -2290,45 +2067,10 @@ msgstr "Gleich" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Fehler" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Fehler" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Fehler" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Fehler" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2799,27 +2541,9 @@ msgstr "" msgid "Free Look" msgstr "Frei Umsehen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Französisch" @@ -2888,19 +2612,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube-&Pad Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Cards (*.raw,*.gcp)" @@ -2926,21 +2638,8 @@ msgstr "" "unterstützt.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Allgemein" @@ -2950,27 +2649,9 @@ msgstr "Allgemein" msgid "General Settings" msgstr "Interface Einstellungen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Deutsch" @@ -3095,21 +2776,8 @@ msgid "Hotkey Configuration" msgstr "Tastenkürzel Einstellungen" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tastenkürzel" @@ -3326,19 +2994,7 @@ msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "WAD ins Wii-Menü installieren..." @@ -3424,27 +3080,9 @@ msgstr "Ungültige Aufnahmedatei" msgid "Invalid state" msgstr "Ungültiger Status" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italienisch" @@ -3603,36 +3241,12 @@ msgstr "Status aus Slot 8 laden" msgid "Load State..." msgstr "Status laden..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Wii-Menü laden (%d %c)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii-Menü laden (%d %c)" @@ -3717,15 +3331,7 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark Dateien(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Main Stick" @@ -3757,19 +3363,7 @@ msgid "Memory Byte" msgstr "Speicher" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Memory Card" @@ -3956,19 +3550,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Hoch" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4056,15 +3638,7 @@ msgstr "Ungleich" msgid "Not Set" msgstr "Nicht Festgelegt" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Nicht Verbunden" @@ -4125,14 +3699,7 @@ msgstr "Nur %d Blöcke verfügbar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Öffnen" @@ -4264,23 +3831,8 @@ msgstr "Patches" msgid "Paths" msgstr "Pfade" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4301,23 +3853,8 @@ msgstr "Perspektive %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Start" @@ -4344,19 +3881,7 @@ msgstr "Optionen" msgid "Players" msgstr "Spieler" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -4572,31 +4097,10 @@ msgstr "Liste aktualisieren" msgid "Refresh game list" msgstr "Spieleliste aktualisieren" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Entfernen" @@ -4615,14 +4119,7 @@ msgid "Render to Main Window" msgstr "Im Hauptfenster Rendern" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Zurücksetzen" @@ -4665,19 +4162,7 @@ msgstr "S&tatus speichern" msgid "Safe" msgstr "Sicher" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Abtastrate:" @@ -4762,19 +4247,7 @@ msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." msgid "Scaled EFB Copy" msgstr "EFB Scaled Copy" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Suche..." @@ -4814,39 +4287,12 @@ msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" msgid "Select" msgstr "Auswählen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Aufnahmedatei auswählen" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Aufnahmedatei auswählen" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Aufnahmedatei auswählen" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Aufnahmedatei auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Speicherdatei zum Importieren auswählen" @@ -4873,13 +4319,7 @@ msgstr "Wähle unverankerte Fenster" msgid "Select the file to load" msgstr "Datei zum Laden auswählen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Wii-Spielstand auswählen" @@ -4887,29 +4327,7 @@ msgstr "Wii-Spielstand auswählen" msgid "Select the state to load" msgstr "Status zum Laden auswählen" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "Wii-Spielstand auswählen" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Status zum Laden auswählen" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Status zum Speichern auswählen" @@ -5265,27 +4683,9 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s" msgid "Space" msgstr "Leertaste" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanisch" @@ -5321,15 +4721,7 @@ msgstr "" msgid "Standard Controller" msgstr "Standard-Controller" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5364,14 +4756,7 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" @@ -5444,14 +4829,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Screenshot erstellen" @@ -5681,31 +5059,12 @@ msgstr "Alle umschalten" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Vollbildmodus wechseln" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Oben" @@ -5810,21 +5169,6 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Unbekannte Meldung mit ID %d erhalten von Spieler %d, Spieler herausgeworfen!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Unbekanter Pointer %#08x\n" -"Fortfahren?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6039,19 +5383,7 @@ msgstr "DVD Laufwerk:" msgid "Wii Save Import" msgstr "Wii Spielstand importieren" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii Speicherdateien (*.bin)|*.bin" @@ -6082,15 +5414,7 @@ msgstr "" "oder die Wiimote war zulange inaktiv oder andere Ursachen.\n" "Soll die Wiimote jetzt wieder verbunden werden?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Verbunden" @@ -6123,27 +5447,9 @@ msgstr "Windows Rechts" msgid "Word Wrap" msgstr "Zeilenumbruch" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Arbeite..." diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index 0f5636c238..3bfb569233 100644 --- a/Languages/po/dolphin-emu.pot +++ b/Languages/po/dolphin-emu.pot @@ -8,19 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:56-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -518,27 +506,9 @@ msgstr "" msgid "Add new pane" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "" @@ -592,23 +562,8 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -686,19 +641,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -720,19 +663,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -840,19 +771,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "" @@ -885,15 +804,7 @@ msgstr "" msgid "Buffer:" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1113,21 +1024,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "" @@ -1235,15 +1133,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "" @@ -1417,21 +1307,8 @@ msgstr "" msgid "DSP Emulator Engine" msgstr "" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1649,19 +1526,7 @@ msgstr "" msgid "Divide" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1690,39 +1555,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1805,27 +1643,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1944,40 +1764,15 @@ msgstr "" msgid "Enable Block Merging" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -2103,27 +1898,9 @@ msgstr "" msgid "End" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2152,45 +1929,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2615,27 +2357,9 @@ msgstr "" msgid "Free Look" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2701,19 +2425,7 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2736,21 +2448,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2759,27 +2458,9 @@ msgstr "" msgid "General Settings" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "" @@ -2894,21 +2575,8 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" @@ -3099,19 +2767,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -3188,27 +2844,9 @@ msgstr "" msgid "Invalid state" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "" @@ -3359,35 +2997,11 @@ msgstr "" msgid "Load State..." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3464,15 +3078,7 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3503,19 +3109,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3692,19 +3286,7 @@ msgstr "" msgid "NP Up" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3791,15 +3373,7 @@ msgstr "" msgid "Not Set" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3860,14 +3434,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "" @@ -3993,23 +3560,8 @@ msgstr "" msgid "Paths" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -4029,23 +3581,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "" @@ -4071,19 +3608,7 @@ msgstr "" msgid "Players" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4289,31 +3814,10 @@ msgstr "" msgid "Refresh game list" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4329,14 +3833,7 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -4379,19 +3876,7 @@ msgstr "" msgid "Safe" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4475,19 +3960,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" @@ -4527,39 +4000,12 @@ msgstr "" msgid "Select" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4582,26 +4028,7 @@ msgstr "" msgid "Select the file to load" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "" @@ -4609,16 +4036,7 @@ msgstr "" msgid "Select the state to load" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4952,27 +4370,9 @@ msgstr "" msgid "Space" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -5008,15 +4408,7 @@ msgstr "" msgid "Standard Controller" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5051,14 +4443,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -5130,14 +4515,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -5340,31 +4718,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" @@ -5466,19 +4825,6 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5683,19 +5029,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5722,15 +5056,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5762,27 +5088,9 @@ msgstr "" msgid "Word Wrap" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "" diff --git a/Languages/po/el.po b/Languages/po/el.po index 74d89374e1..2f7ef538fc 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -7,31 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -"PO-Revision-Date: 2011-09-13 17:28+0200\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-08-10 08:30-0500\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> The actual update of the Greek and Czech translations. The last commit -"PO-Revision-Date: 2011-10-15 11:16+0200\n" ->>>>>>> Update Greek and Czech translations -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -"PO-Revision-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" "Language: Greek\n" @@ -447,49 +424,15 @@ msgstr "Σχετικά με το Dolphin" msgid "Acceleration" msgstr "Επιτάχυνση" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 -msgid "Accuracy:" -<<<<<<< HEAD -msgstr "ΑκÏίβεια:" -======= -msgstr "" ->>>>>>> Update translation files for recent changes in the code. - -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 -msgid "Accuracy:" -msgstr "ΑκÏίβεια:" - ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 -======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "ΑκÏίβεια:" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Accurate VBeam emulation" msgstr "ΑκÏιβής VBeam εξομοίωση" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -======= -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 ->>>>>>> Update Greek and Czech translations -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -617,39 +560,9 @@ msgstr "ΠÏοσθήκη Patch" msgid "Add new pane" msgstr "ΠÏοσθήκη νέου pane" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "ΠÏοσθήκη..." @@ -705,33 +618,8 @@ msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" @@ -759,33 +647,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -msgid "Alternate Wiimote Timing" -msgstr "Εναλλακτικός ΧÏονισμός Wiimote" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Εξομοιωμένο Wiimote" ->>>>>>> Update translation files for recent changes in the code. - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Εναλλακτικός ΧÏονισμός Wiimote" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Anisotropic Filtering:" msgstr "ΑνισοτÏοπικό ΦιλτÏάÏισμα:" @@ -842,28 +708,8 @@ msgstr "" "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " "πάντα!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 ->>>>>>> Update Greek and Czech translations -======= -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -884,28 +730,8 @@ msgstr "Backend Ήχου:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 ->>>>>>> Update Greek and Czech translations -======= -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" msgstr "Αυτόματα" @@ -932,10 +758,6 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Automatically generate mipmaps rather than decoding them from memory.\n" @@ -943,26 +765,12 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -"ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" -"Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα στις " -"υφές.\n" -"\n" -"Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -======= ->>>>>>> Update translation files for recent changes in the code. - -======= ->>>>>>> Update Greek and Czech translations -======= "ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" "Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα στις " "υφές.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." ->>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "Πίσω" @@ -1038,30 +846,8 @@ msgstr "ΑÏιστεÏÏŒ Μπλε" msgid "Blue Right" msgstr "Δεξί Μπλε" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Βάση" @@ -1094,25 +880,7 @@ msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" msgid "Buffer:" msgstr "Buffer:" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1313,33 +1081,13 @@ msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάÏτα μνήμης:" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που " "απαÏτίζονται μόνο από φακέλους)" -<<<<<<< HEAD -======= -msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" -msgstr "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που απαÏτίζονται μόνο από φακέλους)" ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 @@ -1375,29 +1123,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 ->>>>>>> Update Greek and Czech translations -======= -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Κλείσιμο" @@ -1505,23 +1232,7 @@ msgstr "ΣÏνδεση Wiimote 3" msgid "Connect Wiimote 4" msgstr "ΣÏνδεση Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:608 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Γίνεται ΣÏνδεση..." @@ -1640,32 +1351,12 @@ msgstr "ΔημιουÏγία νέας οπτικής" msgid "Created by KDE-Look.org" msgstr "ΔημιουÏγήθηκε από KDE-Look.org" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "ΔημιουÏγήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart." "com]" -<<<<<<< HEAD -======= -msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "ΔημιουÏγήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" @@ -1736,31 +1427,8 @@ msgstr "Ήχος (DSP)" msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" @@ -1999,27 +1667,7 @@ msgstr "" msgid "Divide" msgstr "Divide" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" @@ -2048,55 +1696,12 @@ msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Ρυθμίσεις Dolphin GCPad" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -msgid "Dolphin GCPad Configuration" -msgstr "Ρυθμίσεις Dolphin GCPad" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Ρυθμίσεις Dolphin GCPad" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -2108,51 +1713,21 @@ msgstr "Ρυθμίσεις Dolphin Wiimote" msgid "Dolphin at &Google Code" msgstr "Dolphin στο &Google Code" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ->>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" "Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εÏÏεση " "αÏχείων..." -<<<<<<< HEAD -======= -msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." -msgstr "Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εÏÏεση αÏχείων..." ->>>>>>> The actual update of the Greek and Czech translations. The last commit - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ->>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ " "εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." -<<<<<<< HEAD -======= -msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." -msgstr "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -2224,39 +1799,9 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Ολλανδικά" @@ -2397,51 +1942,15 @@ msgstr "ΕνεÏγοποίηση BAT" msgid "Enable Block Merging" msgstr "ΕνεÏγοποίηση Block Merging" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "ΕνεÏγοποίηση Cache" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 -#, fuzzy -msgid "Enable Cache" -msgstr "ΕνεÏγοποίηση Cheat" - -======= ->>>>>>> Update Greek and Czech translations -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "ΕνεÏγοποίηση Cheat" @@ -2542,33 +2051,13 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" "ΕνεÏγοποιήστε το για να επιταχÏνετε το The Legend of Zelda: Twilight " "Princess. ΑπενεÏγοποιήστε το για τα υπόλοιπα παιχνίδια." -<<<<<<< HEAD -======= -msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." -msgstr "ΕνεÏγοποιήστε το για να επιταχÏνετε το The Legend of Zelda: Twilight Princess. ΑπενεÏγοποιήστε το για τα υπόλοιπα παιχνίδια." ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" @@ -2618,39 +2107,9 @@ msgstr "" msgid "End" msgstr "Τέλος" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Αγγλικά" @@ -2677,91 +2136,19 @@ msgstr "ΕγγÏαφή 1/%d" msgid "Equal" msgstr "Ίσο" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Σφάλμα" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Σφάλμα" - -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/Main.cpp:346 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:356 ->>>>>>> Update Greek and Czech translations -msgid "Error loading selected language. Falling back to system default." -msgstr "" -"Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " -"συστήματος." -<<<<<<< HEAD -======= -#: Source/Core/DolphinWX/Src/Main.cpp:346 -msgid "Error loading selected language. Falling back to system default." -msgstr "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή συστήματος." ->>>>>>> The actual update of the Greek and Czech translations. The last commit - -#: Source/Core/Common/Src/ChunkFile.h:180 -#, c-format -msgid "" -"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -"Aborting savestate load..." -msgstr "" -======= ->>>>>>> Update translation files for recent changes in the code. - -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 -======= -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Σφάλμα" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " "συστήματος." -<<<<<<< HEAD -#: Source/Core/Common/Src/ChunkFile.h:180 ->>>>>>> Update from master branch. -======= #: Source/Core/Common/Src/ChunkFile.h:194 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " @@ -3038,47 +2425,19 @@ msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το msgid "Failed to write header for file %d" msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το αÏχείο %d" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 -msgid "Fast" -<<<<<<< HEAD -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Fast" ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgstr "ΓÏήγοÏη" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "ΓÏήγοÏα Mipmaps" -<<<<<<< HEAD -======= -msgstr "" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Fast Mipmaps" -msgstr "" ->>>>>>> Update translation files for recent changes in the code. - -======= ->>>>>>> Update Greek and Czech translations -======= - ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Fast version of the MMU. Does not work for every game." msgstr "ΓÏήγοÏη έκδοση του MMU. Δε δουλεÏει για όλα τα παιχνίδια." @@ -3252,39 +2611,9 @@ msgstr "ΚαÏέ ΠÏος ΕγγÏαφή" msgid "Free Look" msgstr "ΕλεÏθεÏη Ματιά" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Γαλλικά" @@ -3350,30 +2679,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -3397,31 +2704,10 @@ msgstr "" "Ο Κωδικός Gecko απέτυχε να εκτελεστεί (CT%i CST%i) (%s)\n" "(ή είναι ένας κακός κωδικός ή ο Ï„Ïπος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζεται.)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "General" msgstr "Γενικά" @@ -3429,39 +2715,9 @@ msgstr "Γενικά" msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "ΓεÏμανικά" @@ -3484,19 +2740,7 @@ msgstr "Ρυθμίσεις ΓÏαφικών" msgid "Greater Than" msgstr "ΜεγαλÏτεÏο από" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -======= -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 ->>>>>>> Update Greek and Czech translations -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3606,32 +2850,9 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" @@ -3712,34 +2933,12 @@ msgstr "" "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = " "Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." -======= -msgid "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you also have to disable Audio Throttle in DSP to make it effective." ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " -"also have to disable Audio Throttle in DSP to make it effective." ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." ->>>>>>> Update the pot file to reflect recent changes in the code. msgstr "" "Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, " "PAL:50),\n" @@ -3882,27 +3081,7 @@ msgstr "" "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει " "ακόμα." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3984,39 +3163,9 @@ msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" msgid "Invalid state" msgstr "Μη έγκυÏο κατάσταση" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Ιταλικά" @@ -4174,51 +3323,11 @@ msgstr "ΦόÏτωση Σημείου Αποθήκευσης 8" msgid "Load State..." msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 -msgid "Load Wii System Menu" -msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii %d%c" @@ -4300,23 +3409,7 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ΚÏÏιο Stick" @@ -4346,30 +3439,8 @@ msgstr "Η κάÏτα μνήμης είναι ήδη ανοιχτή" msgid "Memory Byte" msgstr "Memory Byte" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "ΚάÏτα Μνήμης" @@ -4569,26 +3640,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4675,23 +3727,7 @@ msgstr "Όχι ίσο" msgid "Not Set" msgstr "Μη ΟÏισμένο" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:607 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -4750,24 +3786,9 @@ msgstr "Offset:" msgid "Only %d blocks available" msgstr "Διαθέσιμα μόνο %d μπλοκ" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 ->>>>>>> Update Greek and Czech translations -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Άνοιγμα" @@ -4899,31 +3920,8 @@ msgstr "Patches" msgid "Paths" msgstr "Φάκελοι" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "ΠαÏση" @@ -4941,37 +3939,10 @@ msgstr "Τέλειο" msgid "Perspective %d" msgstr "Οπτική %d" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 ->>>>>>> Update Greek and Czech translations -======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "ΑναπαÏαγωγή" @@ -4997,27 +3968,7 @@ msgstr "Ρυθμίσεις ΑναπαÏαγωγής" msgid "Players" msgstr "Παίχτες" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -5228,45 +4179,10 @@ msgstr "Ανανέωση Λίστας" msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "ΑφαίÏεση" @@ -5284,18 +4200,6 @@ msgstr "" msgid "Render to Main Window" msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 @@ -5336,38 +4240,11 @@ msgstr "Ρώσικα" msgid "Sa&ve State" msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 -======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 ->>>>>>> Update the pot file to reflect recent changes in the code. -msgid "Safe" -<<<<<<< HEAD -msgstr "Ασφαλής" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -<<<<<<< HEAD -======= -msgstr "" - -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Safe" msgstr "Ασφαλής" ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" @@ -5453,27 +4330,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 -msgid "Scaled EFB Copy" -<<<<<<< HEAD -msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" -======= -msgstr "" ->>>>>>> Update translation files for recent changes in the code. - -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Ανίχνευση %s" @@ -5513,47 +4370,12 @@ msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" msgid "Select" msgstr "Επιλογή" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" - -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" @@ -5579,15 +4401,7 @@ msgstr "Επιλέξτε αιωÏοÏμενα παÏάθυÏα" msgid "Select the file to load" msgstr "Επιλέξτε το αÏχείο για φόÏτωση" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" @@ -5595,43 +4409,7 @@ msgstr "Επιλέξτε αÏχείο αποθήκευσης" msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "Επιλέξτε αÏχείο αποθήκευσης" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Επιλέξτε το σημείο φόÏτωσης" - -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -5707,32 +4485,12 @@ msgstr "ΔιαχωÏιστής" msgid "Serbian" msgstr "ΣεÏβικά" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "ΣειÏιακή ΘÏÏα 1 - Αυτή είναι η θÏÏα που χÏησιμοποιοÏν οι συσκευές όπως ο " "Ï€ÏοσαÏμογέας δικτÏου" -<<<<<<< HEAD -======= -msgid "Serial Port 1 - This is the port which devices such as the net adapter use" -msgstr "ΣειÏιακή ΘÏÏα 1 - Αυτή είναι η θÏÏα που χÏησιμοποιοÏν οι συσκευές όπως ο Ï€ÏοσαÏμογέας δικτÏου" ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -5955,16 +4713,7 @@ msgstr "ΠαÏάλειψη Dest. Alpha Pass" msgid "Skip EFB Access from CPU" msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 -<<<<<<< HEAD -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -5993,46 +4742,6 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 -msgid "" -"Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" -"Sometimes also increases visual quality.\n" -"If you're experiencing any issues, try raising texture cache accuracy or " -"disable this option.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της " -"εξομοίωσης.\n" -"ΜεÏικές φοÏές μποÏεί να βελτιώσει την οπτική ποιότητα.\n" -"Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της cache " -"υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" -======= -msgid "" -"Skip the destination alpha pass used in many games for various graphical " -"effects.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"ΠαÏάλειψη του destination alpha pass που χÏησιμοποιείται από πολλά παιχνίδια " -"σε διάφοÏα γÏαφικά εφέ.\n" ->>>>>>> Update translation files for recent changes in the code. -"\n" -"Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 -msgid "" -"Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" -"Sometimes also increases visual quality.\n" -"If you're experiencing any issues, try raising texture cache accuracy or " -"disable this option.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - -======= ->>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -6086,39 +4795,9 @@ msgstr "Αποτυχία δημιουÏγίας buffer ήχου: %s" msgid "Space" msgstr "Space" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Ισπανικά" @@ -6163,22 +4842,7 @@ msgstr "ΤετÏάγωνο Stick" msgid "Standard Controller" msgstr "Τυπικός Controller" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -6210,54 +4874,14 @@ msgstr "Σημεία Αποθήκευσης" msgid "Stick" msgstr "Stick" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 ->>>>>>> Update Greek and Czech translations -======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Διακοπή" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 -msgid "" -"Store EFB copies in GPU texture objects.\n" -"This is not so accurate, but it works well enough for most games and gives a " -"great speedup over EFB to RAM.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -<<<<<<< HEAD -"Αποθήκευση των EFB αντιγÏάφων σε GPU αντικείμενα υφών.\n" -"Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα " -"παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" -"\n" -"Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -======= ->>>>>>> Update translation files for recent changes in the code. - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 ->>>>>>> Update Greek and Czech translations -======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Store EFB copies in GPU texture objects.\n" @@ -6273,7 +4897,6 @@ msgstr "" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Stretch to Window" msgstr "ΠÏοσαÏμογή στο ΠαÏάθυÏο" @@ -6330,22 +4953,8 @@ msgstr "Δεξί Table" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "ΔημιουÏγία Στιγμιότυπου" @@ -6357,43 +4966,15 @@ msgstr "" msgid "Test" msgstr "Τέστ" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 -<<<<<<< HEAD -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Texture" msgstr "Υφή" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" msgstr "Cache Υφών" -<<<<<<< HEAD -======= -#, fuzzy -msgid "Texture" -msgstr "Εξαγωγή Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 -#, fuzzy -msgid "Texture Cache" -msgstr "ΚαθαÏισμός Cache" ->>>>>>> Update translation files for recent changes in the code. - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 ->>>>>>> Update Greek and Czech translations -======= - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" @@ -6469,24 +5050,6 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από δεξιά." -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 -msgid "" -"The safer you adjust this, the less likely the emulator will be missing any " -"texture updates from RAM.\n" -"\n" -"If unsure, use the second-fastest value from the right." -msgstr "" -<<<<<<< HEAD -"Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να " -"χάσει ανανεώσεις των υφών από την RAM.\n" -"\n" -"Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από δεξιά." -======= ->>>>>>> Update translation files for recent changes in the code. - -======= ->>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" msgstr "" @@ -6628,25 +5191,6 @@ msgstr "Εώς" msgid "Toggle All Log Types" msgstr "Εναλλαγή Όλων ΤÏπων ΚαταγÏαφής " -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -msgid "Toggle Fullscreen" -msgstr "Εναλλαγή ΠλήÏους Οθόνης" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 @@ -6654,19 +5198,7 @@ msgid "Toggle Fullscreen" msgstr "Εναλλαγή ΠλήÏους Οθόνης" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "ΚοÏυφή" @@ -6776,29 +5308,6 @@ msgstr "Ελήφθη άγνωστο μήνυμα με id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ελήφθη άγνωστο μήνυμα με:%d από τον παίκτη:%d ΑποσÏνδεση παίκτη!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Άγνωστος δείκτης %#08x\n" -"Συνέχεια;" - -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -7029,27 +5538,7 @@ msgstr "Wii NAND Ρίζα:" msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -7080,23 +5569,7 @@ msgstr "" "ή πιθανόν να οφείλεται σε χÏόνο αδÏάνειας ή κάποιον άλλο λόγο.\n" "Θέλετε να γίνει άμεση επανασÏνδεση;" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:609 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -7128,35 +5601,9 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Σε εÏγασία..." @@ -7373,12 +5820,6 @@ msgstr "zNear ΔιόÏθωση: " msgid "| OR" msgstr "| OR" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. #~ msgid "Cannot record movies in read-only mode." #~ msgstr "" #~ "Δεν μποÏεί να γίνει εγγÏαφή ταινιών σε λειτουÏγία μόνο για ανάγνωση." @@ -7409,93 +5850,3 @@ msgstr "| OR" #~ msgstr "" #~ "Άγνωστος δείκτης %#08x\n" #~ "Συνέχεια;" -<<<<<<< HEAD -======= -#~ msgid "Disable Wiimote Speaker" -#~ msgstr "ΑπενεÏγοποίηση Ηχείου Wiimote" ->>>>>>> Update translation files for recent changes in the code. -======= -#~ msgid "Accuracy:" -#~ msgstr "ΑκÏίβεια:" - -#~ msgid "Alternate Wiimote Timing" -#~ msgstr "Εναλλακτικός ΧÏονισμός Wiimote" - -#~ msgid "" -#~ "Automatically generate mipmaps rather than decoding them from memory.\n" -#~ "Increases performance a bit but might cause minor texture defects.\n" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" -#~ "Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα " -#~ "στις υφές.\n" -#~ "\n" -#~ "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." - -#~ msgid "Enable Cache" -#~ msgstr "ΕνεÏγοποίηση Cache" - -#~ msgid "Fast" -#~ msgstr "ΓÏήγοÏη" - -#~ msgid "Fast Mipmaps" -#~ msgstr "ΓÏήγοÏα Mipmaps" - -#~ msgid "Safe" -#~ msgstr "Ασφαλής" - -#~ msgid "Scaled EFB Copy" -#~ msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" - -#~ msgid "" -#~ "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" -#~ "Sometimes also increases visual quality.\n" -#~ "If you're experiencing any issues, try raising texture cache accuracy or " -#~ "disable this option.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της " -#~ "εξομοίωσης.\n" -#~ "ΜεÏικές φοÏές μποÏεί να βελτιώσει την οπτική ποιότητα.\n" -#~ "Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της " -#~ "cache υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" -#~ "\n" -#~ "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." - -#~ msgid "" -#~ "Store EFB copies in GPU texture objects.\n" -#~ "This is not so accurate, but it works well enough for most games and " -#~ "gives a great speedup over EFB to RAM.\n" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Αποθήκευση των EFB αντιγÏάφων σε GPU αντικείμενα υφών.\n" -#~ "Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα " -#~ "παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" -#~ "\n" -#~ "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." - -#~ msgid "Texture" -#~ msgstr "Υφή" - -#~ msgid "Texture Cache" -#~ msgstr "Cache Υφών" - -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ msgstr "" -#~ "Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής " -#~ "να χάσει ανανεώσεις των υφών από την RAM.\n" -#~ "\n" -#~ "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από " -#~ "δεξιά." ->>>>>>> Update Greek and Czech translations -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. diff --git a/Languages/po/en.po b/Languages/po/en.po index a5b3cab7a4..aa648c3fc8 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -517,27 +505,9 @@ msgstr "" msgid "Add new pane" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "" @@ -591,23 +561,8 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -685,19 +640,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -719,19 +662,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -839,19 +770,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "" @@ -884,15 +803,7 @@ msgstr "" msgid "Buffer:" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1112,21 +1023,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "" @@ -1234,15 +1132,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "" @@ -1416,21 +1306,8 @@ msgstr "" msgid "DSP Emulator Engine" msgstr "" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1648,19 +1525,7 @@ msgstr "" msgid "Divide" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1689,39 +1554,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1804,27 +1642,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1943,40 +1763,15 @@ msgstr "" msgid "Enable Block Merging" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -2102,27 +1897,9 @@ msgstr "" msgid "End" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2151,45 +1928,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2614,27 +2356,9 @@ msgstr "" msgid "Free Look" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2700,19 +2424,7 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2735,21 +2447,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2758,27 +2457,9 @@ msgstr "" msgid "General Settings" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "" @@ -2893,21 +2574,8 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" @@ -3098,19 +2766,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -3187,27 +2843,9 @@ msgstr "" msgid "Invalid state" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "" @@ -3358,35 +2996,11 @@ msgstr "" msgid "Load State..." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3463,15 +3077,7 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3502,19 +3108,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3691,19 +3285,7 @@ msgstr "" msgid "NP Up" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3790,15 +3372,7 @@ msgstr "" msgid "Not Set" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3859,14 +3433,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "" @@ -3992,23 +3559,8 @@ msgstr "" msgid "Paths" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -4028,23 +3580,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "" @@ -4070,19 +3607,7 @@ msgstr "" msgid "Players" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4288,31 +3813,10 @@ msgstr "" msgid "Refresh game list" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4328,14 +3832,7 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -4378,19 +3875,7 @@ msgstr "" msgid "Safe" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4474,19 +3959,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" @@ -4526,39 +3999,12 @@ msgstr "" msgid "Select" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4581,26 +4027,7 @@ msgstr "" msgid "Select the file to load" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "" @@ -4608,16 +4035,7 @@ msgstr "" msgid "Select the state to load" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4951,27 +4369,9 @@ msgstr "" msgid "Space" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -5007,15 +4407,7 @@ msgstr "" msgid "Standard Controller" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5050,14 +4442,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -5129,14 +4514,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -5339,31 +4717,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" @@ -5465,19 +4824,6 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5682,19 +5028,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5721,15 +5055,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5761,27 +5087,9 @@ msgstr "" msgid "Word Wrap" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "" diff --git a/Languages/po/es.po b/Languages/po/es.po index 3e31ea03ed..6e2a488d32 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -7,26 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -"PO-Revision-Date: 2011-12-09 00:28+0100\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -<<<<<<< HEAD -"PO-Revision-Date: 2011-08-11 15:30+0100\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"PO-Revision-Date: 2011-10-15 23:23+0100\n" ->>>>>>> Updated Spanish translation -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-23 16:03+0100\n" ->>>>>>> Update from master branch. "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" "Language: Spanish\n" @@ -449,13 +431,6 @@ msgid "Accurate VBeam emulation" msgstr "Emulación de VBeam Precisa" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Updated Spanish translation msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -584,27 +559,9 @@ msgstr "Añadir Parche" msgid "Add new pane" msgstr "Añadir nueva ventana" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Añadir..." @@ -673,23 +630,8 @@ msgstr "Todas las imágenes GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos los archivos Gamecube GCM (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" @@ -717,24 +659,9 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -<<<<<<< HEAD -msgid "Alternate Wiimote Timing" -msgstr "Sincronización alternativa del Wiimote" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Wiimote emulado" ->>>>>>> Update translation files for recent changes in the code. -======= -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Sincronización alternativa del Wiimote" ->>>>>>> Updated Spanish translation #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -791,19 +718,7 @@ msgstr "" 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!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -825,19 +740,7 @@ msgstr "Motor de Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error al abrir dispositivo AO.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -953,19 +856,7 @@ msgid "Blue Right" msgstr "Azul derecha" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Inferior" @@ -998,15 +889,7 @@ msgstr "Busca un directorio de salida" msgid "Buffer:" msgstr "Búfer" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1211,19 +1094,7 @@ msgstr "Escoge un archivo a abrir" msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1265,21 +1136,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Cerrar" @@ -1387,15 +1245,7 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Conectando..." @@ -1513,19 +1363,7 @@ msgstr "Crear nueva perspectiva" msgid "Created by KDE-Look.org" msgstr "Creado por KDE-Look.org" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1598,21 +1436,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Motor de emulación DSP" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulación DSP HLE (rápido)" @@ -1851,19 +1676,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" @@ -1892,39 +1705,12 @@ msgstr "Configuración de wiimote emulado de Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuración de GCPad Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Configuración de GCPad Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuración de GCPad Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Configuración de GCPad Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" @@ -1936,15 +1722,7 @@ msgstr "Configuración de wiimote de Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin en &Google Code" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ->>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1952,15 +1730,7 @@ msgstr "" "Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para " "buscar..." -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ->>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -2036,27 +1806,9 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandés" @@ -2191,41 +1943,15 @@ msgstr "Habilitar BAT" msgid "Enable Block Merging" msgstr "Habilitar asociación de bloques" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -msgid "Enable Bounding Box Calculation" -msgstr "" - -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Permitir el cálculo del cuadro delimitador" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Habilitar caché" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Habilitar trucos" @@ -2325,19 +2051,7 @@ msgstr "" "\n" "Si no estás seguro, déjalo sin marcar." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2393,27 +2107,9 @@ msgstr "" msgid "End" msgstr "Fin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglés" @@ -2442,59 +2138,16 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Error" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Error" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Error" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" -"Error en PlayWiimote. %u != %u, byte %d.\n" -"Disculpa, la grabación de Wii no funciona temporalmente." - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Error" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error al cargar el idioma seleccionado. Volviendo al defecto del sistema." -<<<<<<< HEAD -#: Source/Core/Common/Src/ChunkFile.h:180 -<<<<<<< HEAD -======= -======= #: Source/Core/Common/Src/ChunkFile.h:194 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " @@ -2503,24 +2156,9 @@ msgstr "" "Error: Después de \"%s\", se ha encontrado %d (0x%X) en vezde la marca de " "guardado %d (0x%X). Cancelando carga del guardado..." -<<<<<<< HEAD -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 ->>>>>>> Update from master branch. -======= #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" -<<<<<<< HEAD -"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -"Aborting savestate load..." -msgstr "" - -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 -#, c-format -msgid "" -======= ->>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2974,27 +2612,9 @@ msgstr "Frames a grabar" msgid "Free Look" msgstr "Cámara libre" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francés" @@ -3020,14 +2640,8 @@ msgid "GCI File(*.gci)" msgstr "Archivo GCI (*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 -<<<<<<< HEAD -#, fuzzy -msgid "GCMic Configuration" -msgstr "Configuración de registro" -======= msgid "GCMic Configuration" msgstr "Configuración del micro de GC" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -3066,19 +2680,7 @@ msgid "Gamecube &Pad Settings" msgstr "&Configuración del mando Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" @@ -3103,21 +2705,8 @@ msgstr "" "(puede ser un código incorrecto o su tipo no es soportado todavía.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -3126,27 +2715,9 @@ msgstr "General" msgid "General Settings" msgstr "Ajustes generales" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemán" @@ -3169,13 +2740,6 @@ msgid "Greater Than" msgstr "Mayor que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Updated Spanish translation msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3185,29 +2749,10 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD "Mejora bastante la calidad de las texturas generadas usando los efectos de " "renderización para la textura.\n" "Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" "Reduce ligeramente el desempeño y posiblemente cause fallos (altamente " -======= -"Aumenta bastante la calidad de las texturas generadas utilizando los efectos " -"de renderización para la textura.\n" -<<<<<<< HEAD -"Aumentar la resolución interna va a mejorar el efecto de esta definición.\n" -"Diminuye ligeramente el desempenño y probablemente provoca fallos (aunque es " ->>>>>>> Update translation files for recent changes in the code. -======= -"Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" -"Diminuye ligeramente el desempeño y probablemente provoca fallos (aunque es " ->>>>>>> Updated Spanish translation -======= -"Mejora bastante la calidad de las texturas generadas usando los efectos de " -"renderización para la textura.\n" -"Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" -"Reduce ligeramente el desempeño y posiblemente cause fallos (altamente " ->>>>>>> Update from master branch. "improbable).\n" "\n" "Si está inseguro, déjelo marcado." @@ -3305,21 +2850,8 @@ msgid "Hotkey Configuration" msgstr "Configuración de atajos" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Atajos" @@ -3392,11 +2924,8 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -<<<<<<< HEAD -======= "Si se elige, los registros del cuadro delimitador serán actualizados. Es " "usado por los juegos de Paper Mario." ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" @@ -3405,20 +2934,8 @@ msgstr "" "Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF = " "Rápido)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -3563,19 +3080,7 @@ msgstr "" "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " "todavía." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3657,27 +3162,9 @@ msgstr "Archivo de grabación no válido" msgid "Invalid state" msgstr "Estado no válido" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3835,35 +3322,11 @@ msgstr "&Cargar estado 8" msgid "Load State..." msgstr "Cargar estado..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Cargar Menú de sistema Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Cargar Menú de sistema Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Cargar Menú de sistema Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Cargar Menú de sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Cargar Menú de sistema Wii %d %c" @@ -3945,15 +3408,7 @@ msgstr "Hack de velocidad MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Archivos MadCatz Gameshark (*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" @@ -3984,19 +3439,7 @@ msgid "Memory Byte" msgstr "Byte de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Tarjeta de memoria" @@ -4094,12 +3537,6 @@ msgid "" msgstr "" "Mueva el puntero del ratón sobre una opción para obtener una descripción " "detallada.\n" -<<<<<<< HEAD -"\n" -"\n" -"\n" -======= ->>>>>>> Update translation files for recent changes in the code. "\n" "\n" "\n" @@ -4203,19 +3640,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Arriba" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4302,15 +3727,7 @@ msgstr "No igual" msgid "Not Set" msgstr "No definido" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Sin conectar" @@ -4371,14 +3788,7 @@ msgstr "Solo %d bloques disponibles" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Abrir" @@ -4510,23 +3920,8 @@ msgstr "Parches" msgid "Paths" msgstr "Directorios" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4546,23 +3941,8 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Reproducir" @@ -4588,19 +3968,7 @@ msgstr "Opciones de reproducción" msgid "Players" msgstr "Jugadores" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Confirma, por favor..." @@ -4652,29 +4020,17 @@ msgstr "Efecto de posprocesado:" #: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "Final prematuro de la película en PlayController. %u + 8 > %u" ->>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "Final prematuro de la película en PlayWiimote. %u + %d > %u" ->>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "Final prematuro de la película en PlayWiimote. %u > %u" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4823,31 +4179,10 @@ msgstr "Actualizar lista" msgid "Refresh game list" msgstr "Actualizar lista de juegos" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Eliminar" @@ -4866,14 +4201,7 @@ msgid "Render to Main Window" msgstr "Renderizar a ventana principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4916,19 +4244,7 @@ msgstr "Guardar estado" msgid "Safe" msgstr "Seguro" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Frecuencia del sonido:" @@ -5054,39 +4370,12 @@ msgstr "No se ha encontrado la sección %s en SYSCONF" msgid "Select" msgstr "Seleccionar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Seleccionar archivo de grabación" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Seleccionar archivo de grabación" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Seleccionar archivo de grabación" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Seleccionar archivo de grabación" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" @@ -5112,13 +4401,7 @@ msgstr "Selecciona las ventanas flotantes" msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Selecciona el archivo de guardado" @@ -5126,29 +4409,7 @@ msgstr "Selecciona el archivo de guardado" msgid "Select the state to load" msgstr "Selecciona el estado para cargar" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "Selecciona el archivo de guardado" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Selecciona el estado para cargar" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Selecciona el estado para guardar" @@ -5223,19 +4484,7 @@ msgstr "Separador" msgid "Serbian" msgstr "Serbio" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5464,7 +4713,6 @@ msgid "Skip EFB Access from CPU" msgstr "Saltar el acceso al EFB desde la CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 -<<<<<<< HEAD msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -5485,28 +4733,6 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -======= -msgid "" -"Skip the destination alpha pass 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" -"\n" -"Si está inseguro, déjelo sin marcar." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 -msgid "" -"Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" -"Sometimes also increases visual quality.\n" -"If you're experiencing any issues, try raising texture cache accuracy or " -"disable this option.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" ->>>>>>> Update translation files for recent changes in the code. "Aumenta ligeramente las copias de EFB a la RAM al sacrificar exactitud de " "emulación.\n" "A veces también aumenta la calidad visual.\n" @@ -5567,27 +4793,9 @@ msgstr "Falló la creación del búfer de sonido: %s" msgid "Space" msgstr "Espacio" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Español" @@ -5631,15 +4839,7 @@ msgstr "Stick cuadrado" msgid "Standard Controller" msgstr "Control estándar" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5674,14 +4874,7 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Detener" @@ -5761,24 +4954,13 @@ msgstr "Tabla derecha" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Captura de pantalla" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" -<<<<<<< HEAD -msgstr "" -======= msgstr "TaruKonga (Bongos)" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -6009,31 +5191,12 @@ msgstr "Alternar todos los tipos de registro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Cambiar a pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Superior" @@ -6140,23 +5303,9 @@ msgstr "Se recibió un mensaje desconocido de id: %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -<<<<<<< HEAD -======= msgstr "" "Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" -<<<<<<< HEAD -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" ->>>>>>> Update translation files for recent changes in the code. -msgstr "" -"Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" - -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6326,12 +5475,9 @@ msgid "" "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" -<<<<<<< HEAD -======= "Advertencia: Has cargado un guardado de después del final de la película " "actual.(Byte %u > %u) (frame %u > %u). Deberías cargar otor guardado antes " "de continuar, o cargar éste sin el modo de solo lectura." ->>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:684 #, c-format @@ -6340,13 +5486,10 @@ msgid "" "should load another save before continuing, or load this state with read-" "only mode off. Otherwise you'll probably get a desync." msgstr "" -<<<<<<< HEAD -======= "Advertencia: has cargado una partida guardada con desjustes en %d bytes (0x" "%X). Debe de cargar otro guardado antes de continuar, o cargar este guardado " "con el modo de solo lectura desactivado. De lo contrario probablemente " "obtenga una desincronización." ->>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:693 #, c-format @@ -6366,8 +5509,6 @@ 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 "" -<<<<<<< HEAD -======= "Advertencia: has cargado una partida guardada con desajustes en %d bytes. " "Debes cargar otro guardado antes de continuar, o cargar este guardado con el " "modo de solo lectura desactivado. De lo contrario, probablemente obtengas " @@ -6383,7 +5524,6 @@ msgstr "" "En el fotograma %d, el guardado de la película presiona:\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" ->>>>>>> Update from master branch. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -6418,19 +5558,7 @@ msgstr "Raíz de la NAND de Wii:" msgid "Wii Save Import" msgstr "Importar guardado de Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -6461,15 +5589,7 @@ msgstr "" "o mucho tiempo de espera, o alguna otra razón.\n" "¿Desea reconectarlo inmediatamente?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote conectado" @@ -6501,27 +5621,9 @@ msgstr "Windows Derecha" msgid "Word Wrap" msgstr "Word Wrap" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Trabajando..." diff --git a/Languages/po/fr.po b/Languages/po/fr.po index f50163bd39..73410c8858 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -7,31 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-10-28 23:40+0100\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -<<<<<<< HEAD -"PO-Revision-Date: 2011-08-10 17:42+0100\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"PO-Revision-Date: 2011-10-28 23:40+0100\n" ->>>>>>> Update french translation. -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -"PO-Revision-Date: 2011-12-20 18:42+0100\n" ->>>>>>> Update Hungarian and Turkish translations. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -"PO-Revision-Date: 2011-10-28 23:40+0100\n" ->>>>>>> Update from master branch. "Last-Translator: Pascal\n" "Language-Team: \n" "Language: French\n" @@ -452,13 +429,6 @@ msgid "Accurate VBeam emulation" msgstr "Emulation fidèle VBeam" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update french translation. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -586,33 +556,9 @@ msgstr "Ajouter un patch" msgid "Add new pane" msgstr "Ajouter un nouveau panneau" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Ajouter..." @@ -681,28 +627,8 @@ msgstr "Toutes les images GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" @@ -730,24 +656,9 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -<<<<<<< HEAD -msgid "Alternate Wiimote Timing" -msgstr "Délai alternatif de communication avec la Wiimote" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Wiimote émulée" ->>>>>>> Update translation files for recent changes in the code. -======= -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Délai alternatif de communication avec la Wiimote" ->>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -807,23 +718,7 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé " "définitivement !" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -845,23 +740,7 @@ msgstr "Moteur audio :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -980,23 +859,7 @@ msgid "Blue Right" msgstr "Bleu Droite" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Bas" @@ -1029,19 +892,7 @@ msgstr "Parcourir un dossier de destination" msgid "Buffer:" msgstr "Buffer :" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1247,37 +1098,13 @@ msgstr "Choisir un fichier à ouvrir" msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "Choisir un fichier comme apploader : (uniquement pour les disques créés à " "partir de dossiers)" -<<<<<<< HEAD -======= -msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" -msgstr "Choisir un fichier comme apploader : (uniquement pour les disques créés à partir de dossiers)" ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 @@ -1313,25 +1140,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Fermer" @@ -1439,19 +1249,7 @@ msgstr "Connecter la 3è Wiimote" msgid "Connect Wiimote 4" msgstr "Connecter la 4è Wiimote" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Connexion..." @@ -1570,35 +1368,11 @@ msgstr "Créer une nouvelle perspective" msgid "Created by KDE-Look.org" msgstr "Créé par KDE-Look.org" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -<<<<<<< HEAD -======= -msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" @@ -1667,25 +1441,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" @@ -1924,23 +1681,7 @@ msgstr "" msgid "Divide" msgstr "Diviser" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" @@ -1969,48 +1710,12 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuration de la manette GC pour Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Configuration de la manette GC pour Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Configuration de la manette GC pour Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuration de la manette GC pour Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Configuration de la manette GC pour Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -2022,59 +1727,21 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ->>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des " "fichiers..." -<<<<<<< HEAD -======= -msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." -msgstr "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des fichiers..." ->>>>>>> Update french translation. -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ->>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour " "afficher tous les jeux..." -<<<<<<< HEAD -======= -msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." -msgstr "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour afficher tous les jeux..." ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -2145,33 +1812,9 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Néerlandais" @@ -2311,47 +1954,15 @@ msgstr "Activer BAT" msgid "Enable Block Merging" msgstr "Activer l'assemblage de blocs" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activer le cache" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activer les Cheats" @@ -2452,37 +2063,13 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. " "Désactiver pour TOUS les autres jeux." -<<<<<<< HEAD -======= -msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." -msgstr "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. Désactiver pour TOUS les autres jeux." ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" @@ -2532,33 +2119,9 @@ msgstr "" msgid "End" msgstr "Fin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Anglais" @@ -2587,65 +2150,15 @@ msgstr "Egal" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Erreur" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Erreur" - ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/Main.cpp:346 -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 défaut du système." - -#: Source/Core/Common/Src/ChunkFile.h:180 -#, c-format -msgid "" -<<<<<<< HEAD -"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -"Aborting savestate load..." -msgstr "" -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 ->>>>>>> Update from master branch. -msgid "Error" -msgstr "Erreur" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Erreur" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 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 " "défaut du système." ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/Common/Src/ChunkFile.h:194 #, c-format @@ -2656,26 +2169,12 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format -<<<<<<< HEAD -<<<<<<< HEAD msgid "" -======= ->>>>>>> Update translation files for recent changes in the code. -======= -msgid "" ->>>>>>> Update Hungarian and Turkish translations. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" "Erreur : essai d'accès aux polices %s mais elles ne sont pas chargées. Les " "jeux peuvent ne pas afficher les polices correctement, ou planter." -<<<<<<< HEAD -======= -msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." -msgstr "Erreur : essai d'accès aux polices %s mais elles ne sont pas chargées. Les jeux peuvent ne pas afficher les polices correctement, ou planter." ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -3126,33 +2625,9 @@ msgstr "Images à enregistrer :" msgid "Free Look" msgstr "Vue libre" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Français" @@ -3177,20 +2652,11 @@ msgstr "Résolution en Plein écran :" msgid "GCI File(*.gci)" msgstr "Fichier GCI (*.gci)" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 #, fuzzy msgid "GCMic Configuration" msgstr "Configuration de la journalisation" -<<<<<<< HEAD -======= ->>>>>>> Update Hungarian and Turkish translations. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "Manette GC" @@ -3228,23 +2694,7 @@ msgid "Gamecube &Pad Settings" msgstr "Paramètres de la &manette GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" @@ -3269,25 +2719,8 @@ msgstr "" "(ou c'est un mauvais code, ou il n'est pas encore pris en charge.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Général" @@ -3296,33 +2729,9 @@ msgstr "Général" msgid "General Settings" msgstr "Paramètres généraux" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Allemand" @@ -3345,13 +2754,6 @@ msgid "Greater Than" msgstr "Plus grand que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update french translation. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3361,29 +2763,12 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Hungarian and Turkish translations. "Améliore significativement la qualité des textures générées en utilisant les " "effets de rendu vers texture.\n" "Le fait d'augmenter la résolution interne améliore l'impact de cette " "option.\n" -<<<<<<< HEAD -<<<<<<< HEAD "Baisse légèrement les performances et peut provoquer quelques pépins (mais " "peu probable).\n" -======= ->>>>>>> Update translation files for recent changes in the code. -======= -"Améliore significativement la qualité des textures générées en utilisant les effets de rendu vers texture.\n" -"Le fait d'augmenter la résolution interne améliore l'impact de cette option.\n" -"Baisse légèrement les performances et peut provoquer quelques pépins (mais peu probable).\n" ->>>>>>> Update french translation. -======= -"Baisse légèrement les performances et peut provoquer quelques pépins (mais " -"peu probable).\n" ->>>>>>> Update Hungarian and Turkish translations. "\n" "Dans le doute, cochez cette case." @@ -3482,25 +2867,8 @@ msgid "Hotkey Configuration" msgstr "Configuration des raccourcis clavier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Raccourcis clavier" @@ -3568,55 +2936,21 @@ msgstr "Italie" msgid "Icon" msgstr "Icône" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Hungarian and Turkish translations. -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 ->>>>>>> Update the pot file to reflect recent changes in the code. 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)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -3625,13 +2959,6 @@ 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), vous devez aussi désactiver " "le contrôle audio dans le DSP pour que cela fonctionne." -<<<<<<< HEAD -======= -msgid "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you also have to disable Audio Throttle in DSP to make it effective." -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), vous devez aussi désactiver le contrôle audio dans le DSP pour que cela fonctionne." ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3768,23 +3095,7 @@ msgstr "" "InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas " "encore en charge." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Installation du WAD..." @@ -3866,33 +3177,9 @@ msgstr "Fichier d'enregitrement non valide" msgid "Invalid state" msgstr "Etat non valide" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italien" @@ -4050,43 +3337,11 @@ msgstr "Charger l'état du Slot 8" msgid "Load State..." msgstr "Charger un état..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Charger le Menu Système Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Charger le Menu Système Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Charger le Menu Système Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Charger le Menu Système Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Charger le Menu Système Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" @@ -4170,19 +3425,7 @@ msgstr "Hack de vitesse pour le MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Fichiers MadCatz Gameshark (*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" @@ -4213,23 +3456,7 @@ msgid "Memory Byte" msgstr "Octet mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Carte mémoire" @@ -4430,23 +3657,7 @@ msgstr "NP Tabulation" msgid "NP Up" msgstr "NP Haut" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4533,19 +3744,7 @@ msgstr "Différent" msgid "Not Set" msgstr "Non défini" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Non connectée" @@ -4606,17 +3805,7 @@ msgstr "%d blocs disponibles seulement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Ouvrir" @@ -4748,28 +3937,8 @@ msgstr "Patchs" msgid "Paths" msgstr "Chemins" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4789,28 +3958,8 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Démarrer" @@ -4836,23 +3985,7 @@ msgstr "Options de lecture" msgid "Players" msgstr "Joueurs" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4901,15 +4034,7 @@ msgstr "Portugais (brésilien)" msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:735 -======= #: Source/Core/Core/Src/Movie.cpp:759 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" @@ -4924,11 +4049,6 @@ msgstr "" msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update Hungarian and Turkish translations. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "Pré-réglages :" @@ -5077,38 +4197,10 @@ msgstr "Rafraîchir la liste" msgid "Refresh game list" msgstr "Rafraîchir la liste des jeux" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Retirer" @@ -5127,17 +4219,7 @@ msgid "Render to Main Window" msgstr "Rendu dans la fenêtre principale" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -5180,23 +4262,7 @@ msgstr "Sau&vegarder l'état" msgid "Safe" msgstr "Sûr " -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Echantillonnage :" @@ -5322,48 +4388,12 @@ msgstr "La section %s n'a pas été trouvée dans SYSCONF" msgid "Select" msgstr "Select" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Sélectionner le fichier d'enregistrement" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Sélectionner le fichier d'enregistrement" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Sélectionner le fichier d'enregistrement" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Sélectionner le fichier d'enregistrement" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Sélectionner le fichier d'enregistrement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -5389,31 +4419,7 @@ msgstr "Sélectionner les fenêtres flottantes" msgid "Select the file to load" msgstr "Sélectionner le fichier à charger" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 ->>>>>>> Update Hungarian and Turkish translations. -msgid "Select the save file" -msgstr "Sélectionner le fichier à enregistrer" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -msgid "Select the state to load" -msgstr "Sélectionner l'état à charger" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" @@ -5421,19 +4427,7 @@ msgstr "Sélectionner le fichier à enregistrer" msgid "Select the state to load" msgstr "Sélectionner l'état à charger" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -5509,36 +4503,12 @@ msgstr "Séparateur" msgid "Serbian" msgstr "Serbe" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Port série 1 - C'est le port que les périphériques tels que l'adaptateur " "ethernet utilisent" -<<<<<<< HEAD -======= -msgid "Serial Port 1 - This is the port which devices such as the net adapter use" -msgstr "Port série 1 - C'est le port que les périphériques tels que l'adaptateur ethernet utilisent" ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -5762,7 +4732,6 @@ msgid "Skip EFB Access from CPU" msgstr "Ignorer l'accès à l'EFB depuis le CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 -<<<<<<< HEAD msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -5783,39 +4752,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -======= -msgid "" -"Skip the destination alpha pass 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" -"\n" -"Dans le doute, décochez cette case." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 -msgid "" -"Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" -"Sometimes also increases visual quality.\n" -"If you're experiencing any issues, try raising texture cache accuracy or " -"disable this option.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. "Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision " "de l'émulation.\n" -======= -"Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision de l'émulation.\n" ->>>>>>> Update french translation. -======= -"Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision " -"de l'émulation.\n" ->>>>>>> Update Hungarian and Turkish translations. "Améliore parfois la qualité visuelle.\n" "Si vous rencontrez des problèmes, essayez d'augmenter la précision du cache " "ou désactivez cette option.\n" @@ -5875,33 +4813,9 @@ msgstr "Echec de la création du buffer audio : %s" msgid "Space" msgstr "Espace" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espagnol" @@ -5945,19 +4859,7 @@ msgstr "Stick carré" msgid "Standard Controller" msgstr "Contrôleur standard" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5992,17 +4894,7 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arrêter" @@ -6079,12 +4971,7 @@ msgstr "Table Droite" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Capture d'écran" @@ -6092,21 +4979,6 @@ msgstr "Capture d'écran" msgid "TaruKonga (Bongos)" msgstr "" -======= -msgid "Take Screenshot" -msgstr "Capture d'écran" - ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -msgid "Take Screenshot" -msgstr "Capture d'écran" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 -msgid "TaruKonga (Bongos)" -msgstr "" - ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Test" @@ -6334,38 +5206,12 @@ msgstr "Activer tous les types de journaux" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Activer le plein écran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Haut" @@ -6472,38 +5318,9 @@ msgstr "Reception d'un message inconnu avec l'ID : %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= msgstr "" "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" -======= -msgstr "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" ->>>>>>> Update french translation. -======= -msgstr "" -"Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" ->>>>>>> Update Hungarian and Turkish translations. -<<<<<<< HEAD -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -msgstr "" -"Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" -======= -msgstr "" -"Pointeur inconnu %#08x\n" -"Continuer ?" ->>>>>>> Update Hungarian and Turkish translations. - -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6665,15 +5482,7 @@ msgstr "" "et vont avoir le même nom que le fichier sur votre carte mémoire\n" "Continuer ?" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:629 -======= #: Source/Core/Core/Src/Movie.cpp:667 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -6708,11 +5517,6 @@ msgid "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update Hungarian and Turkish translations. -======= ->>>>>>> Update from master branch. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -6746,23 +5550,7 @@ msgstr "Racine de la NAND (Wii) :" msgid "Wii Save Import" msgstr "Importer une sauvegarde Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -6793,19 +5581,7 @@ msgstr "" "ou bien c'est dû à un temps d'attente trop long, ou encore autre chose.\n" "Voulez-vous la reconnecter tout de suite ?" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote connectée" @@ -6837,33 +5613,9 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Travail..." diff --git a/Languages/po/he.po b/Languages/po/he.po index 51453ebfe0..e1252b7c89 100644 --- a/Languages/po/he.po +++ b/Languages/po/he.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-08 20:50+0200\n" "Last-Translator: Ely \n" "Language-Team: \n" @@ -518,27 +506,9 @@ msgstr "" msgid "Add new pane" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "" @@ -592,23 +562,8 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -686,19 +641,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -720,19 +663,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -841,19 +772,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "" @@ -886,15 +805,7 @@ msgstr "" msgid "Buffer:" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1114,21 +1025,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "" @@ -1236,15 +1134,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "" @@ -1418,21 +1308,8 @@ msgstr "קול" msgid "DSP Emulator Engine" msgstr "" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1650,19 +1527,7 @@ msgstr "" msgid "Divide" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1691,40 +1556,13 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Dolphin GCPad Configuration" msgstr "הגדרות גרפיקה" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1807,27 +1645,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1946,40 +1766,15 @@ msgstr "" msgid "Enable Block Merging" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -2105,27 +1900,9 @@ msgstr "" msgid "End" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2154,45 +1931,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2617,27 +2359,9 @@ msgstr "" msgid "Free Look" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2706,19 +2430,7 @@ msgid "Gamecube &Pad Settings" msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2741,21 +2453,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2765,27 +2464,9 @@ msgstr "" msgid "General Settings" msgstr "הגדרות קול" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "" @@ -2900,21 +2581,8 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" @@ -3105,19 +2773,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -3194,27 +2850,9 @@ msgstr "" msgid "Invalid state" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "" @@ -3365,35 +3003,11 @@ msgstr "" msgid "Load State..." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3471,15 +3085,7 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3510,19 +3116,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3699,19 +3293,7 @@ msgstr "" msgid "NP Up" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3798,15 +3380,7 @@ msgstr "" msgid "Not Set" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3867,14 +3441,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "" @@ -4000,23 +3567,8 @@ msgstr "" msgid "Paths" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -4036,23 +3588,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "" @@ -4078,19 +3615,7 @@ msgstr "" msgid "Players" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4296,31 +3821,10 @@ msgstr "" msgid "Refresh game list" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4336,14 +3840,7 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -4386,19 +3883,7 @@ msgstr "" msgid "Safe" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4482,19 +3967,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" @@ -4534,39 +4007,12 @@ msgstr "" msgid "Select" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4589,13 +4035,7 @@ msgstr "" msgid "Select the file to load" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "" @@ -4603,29 +4043,7 @@ msgstr "" msgid "Select the state to load" msgstr "" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4961,27 +4379,9 @@ msgstr "" msgid "Space" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -5017,15 +4417,7 @@ msgstr "" msgid "Standard Controller" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5060,14 +4452,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -5139,14 +4524,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -5349,31 +4727,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" @@ -5475,19 +4834,6 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5693,19 +5039,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5732,15 +5066,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5772,27 +5098,9 @@ msgstr "" msgid "Word Wrap" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index fb426b13e9..f4ed971576 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -7,30 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -"PO-Revision-Date: 2011-12-18 13:41-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -<<<<<<< HEAD -"PO-Revision-Date: 2011-06-04 14:29+0100\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"PO-Revision-Date: 2011-12-20 17:22-0600\n" ->>>>>>> Update Hungarian and Turkish translations. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -<<<<<<< HEAD -"PO-Revision-Date: 2011-12-27 08:22-0600\n" ->>>>>>> Update from master branch. -======= -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-28 09:44+0100\n" ->>>>>>> Update Hungarian translation. "Last-Translator: Delirious \n" "Language-Team: Delirious \n" "Language: Hungarian\n" @@ -96,15 +74,7 @@ msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s tisztítása sikertelen. Valószínűleg a képfájl sérült." #: Source/Core/Core/Src/HW/GCMemcard.cpp:97 -<<<<<<< HEAD -<<<<<<< HEAD #, c-format -======= -#, fuzzy, c-format ->>>>>>> Update translation files for recent changes in the code. -======= -#, c-format ->>>>>>> Update Hungarian and Turkish translations. msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" @@ -113,15 +83,7 @@ msgstr "" " A kártya fájlmérete nem megfelelÅ‘ (0x%x bájt)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:112 -<<<<<<< HEAD -<<<<<<< HEAD #, c-format -======= -#, fuzzy, c-format ->>>>>>> Update translation files for recent changes in the code. -======= -#, c-format ->>>>>>> Update Hungarian and Turkish translations. msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" @@ -467,13 +429,6 @@ msgid "Accurate VBeam emulation" msgstr "Pontos VBeam emuláció" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -599,27 +554,9 @@ msgstr "Patch hozzáadása" msgid "Add new pane" msgstr "Új mezÅ‘ hozzáadása" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Hozzáadás..." @@ -689,23 +626,8 @@ msgstr "Minden GC/Wii képfájl (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Minden Gamecube GCM fájl (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" @@ -733,24 +655,9 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -<<<<<<< HEAD -msgid "Alternate Wiimote Timing" -msgstr "Változtatható Wiimote idÅ‘zítés" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Emulált Wiimote" ->>>>>>> Update translation files for recent changes in the code. -======= -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Változtatható Wiimote idÅ‘zítés" ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -808,19 +715,7 @@ msgstr "" 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!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -842,19 +737,7 @@ msgstr "Hang feldolgozó:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatikus" @@ -971,19 +854,7 @@ msgid "Blue Right" msgstr "Kék jobbra" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Gomb" @@ -1016,15 +887,7 @@ msgstr "Kimeneti könyvtár tallózása" msgid "Buffer:" msgstr "Puffer:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1090,33 +953,11 @@ msgstr "Mégse" msgid "Cannot open %s" msgstr "%s nem nyitható meg" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "A mozgások rögzítése nem lehetséges írásvédett módban." - ->>>>>>> Update Hungarian and Turkish translations. -======= ->>>>>>> Update from master branch. #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "Nem lehet esemény bejegyzéseket törölni függÅ‘ben lévÅ‘ eseményekkel" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1290,21 +1131,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Bezárás" @@ -1412,15 +1240,7 @@ msgstr "Wiimote 3 csatlakoztatása" msgid "Connect Wiimote 4" msgstr "Wiimote 4 csatlakoztatása" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Csatlakozás..." @@ -1609,21 +1429,8 @@ msgstr "Hang" msgid "DSP Emulator Engine" msgstr "DSP emulátor motor" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emuláció (gyors)" @@ -1864,19 +1671,7 @@ msgstr "" msgid "Divide" msgstr "Megosztás" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Le akarod állítani az éppen működÅ‘ emulációt?" @@ -1905,39 +1700,12 @@ msgstr "Dolphin emulált Wiimote beállítások" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad beállítások" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad beállítások" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad beállítások" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad beállítások" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" @@ -2034,27 +1802,9 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holland" @@ -2194,41 +1944,15 @@ msgstr "BAT használata" msgid "Enable Block Merging" msgstr "Blokk csatlakozás használata" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -msgid "Enable Bounding Box Calculation" -msgstr "" - -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Bounding Box kalkuláció használata" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Gyorsítótár használata" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Csalások használata" @@ -2384,27 +2108,9 @@ msgstr "" msgid "End" msgstr "Vége" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Angol" @@ -2433,47 +2139,10 @@ msgstr "EgyenlÅ‘" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Hiba" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Hiba" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Hiba" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" -"PlayWiimote hiba. %u != %u, bájt %d.\n" -"Sajnos a Wii videó rögzítés egyenlÅ‘re nem működik." - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Hiba" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2482,28 +2151,12 @@ msgstr "" #: Source/Core/Common/Src/ChunkFile.h:194 #, c-format -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x%X). " "Mentés betöltésének leállítása..." ->>>>>>> Update from master branch. -======= -msgid "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load..." -msgstr "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x%X). Mentés betöltésének leállítása..." ->>>>>>> Update Hungarian translation. -======= -"Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x%X). " -"Mentés betöltésének leállítása..." ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format @@ -2961,27 +2614,9 @@ msgstr "RögzítendÅ‘ képkockák" msgid "Free Look" msgstr "Szabad nézet" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francia" @@ -3007,14 +2642,8 @@ msgid "GCI File(*.gci)" msgstr "GCI fájl(*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 -<<<<<<< HEAD -#, fuzzy -msgid "GCMic Configuration" -msgstr "Napló beállítások" -======= msgid "GCMic Configuration" msgstr "GCMic beállítások" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -3053,19 +2682,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube &irányító beállítások" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" @@ -3090,21 +2707,8 @@ msgstr "" "(vagy rossz a kód vagy a kód típus még nem támogatott.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Ãltalános" @@ -3113,27 +2717,9 @@ msgstr "Ãltalános" msgid "General Settings" msgstr "Ãltalános beállítások" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Német" @@ -3155,13 +2741,6 @@ msgid "Greater Than" msgstr "Nagyobb mint" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3272,21 +2851,8 @@ msgid "Hotkey Configuration" msgstr "Gyorsbillentyű beállítások" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Gyorsbill." @@ -3354,30 +2920,13 @@ msgstr "OLASZORSZÃG" msgid "Icon" msgstr "Ikon" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -<<<<<<< HEAD -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario " "játékok használják." ->>>>>>> Update from master branch. -======= -msgid "If checked, the bounding box registers will be updated. Used by the Paper Mario games." -msgstr "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario játékok használják." ->>>>>>> Update Hungarian translation. -======= -"Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario " -"játékok használják." ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" @@ -3532,19 +3081,7 @@ msgid "" msgstr "" "InstallExceptionHandler elÅ‘idézve, de ez a platform még nem támogatja azt." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD telepítése..." @@ -3626,27 +3163,9 @@ msgstr "Nem megfelelÅ‘ rögzített fájl" msgid "Invalid state" msgstr "Nem megfelelÅ‘ mentés" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Olasz" @@ -3804,35 +3323,11 @@ msgstr "Ãllás betöltése a 8. helyrÅ‘l" msgid "Load State..." msgstr "Ãllás betöltése..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wii rendszer menü betöltése" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Wii rendszer menü betöltése" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wii rendszer menü betöltése" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Wii rendszer menü betöltése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii rendszer menü betöltése %d%c" @@ -3914,15 +3409,7 @@ msgstr "MMU sebesség növelÅ‘ hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark fájlok (*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "FÅ‘kar" @@ -3953,19 +3440,7 @@ msgid "Memory Byte" msgstr "Memória bájt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Memóriakártya" @@ -4163,19 +3638,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4262,15 +3725,7 @@ msgstr "Nem egyenlÅ‘" msgid "Not Set" msgstr "Nincs beállítva" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Nincs csatlakoztatva" @@ -4331,14 +3786,7 @@ msgstr "Csak %d blokk szabad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Megnyitás" @@ -4469,23 +3917,8 @@ msgstr "Javítások" msgid "Paths" msgstr "Mappák" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Szünet" @@ -4505,23 +3938,8 @@ msgstr "%d perspektíva" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Indítás" @@ -4547,19 +3965,7 @@ msgstr "Visszajátszási lehetÅ‘ségek" msgid "Players" msgstr "Játékosok" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -4611,29 +4017,17 @@ msgstr "Utófeldolgozási effektus:" #: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u" ->>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u" ->>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "Túl korai PlayWiimote videó befejezés. %u > %u" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4782,31 +4176,10 @@ msgstr "A lista frissítése" msgid "Refresh game list" msgstr "Játéklista frissítése" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Törlés" @@ -4825,14 +4198,7 @@ msgid "Render to Main Window" msgstr "Megjelenítés a fÅ‘ablakban" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Alapra állítás" @@ -4875,19 +4241,7 @@ msgstr "Ãl&lás mentése" msgid "Safe" msgstr "Biztonságos" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Mintavételezési frekvencia:" @@ -4971,19 +4325,7 @@ msgstr "%s állásmentés videója sérült, videó rögzítése leáll..." msgid "Scaled EFB Copy" msgstr "Méretezett EFB másolat" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Keresés %s" @@ -5023,39 +4365,12 @@ msgstr "%s rész nem található a SYSCONF fájlban" msgid "Select" msgstr "Választás" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Válassz rögzítendÅ‘ fájlt" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Válassz rögzítendÅ‘ fájlt" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Válassz rögzítendÅ‘ fájlt" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Válassz rögzítendÅ‘ fájlt" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendÅ‘ Wii WAD fájlt" @@ -5081,26 +4396,7 @@ msgstr "Válassz lebegÅ‘ ablakokat" msgid "Select the file to load" msgstr "BetöltendÅ‘ fájl kiválasztása" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Válassz mentési fájlt" - -#: 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:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Válassz mentési fájlt" @@ -5108,16 +4404,7 @@ msgstr "Válassz mentési fájlt" msgid "Select the state to load" msgstr "Válassz betöltendÅ‘ állásmentést" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Válassz mentendÅ‘ állást" @@ -5499,27 +4786,9 @@ msgstr "Hang puffer létrehozása sikertelen: %s" msgid "Space" msgstr "Szóköz" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanyol" @@ -5563,15 +4832,7 @@ msgstr "Négyzetes kar" msgid "Standard Controller" msgstr "Normál irányító" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5606,14 +4867,7 @@ msgstr "Kar" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Leállítás" @@ -5669,13 +4923,6 @@ msgstr "TAJVAN" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. msgid "TAS Input" msgstr "TAS bemenet" @@ -5698,24 +4945,13 @@ msgstr "Tábla jobbra" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Pillanatkép készítése" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" -<<<<<<< HEAD -msgstr "" -======= msgstr "TaruKonga (Bongos)" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5941,31 +5177,12 @@ msgstr "Minden napló típus kijelölése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Váltás teljes nézetre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Fent" @@ -6076,21 +5293,6 @@ msgstr "" "Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettÅ‘l a játékostól:%d " "Játékos kirúgása!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Ismeretlen mutató %#08x\n" -"Folytatod?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6252,54 +5454,18 @@ msgstr "" #: Source/Core/Core/Src/Movie.cpp:667 #, c-format -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> Update the pot file to reflect recent changes in the code. "Figyelem: Olyan mentést töltöttél be, ami a választott videó befejezése " "utáni. (%u > %u bájt) (%u > %u képkocka). Folytatás elÅ‘tt betölthetsz egy " "másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása " "után." -<<<<<<< HEAD ->>>>>>> Update from master branch. - -#: Source/Core/Core/Src/Movie.cpp:646 -#, c-format -msgid "" -"Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " -"should load another save before continuing, or load this state with read-" -"only mode off. Otherwise you'll probably get a desync." -msgstr "" -<<<<<<< HEAD -======= -"Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d (0x%X) bájt " -"eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy " -"betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " -"esetben szinkronizációs hibák jelentkezhetnek." ->>>>>>> Update from master branch. -======= -msgid "Warning: You loaded a save that's after the end of the current movie. (byte %u > %u) (frame %u > %u). You should load another save before continuing, or load this state with read-only mode off." -msgstr "Figyelem: Olyan mentést töltöttél be, ami a választott videó befejezése utáni. (%u > %u bájt) (%u > %u képkocka). Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása után." -======= ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/Core/Src/Movie.cpp:684 #, c-format -<<<<<<< HEAD -msgid "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync." -msgstr "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d (0x%X) bájt eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben szinkronizációs hibák jelentkezhetnek." ->>>>>>> Update Hungarian translation. -======= msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " "should load another save before continuing, or load this state with read-" @@ -6309,7 +5475,6 @@ msgstr "" "eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy " "betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " "esetben szinkronizációs hibák jelentkezhetnek." ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/Core/Src/Movie.cpp:693 #, c-format @@ -6329,22 +5494,10 @@ 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 "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> Update the pot file to reflect recent changes in the code. "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka eltérés " "mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted " "ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben " "szinkronizációs hibák jelentkezhetnek.\n" -<<<<<<< HEAD -======= -"Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben szinkronizációs hibák jelentkezhetnek.\n" ->>>>>>> Update Hungarian translation. -======= ->>>>>>> Update the pot file to reflect recent changes in the code. "\n" "BÅ‘vebb információk: A választott videó %d képkocka hosszú, a mentett állás " "videója pedig %d képkocka hosszú.\n" @@ -6354,18 +5507,8 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" "\n" "%d képkockánál a mentett állás videója tömörítve lesz:\n" -<<<<<<< HEAD -<<<<<<< HEAD "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" ->>>>>>> Update from master branch. -======= -"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" ->>>>>>> Update Hungarian translation. -======= -"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" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -6400,19 +5543,7 @@ msgstr "Wii NAND gyökér könyvtár:" msgid "Wii Save Import" msgstr "Wii mentés importálása" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -6443,15 +5574,7 @@ msgstr "" "esetleg az üresjárati idÅ‘korlát letelt vagy egyéb ok miatt történt.\n" "Újra akarod csatlakoztatni most?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote csatlakoztatva" @@ -6483,27 +5606,9 @@ msgstr "Jobb Windows" msgid "Word Wrap" msgstr "Word Wrap" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Folyamatban..." diff --git a/Languages/po/it.po b/Languages/po/it.po index bc89c73efc..dc19d18fea 100644 --- a/Languages/po/it.po +++ b/Languages/po/it.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-04-08 20:40+0100\n" "Last-Translator: RebuMan, Dolphin Team\n" "Language-Team: \n" @@ -564,27 +552,9 @@ msgstr "Aggiungi Patch" msgid "Add new pane" msgstr "Aggiungi nuovo riquadro" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Aggiungi..." @@ -656,23 +626,8 @@ msgstr "Tutti i file di immagine GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tutti i file GCM GameCube (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)" @@ -756,19 +711,7 @@ 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!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspetto:" @@ -790,19 +733,7 @@ msgstr "Interfaccia Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -915,19 +846,7 @@ msgid "Blue Right" msgstr "Blu Destro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Sotto" @@ -960,15 +879,7 @@ msgstr "Cerca una directory di destinazione" msgid "Buffer:" msgstr "Buffer:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1204,21 +1115,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Chiudi" @@ -1327,15 +1225,7 @@ msgstr "Collega Wiimote 3" msgid "Connect Wiimote 4" msgstr "Collega Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Connessione in corso..." @@ -1523,21 +1413,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Motore di Emulazione DSP" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulazione DSP HLE (veloce)" @@ -1765,19 +1642,7 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Divide" msgstr "/" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" @@ -1806,39 +1671,12 @@ msgstr "Dolphin - Configurazione Wiimote Emulato" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin - Configurazione Controlli GC" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin - Configurazione Controlli GC" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin - Configurazione Controlli GC" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin - Configurazione Controlli GC" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" @@ -1927,27 +1765,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Olandese" @@ -2072,41 +1892,16 @@ msgstr "Attiva BAT" msgid "Enable Block Merging" msgstr "Attiva Unione Blocchi" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Attiva Cache" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Abilita Trucchi" @@ -2247,27 +2042,9 @@ msgstr "" msgid "End" msgstr "Fine" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglese" @@ -2296,45 +2073,10 @@ msgstr "Uguale" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Errore/i" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Errore/i" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Errore/i" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Errore/i" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2809,27 +2551,9 @@ msgstr "Fotogrammi da Registrare:" msgid "Free Look" msgstr "Visuale Libera" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francese" @@ -2897,19 +2621,7 @@ msgid "Gamecube &Pad Settings" msgstr "Impostazioni &Controlli GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" @@ -2934,21 +2646,8 @@ msgstr "" "(codice corrotto oppure tipo di codice non ancora supportato.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generale" @@ -2958,27 +2657,9 @@ msgstr "Generale" msgid "General Settings" msgstr "Impostazioni Interfaccia" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Tedesco" @@ -3103,21 +2784,8 @@ msgid "Hotkey Configuration" msgstr "Configurazione Tasti di Scelta Rapida" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tasti di Scelta Rapida" @@ -3333,19 +3001,7 @@ msgstr "" "E' stata sollevata un'Eccezione all'Installazione, tuttavia questa " "piattaforma non la supporta ancora." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Installazione WAD..." @@ -3429,27 +3085,9 @@ msgstr "File di registrazione non valido" msgid "Invalid state" msgstr "Stato non valido" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3608,36 +3246,12 @@ msgstr "Carica Stato di Gioco dall'Ingresso 8" msgid "Load State..." msgstr "Carica Stato di Gioco..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Carica il Menu di Sistema Wii %d%c" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carica il Menu di Sistema Wii %d%c" @@ -3720,15 +3334,7 @@ msgstr "Hack Velocità MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "File MadCatz Gameshark(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Levetta Principale" @@ -3759,19 +3365,7 @@ msgid "Memory Byte" msgstr "Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Scheda di Memoria" @@ -3957,19 +3551,7 @@ msgstr "TN Tab" msgid "NP Up" msgstr "TN Su" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4056,15 +3638,7 @@ msgstr "Diverso" msgid "Not Set" msgstr "Non Impostato" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Non collegato" @@ -4125,14 +3699,7 @@ msgstr "Solo %d blocchi disponibili" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Apri" @@ -4266,23 +3833,8 @@ msgstr "Patches" msgid "Paths" msgstr "Percorsi" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4303,23 +3855,8 @@ msgstr "Prospettiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Gioca" @@ -4345,19 +3882,7 @@ msgstr "Opzioni di Riproduzione" msgid "Players" msgstr "Giocatori" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Per favore confermare..." @@ -4571,31 +4096,10 @@ msgstr "Aggiorna Elenco" msgid "Refresh game list" msgstr "Aggiorna elenco giochi" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Rimuovi" @@ -4614,14 +4118,7 @@ msgid "Render to Main Window" msgstr "Rendering nella finestra Principale" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetta" @@ -4664,19 +4161,7 @@ msgstr "Sa&lva Stato di Gioco" msgid "Safe" msgstr "Accurata" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Frequenza di Campionamento:" @@ -4761,19 +4246,7 @@ msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." msgid "Scaled EFB Copy" msgstr "Scala Copie EFB" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Ricerca..." @@ -4813,39 +4286,12 @@ msgstr "Sezione %s non trovata in SYSCONF" msgid "Select" msgstr "Seleziona" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Seleziona il File di Registrazione" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Seleziona il File di Registrazione" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Seleziona il File di Registrazione" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Seleziona il File di Registrazione" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" @@ -4871,13 +4317,7 @@ msgstr "Seleziona finestre libere/mobili" msgid "Select the file to load" msgstr "Seleziona il file da caricare" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Seleziona il file di salvataggio" @@ -4885,29 +4325,7 @@ msgstr "Seleziona il file di salvataggio" msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "Seleziona il file di salvataggio" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Seleziona lo stato di gioco da caricare" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" @@ -5262,27 +4680,9 @@ msgstr "Creazione buffer audio non riuscita: %s" msgid "Space" msgstr "Spazio" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spagnolo" @@ -5318,15 +4718,7 @@ msgstr "Levetta Quadrata" msgid "Standard Controller" msgstr "Controller Standard" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5361,14 +4753,7 @@ msgstr "Levetta" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arresta" @@ -5441,14 +4826,7 @@ msgstr "Semipiano destro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Genera un'Istantanea di Gioco" @@ -5675,31 +5053,12 @@ msgstr "Seleziona/Deseleziona tutti i Tipi di Log" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Commuta a Schermo Intero" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Sopra" @@ -5805,21 +5164,6 @@ msgstr "" "Messaggio sconosciuto avente id:%d ricevuto dal giocatore:%d Giocatore " "espluso!!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Puntatore %#08x sconosciuto\n" -"Continuare?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6036,19 +5380,7 @@ msgstr "Origine DVD:" msgid "Wii Save Import" msgstr "Importa Salvataggi Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Salva i file Wii (*.bin)|*.bin" @@ -6079,15 +5411,7 @@ msgstr "" " o forse è dovuto ad altri motivi. \n" "Vuoi riconnettersi immediatamente?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Collegato" @@ -6120,27 +5444,9 @@ msgstr "Windows Destro" msgid "Word Wrap" msgstr "Adatta Testo" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Attività in corso..." diff --git a/Languages/po/ja.po b/Languages/po/ja.po index eec5710d55..f69337fcf9 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -7,25 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-10-12 20:45+0900\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -<<<<<<< HEAD -"PO-Revision-Date: 2011-08-19 08:37-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -"PO-Revision-Date: 2011-10-12 20:45+0900\n" ->>>>>>> Update Arabic and Japanese translations. "Last-Translator: DanbSky\n" "Language-Team: \n" "Language: Japanese\n" @@ -443,13 +426,6 @@ msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -574,27 +550,9 @@ msgstr "パッãƒã‚’追加" msgid "Add new pane" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "追加" @@ -660,23 +618,8 @@ msgstr "å…¨ã¦ã® GC/Wii イメージ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "GC GCMファイル (gcm)|*.gcm" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "å…¨ã¦ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイル (sav, s##)" @@ -704,24 +647,9 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -<<<<<<< HEAD -msgid "Alternate Wiimote Timing" -msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Wii リモコンをエミュレート" ->>>>>>> Update translation files for recent changes in the code. -======= -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" ->>>>>>> Update Arabic and Japanese translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -779,19 +707,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿå…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "アスペクト比：" @@ -813,19 +729,7 @@ msgstr "出力API (Audio Backend)" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error opening AO device.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -940,19 +844,7 @@ msgid "Blue Right" msgstr "é’ - å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "下部" @@ -985,15 +877,7 @@ msgstr "出力先をé¸æŠž" msgid "Buffer:" msgstr "ãƒãƒƒãƒ•ã‚¡ï¼š" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1238,21 +1122,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "é–‰ã˜ã‚‹" @@ -1360,15 +1231,7 @@ msgstr "3Pã®Wii リモコンを接続ï¼åˆ‡æ–­" msgid "Connect Wiimote 4" msgstr "4Pã®Wii リモコンを接続ï¼åˆ‡æ–­" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "接続中..." @@ -1558,21 +1421,8 @@ msgstr "サウンド" msgid "DSP Emulator Engine" msgstr "DSPエミュレーション方å¼" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP-HLE エミュレーション (高速)" @@ -1811,19 +1661,7 @@ msgstr "" msgid "Divide" msgstr "Divide" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "動作中ã®ã‚²ãƒ¼ãƒ ã‚’åœæ­¢ã—ã¾ã™ã‹ï¼Ÿ" @@ -1852,39 +1690,12 @@ msgstr "Wii リモコンã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³è¨­å®š" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "GCコントローラ設定" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "GCコントローラ設定" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "GCコントローラ設定" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "GCコントローラ設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" @@ -1981,27 +1792,9 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "オランダ語" @@ -2141,40 +1934,15 @@ msgstr "Enable BAT" msgid "Enable Block Merging" msgstr "Enable Block Merging" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Enable Cache" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ã‚’有効化" @@ -2328,27 +2096,9 @@ msgstr "" msgid "End" msgstr "End" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "英語" @@ -2377,45 +2127,10 @@ msgstr "ã«ä¸€è‡´ã™ã‚‹" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "エラー" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "エラー" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "エラー" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "エラー" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2884,27 +2599,9 @@ msgstr "録画フレーム数設定" msgid "Free Look" msgstr "フリールック" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "フランス語" @@ -2971,19 +2668,7 @@ msgid "Gamecube &Pad Settings" msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp" @@ -3008,21 +2693,8 @@ msgstr "" "(コードã«å•é¡ŒãŒã‚ã‚‹ã‹ã€ã¾ã ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„タイプã®ã‚³ãƒ¼ãƒ‰ã§ã™)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -3031,27 +2703,9 @@ msgstr "一般" msgid "General Settings" msgstr "一般" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "ドイツ語" @@ -3074,13 +2728,6 @@ msgid "Greater Than" msgstr "より大ãã„" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3190,21 +2837,8 @@ msgid "Hotkey Configuration" msgstr "ホットキーã®è¨­å®š" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "ホットキー" @@ -3429,19 +3063,7 @@ msgstr "" "InstallExceptionHandler ãŒå‘¼ã³å‡ºã•ã‚Œã¾ã—ãŸãŒã€ã“ã®ãƒ—ラットフォームã¯ã¾ã ã‚µ" "ãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WADファイルを追加ã—ã¦ã„ã¾ã™..." @@ -3523,27 +3145,9 @@ msgstr "ä¸æ­£ãªéŒ²ç”»ãƒ•ã‚¡ã‚¤ãƒ«" msgid "Invalid state" msgstr "ä¸æ­£ãªã‚»ãƒ¼ãƒ–ï¼ãƒ­ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "イタリア語" @@ -3701,35 +3305,11 @@ msgstr "ステートロード - スロット 8" msgid "Load State..." msgstr "ファイルã‹ã‚‰ãƒ­ãƒ¼ãƒ‰" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wiiメニューを起動" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Wiiメニューを起動" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wiiメニューを起動" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Wiiメニューを起動" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wiiメニューを起動 ( ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š%d %c )" @@ -3812,15 +3392,7 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark セーブファイル(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "コントロールスティック" @@ -3851,19 +3423,7 @@ msgid "Memory Byte" msgstr "メモリãƒã‚¤ãƒˆ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "メモリーカード" @@ -4059,19 +3619,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4158,15 +3706,7 @@ msgstr "ã«ä¸€è‡´ã—ãªã„" msgid "Not Set" msgstr "未確èª" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "未接続" @@ -4227,14 +3767,7 @@ msgstr "残り %d ブロックã—ã‹ã‚ã‚Šã¾ã›ã‚“ï¼" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "é–‹ã" @@ -4365,23 +3898,8 @@ msgstr "パッãƒ" msgid "Paths" msgstr "フォルダ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "一時åœæ­¢" @@ -4401,23 +3919,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "開始" @@ -4443,19 +3946,7 @@ msgstr "å†ç”Ÿã‚ªãƒ—ション" msgid "Players" msgstr "プレイヤー一覧" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "確èª" @@ -4667,31 +4158,10 @@ msgstr "ゲームリストをå†æ›´æ–°" msgid "Refresh game list" msgstr "ゲームリストをå†æ›´æ–°ã—ã¾ã™" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "削除" @@ -4710,14 +4180,7 @@ msgid "Render to Main Window" msgstr "メインウィンドウ部分ã«æç”»" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "åˆæœŸåŒ–" @@ -4760,19 +4223,7 @@ msgstr "ステートセーブ(&V)" msgid "Safe" msgstr "Safe" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "サンプルレート" @@ -4856,19 +4307,7 @@ msgstr "Savestate movie %s ã®ç ´æを確èªã—ã¾ã—ãŸã€‚録画を中止㗠msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "確èªä¸­... .%s" @@ -4908,39 +4347,12 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "é¸æŠž" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "録画ファイルをé¸æŠž" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "録画ファイルをé¸æŠž" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "録画ファイルをé¸æŠž" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "録画ファイルをé¸æŠž" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "追加ã™ã‚‹WADファイルをé¸æŠž" @@ -4966,13 +4378,7 @@ msgstr "" msgid "Select the file to load" msgstr "ロードã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "セーブファイルをé¸æŠž" @@ -4980,29 +4386,7 @@ msgstr "セーブファイルをé¸æŠž" msgid "Select the state to load" msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "セーブファイルをé¸æŠž" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "ステートセーブã®ä¿å­˜å…ˆã‚’é¸æŠž" @@ -5381,27 +4765,9 @@ msgstr "Sound buffer creation failed: %s" msgid "Space" msgstr "Space" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "スペイン語" @@ -5445,15 +4811,7 @@ msgstr "丸ã¿" msgid "Standard Controller" msgstr "標準コントローラ" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5488,14 +4846,7 @@ msgstr "スティック" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -5572,14 +4923,7 @@ msgstr "å³ãƒ†ãƒ¼ãƒ–ル" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "スクリーンショット" @@ -5815,31 +5159,12 @@ msgstr "å…¨ã¦ã®ãƒ­ã‚°æƒ…報をé¸æŠžï¼è§£é™¤" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "フルスクリーン表示切り替ãˆ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "上部" @@ -5948,21 +5273,6 @@ msgstr "次ã®IDã‹ã‚‰ä¸æ˜Žãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å—ä¿¡ : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Unknown message with id:%d received from player:%d Kicking player!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Unknown pointer %#08x\n" -"Continue?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6190,19 +5500,7 @@ msgstr "Wii NANDルート" msgid "Wii Save Import" msgstr "Wiiã®ã‚»ãƒ¼ãƒ–データをインãƒãƒ¼ãƒˆ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -6233,15 +5531,7 @@ msgstr "" "ã¾ãŸã¯ã—ã°ã‚‰ã入力ãŒãªã‹ã£ãŸãŸã‚çœé›»åŠ›ãƒ¢ãƒ¼ãƒ‰ã«å…¥ã£ãŸã®ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“\n" "å†æŽ¥ç¶šã—ã¾ã™ã‹ï¼Ÿ" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wii リモコン接続中" @@ -6273,27 +5563,9 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ワードラップ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "動作中..." @@ -7013,16 +6285,6 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "音声や効果音ã®å†ç”Ÿã«ã‚ˆã使用ã•ã‚Œã¾ã™" -<<<<<<< HEAD - -#~ msgid "" -#~ "Unknown pointer %#08x\n" -#~ "Continue?" -#~ msgstr "" -#~ "Unknown pointer %#08x\n" -#~ "Continue?" -======= ->>>>>>> Update translation files for recent changes in the code. #~ msgid "" #~ "Unknown pointer %#08x\n" diff --git a/Languages/po/ko.po b/Languages/po/ko.po index 338b22dab0..41813f2e85 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -7,24 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -<<<<<<< HEAD -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -"PO-Revision-Date: 2011-07-07 10:24+0900\n" -======= -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2012-01-19 11:47+0900\n" ->>>>>>> Update Korean translations. "Last-Translator: \n" "Language-Team: \n" "Language: Korean\n" @@ -566,27 +550,9 @@ msgstr "패치 추가" msgid "Add new pane" msgstr "새로운 ì°½ 추가" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "추가..." @@ -654,23 +620,8 @@ msgstr "모든 GC/Wii ì´ë¯¸ì§€ë“¤ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임í브 GCM 파ì¼ë“¤ (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "모든 ìƒíƒœë“¤ 저장 (sav, s##)" @@ -757,19 +708,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ì´ íŒŒì¼ì„ ì •ë§ë¡œ 지우고 싶습니까? ê·¸ê²ƒì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -791,19 +730,7 @@ msgstr "오디오 백엔드:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO 장치를 열기 ì—러.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "ìžë™" @@ -918,19 +845,7 @@ msgid "Blue Right" msgstr "파랑 오른쪽" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "아래" @@ -963,15 +878,7 @@ msgstr "출력 디렉토리 둘러보기" msgid "Buffer:" msgstr "버í¼:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1211,21 +1118,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "닫기" @@ -1333,15 +1227,7 @@ msgstr "위모트 3 ì—°ê²°" msgid "Connect Wiimote 4" msgstr "위모트 4 ì—°ê²°" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "연결중..." @@ -1531,21 +1417,8 @@ msgstr "오디오" msgid "DSP Emulator Engine" msgstr "DSP ì—뮬레ì´í„° 엔진" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE ì—뮬레ì´ì…˜ (빠름)" @@ -1782,19 +1655,7 @@ msgstr "" msgid "Divide" msgstr "나누기" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "현재 ì—뮬레ì´ì…˜ì„ 중단하고 싶습니까?" @@ -1823,39 +1684,12 @@ msgstr "ëŒí•€ ì—ë®¬ëœ ìœ„ëª¨íŠ¸ 환경설정" msgid "Dolphin FIFO" msgstr "ëŒí•€ FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "ëŒí•€ GC패드 환경설정" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "ëŒí•€ GC패드 환경설정" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "ëŒí•€ GC패드 환경설정" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "ëŒí•€ GC패드 환경설정" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "ëŒí•€ TAS ë™ì˜ìƒ (*.dtm)" @@ -1951,27 +1785,9 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "네ëœëž€ë“œì–´" @@ -2110,40 +1926,15 @@ msgstr "BAT 활성" msgid "Enable Block Merging" msgstr "ë¸”ë¡ í•©ì¹˜ê¸° 활성" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "바운딩 박스 계산 켜기" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "ìºì‰¬ 활성" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "치트 활성" @@ -2294,27 +2085,9 @@ msgstr "" msgid "End" msgstr "ë" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "ì˜ì–´" @@ -2343,47 +2116,10 @@ msgstr "ê°™ìŒ" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "ì—러" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "ì—러" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "ì—러" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" -"PlayWiimoteì— ì—러발ìƒ. %u != %u, byte %d.\n" -"죄송합니다, Wii 녹화가 ì¼ì‹œì ìœ¼ë¡œ 깨졌습니다." - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "ì—러" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "ì„ íƒëœ 언어 로딩 ì—러. 시스템 기본으로 ëŒì•„갑니다." @@ -2850,27 +2586,9 @@ msgstr "녹화할 프레임" msgid "Free Look" msgstr "ìžìœ ë¡œìš´ 보기" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "프랑스어" @@ -2936,19 +2654,7 @@ msgid "Gamecube &Pad Settings" msgstr "게임í브 패드 설정(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임í브 메모리 카드들 (*.raw,*.gcp)" @@ -2973,21 +2679,8 @@ msgstr "" "(ìž˜ëª»ëœ ì½”ë“œì´ê±°ë‚˜ 코드 íƒ€ìž…ì´ ì•„ì§ ì§€ì›ì•Šëœë‹¤.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "ì¼ë°˜" @@ -2996,27 +2689,9 @@ msgstr "ì¼ë°˜" msgid "General Settings" msgstr "ì¼ë°˜ 설정" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "ë…ì¼ì–´" @@ -3147,21 +2822,8 @@ msgid "Hotkey Configuration" msgstr "단축키 설정" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "단축키들" @@ -3387,19 +3049,7 @@ msgstr "" "InstallExceptionHandler 호출ë¨, 하지만 ì´ í”Œëž«í¼ì€ ì•„ì§ ê·¸ê²ƒì„ ì§€ì›í•˜ì§€ 않습" "니다." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD 설치하기..." @@ -3481,27 +3131,9 @@ msgstr "비ì í•© ê¸°ë¡ íŒŒì¼" msgid "Invalid state" msgstr "비ì í•© ìƒíƒœ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "ì´íƒˆë¦¬ì•„ì–´" @@ -3659,35 +3291,11 @@ msgstr "슬롯8 ìƒíƒœ 로드" msgid "Load State..." msgstr "ìƒíƒœ 로드..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wii 시스템 메뉴 로드" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Wii 시스템 메뉴 로드" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wii 시스템 메뉴 로드" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Wii 시스템 메뉴 로드" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii 시스템 메뉴 %d %c 로드" @@ -3769,15 +3377,7 @@ msgstr "MMU 스피드 핵" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz ê²Œìž„ìƒ¤í¬ íŒŒì¼ë“¤(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ë©”ì¸ ìŠ¤í‹±" @@ -3808,19 +3408,7 @@ msgid "Memory Byte" msgstr "메모리 ë°”ì´íŠ¸" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "메모리 ì¹´ë“œ" @@ -4018,19 +3606,7 @@ msgstr "NP 탭" msgid "NP Up" msgstr "NP 위" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4117,15 +3693,7 @@ msgstr "같지 ì•ŠìŒ" msgid "Not Set" msgstr "설정 안함" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "ì—°ê²°ë˜ì§€ ì•ŠìŒ" @@ -4186,14 +3754,7 @@ msgstr "%d 블럭들만 유용한" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "열기" @@ -4321,23 +3882,8 @@ msgstr "패치" msgid "Paths" msgstr "경로" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "ì¼ì‹œì •ì§€" @@ -4357,23 +3903,8 @@ msgstr "ê´€ì  %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr " 실행 " @@ -4399,19 +3930,7 @@ msgstr "ìž¬ìƒ ì˜µì…˜" msgid "Players" msgstr "플레ì´ì–´" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "확ì¸í•´ì£¼ì„¸ìš”..." @@ -4622,31 +4141,10 @@ msgstr "ëª©ë¡ ìƒˆë¡œ 고침" msgid "Refresh game list" msgstr "게임 ëª©ë¡ ìƒˆë¡œ 고침" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "제거" @@ -4665,14 +4163,7 @@ msgid "Render to Main Window" msgstr "ë©”ì¸ ìœˆë„ìš°ì— ë Œë”" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "리셋" @@ -4715,19 +4206,7 @@ msgstr "ìƒíƒœ 저장(&v) " msgid "Safe" msgstr "안전" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "샘플율:" @@ -4811,19 +4290,7 @@ msgstr "%s ì˜ìƒ ìƒíƒœì €ìž¥ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤, ì˜ìƒ ê¸°ë¡ ì¤‘ì§€... msgid "Scaled EFB Copy" msgstr "스케ì¼ëœ EFB 복사" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "스ìºë‹ %s" @@ -4863,39 +4330,12 @@ msgstr "섹션 %s를 SYSCONFì—ì„œ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "Select" msgstr "ì„ íƒ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD íŒŒì¼ ì„ íƒ" @@ -4921,26 +4361,7 @@ msgstr "유ë™ì ì¸ 윈ë„우즈 ì„ íƒ" msgid "Select the file to load" msgstr "로드할 íŒŒì¼ ì„ íƒ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "저장 파ì¼ì„ ì„ íƒ" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "로드할 ìƒíƒœ ì„ íƒ" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "저장 파ì¼ì„ ì„ íƒ" @@ -4948,16 +4369,7 @@ msgstr "저장 파ì¼ì„ ì„ íƒ" msgid "Select the state to load" msgstr "로드할 ìƒíƒœ ì„ íƒ" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "저장할 ìƒíƒœ ì„ íƒ" @@ -5332,27 +4744,9 @@ msgstr "사운드 ë²„í¼ ìƒì„± 실패했습니다: %s" msgid "Space" msgstr "스페ì´ìŠ¤" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "스페ì¸ì–´" @@ -5396,15 +4790,7 @@ msgstr "스퀘어 스틱" msgid "Standard Controller" msgstr "표준 컨트롤러" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5439,14 +4825,7 @@ msgstr "스틱" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "중지" @@ -5522,14 +4901,7 @@ msgstr "í…Œì´ë¸” 오른쪽" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "스í¬ë¦°ìƒ· ì°ê¸°" @@ -5759,31 +5131,12 @@ msgstr "모든 로그 타입 토글" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "전체화면 토글" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "위" @@ -5893,21 +5246,6 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "id:%dì˜ ì•Œë ¤ì§€ì§€ ì•Šì€ ë©”ì‹œì§€, 플레ì´ì–´:%d 플레ì´ì–´ 킥킹으로 부터 전달ëœ!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"알려지지 ì•Šì€ í¬ì¸í„° %#08x\n" -"계ì†í•©ë‹ˆê¹Œ?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6153,19 +5491,7 @@ msgstr "Wii NAND 루트:" msgid "Wii Save Import" msgstr "Wii 저장 가져오기" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파ì¼ë“¤ (*.bin)|*.bin" @@ -6196,15 +5522,7 @@ msgstr "" "í˜¹ì€ ì•„ë§ˆë„ ì•„ì´ë“¤ 타임 아웃ì´ê±°ë‚˜ 다른 ì›ì¸ ë•Œë¬¸ì¸ ê²ƒ 같습니다.\n" "ë‹¹ì‹ ì€ ì¦‰ì‹œ 재연결 하고 싶습니까?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "위모트가 ì—°ê²°ë¨" @@ -6236,27 +5554,9 @@ msgstr "윈ë„우즈 오른쪽" msgid "Word Wrap" msgstr "ìžë™ 줄바꿈" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "ìž‘ë™ì¤‘..." diff --git a/Languages/po/nb.po b/Languages/po/nb.po index d2fa9aa314..aa491a3b56 100644 --- a/Languages/po/nb.po +++ b/Languages/po/nb.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-06-06 20:15+0100\n" "Last-Translator: Knut \n" "Language-Team: Norwegian \n" @@ -567,27 +555,9 @@ msgstr "Legg til Patch" msgid "Add new pane" msgstr "Legg til ny rute" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Legg til..." @@ -655,23 +625,8 @@ msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" @@ -763,19 +718,7 @@ msgstr "" "Er du sikker pÃ¥ at du vil slette denne filen?\n" "Den vil bli borte for alltid!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -797,19 +740,7 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Feil ved Ã¥pning av AO-device.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisk" @@ -924,19 +855,7 @@ msgid "Blue Right" msgstr "BlÃ¥ Høyre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Bunn" @@ -969,15 +888,7 @@ msgstr "Bla etter lagringssted" msgid "Buffer:" msgstr "Buffer:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1218,21 +1129,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Lukk" @@ -1340,15 +1238,7 @@ msgstr "Koble til Wiimote 3" msgid "Connect Wiimote 4" msgstr "Koble til Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Kobler til..." @@ -1537,21 +1427,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "CPU Emulatormotor" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulering (raskt)" @@ -1790,19 +1667,7 @@ msgstr "" msgid "Divide" msgstr "Del" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pÃ¥gÃ¥ende emulering?" @@ -1831,39 +1696,12 @@ msgstr "Dolphin Emulert Wiimote Konfigurasjon" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC-kontroll konfigurasjon" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC-kontroll konfigurasjon" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC-kontroll konfigurasjon" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC-kontroll konfigurasjon" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" @@ -1959,27 +1797,9 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Nederlansk" @@ -2118,40 +1938,15 @@ msgstr "Aktiver BAT" msgid "Enable Block Merging" msgstr "Aktiver Block Merging" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Aktiver cache" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Aktiver Juksekoder" @@ -2306,27 +2101,9 @@ msgstr "" msgid "End" msgstr "Slutt" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Engelsk" @@ -2355,45 +2132,10 @@ msgstr "Lik" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Feil" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Feil" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Feil" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Feil" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Feil ved lasting av valgt sprÃ¥k. Faller tilbake til systemstandarden." @@ -2859,27 +2601,9 @@ msgstr "Bilder Til Opptak" msgid "Free Look" msgstr "Fri Utkikk" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Fransk" @@ -2946,19 +2670,7 @@ msgid "Gamecube &Pad Settings" msgstr "Innstillinger for &GameCube-kontroll" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" @@ -2983,21 +2695,8 @@ msgstr "" "(Enten en dÃ¥rlig kode, eller sÃ¥ støttes ikke kodeformatet.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generelt" @@ -3006,27 +2705,9 @@ msgstr "Generelt" msgid "General Settings" msgstr "Generelle Innstillinger" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Tysk" @@ -3157,21 +2838,8 @@ msgid "Hotkey Configuration" msgstr "Konfigurer Snarveistaster" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Snarveistaster" @@ -3392,19 +3060,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Installer WAD..." @@ -3486,27 +3142,9 @@ msgstr "Ugyldig opptaksfil" msgid "Invalid state" msgstr "Ugyldig save state" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiensk" @@ -3664,35 +3302,11 @@ msgstr "Last Inn Save State Slot 8" msgid "Load State..." msgstr "Last Inn Save State..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Last inn Wii System Meny" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Last inn Wii System Meny" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Last inn Wii System Meny" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Last inn Wii System Meny" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Last inn Wii System Meny %d %c" @@ -3774,15 +3388,7 @@ msgstr "Ytelses-hack for MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark-filer(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hoved-joystick" @@ -3813,19 +3419,7 @@ msgid "Memory Byte" msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Minnekort" @@ -4023,19 +3617,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Opp" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4122,15 +3704,7 @@ msgstr "Ikke Lik" msgid "Not Set" msgstr "Ikke Satt" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Ikke tilkoblet" @@ -4191,14 +3765,7 @@ msgstr "Kun %d blokker tilgjengelig" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Ã…pne" @@ -4329,23 +3896,8 @@ msgstr "Patcher" msgid "Paths" msgstr "Mappestier" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4365,23 +3917,8 @@ msgstr "Perspektiv %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Spill" @@ -4407,19 +3944,7 @@ msgstr "Avspillingsalterntiver" msgid "Players" msgstr "Spillere" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -4632,31 +4157,10 @@ msgstr "Oppdater liste" msgid "Refresh game list" msgstr "Oppdater spilliste" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Fjern" @@ -4675,14 +4179,7 @@ msgid "Render to Main Window" msgstr "Render til Hovedvindu" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Restart" @@ -4725,19 +4222,7 @@ msgstr "Lagre Sa&ve State" msgid "Safe" msgstr "Sikker" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Samplingsratio:" @@ -4821,19 +4306,7 @@ msgstr "Save State-film %s er korrupt, opptak avsluttes..." msgid "Scaled EFB Copy" msgstr "Skalert EFB-kopi" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Søker i %s" @@ -4873,39 +4346,12 @@ msgstr "Seksjon %s ikke funnet i SYSCONF" msgid "Select" msgstr "Velg" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Velg Opptaksfil" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Velg Opptaksfil" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Velg Opptaksfil" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Velg Opptaksfil" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil Ã¥ innstallere" @@ -4931,26 +4377,7 @@ msgstr "Velg flytvindu" msgid "Select the file to load" msgstr "Velg fil Ã¥ laste" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Velg lagringsfil" - -#: 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:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Velg lagringsfil" @@ -4958,16 +4385,7 @@ msgstr "Velg lagringsfil" msgid "Select the state to load" msgstr "Velg en save state Ã¥ laste" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Velg en save state Ã¥ lagre" @@ -5344,27 +4762,9 @@ msgstr "Laging av lydbuffer mislyktes: %s" msgid "Space" msgstr "Mellomrom" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spansk" @@ -5407,15 +4807,7 @@ msgstr "Kvadrat-joystick" msgid "Standard Controller" msgstr "Standardkontroller" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5450,14 +4842,7 @@ msgstr "Joystick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" @@ -5535,14 +4920,7 @@ msgstr "Tabell Høyre" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Ta Skjermbilde" @@ -5772,31 +5150,12 @@ msgstr "Vipp Alle Loggtyper" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Vipp Mellom Vindu/Fullskjerm" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Topp" @@ -5903,21 +5262,6 @@ msgstr "Ukjent melding mottatt med ID: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ukjent melding mottatt med ID: %d fra spiller: %d Sparker spiller!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Ukjent peker %#08x\n" -"Fortsett?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6144,19 +5488,7 @@ msgstr "Wii NAND-rot:" msgid "Wii Save Import" msgstr "Importer Wii-lagringsfil" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -6187,15 +5519,7 @@ msgstr "" "eller kanskje den koblet seg fra pga. inaktivitet.\n" "Vil du koble til igjen øyeblikkelig?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Tilkoblet" @@ -6228,27 +5552,9 @@ msgstr "Windows Høyre" msgid "Word Wrap" msgstr "Ordkrumning" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Arbeider..." diff --git a/Languages/po/nl.po b/Languages/po/nl.po index 017f33c5c1..6462e84f3c 100644 --- a/Languages/po/nl.po +++ b/Languages/po/nl.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-08-07 16:43+0100\n" "Last-Translator: Goost \n" "Language-Team: DevPro Team. \n" @@ -568,27 +556,9 @@ msgstr "Voeg Patch toe" msgid "Add new pane" msgstr "Voeg een nieuwe paneel toe" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Voeg toe..." @@ -656,23 +626,8 @@ msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Opgeslagen Staten (sav, s##)" @@ -763,19 +718,7 @@ msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet " "terug te halen!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -797,19 +740,7 @@ msgstr "Geluid Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -920,19 +851,7 @@ msgid "Blue Right" msgstr "Blauw Rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Onder" @@ -965,15 +884,7 @@ msgstr "Zoek een uitvoer folder" msgid "Buffer:" msgstr "Buffer:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1216,21 +1127,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Sluit" @@ -1339,15 +1237,7 @@ msgstr "Verbind Wiimote 3" msgid "Connect Wiimote 4" msgstr "Verbind Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Verbinden..." @@ -1537,21 +1427,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "DSP Emulator Motor" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulatie (snel)" @@ -1792,19 +1669,7 @@ msgstr "" msgid "Divide" msgstr "Verdelen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" @@ -1833,39 +1698,12 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Configuratie" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Configuratie" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Configuratie" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Configuratie" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" @@ -1960,27 +1798,9 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Nederlands" @@ -2119,41 +1939,16 @@ msgstr "Activeer BAT" msgid "Enable Block Merging" msgstr "Activeer Block Merging" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Activeer Cache" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activeer Cheats" @@ -2309,27 +2104,9 @@ msgstr "" msgid "End" msgstr "Einde" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Engels" @@ -2358,45 +2135,10 @@ msgstr "Gelijk" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Error (Fout)" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Error (Fout)" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Error (Fout)" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Error (Fout)" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2869,27 +2611,9 @@ msgstr "Frames om op te nemen" msgid "Free Look" msgstr "Vrije kijk" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Frans" @@ -2957,19 +2681,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube &Pad Instellingen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" @@ -2994,21 +2706,8 @@ msgstr "" "(ofwel een onjuiste code of het type code is nog niet ondersteund.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Algemeen" @@ -3017,27 +2716,9 @@ msgstr "Algemeen" msgid "General Settings" msgstr "Algemene Instellingen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Duits" @@ -3168,21 +2849,8 @@ msgid "Hotkey Configuration" msgstr "Sneltoets Configuratie" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Hotkeys" @@ -3409,19 +3077,7 @@ msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD aan het installeren..." @@ -3504,27 +3160,9 @@ msgstr "Onjuist opname bestand" msgid "Invalid state" msgstr "Onjuiste staat" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italië" @@ -3682,36 +3320,12 @@ msgstr "Laad staat 8" msgid "Load State..." msgstr "Laad staat..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Laad Wii System Menu(%d %c)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Laad Wii System Menu(%d %c)" @@ -3793,15 +3407,7 @@ msgstr "MMU Snelheids Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark bestanden(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3832,19 +3438,7 @@ msgid "Memory Byte" msgstr "Geheugen Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Geheugen Kaart" @@ -4043,19 +3637,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Omhoog" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4142,15 +3724,7 @@ msgstr "Niet gelijk" msgid "Not Set" msgstr "Niet ingesteld" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Niet verbonden" @@ -4211,14 +3785,7 @@ msgstr "Er zijn maar %d blocks beschikaarr" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Open" @@ -4350,23 +3917,8 @@ msgstr "Patches" msgid "Paths" msgstr "Pad" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauze" @@ -4386,23 +3938,8 @@ msgstr "Perspectief %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Speel" @@ -4428,19 +3965,7 @@ msgstr "Terugspeel Opties" msgid "Players" msgstr "Spelers" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -4653,31 +4178,10 @@ msgstr "Lijst Verversen" msgid "Refresh game list" msgstr "Ververs de speellijst" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Verwijder" @@ -4697,14 +4201,7 @@ msgid "Render to Main Window" msgstr "Geef weer op hoofdscherm" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Opnieuw" @@ -4747,19 +4244,7 @@ msgstr "S&la Staat Op" msgid "Safe" msgstr "Opslaan" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Sample Rate:" @@ -4844,19 +4329,7 @@ msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." msgid "Scaled EFB Copy" msgstr "EFB Verkleinde Kopie" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Scannen van %s" @@ -4896,39 +4369,12 @@ msgstr "Sectie %s niet gevonden in SYSCONF" msgid "Select" msgstr "Selecteer" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Selecteer de opname Bestand" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Selecteer de opname Bestand" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Selecteer de opname Bestand" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Selecteer de opname Bestand" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" @@ -4954,13 +4400,7 @@ msgstr "Selecteer zwevende vensters" msgid "Select the file to load" msgstr "Selecteer het bestand om het te laden" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Selecteer het save - bestand" @@ -4968,29 +4408,7 @@ msgstr "Selecteer het save - bestand" msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "Selecteer het save - bestand" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Selecteer de Staat om te laden" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" @@ -5363,27 +4781,9 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s" msgid "Space" msgstr "Ruimte" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spaans" @@ -5427,15 +4827,7 @@ msgstr "" msgid "Standard Controller" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5470,14 +4862,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" @@ -5549,14 +4934,7 @@ msgstr "Rechter Tabel" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Neem een Schermafdruk" @@ -5786,31 +5164,12 @@ msgstr "Zet Alle Log Types Aan" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Volledig Scherm Inschakelen" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Boven" @@ -5920,21 +5279,6 @@ msgstr "" "Onbekend bericht ontvagen met id : %d ontvangen van speler: %d Speler " "eruitgeschopt!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Onbekende pointer %#08x\n" -"Doorgaan?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6162,19 +5506,7 @@ msgstr "Wii NAND basismap:" msgid "Wii Save Import" msgstr "Wii Save Importeren" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -6205,15 +5537,7 @@ msgstr "" "of misschien is het te wijten aan een time-out of een andere reden.\n" "Wilt u meteen opnieuw verbinden?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Connected" @@ -6246,27 +5570,9 @@ msgstr "Venster Rechts" msgid "Word Wrap" msgstr "Regelafbreking" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Werken..." diff --git a/Languages/po/pl.po b/Languages/po/pl.po index b4a21374be..ef05f0c54c 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-08-12 17:04+0100\n" "Last-Translator: Krzysztof Baszczok \n" "Language-Team: Polish \n" @@ -566,27 +554,9 @@ msgstr "Dodaj Å‚atkÄ™" msgid "Add new pane" msgstr "Dodaj nowy panel" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Dodaj..." @@ -654,23 +624,8 @@ msgstr "Wszystkie obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" @@ -758,19 +713,7 @@ msgstr "" 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!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -792,19 +735,7 @@ msgstr "Audio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: BÅ‚Ä…d otwarcia urzÄ…dzenia AO.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -919,19 +850,7 @@ msgid "Blue Right" msgstr "Niebieski prawo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Dół" @@ -964,15 +883,7 @@ msgstr "Szukaj folderu wyjÅ›ciowego" msgid "Buffer:" msgstr "Bufor:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1171,19 +1082,7 @@ msgstr "Wybierz plik do otwarcia" msgid "Choose a memory card:" msgstr "Wybierz kartÄ™ pamiÄ™ci:" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1225,21 +1124,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Zamknij" @@ -1347,15 +1233,7 @@ msgstr "PoÅ‚Ä…cz Wiilot 3" msgid "Connect Wiimote 4" msgstr "PoÅ‚Ä…cz Wiilot 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "ÅÄ…czÄ™..." @@ -1471,19 +1349,7 @@ msgstr "Utwórz nowÄ… perspektywÄ™" msgid "Created by KDE-Look.org" msgstr "Utworzone przez KDE-Look.org" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1558,21 +1424,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulacja (szybkie)" @@ -1811,19 +1664,7 @@ msgstr "" msgid "Divide" msgstr "Podziel" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualnÄ… emulacjÄ™?" @@ -1852,39 +1693,12 @@ msgstr "Konfiguracja emulowanego Wiilota" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Konfiguracja GCPad'a" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Konfiguracja GCPad'a" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Konfiguracja GCPad'a" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Konfiguracja GCPad'a" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" @@ -1896,15 +1710,7 @@ msgstr "Konfiguracja Wiilot'a" msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ->>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1912,15 +1718,7 @@ msgstr "" "Program nie mógÅ‚ znaleść żadnych obrazów GC/Wii ISO. Kliknij tutaj by " "przeglÄ…dać pliki..." -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ->>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1996,27 +1794,9 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holenderski" @@ -2156,40 +1936,15 @@ msgstr "WÅ‚Ä…cz BAT" msgid "Enable Block Merging" msgstr "WÅ‚Ä…cz Å‚Ä…czenie bloków" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "WÅ‚Ä…cz cache" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "WÅ‚Ä…cz kody" @@ -2288,19 +2043,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2356,27 +2099,9 @@ msgstr "" msgid "End" msgstr "Koniec" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Angielski" @@ -2405,45 +2130,10 @@ msgstr "Równy" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "BÅ‚Ä…d" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "BÅ‚Ä…d" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "BÅ‚Ä…d" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "BÅ‚Ä…d" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." @@ -2451,10 +2141,6 @@ msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." #: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" @@ -2462,8 +2148,6 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" -======= ->>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2914,27 +2598,9 @@ msgstr "Ramki do nagrania" msgid "Free Look" msgstr "Free Look" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francuski" @@ -3001,19 +2667,7 @@ msgid "Gamecube &Pad Settings" msgstr "Ustawienia &pada GC" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamiÄ™ci GC (*.raw,*.gcp)" @@ -3038,21 +2692,8 @@ msgstr "" "(zÅ‚y kod albo typ kodu nie jest jeszcze wspierany)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Główne" @@ -3061,27 +2702,9 @@ msgstr "Główne" msgid "General Settings" msgstr "Ustawienia ogólne" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Niemiecki" @@ -3210,21 +2833,8 @@ msgid "Hotkey Configuration" msgstr "Konfiguracja skrótów klawiszowych" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Skróty klawiszowe" @@ -3304,20 +2914,8 @@ msgstr "" "JeÅ›li FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, OFF " "= szybko)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -3459,19 +3057,7 @@ msgid "" msgstr "" "InstallExceptionHandler wywoÅ‚any, ale ta platforma nie wspiera go jeszcze." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instalacja WAD..." @@ -3553,27 +3139,9 @@ msgstr "NewÅ‚aÅ›ciwy plik nagrania" msgid "Invalid state" msgstr "NiewÅ‚aÅ›ciwy stan" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "WÅ‚oski" @@ -3731,35 +3299,11 @@ msgstr "Wczytaj stan Slot 8" msgid "Load State..." msgstr "Wczytaj stan..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wczytaj Wii System Menu" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Wczytaj Wii System Menu" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wczytaj Wii System Menu" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Wczytaj Wii System Menu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wczytaj Wii System Menu %d %c" @@ -3841,15 +3385,7 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Pliki MadCatz Gameshark(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Główna gaÅ‚ka" @@ -3880,19 +3416,7 @@ msgid "Memory Byte" msgstr "Bajt pamiÄ™ci" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Karta pamiÄ™ci" @@ -4090,19 +3614,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4189,15 +3701,7 @@ msgstr "Nie równe" msgid "Not Set" msgstr "Nie ustawiono" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Nie poÅ‚Ä…czono" @@ -4258,14 +3762,7 @@ msgstr "DostÄ™pnych tylko %d bloków" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Otwórz" @@ -4396,23 +3893,8 @@ msgstr "Patche" msgid "Paths" msgstr "Åšcieżki" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4432,23 +3914,8 @@ msgstr "Perspekrtywa %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Play" @@ -4474,19 +3941,7 @@ msgstr "Opcje playback'u" msgid "Players" msgstr "Gracze" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Potwierdź..." @@ -4697,31 +4152,10 @@ msgstr "OdÅ›wież listÄ™" msgid "Refresh game list" msgstr "OdÅ›wież listÄ™ gier" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "UsuÅ„" @@ -4740,14 +4174,7 @@ msgid "Render to Main Window" msgstr "Generuj w oknie głównym" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4790,19 +4217,7 @@ msgstr "Zapisz &stan" msgid "Safe" msgstr "Bezpieczny" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Wskaźnik próbkowania:" @@ -4886,19 +4301,7 @@ msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "SknaujÄ™ %s" @@ -4938,39 +4341,12 @@ msgstr "Nie odnaleziono sekcji %s w SYSCONF" msgid "Select" msgstr "Select" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Wybierz plik nagrania" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Wybierz plik nagrania" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Wybierz plik nagrania" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Wybierz plik nagrania" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" @@ -4996,13 +4372,7 @@ msgstr "Select floating windows" msgid "Select the file to load" msgstr "Wybierz plik do wczytania" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Wybierz plik do zapisu" @@ -5010,29 +4380,7 @@ msgstr "Wybierz plik do zapisu" msgid "Select the state to load" msgstr "Wybierz stan do wczytania" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "Wybierz plik do zapisu" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Wybierz stan do wczytania" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Wybierz stan do zapisu" @@ -5105,19 +4453,7 @@ msgstr "Separator" msgid "Serbian" msgstr "Serbski" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 ->>>>>>> Update the pot file to reflect recent changes in the code. 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" @@ -5419,27 +4755,9 @@ msgstr "Utworzenie bufora dźwiÄ™ku nie powiodÅ‚o siÄ™: %s" msgid "Space" msgstr "Space" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "HiszpaÅ„ski" @@ -5483,15 +4801,7 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "Standard Controller" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5526,14 +4836,7 @@ msgstr "GaÅ‚ka" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" @@ -5610,14 +4913,7 @@ msgstr "Talerz prawo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Zrób zdjÄ™cie" @@ -5846,31 +5142,12 @@ msgstr "PrzeÅ‚Ä…cz wszystkie typy logów" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "PrzeÅ‚Ä…cz na peÅ‚ny ekran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Góra" @@ -5979,21 +5256,6 @@ msgstr "Nieznana wiadomość o ID: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Nieznana wiadomość o ID: %d od gracza: %d Gracz wylatuje!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Nieznany wskaźnik %#08x\n" -"Kontynuować?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6220,19 +5482,7 @@ msgstr "ŹródÅ‚o Wii NAND:" msgid "Wii Save Import" msgstr "Import zapisów Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -6263,15 +5513,7 @@ msgstr "" "lub zbyt dÅ‚ugi czas nieobecnoÅ›ci lub coÅ› innego.\n" "PoÅ‚Ä…czyć ponownie?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiilot poÅ‚Ä…czony" @@ -6303,27 +5545,9 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Zawijanie wierszy" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "PracujÄ™..." diff --git a/Languages/po/pt.po b/Languages/po/pt.po index 1cee620d50..60d895f98c 100644 --- a/Languages/po/pt.po +++ b/Languages/po/pt.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-07-23 15:53-0000\n" "Last-Translator: Zilaan \n" "Language-Team: Zilaan \n" @@ -568,27 +556,9 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Adicionar..." @@ -657,23 +627,8 @@ msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos os ficheiros Gamecube GCM (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" @@ -763,19 +718,7 @@ msgstr "" "Tem a certeza que quer eliminar este ficheiro? Será eliminado " "permanentemente!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -797,19 +740,7 @@ msgstr "Ãudio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -925,19 +856,7 @@ msgid "Blue Right" msgstr "Azul Direita" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Inferior" @@ -970,15 +889,7 @@ msgstr "Procurar por pasta de destino" msgid "Buffer:" msgstr "Buffer:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1224,21 +1135,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Fechar" @@ -1346,15 +1244,7 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "A conectar..." @@ -1544,21 +1434,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Motor de Emulador DSP" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulação de DSP HLE (rápido)" @@ -1797,19 +1674,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" @@ -1838,39 +1703,12 @@ msgstr "Configuração da emulação de Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuração de GCPad " - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Configuração de GCPad " - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuração de GCPad " - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Configuração de GCPad " #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" @@ -1967,27 +1805,9 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandês" @@ -2127,40 +1947,15 @@ msgstr "Activar BAT" msgid "Enable Block Merging" msgstr "Activar Fusão de blocos" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activar Cache" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activar Cheats" @@ -2316,27 +2111,9 @@ msgstr "" msgid "End" msgstr "Fim" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglês" @@ -2365,45 +2142,10 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Erro" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Erro" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Erro" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Erro" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2874,27 +2616,9 @@ msgstr "Quadros para Gravar" msgid "Free Look" msgstr "Vista Livre" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francês" @@ -2961,19 +2685,7 @@ msgid "Gamecube &Pad Settings" msgstr "Definições de Comando &Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" @@ -2998,21 +2710,8 @@ msgstr "" "(Ou é um código com erros ou o tipo de código não é suportado.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -3021,27 +2720,9 @@ msgstr "Geral" msgid "General Settings" msgstr "Definições Gerais" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemão" @@ -3171,21 +2852,8 @@ msgid "Hotkey Configuration" msgstr "Configuração de Teclas de atalho" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Teclas de Atalho" @@ -3411,19 +3079,7 @@ msgid "" msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "A Instalar WAD..." @@ -3505,27 +3161,9 @@ msgstr "Ficheiro de Gravação inválido" msgid "Invalid state" msgstr "Estado Inválido" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3683,35 +3321,11 @@ msgstr "Carregar Estado Slot 8" msgid "Load State..." msgstr "Carregar Estado..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Carregar Sistema de Menu Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Carregar Sistema de Menu Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Carregar Sistema de Menu Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Carregar Sistema de Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Sistema de Menu Wii %d%c" @@ -3793,15 +3407,7 @@ msgstr "MMU Hack de velocidade" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ficheiros MadCatz Gameshark(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick Principal" @@ -3832,19 +3438,7 @@ msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Cartão de memória" @@ -4043,19 +3637,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4142,15 +3724,7 @@ msgstr "Não igual" msgid "Not Set" msgstr "Não definido" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Não conectado" @@ -4211,14 +3785,7 @@ msgstr "Apenas %d blocos disponíveis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Abrir" @@ -4349,23 +3916,8 @@ msgstr "Patches" msgid "Paths" msgstr "Caminhos" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4385,23 +3937,8 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Começar" @@ -4427,19 +3964,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Por favor confirme..." @@ -4652,31 +4177,10 @@ msgstr "Actualizar Lista" msgid "Refresh game list" msgstr "Actualizar lista de Jogos" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Remover" @@ -4695,14 +4199,7 @@ msgid "Render to Main Window" msgstr "Renderizar para a Janela Principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4745,19 +4242,7 @@ msgstr "Gua&rdar Estado" msgid "Safe" msgstr "Seguro" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4841,19 +4326,7 @@ msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..." msgid "Scaled EFB Copy" msgstr "Cópia EFB Escalada" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "A procurar %s" @@ -4893,39 +4366,12 @@ msgstr "Selecção %s não encontrada em SYSCONF" msgid "Select" msgstr "Seleccionar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Seleccione o Ficheiro de Gravação" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Seleccione o Ficheiro de Gravação" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Seleccione o Ficheiro de Gravação" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Seleccione o Ficheiro de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" @@ -4951,26 +4397,7 @@ msgstr "Seleccionar janelas flutuantes" msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Seleccione o ficheiro de jogo guardado" - -#: 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:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" @@ -4978,16 +4405,7 @@ msgstr "Seleccione o ficheiro de jogo guardado" msgid "Select the state to load" msgstr "Seleccione o estado para carregar" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Seleccione o estado para gravar" @@ -5368,27 +4786,9 @@ msgstr "Criação do buffer de som falhou: %s" msgid "Space" msgstr "Espaço" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espanhol" @@ -5432,15 +4832,7 @@ msgstr "Stick quadrado" msgid "Standard Controller" msgstr "Comando padrão" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5475,14 +4867,7 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" @@ -5559,14 +4944,7 @@ msgstr "Table Direita" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Tirar Screenshot" @@ -5802,31 +5180,12 @@ msgstr "Alternar Todos os Tipos de Relatório" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Alternar Ecrã Inteiro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Topo" @@ -5935,21 +5294,6 @@ msgstr "" "Mensagem desconhecida com a id:%d recebida pelo jogador:%d Excluindo o " "jogador!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Apontador desconhecido %#08x\n" -"Continuar?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6179,19 +5523,7 @@ msgstr "Raiz de NAND Wii:" msgid "Wii Save Import" msgstr "Importação de Jogo Guardado Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -6223,15 +5555,7 @@ msgstr "" "razão.\n" "Quer reconectar imediatamente?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -6264,27 +5588,9 @@ msgstr "Janelas Direita" msgid "Word Wrap" msgstr "Moldar o texto" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "A trabalhar..." @@ -6905,10 +6211,6 @@ msgstr "| OU" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Começar a janela renderizada em ecrã inteiro" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -6931,11 +6233,6 @@ msgstr "| OU" #~ "Apontador desconhecido %#08x\n" #~ "Continuar?" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "Usar FPS como limitador" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index d12775657f..45cab5d3a0 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -7,22 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-18 13:38-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -"PO-Revision-Date: 2011-09-11 23:35-0300\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -"PO-Revision-Date: 2011-12-18 13:38-0600\n" ->>>>>>> Update from master branch. "Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" "Language: \n" @@ -572,27 +558,9 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painél" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Adicionar..." @@ -660,23 +628,8 @@ msgstr "Todas as imagens CG/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos os arquivos Gamecube CGM (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" @@ -766,19 +719,7 @@ msgstr "" "Você tem certeza que quer deletar este arquivo? Ele ficará perdido para " "sempre!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -800,19 +741,7 @@ msgstr "Backend de Audio" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -928,19 +857,7 @@ msgid "Blue Right" msgstr "Azul Direito" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Embaixo" @@ -973,15 +890,7 @@ msgstr "Procurar por um diretório de saída" msgid "Buffer:" msgstr "Buffer:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1184,19 +1093,7 @@ msgstr "Escolher um arquivo para abrir" msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1238,21 +1135,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Fechar" @@ -1360,15 +1244,7 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Conectando..." @@ -1485,19 +1361,7 @@ msgstr "Criar nova perspectiva" msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1570,21 +1434,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Engine de Emulação do DSP" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulação HLE do DSP (rápido)" @@ -1823,19 +1674,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" @@ -1864,39 +1703,12 @@ msgstr "Configuração de Wiimote Emulado do Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuração do GCPad do Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Configuração do GCPad do Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuração do GCPad do Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Configuração do GCPad do Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS Dolphin (*.dtm)" @@ -1908,15 +1720,7 @@ msgstr "Configuração de Wiimote Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin no &Google Code" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ->>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1924,15 +1728,7 @@ msgstr "" "Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por " "arquivos..." -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ->>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -2008,27 +1804,9 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandês" @@ -2168,40 +1946,15 @@ msgstr "Ativar BAT" msgid "Enable Block Merging" msgstr "Ativar Block Merging" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Ativar Cache" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Ativar Cheats" @@ -2301,19 +2054,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2369,27 +2110,9 @@ msgstr "" msgid "End" msgstr "Fim" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglês" @@ -2418,80 +2141,24 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Erro" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Erro" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Erro" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Erro" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." -<<<<<<< HEAD -#: Source/Core/Common/Src/ChunkFile.h:180 -<<<<<<< HEAD -======= -======= #: Source/Core/Common/Src/ChunkFile.h:194 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -<<<<<<< HEAD -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 ->>>>>>> Update from master branch. -======= #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" -<<<<<<< HEAD -"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -"Aborting savestate load..." -msgstr "" - -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 -#, c-format -msgid "" -======= ->>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2944,27 +2611,9 @@ msgstr "QUadros para Capturar" msgid "Free Look" msgstr "Olhar Livre" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francês" @@ -3031,19 +2680,7 @@ msgid "Gamecube &Pad Settings" msgstr "Configurações de &Controle de Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" @@ -3068,21 +2705,8 @@ msgstr "" "(É um código ruim ou um tipo de código não suportado.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -3091,27 +2715,9 @@ msgstr "Geral" msgid "General Settings" msgstr "Configurações Gerais" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemão" @@ -3242,21 +2848,8 @@ msgid "Hotkey Configuration" msgstr "Configuração de hotkey" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Hotkeys" @@ -3336,20 +2929,8 @@ msgstr "" "Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = Compatível, " "OFF = Rápido)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -3494,19 +3075,7 @@ msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3588,27 +3157,9 @@ msgstr "Arquivo de gravação inválido" msgid "Invalid state" msgstr "Estado Salvo Inválido" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3766,35 +3317,11 @@ msgstr "Carregar Estado do Slot 8" msgid "Load State..." msgstr "Carregar State..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Carregar Menu de Sistema do Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Carregar Menu de Sistema do Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Carregar Menu de Sistema do Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Carregar Menu de Sistema do Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Menu de Sistema do Wii %d %c" @@ -3877,15 +3404,7 @@ msgstr "Hack de velocidade MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arquivos de Gameshark MadCatz(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Analógico Principal" @@ -3916,19 +3435,7 @@ msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Cartão de memoria" @@ -4127,19 +3634,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4226,15 +3721,7 @@ msgstr "Não igual" msgid "Not Set" msgstr "Indefinido" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Não conectado" @@ -4295,14 +3782,7 @@ msgstr "Apenas %d blocos disponíveis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Abrir" @@ -4433,23 +3913,8 @@ msgstr "Patches" msgid "Paths" msgstr "Diretórios" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausar" @@ -4469,23 +3934,8 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Executar" @@ -4511,19 +3961,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Favor confirmar..." @@ -4734,31 +4172,10 @@ msgstr "Atualizar Lista" msgid "Refresh game list" msgstr "Atualizar a lista de jogos" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Remover" @@ -4777,14 +4194,7 @@ msgid "Render to Main Window" msgstr "Renderizar na Janela Principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4827,19 +4237,7 @@ msgstr "Sal&var estado atual" msgid "Safe" msgstr "Seguro" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4923,19 +4321,7 @@ msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." msgid "Scaled EFB Copy" msgstr "Cópia Escalada do EFB" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Escaneando %s" @@ -4975,39 +4361,12 @@ msgstr "A seção %s não foi encontrada no SYSCONF" msgid "Select" msgstr "Selecionar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Selecione o arquivo de Gravação" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Selecione o arquivo de Gravação" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Selecione o arquivo de Gravação" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Selecione o arquivo de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" @@ -5032,26 +4391,7 @@ msgstr "Selecionar Janelas flutuantes" msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Selecione o arquivo de salva" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Selecione um estado para carregar" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Selecione o arquivo de salva" @@ -5059,16 +4399,7 @@ msgstr "Selecione o arquivo de salva" msgid "Select the state to load" msgstr "Selecione um estado para carregar" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Selecione um estado para salvar" @@ -5142,19 +4473,7 @@ msgstr "Separador" msgid "Serbian" msgstr "Sérvio" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5461,27 +4780,9 @@ msgstr "Falha na criação do buffer de som: %s" msgid "Space" msgstr "Barra de Espaço" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espanhol" @@ -5525,15 +4826,7 @@ msgstr "Analógico Quadrado" msgid "Standard Controller" msgstr "Controle Padrão" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5568,14 +4861,7 @@ msgstr "Analógico" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" @@ -5652,14 +4938,7 @@ msgstr "Direita da Mesa" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Capturar Tela" @@ -5893,31 +5172,12 @@ msgstr "Ligar/Desligar Todos os Logs" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Ir para Tela Cheia" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Topo" @@ -6025,23 +5285,9 @@ msgstr "Menssagem desconhecida recebida com identificação: %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -<<<<<<< HEAD -======= msgstr "" "Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" -<<<<<<< HEAD -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" ->>>>>>> Update translation files for recent changes in the code. -msgstr "" -"Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" - -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6271,19 +5517,7 @@ msgstr "Raiz do Wii NAND" msgid "Wii Save Import" msgstr "Importar Save de Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Arquivos de Salva do Wii (*.bin)|*.bin" @@ -6314,15 +5548,7 @@ msgstr "" "ou talvez tenha sido pelo tempo parado ou por outra razão.\n" "Você quer reconectar imediatamente?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -6354,27 +5580,9 @@ msgstr "Janelas da Direita" msgid "Word Wrap" msgstr "Word Wrap" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Funcionando..." diff --git a/Languages/po/ru.po b/Languages/po/ru.po index c882cf9f5b..6fd46df066 100644 --- a/Languages/po/ru.po +++ b/Languages/po/ru.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-20 14:40+0300\n" "Last-Translator: firnis \n" "Language-Team: Russian <>\n" @@ -551,27 +539,9 @@ msgstr "Добавление патча" msgid "Add new pane" msgstr "Добавить панель" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Добавить..." @@ -626,23 +596,8 @@ msgstr "Ð’Ñе образа от GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Ð’Ñе GCM-файлы Gamecube (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Файлы быÑтрых Ñохранений (sav, s##)" @@ -723,19 +678,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтот файл? Он иÑчезнет навÑегда!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Соотношение Ñторон:" @@ -758,19 +701,7 @@ msgstr "СиÑтема вывода" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва вывода звука.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Ðвто" @@ -885,19 +816,7 @@ msgid "Blue Right" msgstr "СинÑÑ Ñправа" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Ñнизу" @@ -930,15 +849,7 @@ msgstr "Укажите папку Ð´Ð»Ñ ÑохранениÑ" msgid "Buffer:" msgstr "Буфер:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1170,21 +1081,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Закрыть" @@ -1293,15 +1191,7 @@ msgstr "Подключить Wiimote 3" msgid "Connect Wiimote 4" msgstr "Подключить Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Подключение..." @@ -1486,21 +1376,8 @@ msgstr "Ðудио" msgid "DSP Emulator Engine" msgstr "Режим ÑмулÑции CPU" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1724,19 +1601,7 @@ msgstr "" msgid "Divide" msgstr "/" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Ð’Ñ‹ хотите оÑтановить ÑмулÑцию?" @@ -1766,39 +1631,12 @@ msgstr "ÐаÑтройки Ñмулируемого Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "ÐаÑтройки Dolphin GCPad" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "ÐаÑтройки Dolphin GCPad" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "ÐаÑтройки Dolphin GCPad" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "ÐаÑтройки Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1886,27 +1724,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Dutch" msgstr "Dutch" @@ -2030,41 +1850,16 @@ msgstr "Включить BAT" msgid "Enable Block Merging" msgstr "Включить Ñовмещение блоков" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "кÑшировать" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Включить чит-коды" @@ -2205,27 +2000,9 @@ msgstr "" msgid "End" msgstr "End" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "English" msgstr "English" @@ -2255,45 +2032,10 @@ msgstr "Равно" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Ошибки" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Ошибки" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Ошибки" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Ошибки" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Ошибка загрузки выбранного Ñзыка. ВозвращаемÑÑ Ðº Ñтандартному." @@ -2738,27 +2480,9 @@ msgstr "" msgid "Free Look" msgstr "Свободный обзор" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "French" msgstr "French" @@ -2828,19 +2552,7 @@ msgid "Gamecube &Pad Settings" msgstr "Опции &контроллера Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памÑти Gamecube (*.raw,*.gcp)" @@ -2863,21 +2575,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Общие" @@ -2887,27 +2586,9 @@ msgstr "Общие" msgid "General Settings" msgstr "ÐаÑтройки интерфейÑа" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "German" msgstr "German" @@ -3035,21 +2716,8 @@ msgid "Hotkey Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Клавиши" @@ -3267,19 +2935,7 @@ msgid "" msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "УÑтанавливаетÑÑ WAD в меню Wii..." @@ -3364,27 +3020,9 @@ msgstr "Ðеверный файл запиÑи" msgid "Invalid state" msgstr "Ðеверное Ñохранение" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Italian" msgstr "Italian" @@ -3550,36 +3188,12 @@ msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" msgid "Load State..." msgstr "Загрузить игру..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Загрузить Wii System Menu (%d %c)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Загрузить Wii System Menu (%d %c)" @@ -3663,15 +3277,7 @@ msgstr "УÑкорить MMU (Ñпидхак)" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Файлы Gameshark MadCatz (*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3703,19 +3309,7 @@ msgid "Memory Byte" msgstr "Па&мÑÑ‚ÑŒ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Карта памÑти" @@ -3893,19 +3487,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Вверх" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3994,15 +3576,7 @@ msgstr "Ðе равно" msgid "Not Set" msgstr "ÐеизвеÑтно" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Ðе подключено" @@ -4063,14 +3637,7 @@ msgstr "ДоÑтупно только %d блоков" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Открыть" @@ -4196,23 +3763,8 @@ msgstr "Патчи" msgid "Paths" msgstr "Папки" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Пауза" @@ -4233,23 +3785,8 @@ msgstr "Точка %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "ЗапуÑк" @@ -4277,19 +3814,7 @@ msgstr "Опции" msgid "Players" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4514,31 +4039,10 @@ msgstr "&Обновить ÑпиÑок игр" msgid "Refresh game list" msgstr "Обновление ÑпиÑка игр" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Удалить" @@ -4557,14 +4061,7 @@ msgid "Render to Main Window" msgstr "Выводить изображение в главное окно" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð½Ð°Ñтроек" @@ -4607,19 +4104,7 @@ msgstr "БыÑтрое &Ñохранение" msgid "Safe" msgstr "безопаÑное" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Sample Rate:" msgstr "ЧаÑтота" @@ -4712,19 +4197,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "ПоиÑк..." @@ -4764,39 +4237,12 @@ msgstr "Ð¡ÐµÐºÑ†Ð¸Ñ %s не найдена в SYSCONF" msgid "Select" msgstr "Выбрать" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°" @@ -4823,13 +4269,7 @@ msgstr "" msgid "Select the file to load" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Выберите файл Ñохранений Wii" @@ -4837,29 +4277,7 @@ msgstr "Выберите файл Ñохранений Wii" msgid "Select the state to load" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "Выберите файл Ñохранений Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Выберите или укажите файл Ð´Ð»Ñ Ð±Ñ‹Ñтрого ÑохранениÑ" @@ -5220,27 +4638,9 @@ msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð°ÑƒÐ´Ð¸Ð¾-буфера %s." msgid "Space" msgstr "Пробел" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Spanish" msgstr "Spanish" @@ -5278,15 +4678,7 @@ msgstr "" msgid "Standard Controller" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5323,14 +4715,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Стоп" @@ -5402,14 +4787,7 @@ msgstr "ÐŸÑ€Ð°Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Сделать Ñкриншот" @@ -5639,31 +5017,12 @@ msgstr "Включить вÑе" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Включение полноÑкранного режима" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Ñверху" @@ -5767,21 +5126,6 @@ msgstr "Получено неизвеÑтное Ñообщение Ñ id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Получено неизвеÑтное Ñообщение Ñ id : %d от игрока:%d Игрок выкинут!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"ÐеизвеÑтный указатель %#08x\n" -"Продолжить?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5996,19 +5340,7 @@ msgstr "DVD-диÑк:" msgid "Wii Save Import" msgstr "Импорт Ñохранений Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы Ñохранений Wii (*.bin)|*.bin" @@ -6035,15 +5367,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote подключен" @@ -6079,27 +5403,9 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Подождите..." diff --git a/Languages/po/sr.po b/Languages/po/sr.po index 62ec55ce59..6f8def3659 100644 --- a/Languages/po/sr.po +++ b/Languages/po/sr.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-03-02 21:58+0100\n" "Last-Translator: nikolassj\n" "Language-Team: \n" @@ -520,27 +508,9 @@ msgstr "Dodaj Patch " msgid "Add new pane" msgstr "Dodaj nova okna" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Dodaj..." @@ -594,23 +564,8 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -690,19 +645,7 @@ msgstr "" 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!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -724,19 +667,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -847,19 +778,7 @@ msgid "Blue Right" msgstr "Blue right " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Donji deo/dno" @@ -892,15 +811,7 @@ msgstr "" msgid "Buffer:" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1125,21 +1036,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Zatvori" @@ -1247,15 +1145,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Povezivanje..." @@ -1429,21 +1319,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1663,19 +1540,7 @@ msgstr "" msgid "Divide" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1705,39 +1570,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "Dolphin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1820,27 +1658,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1959,40 +1779,15 @@ msgstr "" msgid "Enable Block Merging" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -2118,27 +1913,9 @@ msgstr "" msgid "End" msgstr "Kraj" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2167,45 +1944,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Error" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Error" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Error" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Error" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2632,27 +2374,9 @@ msgstr "" msgid "Free Look" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2720,19 +2444,7 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2755,21 +2467,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2779,27 +2478,9 @@ msgstr "" msgid "General Settings" msgstr "Opcije Uredjaja " -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Nemacki " @@ -2916,21 +2597,8 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" @@ -3127,19 +2795,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -3217,27 +2873,9 @@ msgstr "" msgid "Invalid state" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italianski " @@ -3389,36 +3027,12 @@ msgstr "Ucitaj State Slot 8" msgid "Load State..." msgstr "Ucitaj State" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Ucitaj Wii Sistem Meni (%d %c)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Ucitaj Wii Sistem Meni (%d %c)" @@ -3495,15 +3109,7 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3535,19 +3141,7 @@ msgid "Memory Byte" msgstr "&Memorija" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3724,19 +3318,7 @@ msgstr "" msgid "NP Up" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3823,15 +3405,7 @@ msgstr "" msgid "Not Set" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3892,14 +3466,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Otvori " @@ -4025,23 +3592,8 @@ msgstr "" msgid "Paths" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauza " @@ -4062,23 +3614,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Pokreni " @@ -4105,19 +3642,7 @@ msgstr "Opcije " msgid "Players" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4325,31 +3850,10 @@ msgstr "" msgid "Refresh game list" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4365,14 +3869,7 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset/Restart " @@ -4415,19 +3912,7 @@ msgstr "" msgid "Safe" msgstr "Siguran " -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4511,19 +3996,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Skeniranje..." @@ -4563,39 +4036,12 @@ msgstr "" msgid "Select" msgstr "Izaberi " -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Izaberi Snimani fajl" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Izaberi Snimani fajl" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Izaberi Snimani fajl" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Izaberi Snimani fajl" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " @@ -4622,13 +4068,7 @@ msgstr "" msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" @@ -4636,29 +4076,7 @@ msgstr "Izaberi \"snimani fajl/the save state\"" msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "Izaberi \"snimani fajl/the save state\"" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Izaberi state za ucitavanje " - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" @@ -4994,27 +4412,9 @@ msgstr "" msgid "Space" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -5050,15 +4450,7 @@ msgstr "" msgid "Standard Controller" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5093,14 +4485,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr " Zaustavi" @@ -5172,14 +4557,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -5384,31 +4762,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" @@ -5510,19 +4869,6 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5733,19 +5079,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5772,15 +5106,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5813,27 +5139,9 @@ msgstr "" msgid "Word Wrap" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Radi..." diff --git a/Languages/po/tr.po b/Languages/po/tr.po index 890dd90043..4860e77e7c 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -7,24 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -"PO-Revision-Date: 2011-08-19 08:38-0500\n" -======= -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Clean up Turkish translation file. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-20 19:22+0200\n" ->>>>>>> Update Hungarian and Turkish translations. "Last-Translator: nlgzrgn \n" "Language-Team: nlgzrgn \n" "Language: Turkish\n" @@ -569,27 +553,9 @@ msgstr "Yama Ekle" msgid "Add new pane" msgstr "Bölme ekle" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Ekle..." @@ -659,23 +625,8 @@ msgstr "Tüm GC/Wii kalıpları (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" @@ -764,19 +715,7 @@ msgstr "" "Bu dosyayı gerçekten silmek istiyor musunuz? Silindikten sonra bu dosyaları " "geri döndüremezsiniz!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -798,19 +737,7 @@ msgstr "Ses Çözücüsü:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO sürücüyü açarken hata.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Otomatik" @@ -925,19 +852,7 @@ msgid "Blue Right" msgstr "Mavi SaÄŸ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Alt" @@ -970,15 +885,7 @@ msgstr "Çıkış klasörü için gözat" msgid "Buffer:" msgstr "Tampon:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1222,21 +1129,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Clean up Turkish translation file. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Kapat" @@ -1344,15 +1238,7 @@ msgstr "Wiimote 3'ü BaÄŸla" msgid "Connect Wiimote 4" msgstr "Wiimote 4'ü BaÄŸla" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Clean up Turkish translation file. msgid "Connecting..." msgstr "BaÄŸlanıyor..." @@ -1544,21 +1430,8 @@ msgstr "Ses" msgid "DSP Emulator Engine" msgstr "Ses Emülatörü Motoru" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emülasyonu (Hızlı)" @@ -1796,19 +1669,7 @@ msgstr "" msgid "Divide" msgstr "Böl" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" @@ -1837,39 +1698,12 @@ msgstr "Dolphin Taklit Wiimote Yapılandırması" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC Kolu Yapılandırması" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC Kolu Yapılandırması" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC Kolu Yapılandırması" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC Kolu Yapılandırması" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" @@ -1966,27 +1800,9 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Flemenkçe" @@ -2125,41 +1941,15 @@ msgstr "BAT'a Ä°zin Ver" msgid "Enable Block Merging" msgstr "Blok BirleÅŸimine Ä°zin Ver" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -msgid "Enable Bounding Box Calculation" -msgstr "" - -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Sınırlayıcı Kutu Hesaplama'yı EtkinleÅŸtir" ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Ön BelleÄŸe Ä°zin Ver" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Hilelere Ä°zin Ver" @@ -2316,27 +2106,9 @@ msgstr "" msgid "End" msgstr "Son" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Ä°ngilizce" @@ -2365,47 +2137,10 @@ msgstr "EÅŸit" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Hata" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Hata" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Hata" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" -"PlayWiimote'da hata. %u != %u, byte %d.\n" -"Ãœzgünüz, Wii kaydında geçici hasar var." - ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Hata" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 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." @@ -2416,11 +2151,8 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -<<<<<<< HEAD -======= "Hata: \"%s\" 'dan sonra, %d (0x%X) bulundu ( %d (0x%X) yerine). Durum kaydı " "yüklemesinden vazgeçiliyor..." ->>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format @@ -2875,27 +2607,9 @@ msgstr "Çekilecek Çerçeveler" msgid "Free Look" msgstr "Serbest Bakış" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Fransızca" @@ -2921,14 +2635,8 @@ msgid "GCI File(*.gci)" msgstr "GCI Dosyası (*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 -<<<<<<< HEAD -#, fuzzy -msgid "GCMic Configuration" -msgstr "GeçmiÅŸ Yapılandırması" -======= msgid "GCMic Configuration" msgstr "GCMic Yapılandırması" ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -2967,19 +2675,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube Kolu Ayarları (&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" @@ -3004,21 +2700,8 @@ msgstr "" "(kötü bir kod veya türü henüz desteklenmiyor.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Genel" @@ -3027,27 +2710,9 @@ msgstr "Genel" msgid "General Settings" msgstr "Genel Ayarlar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Almanca" @@ -3176,21 +2841,8 @@ msgid "Hotkey Configuration" msgstr "Kısayol TuÅŸu Yapılandırması" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "TuÅŸlar" @@ -3261,11 +2913,8 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -<<<<<<< HEAD -======= "EÄŸer iÅŸaretlenmiÅŸse, sınırlayıcı kutu kayıtları güncellenecektir. Paper " "Mario oyunları tarafından kullanılır." ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" @@ -3420,19 +3069,7 @@ msgstr "" "Kurulum Özel Durum Ä°ÅŸleyici çaÄŸrıldı, ama bu platform henüz bunu " "desteklemiyor." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD kuruluyor..." @@ -3514,27 +3151,9 @@ msgstr "Hatalı çekim dosyası" msgid "Invalid state" msgstr "Hatalı durum" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Ä°talyanca" @@ -3692,35 +3311,11 @@ msgstr "Durumu Yükle : 8" msgid "Load State..." msgstr "Durumu Yükle..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wii Sistem Menüsünü Yükle" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Wii Sistem Menüsünü Yükle" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wii Sistem Menüsünü Yükle" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Wii Sistem Menüsünü Yükle" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii Sistem Menüsünü Yükle %d%c" @@ -3802,15 +3397,7 @@ msgstr "MMU Hız Hilesi" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark dosyaları(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Ana Çubuk" @@ -3841,19 +3428,7 @@ msgid "Memory Byte" msgstr "Hafıza Baytı" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Hafıza Kartı" @@ -4051,19 +3626,7 @@ msgstr "NP Sekme" msgid "NP Up" msgstr "NP Yukarı" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4150,15 +3713,7 @@ msgstr "EÅŸit DeÄŸil" msgid "Not Set" msgstr "Ayarlanmamış" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Clean up Turkish translation file. msgid "Not connected" msgstr "BaÄŸlı deÄŸil" @@ -4219,14 +3774,7 @@ msgstr "Sadece %d blok kullanılabilir" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Clean up Turkish translation file. msgid "Open" msgstr "Aç" @@ -4357,23 +3905,8 @@ msgstr "Yamalar" msgid "Paths" msgstr "Yollar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Duraklat" @@ -4393,23 +3926,8 @@ msgstr "Perspektif %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Oynat" @@ -4435,19 +3953,7 @@ msgstr "Oynatma Seçenekleri" msgid "Players" msgstr "Oyuncular" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -4499,29 +4005,17 @@ msgstr "Geç Ä°ÅŸleme Etkisi:" #: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "PlayController'da erken kayıt bitiÅŸi. %u + 8 > %u" ->>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u + %d > %u" ->>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u > %u" ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4670,31 +4164,10 @@ msgstr "Listeyi Yenile" msgid "Refresh game list" msgstr "Oyun Listesini Yenile" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Kaldır" @@ -4713,14 +4186,7 @@ msgid "Render to Main Window" msgstr "Ana pencerede yorumla" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Sıfırla" @@ -4763,19 +4229,7 @@ msgstr "Durumu Kaydet (&V)" msgid "Safe" msgstr "Güvenli" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Örnek Oran:" @@ -4859,19 +4313,7 @@ msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." msgid "Scaled EFB Copy" msgstr "Boyutlandırılmış EFB Kopyası" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Taranıyor %s" @@ -4911,39 +4353,12 @@ msgstr "SYSCONF içinde %s bölümü bulunamadı" msgid "Select" msgstr "Seç" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Çekim Dosyasını Seç" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Çekim Dosyasını Seç" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Çekim Dosyasını Seç" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Çekim Dosyasını Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" @@ -4969,26 +4384,7 @@ msgstr "Sabit olmayan pencereyi seçin" msgid "Select the file to load" msgstr "Yüklemek için dosyayı seçin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Kayıt dosyasını seçin" - -#: 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:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Kayıt dosyasını seçin" @@ -4996,16 +4392,7 @@ msgstr "Kayıt dosyasını seçin" msgid "Select the state to load" msgstr "Yüklemek için durum seçin" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" @@ -5381,27 +4768,9 @@ msgstr "Ses tamponu oluÅŸturulamadı: %s" msgid "Space" msgstr "BoÅŸluk" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Ä°spanyolca" @@ -5445,15 +4814,7 @@ msgstr "Kare Çubuk" msgid "Standard Controller" msgstr "Varsayılan Denetim Aygıtı" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5488,14 +4849,7 @@ msgstr "Çubuk" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Durdur" @@ -5572,24 +4926,13 @@ msgstr "Tablo SaÄŸ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Clean up Turkish translation file. msgid "Take Screenshot" msgstr "Ekran Görüntüsü Al" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" -<<<<<<< HEAD -msgstr "" -======= msgstr "TaruKonga (Bongos)" ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5813,31 +5156,12 @@ msgstr "Tüm GeçmiÅŸ Türlerini Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Clean up Turkish translation file. msgid "Toggle Fullscreen" msgstr "Tam Ekran Moduna Geç" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Ãœst" @@ -5946,21 +5270,6 @@ msgstr "Åžu ID ile bilinmeyen mesaj alındı : %d" 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!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Bilinmeyen iÅŸaretleyici %#08x\n" -"Devam?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Clean up Turkish translation file. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6126,13 +5435,10 @@ msgid "" "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" -<<<<<<< HEAD -======= "Dikkat: Åžu anki kaydın bitiÅŸinden sonra yer alan bir kayıt yüklediniz. (Bayt " "%u > %u) (Çerçeve %u > %u). Devam etmeden önce baÅŸka bir kayıt yüklemeniz, " "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." ->>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:684 #, c-format @@ -6141,13 +5447,10 @@ msgid "" "should load another save before continuing, or load this state with read-" "only mode off. Otherwise you'll probably get a desync." msgstr "" -<<<<<<< HEAD -======= "Dikkat: Bayt %d (0x%X) ile eÅŸleÅŸmeyen bir kayıt yüklediniz. Devam etmeden " "önce baÅŸka bir kayıt yüklemeniz, 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." ->>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:693 #, c-format @@ -6167,8 +5470,6 @@ 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 "" -<<<<<<< HEAD -======= "Dikkat: Çerçeve %d ile eÅŸleÅŸmeyen bir kayıt yüklediniz. Devam etmeden önce " "baÅŸka bir kayıt yüklemeniz, veya bu kaydı Salt Okunur mod kapalıyken " "yüklemeniz daha iyi olacaktır. Aksi taktirde, büyük bir ihtimalle, " @@ -6184,7 +5485,6 @@ msgstr "" "Çerçeve %d 'de, durum kaydı bunları basıyor:\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" ->>>>>>> Clean up Turkish translation file. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -6219,19 +5519,7 @@ msgstr "Wii NAND Kök Dizini:" msgid "Wii Save Import" msgstr "Wii Kaydı Al" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -6262,15 +5550,7 @@ msgstr "" "bir zaman aşımı olabilir veya baÅŸka bir ÅŸey olabilir. \n" "Tekrar baÄŸlamak istiyor musunuz?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Clean up Turkish translation file. msgid "Wiimote Connected" msgstr "Wiimote BaÄŸlandı" @@ -6302,27 +5582,9 @@ msgstr "Pencereleri SaÄŸa Döşe" msgid "Word Wrap" msgstr "Heceleme" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Çalışıyor..." @@ -6632,19 +5894,10 @@ msgstr "| VEYA" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "%s açılamıyor, kayıp bir iÅŸleve sahip." -<<<<<<< HEAD -<<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "Salt-okunur modda film çekilemez." -======= -======= -#~ msgid "Cannot record movies in read-only mode." -#~ msgstr "Salt-okunur modda film çekilemez." - ->>>>>>> Clean up Turkish translation file. #, fuzzy ->>>>>>> Update Hungarian and Turkish translations. #~ msgid "Config..." #~ msgstr "Yapılandır..." diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index f7bb9c4575..ee2e7c5bcd 100644 --- a/Languages/po/zh_CN.po +++ b/Languages/po/zh_CN.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-09 13:55-0800\n" "Last-Translator: thegfw \n" "Language-Team: \n" @@ -548,27 +536,9 @@ msgstr "添加补ä¸" msgid "Add new pane" msgstr "添加新é¢æ¿" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "添加..." @@ -622,23 +592,8 @@ msgstr "所有 GC/Wii é•œåƒ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "æ‰€æœ‰å­˜æ¡£çŠ¶æ€ (sav, s##)" @@ -719,19 +674,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?这将是永久性的删除!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "高宽比:" @@ -753,19 +696,7 @@ msgstr "音频åŽç«¯:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: 打开 AO 设备错误.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自动" @@ -877,19 +808,7 @@ msgid "Blue Right" msgstr "è“ å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "底部" @@ -922,15 +841,7 @@ msgstr "æµè§ˆè¾“出目录" msgid "Buffer:" msgstr "缓冲区:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1163,21 +1074,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "关闭" @@ -1286,15 +1184,7 @@ msgstr "连接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "连接 Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "连接中..." @@ -1479,21 +1369,8 @@ msgstr "DSP音频" msgid "DSP Emulator Engine" msgstr "音频模拟引擎" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "音频 HLE 模拟(很快)" @@ -1721,19 +1598,7 @@ msgstr "按模拟器显示输入读å–" msgid "Divide" msgstr "Divide" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "您确定是å¦åœæ­¢å½“å‰æ¨¡æ‹Ÿ?" @@ -1763,39 +1628,12 @@ msgstr "Dolphin 模拟 Wiimote 设置" msgid "Dolphin FIFO" msgstr "Dolphin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC 手柄设置" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC 手柄设置" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC 手柄设置" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 手柄设置" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" @@ -1879,27 +1717,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "è·å…°è¯­" @@ -2023,41 +1843,16 @@ msgstr "å¯ç”¨ BAT" msgid "Enable Block Merging" msgstr "å¯ç”¨åŒºå—åˆå¹¶" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "å¯ç”¨ç¼“å­˜" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "å¯ç”¨ä½œå¼Š" @@ -2192,27 +1987,9 @@ msgstr "" msgid "End" msgstr "End" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "英语" @@ -2241,45 +2018,10 @@ msgstr "等于" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "错误" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "错误" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "错误" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "错误" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Error loading selected language. Falling back to system default." @@ -2744,27 +2486,9 @@ msgstr "" msgid "Free Look" msgstr "自由视点" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "法语" @@ -2832,19 +2556,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube 手柄设置(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube å†…å­˜å¡ (*.raw,*.gcp)" @@ -2869,21 +2581,8 @@ msgstr "" "(either a bad code or the code type is not yet supported.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "常规" @@ -2893,27 +2592,9 @@ msgstr "常规" msgid "General Settings" msgstr "ç•Œé¢è®¾ç½®" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "德语" @@ -3035,21 +2716,8 @@ msgid "Hotkey Configuration" msgstr "热键设置" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "热键" @@ -3261,19 +2929,7 @@ msgid "" msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "安装 WAD 到 Wii èœå•ä¸­..." @@ -3358,27 +3014,9 @@ msgstr "无效录制文件" msgid "Invalid state" msgstr "Invalid state" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "æ„大利语" @@ -3537,36 +3175,12 @@ msgstr "载入存档æ’槽 8" msgid "Load State..." msgstr "载入状æ€..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "载入 Wii 系统èœå•(%d %c)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "载入 Wii 系统èœå•(%d %c)" @@ -3647,15 +3261,7 @@ msgstr "MMU 速度破解" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 文件(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主摇æ†" @@ -3687,19 +3293,7 @@ msgid "Memory Byte" msgstr "内存(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "内存å¡" @@ -3883,19 +3477,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3983,15 +3565,7 @@ msgstr "ä¸ç­‰äºŽ" msgid "Not Set" msgstr "未设置" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "未连接" @@ -4052,14 +3626,7 @@ msgstr "åªæœ‰ %d 区å—有效" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "打开" @@ -4190,23 +3757,8 @@ msgstr "è¡¥ä¸" msgid "Paths" msgstr "路径" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "æš‚åœ" @@ -4227,23 +3779,8 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "开始" @@ -4270,19 +3807,7 @@ msgstr "选项" msgid "Players" msgstr "玩家" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "请确认..." @@ -4497,31 +4022,10 @@ msgstr "刷新列表" msgid "Refresh game list" msgstr "刷新游æˆåˆ—表" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "移除" @@ -4540,14 +4044,7 @@ msgid "Render to Main Window" msgstr "附加到主窗å£" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "é‡ç½®" @@ -4590,19 +4087,7 @@ msgstr "ä¿å­˜çŠ¶æ€(&V)" msgid "Safe" msgstr "安全" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "采样率:" @@ -4687,19 +4172,7 @@ msgstr "Savestate movie %s is corrupted, movie recording stopping..." msgid "Scaled EFB Copy" msgstr "EFB 比例å¤åˆ¶" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "扫æ中..." @@ -4739,39 +4212,12 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "选择" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "选择录制文件" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "选择录制文件" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "选择录制文件" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "选择录制文件" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "选择è¦å¯¼å…¥çš„存档" @@ -4798,13 +4244,7 @@ msgstr "选择浮动窗å£" msgid "Select the file to load" msgstr "选择è¦è½½å…¥çš„文件" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "选择一个存档文件" @@ -4812,29 +4252,7 @@ msgstr "选择一个存档文件" msgid "Select the state to load" msgstr "选择è¦è½½å…¥çš„状æ€" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "选择一个存档文件" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "选择è¦è½½å…¥çš„状æ€" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "选择è¦ä¿å­˜çš„状æ€" @@ -5183,27 +4601,9 @@ msgstr "声音缓冲区创建失败: %s" msgid "Space" msgstr "空格" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "西ç­ç‰™è¯­" @@ -5239,15 +4639,7 @@ msgstr "æ–¹å—é”®" msgid "Standard Controller" msgstr "标准控制器" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5282,14 +4674,7 @@ msgstr "摇æ†" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -5362,14 +4747,7 @@ msgstr "Table Right" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "å±å¹•æˆªå›¾(&T)" @@ -5591,31 +4969,12 @@ msgstr "切æ¢æ‰€æœ‰æ—¥å¿—类型" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "切æ¢å…¨å±" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "顶部" @@ -5719,21 +5078,6 @@ msgstr "Unknown message received with id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Unknown message with id:%d received from player:%d Kicking player!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"未知指针 %#08x\n" -"继续?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5948,19 +5292,7 @@ msgstr "DVD 根目录:" msgid "Wii Save Import" msgstr "导入 Wii 存档" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5991,15 +5323,7 @@ msgstr "" "or maybe it is due to idle time out or other reason.\n" "Do you want to reconnect immediately?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote 已连接" @@ -6032,27 +5356,9 @@ msgstr "窗å£å³ä¾§" msgid "Word Wrap" msgstr "自动æ¢è¡Œ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "工作中..." diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index e0384728e6..8d0fcc4799 100644 --- a/Languages/po/zh_TW.po +++ b/Languages/po/zh_TW.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-03-15 02:51+0800\n" "Last-Translator: khiav \n" "Language-Team: khiav&yrbn \n" @@ -548,27 +536,9 @@ msgstr "新增修正" msgid "Add new pane" msgstr "新增é¢ç‰ˆ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "新增..." @@ -635,23 +605,8 @@ msgstr "所有 GC/Wii 映åƒæª” (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "所有å³æ™‚存檔 (sav, s##)" @@ -732,19 +687,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？刪了之後就回ä¸ä¾†äº†å“¦ï¼" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "ç•«é¢æ¯”例：" @@ -766,19 +709,7 @@ msgstr "è²éŸ³è£ç½®ï¼š" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon：開啟 AO è£ç½®å‡ºéŒ¯ã€‚\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -890,19 +821,7 @@ msgid "Blue Right" msgstr "è— å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "下方" @@ -935,15 +854,7 @@ msgstr "ç€è¦½è¼¸å‡ºçš„資料夾" msgid "Buffer:" msgstr "ç·©è¡ï¼š" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1172,21 +1083,8 @@ msgstr "在éŠæˆ²åŸ·è¡Œæ™‚客戶端斷開連接ï¼ï¼ç¶²è·¯å°æˆ°å·²ç¶“被關閉 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "關閉" @@ -1295,15 +1193,7 @@ msgstr "連接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "連接 Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "正在連接..." @@ -1487,21 +1377,8 @@ msgstr "è²éŸ³" msgid "DSP Emulator Engine" msgstr "DSP 模擬引擎" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 模擬器 (å¿«)" @@ -1729,19 +1606,7 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Divide" msgstr "Divide" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "您è¦åœæ­¢ç›®å‰çš„模擬嗎？" @@ -1771,39 +1636,12 @@ msgstr "Dolphin 模擬 Wiimote 設定" msgid "Dolphin FIFO" msgstr "Dolphin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC 控制器設定" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC 控制器設定" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC 控制器設定" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 控制器設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" @@ -1887,27 +1725,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Dutch" @@ -2029,41 +1849,16 @@ msgstr "é–‹å•Ÿ BAT" msgid "Enable Block Merging" msgstr "é–‹å•Ÿå¡Šåˆä½µ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "é–‹å•Ÿå¿«å–" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "開啟作弊" @@ -2195,27 +1990,9 @@ msgstr "" msgid "End" msgstr "End" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "English" @@ -2244,45 +2021,10 @@ msgstr "等於" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "錯誤" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "錯誤" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "錯誤" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "錯誤" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "讀å–é¸æ“‡çš„語系出錯。返回使用系統é è¨­å€¼ã€‚" @@ -2745,27 +2487,9 @@ msgstr "" msgid "Free Look" msgstr "自由視點" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "French" @@ -2833,19 +2557,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube 控制器設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube è¨˜æ†¶å¡ (*.raw,*.gcp)" @@ -2870,21 +2582,8 @@ msgstr "" "(一個æ毀的代碼或ä¸æ”¯æ´çš„代碼類型。)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2894,27 +2593,9 @@ msgstr "一般" msgid "General Settings" msgstr "ç•Œé¢è¨­å®š" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "German" @@ -3036,21 +2717,8 @@ msgid "Hotkey Configuration" msgstr "å¿«æ·éµè¨­å®š" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "å¿«æ·éµ" @@ -3254,19 +2922,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler，但是這個平å°å°šæœªæ”¯æ´æ­¤åŠŸèƒ½ã€‚" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "æ­£åœ¨å®‰è£ WAD 至 Wii é¸å–®..." @@ -3350,27 +3006,9 @@ msgstr "無效的錄åƒæª”" msgid "Invalid state" msgstr "無效的狀態" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italian" @@ -3529,36 +3167,12 @@ msgstr "讀å–儲存格 8" msgid "Load State..." msgstr "讀å–進度檔..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" @@ -3639,15 +3253,7 @@ msgstr "MMU 速度修正" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 檔案(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主æ–æ¡¿" @@ -3679,19 +3285,7 @@ msgid "Memory Byte" msgstr "記憶å¡(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "記憶å¡" @@ -3875,19 +3469,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3975,15 +3557,7 @@ msgstr "ä¸ç›¸ç­‰" msgid "Not Set" msgstr "未設定" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "未連接" @@ -4044,14 +3618,7 @@ msgstr "僅 %d 個å€å¡Šå¯ç”¨" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "é–‹å•Ÿ" @@ -4180,23 +3747,8 @@ msgstr "修正" msgid "Paths" msgstr "路徑" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "æš«åœ" @@ -4217,23 +3769,8 @@ msgstr "ç‰ˆå¼ %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "執行" @@ -4260,19 +3797,7 @@ msgstr "é¸é …" msgid "Players" msgstr "玩家" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "請確èª..." @@ -4486,31 +4011,10 @@ msgstr "更新列表" msgid "Refresh game list" msgstr "æ›´æ–°éŠæˆ²åˆ—表" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "移除" @@ -4529,14 +4033,7 @@ msgid "Render to Main Window" msgstr "渲染至主視窗" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "é‡ç½®" @@ -4579,19 +4076,7 @@ msgstr "儲存進度(&V)" msgid "Safe" msgstr "安全" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "å–樣率：" @@ -4676,19 +4161,7 @@ msgstr "儲存的影片 %s 是æ毀的，影片錄製åœæ­¢..." msgid "Scaled EFB Copy" msgstr "EFB 縮放複製" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "正在掃瞄..." @@ -4728,39 +4201,12 @@ msgstr "é …ç›® %s 在 SYSCONF 中找ä¸åˆ°" msgid "Select" msgstr "é¸æ“‡" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "é¸æ“‡å·²éŒ„製的檔案" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "é¸æ“‡å·²éŒ„製的檔案" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "é¸æ“‡å·²éŒ„製的檔案" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "é¸æ“‡å·²éŒ„製的檔案" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "é¸æ“‡è¦å®‰è£çš„ Wii WAD" @@ -4786,13 +4232,7 @@ msgstr "é¸æ“‡æµ®å‹•è¦–窗" msgid "Select the file to load" msgstr "é¸æ“‡è¦è®€å–的檔案" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "é¸æ“‡å­˜æª”" @@ -4800,29 +4240,7 @@ msgstr "é¸æ“‡å­˜æª”" msgid "Select the state to load" msgstr "é¸æ“‡è¦è®€å–的進度" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "é¸æ“‡å­˜æª”" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "é¸æ“‡è¦è®€å–的進度" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "é¸æ“‡è¦å„²å­˜çš„進度" @@ -5170,27 +4588,9 @@ msgstr "è²éŸ³ç·©è¡å»ºç«‹å¤±æ•—：%s" msgid "Space" msgstr "Space" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanish" @@ -5226,15 +4626,7 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "標準控制器" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5269,14 +4661,7 @@ msgstr "æ–æ¡¿" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -5349,14 +4734,7 @@ msgstr "Table å³" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "截å–ç•«é¢" @@ -5568,31 +4946,12 @@ msgstr "å…¨é¸/全部å–消" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "切æ›å…¨èž¢å¹•" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "上方" @@ -5696,21 +5055,6 @@ msgstr "接收到帶有未知 id 的錯誤訊æ¯ï¼š%d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "知訊æ¯å¸¶æœ‰ id:%d 接收於玩家:%d 正在æ出玩家ï¼" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"未知的指示器 %#08x\n" -"是å¦ç¹¼çºŒï¼Ÿ" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5925,19 +5269,7 @@ msgstr "DVD 根：" msgid "Wii Save Import" msgstr "匯入 Wii 存檔" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5968,15 +5300,7 @@ msgstr "" "或閒置的時間太久。\n" "是å¦è¦é‡æ–°é€£æŽ¥ï¼Ÿ" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote 已連接" @@ -6009,27 +5333,9 @@ msgstr "視窗 å³" msgid "Word Wrap" msgstr "自動æ›è¡Œ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "執行中..." From bf76b802a7b619369349ac95de1850ce89091e63 Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 10 Mar 2012 16:24:13 +1100 Subject: [PATCH 049/185] Fixed the in-built Dolphin profiler. --- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 9 ++-- .../Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp | 7 ++- Source/Core/Core/Src/PowerPC/Profiler.cpp | 27 ++++++----- .../Src/Debugger/CodeWindowFunctions.cpp | 45 ++++++++++--------- 4 files changed, 51 insertions(+), 37 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 0d31893b53..df1fd0f589 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -412,9 +412,12 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc if (Core::g_CoreStartupParameter.bEnableDebugging) { // Comment out the following to disable breakpoints (speed-up) - blockSize = 1; - broken_block = true; - Trace(); + if (!Profiler::g_ProfileBlocks) + { + blockSize = 1; + broken_block = true; + Trace(); + } } if (em_address == 0) diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp index 75755de5cb..77c7fb6169 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp @@ -524,8 +524,11 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc if (Core::g_CoreStartupParameter.bEnableDebugging) { // Comment out the following to disable breakpoints (speed-up) - blockSize = 1; - Trace(); + if (!Profiler::g_ProfileBlocks) + { + blockSize = 1; + Trace(); + } } if (em_address == 0) diff --git a/Source/Core/Core/Src/PowerPC/Profiler.cpp b/Source/Core/Core/Src/PowerPC/Profiler.cpp index 2874705d4b..3636b00717 100644 --- a/Source/Core/Core/Src/PowerPC/Profiler.cpp +++ b/Source/Core/Core/Src/PowerPC/Profiler.cpp @@ -56,18 +56,21 @@ void WriteProfileResults(const char *filename) for (int i = 0; i < jit->GetBlockCache()->GetNumBlocks(); i++) { const JitBlock *block = jit->GetBlockCache()->GetBlock(i); - // Rough heuristic. Mem instructions should cost more. - u64 cost = block->originalSize * (block->runCount / 4); + if (block && !block->invalid) + { + // Rough heuristic. Mem instructions should cost more. + u64 cost = block->originalSize * (block->runCount / 4); #ifdef _WIN32 - u64 timecost = block->ticCounter; + u64 timecost = block->ticCounter; #endif - // Todo: tweak. - if (block->runCount >= 1) - stats.push_back(BlockStat(i, cost)); - cost_sum += cost; + // Todo: tweak. + if (block->runCount >= 1) + stats.push_back(BlockStat(i, cost)); + cost_sum += cost; #ifdef _WIN32 - timecost_sum += timecost; + timecost_sum += timecost; #endif + } } sort(stats.begin(), stats.end()); @@ -77,18 +80,18 @@ void WriteProfileResults(const char *filename) PanicAlert("failed to open %s", filename); return; } - fprintf(f.GetHandle(), "origAddr\tblkName\tcost\ttimeCost\tpercent\ttimePercent\tOvAllinBlkTime(ms)\tblkCodeSize\n"); + fprintf(f.GetHandle(), "origAddr\tblkName\tcost\trunCount\ttimeCost\tpercent\ttimePercent\tOvAllinBlkTime(ms)\tblkCodeSize\n"); for (unsigned int i = 0; i < stats.size(); i++) { const JitBlock *block = jit->GetBlockCache()->GetBlock(stats[i].blockNum); - if (block) + if (block && !block->invalid) { std::string name = g_symbolDB.GetDescription(block->originalAddress); double percent = 100.0 * (double)stats[i].cost / (double)cost_sum; #ifdef _WIN32 double timePercent = 100.0 * (double)block->ticCounter / (double)timecost_sum; - fprintf(f.GetHandle(), "%08x\t%s\t%llu\t%llu\t%.2lf\t%llf\t%lf\t%i\n", - block->originalAddress, name.c_str(), stats[i].cost, + fprintf(f.GetHandle(), "%08x\t%s\t%llu\t%llu\t%llu\t%.2lf\t%llf\t%lf\t%i\n", + block->originalAddress, name.c_str(), stats[i].cost, block->runCount, block->ticCounter, percent, timePercent, (double)block->ticCounter*1000.0/(double)countsPerSec, block->codeSize); #else diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp index a3dd9a9ab8..05915ecd20 100644 --- a/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp @@ -187,35 +187,40 @@ void CCodeWindow::CreateMenuSymbols(wxMenuBar *pMenuBar) void CCodeWindow::OnProfilerMenu(wxCommandEvent& event) { - if (Core::GetState() == Core::CORE_RUN) { - event.Skip(); - return; - } switch (event.GetId()) { case IDM_PROFILEBLOCKS: - if (jit != NULL) jit->ClearCache(); + Core::SetState(Core::CORE_PAUSE); + if (jit != NULL) + jit->ClearCache(); Profiler::g_ProfileBlocks = GetMenuBar()->IsChecked(IDM_PROFILEBLOCKS); + Core::SetState(Core::CORE_RUN); break; case IDM_WRITEPROFILE: - if (jit != NULL) - { - std::string filename = File::GetUserPath(D_DUMP_IDX) + "Debug/profiler.txt"; - File::CreateFullPath(filename); - Profiler::WriteProfileResults(filename.c_str()); + if (Core::GetState() == Core::CORE_RUN) + Core::SetState(Core::CORE_PAUSE); - wxFileType* filetype = NULL; - if (!(filetype = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("txt")))) + if (Core::GetState() == Core::CORE_PAUSE && PowerPC::GetMode() == PowerPC::MODE_JIT) + { + if (jit != NULL) { - // From extension failed, trying with MIME type now - if (!(filetype = wxTheMimeTypesManager->GetFileTypeFromMimeType(_T("text/plain")))) - // MIME type failed, aborting mission - break; + std::string filename = File::GetUserPath(D_DUMP_IDX) + "Debug/profiler.txt"; + File::CreateFullPath(filename); + Profiler::WriteProfileResults(filename.c_str()); + + wxFileType* filetype = NULL; + if (!(filetype = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("txt")))) + { + // From extension failed, trying with MIME type now + if (!(filetype = wxTheMimeTypesManager->GetFileTypeFromMimeType(_T("text/plain")))) + // MIME type failed, aborting mission + break; + } + wxString OpenCommand; + OpenCommand = filetype->GetOpenCommand(wxString::From8BitData(filename.c_str())); + if(!OpenCommand.IsEmpty()) + wxExecute(OpenCommand, wxEXEC_SYNC); } - wxString OpenCommand; - OpenCommand = filetype->GetOpenCommand(wxString::From8BitData(filename.c_str())); - if(!OpenCommand.IsEmpty()) - wxExecute(OpenCommand, wxEXEC_SYNC); } break; } From fedf6055ce2d1ac9862eac8c2c112160b8d7fbe8 Mon Sep 17 00:00:00 2001 From: marcosvitali Date: Sun, 11 Mar 2012 12:40:39 -0300 Subject: [PATCH 050/185] I've fixed Super Monkey Ball in some cases when the game write the WriteReadDistance need to be safe like the SafeCPRead. This fix is not related with the previous commits, but the previous commits help me to see that because in the new scenery SMB was hanging. May be in the past also doesn't boot some times because of that. Please Test FZero boot also. Thanks. --- .../Core/VideoCommon/Src/CommandProcessor.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index 77c02d1692..dbf4907160 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -171,11 +171,23 @@ void Read16(u16& _rReturnValue, const u32 _Address) case FIFO_LO_WATERMARK_HI: _rReturnValue = ReadHigh(fifo.CPLoWatermark); return; case FIFO_RW_DISTANCE_LO: + if (IsOnThread()) + if(fifo.CPWritePointer >= fifo.SafeCPReadPointer) + _rReturnValue = ReadLow (fifo.CPWritePointer - fifo.SafeCPReadPointer); + else + _rReturnValue = ReadLow (fifo.CPEnd - fifo.CPWritePointer + fifo.SafeCPReadPointer); + else _rReturnValue = ReadLow (fifo.CPReadWriteDistance); DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_RW_DISTANCE_LO : %04x", _rReturnValue); return; case FIFO_RW_DISTANCE_HI: - _rReturnValue = ReadHigh(fifo.CPReadWriteDistance); + if (IsOnThread()) + if(fifo.CPWritePointer >= fifo.SafeCPReadPointer) + _rReturnValue = ReadHigh (fifo.CPWritePointer - fifo.SafeCPReadPointer); + else + _rReturnValue = ReadHigh (fifo.CPEnd - fifo.CPWritePointer + fifo.SafeCPReadPointer); + else + _rReturnValue = ReadHigh(fifo.CPReadWriteDistance); DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_RW_DISTANCE_HI : %04x", _rReturnValue); return; case FIFO_WRITE_POINTER_LO: @@ -356,6 +368,7 @@ void Write16(const u16 _Value, const u32 _Address) break; case FIFO_READ_POINTER_HI: WriteHigh((u32 &)fifo.CPReadPointer, _Value); + fifo.SafeCPReadPointer = fifo.CPReadPointer; DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_READ_POINTER_HI : %04x", _Value); break; @@ -596,7 +609,7 @@ void SetCpStatusRegister() // Here always there is one fifo attached to the GPU m_CPStatusReg.Breakpoint = fifo.bFF_Breakpoint; - m_CPStatusReg.ReadIdle = (fifo.CPReadPointer == fifo.CPWritePointer) || (fifo.CPReadPointer == fifo.CPBreakpoint) ; + m_CPStatusReg.ReadIdle = !fifo.CPReadWriteDistance || (fifo.CPReadPointer == fifo.CPWritePointer) || (fifo.CPReadPointer == fifo.CPBreakpoint) ; m_CPStatusReg.CommandIdle = !fifo.CPReadWriteDistance; m_CPStatusReg.UnderflowLoWatermark = fifo.bFF_LoWatermark; m_CPStatusReg.OverflowHiWatermark = fifo.bFF_HiWatermark; From 352ab2ba4394180739d7315c0c505aab83ffe211 Mon Sep 17 00:00:00 2001 From: marcosvitali Date: Tue, 13 Mar 2012 01:44:10 -0300 Subject: [PATCH 051/185] Improved the CheckException for the GatherPipe writes in JIT, now only the External Exceptions are processed. We Didn't Check 0x0008000 in PowerPC::ppcState.msr this was killing the performance, this also fix a hang when this check is performed. SMG for example. Deleted the HiWatermark condition from GPFifo. Please test games affected in this Revision 9e649ce79850, and games affected in this Revision b0f75f17ae19. I do not want to excite the game players of 'The Las Story', but Could test again the random hangs with this rev? Thanks --- Source/Core/Core/Src/HW/GPFifo.cpp | 2 +- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/HW/GPFifo.cpp b/Source/Core/Core/Src/HW/GPFifo.cpp index 9bae7bb621..77fdbf5933 100644 --- a/Source/Core/Core/Src/HW/GPFifo.cpp +++ b/Source/Core/Core/Src/HW/GPFifo.cpp @@ -99,7 +99,7 @@ void STACKALIGN CheckGatherPipe() // Profile where the FIFO writes are occurring. - if (g_video_backend->Video_IsHiWatermarkActive() && jit && (jit->js.fifoWriteAddresses.find(PC)) == (jit->js.fifoWriteAddresses.end())) + if (jit && (jit->js.fifoWriteAddresses.find(PC)) == (jit->js.fifoWriteAddresses.end())) { jit->js.fifoWriteAddresses.insert(PC); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 417d1159da..b23964b071 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -576,14 +576,21 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc gpr.Flush(FLUSH_ALL); fpr.Flush(FLUSH_ALL); + + TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_ISI | EXCEPTION_PROGRAM | EXCEPTION_SYSCALL | EXCEPTION_FPU_UNAVAILABLE | EXCEPTION_DSI | EXCEPTION_ALIGNMENT | EXCEPTION_DECREMENTER)); + FixupBranch clearInt = J_CC(CC_NZ); TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_EXTERNAL_INT)); FixupBranch noExtException = J_CC(CC_Z); - TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); + TEST(32, M((void *)&PowerPC::ppcState.msr), Imm32(0x0008000)); FixupBranch noCPInt = J_CC(CC_Z); - + TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); + FixupBranch noCPInt2 = J_CC(CC_Z); + MOV(32, M(&PC), Imm32(ops[i].address)); WriteExceptionExit(); + SetJumpTarget(clearInt); + SetJumpTarget(noCPInt2); SetJumpTarget(noCPInt); SetJumpTarget(noExtException); } From b37c468039b944de7b40ef6e67ae07c3e59f44f6 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Tue, 13 Mar 2012 23:42:30 +1300 Subject: [PATCH 052/185] Fixes issue 5269 Sorry guys but I needed to disable stfs so that Pokepark 2 would not freeze(?). Feel free to put some effort in to finding out why, I do not understand Jit sorry. --- Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp | 4 ++-- .../Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp index 93963513ee..5b7baa28c0 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp @@ -100,8 +100,8 @@ static GekkoOPTemplate primarytable[] = {50, &Jit64::lfd}, //"lfd", OPTYPE_LOADFP, FL_IN_A}}, {51, &Jit64::Default}, //"lfdu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}}, - {52, &Jit64::stfs}, //"stfs", OPTYPE_STOREFP, FL_IN_A}}, - {53, &Jit64::stfs}, //"stfsu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, + {52, &Jit64::Default}, //"stfs", OPTYPE_STOREFP, FL_IN_A}}, + {53, &Jit64::Default}, //"stfsu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, {54, &Jit64::stfd}, //"stfd", OPTYPE_STOREFP, FL_IN_A}}, {55, &Jit64::Default}, //"stfdu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp index 41c9a3ceb7..25ad18acf5 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp @@ -240,7 +240,14 @@ void Jit64::stfd(UGeckoInstruction inst) fpr.UnlockAll(); } - +// In Release on 32bit build, +// this seemed to cause a problem with PokePark2 +// at start after talking to first pokemon, +// you run and smash a box, then he goes on about +// following him and then you cant do anything. +// I have enabled interpreter for this function +// in the mean time. +// Parlane void Jit64::stfs(UGeckoInstruction inst) { INSTRUCTION_START From dc79d68e72f04f60366484f60bff1e39d7e6babe Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 13 Mar 2012 22:35:11 +1100 Subject: [PATCH 053/185] Added the corresponding change from r352ab2ba4394 into JITIL. Tidied some code. --- Source/Core/Core/Src/HW/GPFifo.cpp | 1 - Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 16 +++++---- .../Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp | 7 +++- .../Core/Src/PowerPC/JitCommon/JitBase.cpp | 2 ++ .../Core/Core/Src/PowerPC/JitCommon/JitBase.h | 3 -- .../Core/VideoCommon/Src/CommandProcessor.cpp | 34 ++++++------------- .../Core/VideoCommon/Src/CommandProcessor.h | 1 - Source/Core/VideoCommon/Src/PixelEngine.cpp | 3 -- 8 files changed, 28 insertions(+), 39 deletions(-) diff --git a/Source/Core/Core/Src/HW/GPFifo.cpp b/Source/Core/Core/Src/HW/GPFifo.cpp index 77fdbf5933..3af387792f 100644 --- a/Source/Core/Core/Src/HW/GPFifo.cpp +++ b/Source/Core/Core/Src/HW/GPFifo.cpp @@ -98,7 +98,6 @@ void STACKALIGN CheckGatherPipe() memmove(m_gatherPipe, m_gatherPipe + cnt, m_gatherPipeCount); // Profile where the FIFO writes are occurring. - if (jit && (jit->js.fifoWriteAddresses.find(PC)) == (jit->js.fifoWriteAddresses.end())) { jit->js.fifoWriteAddresses.insert(PC); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index b23964b071..1506170b2b 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -42,6 +42,9 @@ #include "JitRegCache.h" #include "Jit64_Tables.h" #include "HW/ProcessorInterface.h" +#if defined(_DEBUG) || defined(DEBUGFAST) +#include "PowerPCDisasm.h" +#endif using namespace Gen; using namespace PowerPC; @@ -576,23 +579,22 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc gpr.Flush(FLUSH_ALL); fpr.Flush(FLUSH_ALL); - TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_ISI | EXCEPTION_PROGRAM | EXCEPTION_SYSCALL | EXCEPTION_FPU_UNAVAILABLE | EXCEPTION_DSI | EXCEPTION_ALIGNMENT | EXCEPTION_DECREMENTER)); FixupBranch clearInt = J_CC(CC_NZ); TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_EXTERNAL_INT)); FixupBranch noExtException = J_CC(CC_Z); TEST(32, M((void *)&PowerPC::ppcState.msr), Imm32(0x0008000)); - FixupBranch noCPInt = J_CC(CC_Z); + FixupBranch noExtIntEnable = J_CC(CC_Z); TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); - FixupBranch noCPInt2 = J_CC(CC_Z); - + FixupBranch noCPInt = J_CC(CC_Z); + MOV(32, M(&PC), Imm32(ops[i].address)); WriteExceptionExit(); - SetJumpTarget(clearInt); - SetJumpTarget(noCPInt2); SetJumpTarget(noCPInt); + SetJumpTarget(noExtIntEnable); SetJumpTarget(noExtException); + SetJumpTarget(clearInt); } Jit64Tables::CompileInstruction(ops[i]); @@ -619,7 +621,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc { char ppcInst[256]; DisassembleGekko(ops[i].inst.hex, em_address, ppcInst, 256); - NOTICE_LOG(DYNA_REC, "Unflushed reg: %s", ppcInst); + DEBUG_LOG(DYNA_REC, "Unflushed reg: %s", ppcInst); } #endif diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp index 811440d098..f82e34b5b1 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp @@ -1925,17 +1925,22 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak case ExtExceptionCheck: { unsigned InstLoc = ibuild->GetImmValue(getOp1(I)); + Jit->TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_ISI | EXCEPTION_PROGRAM | EXCEPTION_SYSCALL | EXCEPTION_FPU_UNAVAILABLE | EXCEPTION_DSI | EXCEPTION_ALIGNMENT | EXCEPTION_DECREMENTER)); + FixupBranch clearInt = Jit->J_CC(CC_NZ); Jit->TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_EXTERNAL_INT)); FixupBranch noExtException = Jit->J_CC(CC_Z); + Jit->TEST(32, M((void *)&PowerPC::ppcState.msr), Imm32(0x0008000)); + FixupBranch noExtIntEnable = Jit->J_CC(CC_Z); Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); FixupBranch noCPInt = Jit->J_CC(CC_Z); Jit->MOV(32, M(&PC), Imm32(InstLoc)); Jit->WriteExceptionExit(); - Jit->SetJumpTarget(noCPInt); + Jit->SetJumpTarget(noExtIntEnable); Jit->SetJumpTarget(noExtException); + Jit->SetJumpTarget(clearInt); break; } case Int3: { diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp index 7f6cac8dd3..6203a81e15 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp @@ -13,6 +13,8 @@ // If not, see http://www.gnu.org/licenses/ #include "JitBase.h" +#include "PowerPCDisasm.h" +#include "disasm.h" JitBase *jit; diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h index be80754bdc..c2febde722 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h @@ -28,9 +28,6 @@ #include "JitBackpatch.h" // for EmuCodeBlock #include "JitAsmCommon.h" -#include "PowerPCDisasm.h" -#include "disasm.h" - #include #define JIT_OPCODE 0 diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index dbf4907160..3744acd200 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -141,7 +141,6 @@ void Init() void Read16(u16& _rReturnValue, const u32 _Address) { - INFO_LOG(COMMANDPROCESSOR, "(r): 0x%08x", _Address); switch (_Address & 0xFFF) { @@ -177,7 +176,7 @@ void Read16(u16& _rReturnValue, const u32 _Address) else _rReturnValue = ReadLow (fifo.CPEnd - fifo.CPWritePointer + fifo.SafeCPReadPointer); else - _rReturnValue = ReadLow (fifo.CPReadWriteDistance); + _rReturnValue = ReadLow (fifo.CPReadWriteDistance); DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_RW_DISTANCE_LO : %04x", _rReturnValue); return; case FIFO_RW_DISTANCE_HI: @@ -187,7 +186,7 @@ void Read16(u16& _rReturnValue, const u32 _Address) else _rReturnValue = ReadHigh (fifo.CPEnd - fifo.CPWritePointer + fifo.SafeCPReadPointer); else - _rReturnValue = ReadHigh(fifo.CPReadWriteDistance); + _rReturnValue = ReadHigh(fifo.CPReadWriteDistance); DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_RW_DISTANCE_HI : %04x", _rReturnValue); return; case FIFO_WRITE_POINTER_LO: @@ -499,18 +498,15 @@ void AbortFrame() void SetOverflowStatusFromGatherPipe() { - - fifo.bFF_HiWatermark = (fifo.CPReadWriteDistance > fifo.CPHiWatermark); isHiWatermarkActive = fifo.bFF_HiWatermark && fifo.bFF_HiWatermarkInt && m_CPCtrlReg.GPReadEnable; - + if (isHiWatermarkActive) { interruptSet = true; INFO_LOG(COMMANDPROCESSOR,"Interrupt set"); - ProcessorInterface::SetInterrupt(INT_CAUSE_CP, true); + ProcessorInterface::SetInterrupt(INT_CAUSE_CP, true); } - } void SetCpStatus() @@ -520,12 +516,10 @@ void SetCpStatus() fifo.bFF_LoWatermark = (fifo.CPReadWriteDistance < fifo.CPLoWatermark); // breakpoint - if (fifo.bFF_BPEnable) { if (fifo.CPBreakpoint == fifo.CPReadPointer) - { - + { if (!fifo.bFF_Breakpoint) { INFO_LOG(COMMANDPROCESSOR, "Hit breakpoint at %i", fifo.CPReadPointer); @@ -607,15 +601,16 @@ void Shutdown() void SetCpStatusRegister() { // Here always there is one fifo attached to the GPU - m_CPStatusReg.Breakpoint = fifo.bFF_Breakpoint; m_CPStatusReg.ReadIdle = !fifo.CPReadWriteDistance || (fifo.CPReadPointer == fifo.CPWritePointer) || (fifo.CPReadPointer == fifo.CPBreakpoint) ; m_CPStatusReg.CommandIdle = !fifo.CPReadWriteDistance; m_CPStatusReg.UnderflowLoWatermark = fifo.bFF_LoWatermark; m_CPStatusReg.OverflowHiWatermark = fifo.bFF_HiWatermark; - - PixelEngine::ResumeWaitingForPEInterrupt(); - + + // HACK to compensate for slow response to PE interrupts in Time Splitters: Future Perfect + if (IsOnThread()) + PixelEngine::ResumeWaitingForPEInterrupt(); + INFO_LOG(COMMANDPROCESSOR,"\t Read from STATUS_REGISTER : %04x", m_CPStatusReg.Hex); DEBUG_LOG(COMMANDPROCESSOR, "(r) status: iBP %s | fReadIdle %s | fCmdIdle %s | iOvF %s | iUndF %s" , m_CPStatusReg.Breakpoint ? "ON" : "OFF" @@ -624,13 +619,10 @@ void SetCpStatusRegister() , m_CPStatusReg.OverflowHiWatermark ? "ON" : "OFF" , m_CPStatusReg.UnderflowLoWatermark ? "ON" : "OFF" ); - - } void SetCpControlRegister() { - // If the new fifo is being attached We make sure there wont be SetFinish event pending. // This protection fix eternal darkness booting, because the second SetFinish event when it is booting // seems invalid or has a bug and hang the game. @@ -638,7 +630,7 @@ void SetCpControlRegister() if (!fifo.bFF_GPReadEnable && m_CPCtrlReg.GPReadEnable && !m_CPCtrlReg.BPEnable) { ProcessFifoEvents(); - PixelEngine::ResetSetFinish(); + PixelEngine::ResetSetFinish(); } fifo.bFF_BPInt = m_CPCtrlReg.BPInt; @@ -653,9 +645,6 @@ void SetCpControlRegister() ProcessorInterface::Fifo_CPUBase = fifo.CPBase; ProcessorInterface::Fifo_CPUEnd = fifo.CPEnd; } - // If overflown happens process the fifo to LoWatemark - //if (bProcessFifoToLoWatermark) - // ProcessFifoToLoWatermark(); if(fifo.bFF_GPReadEnable && !m_CPCtrlReg.GPReadEnable) { @@ -667,7 +656,6 @@ void SetCpControlRegister() fifo.bFF_GPReadEnable = m_CPCtrlReg.GPReadEnable; } - DEBUG_LOG(COMMANDPROCESSOR, "\t GPREAD %s | BP %s | Int %s | OvF %s | UndF %s | LINK %s" , fifo.bFF_GPReadEnable ? "ON" : "OFF" , fifo.bFF_BPEnable ? "ON" : "OFF" diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.h b/Source/Core/VideoCommon/Src/CommandProcessor.h index 2bf965a3ba..440c900dc3 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.h +++ b/Source/Core/VideoCommon/Src/CommandProcessor.h @@ -25,7 +25,6 @@ class PointerWrap; extern bool MT; - namespace CommandProcessor { diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp index 750e8fbb40..38c85cc10c 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.cpp +++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp @@ -322,7 +322,6 @@ void Write16(const u16 _iValue, const u32 _iAddress) break; case PE_TOKEN_REG: - //LOG(PIXELENGINE,"WEIRD: program wrote token: %i",_iValue); PanicAlert("(w16) WTF? PowerPC program wrote token: %i", _iValue); //only the gx pipeline is supposed to be able to write here //g_token = _iValue; @@ -384,8 +383,6 @@ void SetToken_OnMainThread(u64 userdata, int cyclesLate) CommandProcessor::interruptTokenWaiting = false; IncrementCheckContextId(); //} - //else - // LOGV(PIXELENGINE, 1, "VIDEO Backend wrote token: %i", CommandProcessor::fifo.PEToken); } void SetFinish_OnMainThread(u64 userdata, int cyclesLate) From 0ed8af2287bdca2a7cf1ff1ec57781d45d852551 Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 13 Mar 2012 23:41:40 +1100 Subject: [PATCH 054/185] Forced reload of the native Gecko Code handler if the game overwrites it. Fixes issue 5225. --- Source/Core/Core/Src/GeckoCode.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/GeckoCode.cpp b/Source/Core/Core/Src/GeckoCode.cpp index c0b7af3779..11b1ef2580 100644 --- a/Source/Core/Core/Src/GeckoCode.cpp +++ b/Source/Core/Core/Src/GeckoCode.cpp @@ -255,7 +255,10 @@ void RunCodeHandler() { if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats) { - if (!code_handler_installed) + u8 *gameId = Memory::GetPointer(0x80000000); + u8 *wiirdId = Memory::GetPointer(0x80001800); + + if (!code_handler_installed || memcmp(gameId, wiirdId, 6)) code_handler_installed = InstallCodeHandler(); if (code_handler_installed) From 8ed6ea3b076a3d1aec2a170d0c71dc1a12122371 Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 15 Mar 2012 21:48:19 +1100 Subject: [PATCH 055/185] Sped up the Dolphin debugger in JIT mode by splitting a block only while stepping or when it contains a breakpoint. The block is invalidated when a breakpoint is set or cleared. Fixed a bug in the JitCache where the JIT icache was not being invalidated when a block containing the instruction was destroyed. --- Source/Core/Common/Src/BreakPoints.cpp | 23 +++++++++++++++++-- Source/Core/Common/Src/BreakPoints.h | 2 +- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 19 ++++++++++++--- Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp | 3 ++- Source/Core/Core/Src/PowerPC/Jit64IL/IR.h | 5 +++- .../Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp | 12 ++++++++++ .../Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp | 9 ++++++-- .../Core/Src/PowerPC/JitCommon/JitCache.cpp | 18 +++++++++++++++ 8 files changed, 81 insertions(+), 10 deletions(-) diff --git a/Source/Core/Common/Src/BreakPoints.cpp b/Source/Core/Common/Src/BreakPoints.cpp index 45a0b52daf..9164312f82 100644 --- a/Source/Core/Common/Src/BreakPoints.cpp +++ b/Source/Core/Common/Src/BreakPoints.cpp @@ -19,6 +19,7 @@ #include "DebugInterface.h" #include "BreakPoints.h" #include +#include "..\..\Core\Src\PowerPC\JitCommon\JitBase.h" bool BreakPoints::IsAddressBreakPoint(u32 _iAddress) { @@ -70,7 +71,11 @@ void BreakPoints::AddFromStrings(const TBreakPointsStr& bps) void BreakPoints::Add(const TBreakPoint& bp) { if (!IsAddressBreakPoint(bp.iAddress)) + { m_BreakPoints.push_back(bp); + if (jit) + jit->GetBlockCache()->InvalidateICache(bp.iAddress, 4); + } } void BreakPoints::Add(u32 em_address, bool temp) @@ -83,21 +88,35 @@ void BreakPoints::Add(u32 em_address, bool temp) pt.iAddress = em_address; m_BreakPoints.push_back(pt); + + if (jit) + jit->GetBlockCache()->InvalidateICache(em_address, 4); } } -void BreakPoints::Remove(u32 _iAddress) +void BreakPoints::Remove(u32 em_address) { for (TBreakPoints::iterator i = m_BreakPoints.begin(); i != m_BreakPoints.end(); ++i) { - if (i->iAddress == _iAddress) + if (i->iAddress == em_address) { m_BreakPoints.erase(i); + if (jit) + jit->GetBlockCache()->InvalidateICache(em_address, 4); return; } } } +void BreakPoints::Clear() +{ + for (TBreakPoints::iterator i = m_BreakPoints.begin(); i != m_BreakPoints.end(); ++i) + { + if (jit) + jit->GetBlockCache()->InvalidateICache(i->iAddress, 4); + m_BreakPoints.erase(i); + } +} MemChecks::TMemChecksStr MemChecks::GetStrings() const { diff --git a/Source/Core/Common/Src/BreakPoints.h b/Source/Core/Common/Src/BreakPoints.h index a97452cde6..c742f812a7 100644 --- a/Source/Core/Common/Src/BreakPoints.h +++ b/Source/Core/Common/Src/BreakPoints.h @@ -78,7 +78,7 @@ public: // Remove Breakpoint void Remove(u32 _iAddress); - void Clear() { m_BreakPoints.clear(); }; + void Clear(); void DeleteByAddress(u32 _Address); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 1506170b2b..cb9f66b7d4 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -415,9 +415,8 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc if (Core::g_CoreStartupParameter.bEnableDebugging) { - // Comment out the following to disable breakpoints (speed-up) - blockSize = 1; - broken_block = true; + if (GetState() == CPU_STEPPING) + blockSize = 1; Trace(); } @@ -597,6 +596,20 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc SetJumpTarget(clearInt); } + if (Core::g_CoreStartupParameter.bEnableDebugging && breakpoints.IsAddressBreakPoint(ops[i].address) && GetState() != CPU_STEPPING) + { + MOV(32, M(&PC), Imm32(ops[i].address)); + ABI_CallFunction(reinterpret_cast(&PowerPC::CheckBreakPoints)); + TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF)); + + FixupBranch noBreakpoint = J_CC(CC_Z); + gpr.Flush(FLUSH_ALL); + fpr.Flush(FLUSH_ALL); + + WriteExit(ops[i].address, 0); + SetJumpTarget(noBreakpoint); + } + Jit64Tables::CompileInstruction(ops[i]); if (js.memcheck && (opinfo->flags & FL_LOADSTORE)) diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp index afab21b30e..7c3e7f0810 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp @@ -1269,7 +1269,8 @@ static const unsigned alwaysUsedList[] = { Store16, Store32, StoreSingle, StoreDouble, StorePaired, StoreFReg, FDCmpCR, BlockStart, BlockEnd, IdleBranch, BranchCond, BranchUncond, ShortIdleLoop, SystemCall, InterpreterBranch, RFIExit, FPExceptionCheckStart, - FPExceptionCheckEnd, ISIException, ExtExceptionCheck, Int3, Tramp, Nop + FPExceptionCheckEnd, ISIException, ExtExceptionCheck, BreakPointCheck, + Int3, Tramp, Nop }; static const unsigned extra8RegList[] = { LoadGReg, LoadCR, LoadGQR, LoadFReg, LoadFRegDENToZero, diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h index 284cbe6538..f41742b01c 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h @@ -168,7 +168,7 @@ enum Opcode { // used for exception checking, at least until someone // has a better idea of integrating it FPExceptionCheckStart, FPExceptionCheckEnd, - ISIException,ExtExceptionCheck, + ISIException, ExtExceptionCheck, BreakPointCheck, // "Opcode" representing a register too far away to // reference directly; this is a size optimization Tramp, @@ -414,6 +414,9 @@ public: InstLoc EmitExtExceptionCheck(InstLoc pc) { return EmitUOp(ExtExceptionCheck, pc); } + InstLoc EmitBreakPointCheck(InstLoc pc) { + return EmitUOp(BreakPointCheck, pc); + } InstLoc EmitRFIExit() { return FoldZeroOp(RFIExit, 0); } diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp index f82e34b5b1..743eaf2030 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp @@ -763,6 +763,7 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak case FPExceptionCheckEnd: case ISIException: case ExtExceptionCheck: + case BreakPointCheck: case Int3: case Tramp: // No liveness effects @@ -1943,6 +1944,17 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak Jit->SetJumpTarget(clearInt); break; } + case BreakPointCheck: { + unsigned InstLoc = ibuild->GetImmValue(getOp1(I)); + + Jit->MOV(32, M(&PC), Imm32(InstLoc)); + Jit->ABI_CallFunction(reinterpret_cast(&PowerPC::CheckBreakPoints)); + Jit->TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF)); + FixupBranch noBreakpoint = Jit->J_CC(CC_Z); + Jit->WriteExit(InstLoc, 0); + Jit->SetJumpTarget(noBreakpoint); + break; + } case Int3: { Jit->INT3(); break; diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp index 96afff1613..7694722bb5 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp @@ -523,8 +523,8 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc if (Core::g_CoreStartupParameter.bEnableDebugging) { - // Comment out the following to disable breakpoints (speed-up) - blockSize = 1; + if (GetState() == CPU_STEPPING) + blockSize = 1; Trace(); } @@ -653,6 +653,11 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc { ibuild.EmitExtExceptionCheck(ibuild.EmitIntConst(ops[i].address)); } + + if (Core::g_CoreStartupParameter.bEnableDebugging && breakpoints.IsAddressBreakPoint(ops[i].address) && GetState() != CPU_STEPPING) + { + ibuild.EmitBreakPointCheck(ibuild.EmitIntConst(ops[i].address)); + } JitILTables::CompileInstruction(ops[i]); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index bccb218fd9..46096450e7 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -417,6 +417,24 @@ bool JitBlock::ContainsAddress(u32 em_address) std::map, u32>::iterator it1 = block_map.lower_bound(std::make_pair(address, 0)), it2 = it1, it; while (it2 != block_map.end() && it2->first.second < address + length) { +#ifdef JIT_UNLIMITED_ICACHE + JitBlock &b = blocks[it2->second]; + if (b.originalAddress & JIT_ICACHE_VMEM_BIT) + { + u32 cacheaddr = b.originalAddress & JIT_ICACHE_MASK; + memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, length); + } + else if (b.originalAddress & JIT_ICACHE_EXRAM_BIT) + { + u32 cacheaddr = b.originalAddress & JIT_ICACHEEX_MASK; + memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, length); + } + else + { + u32 cacheaddr = b.originalAddress & JIT_ICACHE_MASK; + memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, length); + } +#endif DestroyBlock(it2->second, true); it2++; } From 05692b1e7e88d19d6045cc42464cc8ef11760c62 Mon Sep 17 00:00:00 2001 From: skidau Date: Fri, 16 Mar 2012 20:08:05 +1100 Subject: [PATCH 056/185] Sped up to the Dolphin debugger by not checking for breakpoints when stepping. Fixed the JIT cache, invalidating one instruction length at a time. Fixed a bug where the JIT cache did not get invalidated when stepping. Disabled fused instructions in the debugger. --- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 2 +- Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp | 3 +++ Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 2 +- Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp | 3 +++ Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp | 6 +++--- Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp | 2 ++ 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index cb9f66b7d4..8140a075a2 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -601,8 +601,8 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc MOV(32, M(&PC), Imm32(ops[i].address)); ABI_CallFunction(reinterpret_cast(&PowerPC::CheckBreakPoints)); TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF)); - FixupBranch noBreakpoint = J_CC(CC_Z); + gpr.Flush(FLUSH_ALL); fpr.Flush(FLUSH_ALL); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp index b9aaa2df6a..04462872e6 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp @@ -81,12 +81,15 @@ void Jit64AsmRoutineManager::Generate() if (Core::g_CoreStartupParameter.bEnableDebugging) { + TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(PowerPC::CPU_STEPPING)); + FixupBranch notStepping = J_CC(CC_Z); ABI_CallFunction(reinterpret_cast(&PowerPC::CheckBreakPoints)); TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF)); FixupBranch noBreakpoint = J_CC(CC_Z); ABI_PopAllCalleeSavedRegsAndAdjustStack(); RET(); SetJumpTarget(noBreakpoint); + SetJumpTarget(notStepping); } SetJumpTarget(skipToRealDispatch); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 4980b4d7a4..5aaf4b99f1 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -266,7 +266,7 @@ void Jit64::reg_imm(UGeckoInstruction inst) case 15: if (a == 0) { // lis // Merge with next instruction if loading a 32-bits immediate value (lis + addi, lis + ori) - if (!js.isLastInstruction) { + if (!js.isLastInstruction && !Core::g_CoreStartupParameter.bEnableDebugging) { if ((js.next_inst.OPCD == 14) && (js.next_inst.RD == d) && (js.next_inst.RA == d)) { // addi gpr.SetImmediate32(d, ((u32)inst.SIMM_16 << 16) + (u32)(s32)js.next_inst.SIMM_16); js.downcountAmount++; diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp index da94c881e3..ac533dd473 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp @@ -83,12 +83,15 @@ void JitILAsmRoutineManager::Generate() if (Core::g_CoreStartupParameter.bEnableDebugging) { + TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(PowerPC::CPU_STEPPING)); + FixupBranch notStepping = J_CC(CC_Z); ABI_CallFunction(reinterpret_cast(&PowerPC::CheckBreakPoints)); TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF)); FixupBranch noBreakpoint = J_CC(CC_Z); ABI_PopAllCalleeSavedRegsAndAdjustStack(); RET(); SetJumpTarget(noBreakpoint); + SetJumpTarget(notStepping); } SetJumpTarget(skipToRealDispatch); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index 46096450e7..8cc85e3284 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -422,17 +422,17 @@ bool JitBlock::ContainsAddress(u32 em_address) if (b.originalAddress & JIT_ICACHE_VMEM_BIT) { u32 cacheaddr = b.originalAddress & JIT_ICACHE_MASK; - memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, length); + memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4); } else if (b.originalAddress & JIT_ICACHE_EXRAM_BIT) { u32 cacheaddr = b.originalAddress & JIT_ICACHEEX_MASK; - memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, length); + memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4); } else { u32 cacheaddr = b.originalAddress & JIT_ICACHE_MASK; - memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, length); + memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4); } #endif DestroyBlock(it2->second, true); diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp index 37ff81772a..0b6b366c88 100644 --- a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp @@ -263,6 +263,8 @@ void CCodeWindow::SingleStep() { if (CCPU::IsStepping()) { + if (jit) + jit->GetBlockCache()->InvalidateICache(PC, 4); CCPU::StepOpcode(&sync_event); wxThread::Sleep(20); // need a short wait here From a648aca65c8c0096410cfb70b8e8cfffb06016aa Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sat, 17 Mar 2012 18:12:27 -0700 Subject: [PATCH 057/185] wxWidgets3: update to svn r70933 --- Externals/wxWidgets3/SConscript | 429 +-- Externals/wxWidgets3/build_wx.sh | 19 + Externals/wxWidgets3/include/wx/aboutdlg.h | 4 +- Externals/wxWidgets3/include/wx/accel.h | 7 +- .../wxWidgets3/include/wx/affinematrix2d.h | 51 + .../include/wx/affinematrix2dbase.h | 127 + Externals/wxWidgets3/include/wx/anybutton.h | 200 ++ Externals/wxWidgets3/include/wx/app.h | 25 +- Externals/wxWidgets3/include/wx/apptrait.h | 10 +- Externals/wxWidgets3/include/wx/arrstr.h | 8 +- Externals/wxWidgets3/include/wx/atomic.h | 4 +- Externals/wxWidgets3/include/wx/aui/auibar.h | 393 +-- Externals/wxWidgets3/include/wx/aui/auibook.h | 308 ++- Externals/wxWidgets3/include/wx/aui/dockart.h | 70 +- .../wxWidgets3/include/wx/aui/floatpane.h | 20 +- .../wxWidgets3/include/wx/aui/framemanager.h | 93 +- Externals/wxWidgets3/include/wx/aui/tabmdi.h | 18 +- .../wxWidgets3/include/wx/bannerwindow.h | 145 ++ Externals/wxWidgets3/include/wx/bitmap.h | 23 +- Externals/wxWidgets3/include/wx/bmpbuttn.h | 4 +- Externals/wxWidgets3/include/wx/bookctrl.h | 30 +- Externals/wxWidgets3/include/wx/brush.h | 8 +- Externals/wxWidgets3/include/wx/buffer.h | 12 +- Externals/wxWidgets3/include/wx/build.h | 4 +- Externals/wxWidgets3/include/wx/button.h | 163 +- Externals/wxWidgets3/include/wx/cairo.h | 128 +- Externals/wxWidgets3/include/wx/calctrl.h | 10 +- Externals/wxWidgets3/include/wx/chartype.h | 4 +- Externals/wxWidgets3/include/wx/checkbox.h | 16 +- Externals/wxWidgets3/include/wx/chkconf.h | 123 +- Externals/wxWidgets3/include/wx/choice.h | 4 +- Externals/wxWidgets3/include/wx/choicebk.h | 4 +- Externals/wxWidgets3/include/wx/clipbrd.h | 4 +- Externals/wxWidgets3/include/wx/cmdline.h | 15 +- Externals/wxWidgets3/include/wx/cmdproc.h | 7 +- Externals/wxWidgets3/include/wx/cmndata.h | 8 +- .../wxWidgets3/include/wx/cocoa/chkconf.h | 4 +- Externals/wxWidgets3/include/wx/cocoa/dc.h | 8 +- Externals/wxWidgets3/include/wx/cocoa/font.h | 15 +- .../wxWidgets3/include/wx/cocoa/notebook.h | 4 +- Externals/wxWidgets3/include/wx/cocoa/sound.h | 6 +- Externals/wxWidgets3/include/wx/colordlg.h | 4 +- Externals/wxWidgets3/include/wx/colour.h | 8 +- Externals/wxWidgets3/include/wx/combo.h | 14 +- Externals/wxWidgets3/include/wx/combobox.h | 14 +- .../wxWidgets3/include/wx/compositewin.h | 155 +- Externals/wxWidgets3/include/wx/config.h | 7 +- Externals/wxWidgets3/include/wx/containr.h | 226 +- Externals/wxWidgets3/include/wx/control.h | 4 +- Externals/wxWidgets3/include/wx/convauto.h | 48 +- Externals/wxWidgets3/include/wx/cppunit.h | 6 +- Externals/wxWidgets3/include/wx/ctrlsub.h | 69 +- Externals/wxWidgets3/include/wx/cursor.h | 12 +- Externals/wxWidgets3/include/wx/custombgwin.h | 53 + Externals/wxWidgets3/include/wx/dataview.h | 106 +- Externals/wxWidgets3/include/wx/datectrl.h | 30 +- Externals/wxWidgets3/include/wx/dateevt.h | 8 +- Externals/wxWidgets3/include/wx/datetime.h | 33 +- .../wxWidgets3/include/wx/datetimectrl.h | 48 + Externals/wxWidgets3/include/wx/dc.h | 82 +- Externals/wxWidgets3/include/wx/dcgraph.h | 18 +- Externals/wxWidgets3/include/wx/dde.h | 6 +- Externals/wxWidgets3/include/wx/debug.h | 15 +- Externals/wxWidgets3/include/wx/defs.h | 370 ++- Externals/wxWidgets3/include/wx/dialog.h | 11 +- Externals/wxWidgets3/include/wx/dialup.h | 4 +- Externals/wxWidgets3/include/wx/dirdlg.h | 4 +- Externals/wxWidgets3/include/wx/dlimpexp.h | 37 +- Externals/wxWidgets3/include/wx/dlist.h | 6 +- Externals/wxWidgets3/include/wx/docview.h | 31 +- Externals/wxWidgets3/include/wx/dvrenderers.h | 132 +- Externals/wxWidgets3/include/wx/dynarray.h | 24 +- Externals/wxWidgets3/include/wx/dynlib.h | 18 +- Externals/wxWidgets3/include/wx/encinfo.h | 6 +- Externals/wxWidgets3/include/wx/event.h | 399 +-- Externals/wxWidgets3/include/wx/eventfilter.h | 72 + Externals/wxWidgets3/include/wx/evtloop.h | 6 +- Externals/wxWidgets3/include/wx/evtloopsrc.h | 4 +- Externals/wxWidgets3/include/wx/features.h | 12 +- Externals/wxWidgets3/include/wx/filedlg.h | 5 +- Externals/wxWidgets3/include/wx/filefn.h | 59 +- Externals/wxWidgets3/include/wx/filehistory.h | 7 +- Externals/wxWidgets3/include/wx/filename.h | 14 +- Externals/wxWidgets3/include/wx/filepicker.h | 47 +- Externals/wxWidgets3/include/wx/font.h | 41 +- Externals/wxWidgets3/include/wx/fontutil.h | 7 +- Externals/wxWidgets3/include/wx/frame.h | 7 +- Externals/wxWidgets3/include/wx/fswatcher.h | 37 +- Externals/wxWidgets3/include/wx/gbsizer.h | 28 +- Externals/wxWidgets3/include/wx/gdicmn.h | 24 +- Externals/wxWidgets3/include/wx/gdiobj.h | 4 +- .../wxWidgets3/include/wx/generic/aboutdlgg.h | 18 +- .../wxWidgets3/include/wx/generic/choicdgg.h | 91 +- .../wxWidgets3/include/wx/generic/collpaneg.h | 6 +- .../include/wx/generic/custombgwin.h | 96 + .../wxWidgets3/include/wx/generic/dataview.h | 40 +- .../wxWidgets3/include/wx/generic/datectrl.h | 6 +- .../include/wx/generic/dvrenderer.h | 27 +- .../include/wx/generic/dvrenderers.h | 75 +- .../include/wx/generic/filepickerg.h | 34 +- .../wxWidgets3/include/wx/generic/grid.h | 12 +- .../wxWidgets3/include/wx/generic/gridctrl.h | 12 +- .../include/wx/generic/grideditors.h | 41 +- .../wxWidgets3/include/wx/generic/hyperlink.h | 8 +- .../wxWidgets3/include/wx/generic/listctrl.h | 21 +- .../wxWidgets3/include/wx/generic/logg.h | 4 +- .../wxWidgets3/include/wx/generic/msgdlgg.h | 3 +- .../wxWidgets3/include/wx/generic/notebook.h | 4 +- .../wxWidgets3/include/wx/generic/panelg.h | 15 +- .../include/wx/generic/private/grid.h | 108 +- .../include/wx/generic/private/listctrl.h | 16 +- .../include/wx/generic/private/richtooltip.h | 62 + .../wxWidgets3/include/wx/generic/prntdlgg.h | 4 +- .../wxWidgets3/include/wx/generic/progdlgg.h | 26 +- .../wxWidgets3/include/wx/generic/spinctlg.h | 12 +- .../wxWidgets3/include/wx/generic/splash.h | 18 +- .../wxWidgets3/include/wx/generic/splitter.h | 18 +- .../wxWidgets3/include/wx/generic/srchctlg.h | 6 +- .../wxWidgets3/include/wx/generic/statbmpg.h | 4 +- .../wxWidgets3/include/wx/generic/statusbr.h | 4 +- .../wxWidgets3/include/wx/generic/tabg.h | 4 +- .../wxWidgets3/include/wx/generic/timectrl.h | 70 + Externals/wxWidgets3/include/wx/geometry.h | 13 +- Externals/wxWidgets3/include/wx/glcanvas.h | 6 +- Externals/wxWidgets3/include/wx/graphics.h | 98 +- Externals/wxWidgets3/include/wx/gtk/animate.h | 2 +- .../wxWidgets3/include/wx/gtk/anybutton.h | 81 + Externals/wxWidgets3/include/wx/gtk/app.h | 4 +- .../wxWidgets3/include/wx/gtk/assertdlg_gtk.h | 20 +- Externals/wxWidgets3/include/wx/gtk/bitmap.h | 8 +- Externals/wxWidgets3/include/wx/gtk/button.h | 46 +- Externals/wxWidgets3/include/wx/gtk/calctrl.h | 20 +- .../wxWidgets3/include/wx/gtk/combobox.h | 9 +- Externals/wxWidgets3/include/wx/gtk/control.h | 12 +- .../wxWidgets3/include/wx/gtk/dataview.h | 29 +- Externals/wxWidgets3/include/wx/gtk/dc.h | 4 +- Externals/wxWidgets3/include/wx/gtk/dirdlg.h | 10 +- Externals/wxWidgets3/include/wx/gtk/dnd.h | 6 +- .../wxWidgets3/include/wx/gtk/dvrenderer.h | 9 +- .../wxWidgets3/include/wx/gtk/dvrenderers.h | 67 +- .../wxWidgets3/include/wx/gtk/filectrl.h | 4 +- Externals/wxWidgets3/include/wx/gtk/filedlg.h | 11 +- .../wxWidgets3/include/wx/gtk/filepicker.h | 4 +- Externals/wxWidgets3/include/wx/gtk/font.h | 17 +- .../wxWidgets3/include/wx/gtk/fontpicker.h | 4 +- Externals/wxWidgets3/include/wx/gtk/gauge.h | 6 +- .../wxWidgets3/include/wx/gtk/hyperlink.h | 14 +- Externals/wxWidgets3/include/wx/gtk/listbox.h | 8 +- Externals/wxWidgets3/include/wx/gtk/mdi.h | 4 +- Externals/wxWidgets3/include/wx/gtk/menu.h | 8 +- Externals/wxWidgets3/include/wx/gtk/msgdlg.h | 3 +- .../wxWidgets3/include/wx/gtk/nonownedwnd.h | 44 + .../wxWidgets3/include/wx/gtk/notebook.h | 8 +- Externals/wxWidgets3/include/wx/gtk/pen.h | 4 +- .../wxWidgets3/include/wx/gtk/popupwin.h | 5 +- Externals/wxWidgets3/include/wx/gtk/private.h | 8 +- .../wxWidgets3/include/wx/gtk/private/event.h | 80 + .../include/wx/gtk/private/gtk2-compat.h | 376 +++ .../wxWidgets3/include/wx/gtk/private/list.h | 33 + .../wxWidgets3/include/wx/gtk/private/timer.h | 4 +- .../wxWidgets3/include/wx/gtk/radiobox.h | 4 +- Externals/wxWidgets3/include/wx/gtk/region.h | 8 +- .../wxWidgets3/include/wx/gtk/scrolbar.h | 14 +- Externals/wxWidgets3/include/wx/gtk/statbox.h | 4 +- .../wxWidgets3/include/wx/gtk/textctrl.h | 5 +- .../wxWidgets3/include/wx/gtk/textentry.h | 6 +- Externals/wxWidgets3/include/wx/gtk/tglbtn.h | 114 +- Externals/wxWidgets3/include/wx/gtk/toolbar.h | 26 +- Externals/wxWidgets3/include/wx/gtk/tooltip.h | 21 +- .../wxWidgets3/include/wx/gtk/toplevel.h | 13 +- .../wxWidgets3/include/wx/gtk/treeentry_gtk.h | 10 +- .../include/wx/gtk/webview_webkit.h | 156 ++ .../wx/gtk/webviewhistoryitem_webkit.h | 34 + Externals/wxWidgets3/include/wx/gtk/window.h | 21 +- Externals/wxWidgets3/include/wx/hash.h | 6 +- Externals/wxWidgets3/include/wx/hashmap.h | 32 +- Externals/wxWidgets3/include/wx/hashset.h | 28 +- Externals/wxWidgets3/include/wx/headercol.h | 25 +- Externals/wxWidgets3/include/wx/headerctrl.h | 4 +- Externals/wxWidgets3/include/wx/help.h | 6 +- Externals/wxWidgets3/include/wx/htmllbox.h | 9 +- Externals/wxWidgets3/include/wx/icon.h | 10 +- Externals/wxWidgets3/include/wx/iconbndl.h | 29 +- Externals/wxWidgets3/include/wx/iconloc.h | 8 +- Externals/wxWidgets3/include/wx/image.h | 21 +- Externals/wxWidgets3/include/wx/imaglist.h | 6 +- Externals/wxWidgets3/include/wx/imagtiff.h | 17 +- Externals/wxWidgets3/include/wx/intl.h | 14 +- Externals/wxWidgets3/include/wx/iosfwrap.h | 4 +- Externals/wxWidgets3/include/wx/ioswrap.h | 4 +- Externals/wxWidgets3/include/wx/ipc.h | 4 +- Externals/wxWidgets3/include/wx/itemid.h | 62 + Externals/wxWidgets3/include/wx/joystick.h | 4 +- Externals/wxWidgets3/include/wx/kbdstate.h | 39 +- Externals/wxWidgets3/include/wx/list.h | 28 +- Externals/wxWidgets3/include/wx/listbase.h | 103 +- Externals/wxWidgets3/include/wx/listbook.h | 4 +- Externals/wxWidgets3/include/wx/listctrl.h | 4 +- Externals/wxWidgets3/include/wx/listimpl.cpp | 8 +- Externals/wxWidgets3/include/wx/log.h | 72 +- Externals/wxWidgets3/include/wx/longlong.h | 73 +- Externals/wxWidgets3/include/wx/math.h | 12 +- Externals/wxWidgets3/include/wx/mdi.h | 14 +- Externals/wxWidgets3/include/wx/memory.h | 6 +- Externals/wxWidgets3/include/wx/menu.h | 4 +- Externals/wxWidgets3/include/wx/menuitem.h | 4 +- .../wxWidgets3/include/wx/meta/movable.h | 4 +- Externals/wxWidgets3/include/wx/metafile.h | 14 +- Externals/wxWidgets3/include/wx/mimetype.h | 4 +- Externals/wxWidgets3/include/wx/minifram.h | 6 +- Externals/wxWidgets3/include/wx/mousestate.h | 17 +- Externals/wxWidgets3/include/wx/msgdlg.h | 19 +- .../wxWidgets3/include/wx/msw/anybutton.h | 81 + .../wxWidgets3/include/wx/msw/bmpbuttn.h | 25 +- Externals/wxWidgets3/include/wx/msw/button.h | 51 +- Externals/wxWidgets3/include/wx/msw/chkconf.h | 37 +- .../wxWidgets3/include/wx/msw/combobox.h | 6 +- .../wxWidgets3/include/wx/msw/custombgwin.h | 58 + .../wxWidgets3/include/wx/msw/datectrl.h | 23 +- .../wxWidgets3/include/wx/msw/datetimectrl.h | 87 + Externals/wxWidgets3/include/wx/msw/dc.h | 9 +- .../wxWidgets3/include/wx/msw/debughlp.h | 61 +- Externals/wxWidgets3/include/wx/msw/dialog.h | 10 +- .../wxWidgets3/include/wx/msw/dragimag.h | 51 +- Externals/wxWidgets3/include/wx/msw/enhmeta.h | 3 +- Externals/wxWidgets3/include/wx/msw/font.h | 10 +- Externals/wxWidgets3/include/wx/msw/frame.h | 17 +- .../wxWidgets3/include/wx/msw/fswatcher.h | 8 +- Externals/wxWidgets3/include/wx/msw/helpchm.h | 4 +- Externals/wxWidgets3/include/wx/msw/helpwin.h | 4 +- .../wxWidgets3/include/wx/msw/listctrl.h | 26 +- Externals/wxWidgets3/include/wx/msw/menu.h | 46 +- .../wxWidgets3/include/wx/msw/menuitem.h | 30 +- Externals/wxWidgets3/include/wx/msw/missing.h | 149 +- .../wxWidgets3/include/wx/msw/nonownedwnd.h | 39 + .../wxWidgets3/include/wx/msw/notebook.h | 7 +- .../wxWidgets3/include/wx/msw/ole/activex.h | 4 +- .../wxWidgets3/include/wx/msw/ole/oleutils.h | 13 +- Externals/wxWidgets3/include/wx/msw/palette.h | 6 +- Externals/wxWidgets3/include/wx/msw/panel.h | 19 +- .../wxWidgets3/include/wx/msw/printdlg.h | 6 +- Externals/wxWidgets3/include/wx/msw/private.h | 7 +- .../include/wx/msw/private/button.h | 5 +- .../include/wx/msw/private/fswatcher.h | 53 +- .../include/wx/msw/private/hiddenwin.h | 31 + .../include/wx/msw/private/msgdlg.h | 7 +- .../wxWidgets3/include/wx/msw/private/timer.h | 4 +- Externals/wxWidgets3/include/wx/msw/progdlg.h | 4 +- .../wxWidgets3/include/wx/msw/radiobox.h | 7 +- Externals/wxWidgets3/include/wx/msw/setup0.h | 226 +- .../wxWidgets3/include/wx/msw/setup_inc.h | 12 +- Externals/wxWidgets3/include/wx/msw/slider.h | 8 +- Externals/wxWidgets3/include/wx/msw/sound.h | 6 +- .../wxWidgets3/include/wx/msw/spinctrl.h | 9 +- .../wxWidgets3/include/wx/msw/statusbar.h | 4 +- .../wxWidgets3/include/wx/msw/textctrl.h | 4 +- .../wxWidgets3/include/wx/msw/textentry.h | 39 +- Externals/wxWidgets3/include/wx/msw/tglbtn.h | 115 +- .../wxWidgets3/include/wx/msw/timectrl.h | 61 + Externals/wxWidgets3/include/wx/msw/toolbar.h | 25 +- .../wxWidgets3/include/wx/msw/toplevel.h | 36 +- .../wxWidgets3/include/wx/msw/webview_ie.h | 518 ++++ .../include/wx/msw/webviewhistoryitem_ie.h | 31 + .../wxWidgets3/include/wx/msw/wince/setup.h | 216 +- Externals/wxWidgets3/include/wx/msw/window.h | 34 +- Externals/wxWidgets3/include/wx/msw/wrapwin.h | 3 +- Externals/wxWidgets3/include/wx/nonownedwnd.h | 98 +- Externals/wxWidgets3/include/wx/odcombo.h | 11 +- .../wxWidgets3/include/wx/osx/anybutton.h | 59 + Externals/wxWidgets3/include/wx/osx/app.h | 7 +- Externals/wxWidgets3/include/wx/osx/button.h | 35 +- .../include/wx/osx/carbon/dataview.h | 4 + .../include/wx/osx/carbon/evtloop.h | 4 +- .../wxWidgets3/include/wx/osx/carbon/region.h | 6 +- .../include/wx/osx/carbon/statbmp.h | 6 +- Externals/wxWidgets3/include/wx/osx/chkconf.h | 4 +- .../include/wx/osx/cocoa/dataview.h | 4 + .../wxWidgets3/include/wx/osx/cocoa/evtloop.h | 9 +- .../wxWidgets3/include/wx/osx/cocoa/private.h | 21 +- .../include/wx/osx/cocoa/private/date.h | 51 + .../include/wx/osx/cocoa/private/textimpl.h | 8 +- .../wxWidgets3/include/wx/osx/combobox.h | 32 +- .../wxWidgets3/include/wx/osx/config_xcode.h | 6 +- .../wxWidgets3/include/wx/osx/core/colour.h | 8 +- .../wxWidgets3/include/wx/osx/core/dataview.h | 4 + .../wxWidgets3/include/wx/osx/core/mimetype.h | 6 +- .../wxWidgets3/include/wx/osx/core/private.h | 22 +- .../wx/osx/core/private/datetimectrl.h | 71 + .../wxWidgets3/include/wx/osx/dataview.h | 16 +- .../wxWidgets3/include/wx/osx/datectrl.h | 55 + .../wxWidgets3/include/wx/osx/datetimectrl.h | 34 + Externals/wxWidgets3/include/wx/osx/dirdlg.h | 10 +- Externals/wxWidgets3/include/wx/osx/evtloop.h | 16 +- Externals/wxWidgets3/include/wx/osx/filedlg.h | 8 +- Externals/wxWidgets3/include/wx/osx/font.h | 15 +- Externals/wxWidgets3/include/wx/osx/fontdlg.h | 4 +- Externals/wxWidgets3/include/wx/osx/frame.h | 5 +- .../include/wx/osx/iphone/chkconf.h | 17 +- .../wxWidgets3/include/wx/osx/joystick.h | 4 +- .../wxWidgets3/include/wx/osx/listctrl.h | 28 +- Externals/wxWidgets3/include/wx/osx/menu.h | 7 +- .../wxWidgets3/include/wx/osx/metafile.h | 11 +- Externals/wxWidgets3/include/wx/osx/msgdlg.h | 11 +- .../wxWidgets3/include/wx/osx/nonownedwnd.h | 24 +- .../wxWidgets3/include/wx/osx/notebook.h | 4 +- Externals/wxWidgets3/include/wx/osx/pnghand.h | 4 +- Externals/wxWidgets3/include/wx/osx/pngread.h | 8 +- .../wxWidgets3/include/wx/osx/popupwin.h | 5 +- .../wxWidgets3/include/wx/osx/printdlg.h | 16 +- .../wxWidgets3/include/wx/osx/radiobox.h | 5 +- Externals/wxWidgets3/include/wx/osx/setup0.h | 236 +- Externals/wxWidgets3/include/wx/osx/sound.h | 6 +- .../wxWidgets3/include/wx/osx/spinctrl.h | 7 +- Externals/wxWidgets3/include/wx/osx/statbox.h | 6 +- .../wxWidgets3/include/wx/osx/textctrl.h | 6 +- .../wxWidgets3/include/wx/osx/textentry.h | 18 +- Externals/wxWidgets3/include/wx/osx/tglbtn.h | 80 +- .../wxWidgets3/include/wx/osx/timectrl.h | 51 + Externals/wxWidgets3/include/wx/osx/toolbar.h | 30 +- .../wxWidgets3/include/wx/osx/toplevel.h | 7 +- .../wxWidgets3/include/wx/osx/treectrl.h | 4 +- .../include/wx/osx/webview_webkit.h | 163 ++ .../wx/osx/webviewhistoryitem_webkit.h | 35 + Externals/wxWidgets3/include/wx/osx/window.h | 13 +- Externals/wxWidgets3/include/wx/palette.h | 8 +- Externals/wxWidgets3/include/wx/panel.h | 25 +- Externals/wxWidgets3/include/wx/pen.h | 8 +- Externals/wxWidgets3/include/wx/persist.h | 29 +- .../wxWidgets3/include/wx/persist/splitter.h | 69 + Externals/wxWidgets3/include/wx/pickerbase.h | 13 +- Externals/wxWidgets3/include/wx/platform.h | 111 +- Externals/wxWidgets3/include/wx/platinfo.h | 16 +- Externals/wxWidgets3/include/wx/popupwin.h | 12 +- Externals/wxWidgets3/include/wx/power.h | 4 +- .../wxWidgets3/include/wx/private/fontmgr.h | 6 +- .../wxWidgets3/include/wx/private/fswatcher.h | 4 +- .../include/wx/private/markupparserattr.h | 6 +- .../include/wx/private/richtooltip.h | 44 + .../wxWidgets3/include/wx/private/sckaddr.h | 4 +- .../wxWidgets3/include/wx/private/socket.h | 8 +- .../wxWidgets3/include/wx/private/wxprintf.h | 6 +- Externals/wxWidgets3/include/wx/prntbase.h | 43 +- Externals/wxWidgets3/include/wx/progdlg.h | 44 +- .../wxWidgets3/include/wx/protocol/ftp.h | 4 +- .../wxWidgets3/include/wx/protocol/http.h | 14 +- Externals/wxWidgets3/include/wx/radiobox.h | 4 +- Externals/wxWidgets3/include/wx/radiobut.h | 4 +- Externals/wxWidgets3/include/wx/rawbmp.h | 9 +- Externals/wxWidgets3/include/wx/region.h | 11 +- Externals/wxWidgets3/include/wx/richmsgdlg.h | 4 +- Externals/wxWidgets3/include/wx/richtooltip.h | 103 + Externals/wxWidgets3/include/wx/rtti.h | 4 +- Externals/wxWidgets3/include/wx/scopedarray.h | 4 +- Externals/wxWidgets3/include/wx/scopeguard.h | 18 +- Externals/wxWidgets3/include/wx/setup_inc.h | 216 +- Externals/wxWidgets3/include/wx/sizer.h | 26 +- Externals/wxWidgets3/include/wx/slider.h | 6 +- Externals/wxWidgets3/include/wx/sound.h | 4 +- Externals/wxWidgets3/include/wx/srchctrl.h | 10 +- Externals/wxWidgets3/include/wx/sstream.h | 10 +- Externals/wxWidgets3/include/wx/stack.h | 6 +- Externals/wxWidgets3/include/wx/stackwalk.h | 4 +- Externals/wxWidgets3/include/wx/stattext.h | 4 +- Externals/wxWidgets3/include/wx/statusbr.h | 7 +- Externals/wxWidgets3/include/wx/stdpaths.h | 7 +- Externals/wxWidgets3/include/wx/stdstream.h | 14 +- Externals/wxWidgets3/include/wx/stopwatch.h | 83 +- Externals/wxWidgets3/include/wx/strconv.h | 4 +- Externals/wxWidgets3/include/wx/stream.h | 4 +- Externals/wxWidgets3/include/wx/string.h | 52 +- Externals/wxWidgets3/include/wx/stringimpl.h | 12 +- Externals/wxWidgets3/include/wx/strvararg.h | 4 +- Externals/wxWidgets3/include/wx/taskbar.h | 8 +- Externals/wxWidgets3/include/wx/tbarbase.h | 54 +- .../wxWidgets3/include/wx/textcompleter.h | 87 + Externals/wxWidgets3/include/wx/textctrl.h | 39 +- Externals/wxWidgets3/include/wx/textentry.h | 34 +- Externals/wxWidgets3/include/wx/textwrapper.h | 5 +- Externals/wxWidgets3/include/wx/tglbtn.h | 8 +- Externals/wxWidgets3/include/wx/thread.h | 12 +- Externals/wxWidgets3/include/wx/thrimpl.cpp | 6 +- Externals/wxWidgets3/include/wx/time.h | 77 + Externals/wxWidgets3/include/wx/timectrl.h | 92 + Externals/wxWidgets3/include/wx/tls.h | 6 +- Externals/wxWidgets3/include/wx/toolbar.h | 4 +- Externals/wxWidgets3/include/wx/toolbook.h | 4 +- Externals/wxWidgets3/include/wx/toplevel.h | 32 +- Externals/wxWidgets3/include/wx/treebase.h | 61 +- Externals/wxWidgets3/include/wx/treebook.h | 16 +- Externals/wxWidgets3/include/wx/treectrl.h | 26 +- Externals/wxWidgets3/include/wx/treelist.h | 567 ++++ Externals/wxWidgets3/include/wx/uiaction.h | 6 +- .../include/wx/unix/private/timer.h | 8 +- Externals/wxWidgets3/include/wx/unix/sound.h | 8 +- Externals/wxWidgets3/include/wx/utils.h | 39 +- Externals/wxWidgets3/include/wx/valgen.h | 13 +- Externals/wxWidgets3/include/wx/vector.h | 8 +- Externals/wxWidgets3/include/wx/version.h | 6 +- Externals/wxWidgets3/include/wx/vscroll.h | 4 +- Externals/wxWidgets3/include/wx/webview.h | 242 ++ .../include/wx/webviewarchivehandler.h | 37 + Externals/wxWidgets3/include/wx/window.h | 49 +- Externals/wxWidgets3/include/wx/withimages.h | 97 + Externals/wxWidgets3/include/wx/wizard.h | 7 +- Externals/wxWidgets3/include/wx/wxcrt.h | 4 +- Externals/wxWidgets3/include/wx/wxcrtbase.h | 51 +- Externals/wxWidgets3/include/wx/wxprec.h | 12 +- Externals/wxWidgets3/include/wx/xti.h | 7 +- Externals/wxWidgets3/include/wx/xtiprop.h | 22 +- Externals/wxWidgets3/include/wx/xtistrm.h | 16 +- Externals/wxWidgets3/include/wx/xtitypes.h | 16 +- Externals/wxWidgets3/include/wx/xtixml.h | 4 +- Externals/wxWidgets3/src/aui/auibar.cpp | 1168 ++++----- Externals/wxWidgets3/src/aui/auibook.cpp | 968 ++++--- Externals/wxWidgets3/src/aui/dockart.cpp | 277 +- Externals/wxWidgets3/src/aui/floatpane.cpp | 129 +- Externals/wxWidgets3/src/aui/framemanager.cpp | 634 ++--- Externals/wxWidgets3/src/aui/tabmdi.cpp | 63 +- Externals/wxWidgets3/src/common/accelcmn.cpp | 12 +- .../wxWidgets3/src/common/affinematrix2d.cpp | 186 ++ Externals/wxWidgets3/src/common/anidecod.cpp | 12 +- Externals/wxWidgets3/src/common/appbase.cpp | 48 +- Externals/wxWidgets3/src/common/appcmn.cpp | 19 +- Externals/wxWidgets3/src/common/arrstr.cpp | 12 +- Externals/wxWidgets3/src/common/artprov.cpp | 19 +- Externals/wxWidgets3/src/common/artstd.cpp | 13 +- Externals/wxWidgets3/src/common/arttango.cpp | 4 +- Externals/wxWidgets3/src/common/bmpbase.cpp | 4 +- Externals/wxWidgets3/src/common/bookctrl.cpp | 46 +- Externals/wxWidgets3/src/common/btncmn.cpp | 4 +- Externals/wxWidgets3/src/common/cairo.cpp | 391 ++- .../wxWidgets3/src/common/calctrlcmn.cpp | 7 +- .../wxWidgets3/src/common/clrpickercmn.cpp | 6 +- Externals/wxWidgets3/src/common/cmdline.cpp | 56 +- Externals/wxWidgets3/src/common/cmdproc.cpp | 30 +- Externals/wxWidgets3/src/common/cmndata.cpp | 4 +- Externals/wxWidgets3/src/common/colourcmn.cpp | 58 +- Externals/wxWidgets3/src/common/combocmn.cpp | 98 +- Externals/wxWidgets3/src/common/config.cpp | 22 +- Externals/wxWidgets3/src/common/containr.cpp | 41 +- Externals/wxWidgets3/src/common/convauto.cpp | 101 +- Externals/wxWidgets3/src/common/cshelp.cpp | 4 +- Externals/wxWidgets3/src/common/ctrlcmn.cpp | 4 +- Externals/wxWidgets3/src/common/datavcmn.cpp | 281 +- Externals/wxWidgets3/src/common/datetime.cpp | 183 +- .../wxWidgets3/src/common/datetimefmt.cpp | 89 +- Externals/wxWidgets3/src/common/dcbase.cpp | 19 +- Externals/wxWidgets3/src/common/dcbufcmn.cpp | 4 +- Externals/wxWidgets3/src/common/dcgraph.cpp | 149 +- Externals/wxWidgets3/src/common/dcsvg.cpp | 230 +- Externals/wxWidgets3/src/common/descrip.mms | 23 +- Externals/wxWidgets3/src/common/dlgcmn.cpp | 10 +- Externals/wxWidgets3/src/common/dobjcmn.cpp | 9 +- Externals/wxWidgets3/src/common/docview.cpp | 106 +- Externals/wxWidgets3/src/common/dummy.cpp | 2 +- Externals/wxWidgets3/src/common/dynarray.cpp | 11 +- Externals/wxWidgets3/src/common/dynlib.cpp | 10 +- Externals/wxWidgets3/src/common/encconv.cpp | 2 +- Externals/wxWidgets3/src/common/event.cpp | 106 +- .../wxWidgets3/src/common/evtloopcmn.cpp | 6 +- Externals/wxWidgets3/src/common/file.cpp | 10 +- Externals/wxWidgets3/src/common/fileconf.cpp | 6 +- Externals/wxWidgets3/src/common/filefn.cpp | 90 +- .../wxWidgets3/src/common/filehistorycmn.cpp | 27 +- Externals/wxWidgets3/src/common/filename.cpp | 248 +- .../wxWidgets3/src/common/filepickercmn.cpp | 49 +- Externals/wxWidgets3/src/common/filesys.cpp | 8 +- Externals/wxWidgets3/src/common/fmapbase.cpp | 27 +- Externals/wxWidgets3/src/common/fontcmn.cpp | 109 +- .../wxWidgets3/src/common/fontmgrcmn.cpp | 6 +- .../wxWidgets3/src/common/fontpickercmn.cpp | 4 +- Externals/wxWidgets3/src/common/framecmn.cpp | 6 +- Externals/wxWidgets3/src/common/fs_mem.cpp | 14 +- .../wxWidgets3/src/common/fswatchercmn.cpp | 28 +- Externals/wxWidgets3/src/common/ftp.cpp | 6 +- Externals/wxWidgets3/src/common/gdicmn.cpp | 24 +- Externals/wxWidgets3/src/common/gifdecod.cpp | 4 +- Externals/wxWidgets3/src/common/glcmn.cpp | 4 +- Externals/wxWidgets3/src/common/graphcmn.cpp | 50 +- .../wxWidgets3/src/common/headerctrlcmn.cpp | 23 +- Externals/wxWidgets3/src/common/http.cpp | 80 +- Externals/wxWidgets3/src/common/iconbndl.cpp | 121 +- Externals/wxWidgets3/src/common/imagbmp.cpp | 68 +- Externals/wxWidgets3/src/common/image.cpp | 146 +- Externals/wxWidgets3/src/common/imagfill.cpp | 8 +- Externals/wxWidgets3/src/common/imaggif.cpp | 4 +- Externals/wxWidgets3/src/common/imagiff.cpp | 7 +- Externals/wxWidgets3/src/common/imagjpeg.cpp | 13 +- Externals/wxWidgets3/src/common/imagpcx.cpp | 6 +- Externals/wxWidgets3/src/common/imagpng.cpp | 18 +- Externals/wxWidgets3/src/common/imagtga.cpp | 6 +- Externals/wxWidgets3/src/common/imagtiff.cpp | 325 ++- Externals/wxWidgets3/src/common/imagxpm.cpp | 4 +- Externals/wxWidgets3/src/common/init.cpp | 14 +- Externals/wxWidgets3/src/common/intl.cpp | 70 +- .../wxWidgets3/src/common/languageinfo.cpp | 4 +- Externals/wxWidgets3/src/common/list.cpp | 18 +- .../wxWidgets3/src/common/listctrlcmn.cpp | 85 +- Externals/wxWidgets3/src/common/log.cpp | 185 +- Externals/wxWidgets3/src/common/longlong.cpp | 18 +- Externals/wxWidgets3/src/common/memory.cpp | 16 +- Externals/wxWidgets3/src/common/menucmn.cpp | 22 +- Externals/wxWidgets3/src/common/mimecmn.cpp | 24 +- Externals/wxWidgets3/src/common/msgout.cpp | 6 +- Externals/wxWidgets3/src/common/nbkbase.cpp | 8 +- .../wxWidgets3/src/common/numformatter.cpp | 19 + .../wxWidgets3/src/common/overlaycmn.cpp | 4 +- .../wxWidgets3/src/common/ownerdrwcmn.cpp | 6 +- Externals/wxWidgets3/src/common/panelcmn.cpp | 17 +- Externals/wxWidgets3/src/common/persist.cpp | 24 +- .../wxWidgets3/src/common/pickerbase.cpp | 31 +- Externals/wxWidgets3/src/common/platinfo.cpp | 9 +- Externals/wxWidgets3/src/common/popupcmn.cpp | 40 +- Externals/wxWidgets3/src/common/powercmn.cpp | 4 +- Externals/wxWidgets3/src/common/prntbase.cpp | 196 +- Externals/wxWidgets3/src/common/quantize.cpp | 4 +- .../wxWidgets3/src/common/richtooltipcmn.cpp | 82 + Externals/wxWidgets3/src/common/sckaddr.cpp | 19 +- Externals/wxWidgets3/src/common/sckfile.cpp | 4 +- Externals/wxWidgets3/src/common/sckipc.cpp | 6 +- Externals/wxWidgets3/src/common/sizer.cpp | 7 +- Externals/wxWidgets3/src/common/socket.cpp | 28 +- Externals/wxWidgets3/src/common/sstream.cpp | 11 +- Externals/wxWidgets3/src/common/stockitem.cpp | 205 +- Externals/wxWidgets3/src/common/stopwatch.cpp | 347 +-- Externals/wxWidgets3/src/common/strconv.cpp | 52 +- Externals/wxWidgets3/src/common/string.cpp | 6 +- .../wxWidgets3/src/common/stringimpl.cpp | 8 +- Externals/wxWidgets3/src/common/strvararg.cpp | 15 +- Externals/wxWidgets3/src/common/sysopt.cpp | 7 +- Externals/wxWidgets3/src/common/tbarbase.cpp | 10 +- Externals/wxWidgets3/src/common/textbuf.cpp | 4 +- Externals/wxWidgets3/src/common/textcmn.cpp | 97 +- .../wxWidgets3/src/common/textentrycmn.cpp | 38 +- Externals/wxWidgets3/src/common/time.cpp | 372 +++ Externals/wxWidgets3/src/common/toplvcmn.cpp | 9 +- .../wxWidgets3/src/common/translation.cpp | 8 +- Externals/wxWidgets3/src/common/treebase.cpp | 40 +- Externals/wxWidgets3/src/common/txtstrm.cpp | 6 +- .../wxWidgets3/src/common/uiactioncmn.cpp | 50 +- Externals/wxWidgets3/src/common/utilscmn.cpp | 45 +- Externals/wxWidgets3/src/common/valgen.cpp | 67 +- Externals/wxWidgets3/src/common/webview.cpp | 119 + .../src/common/webviewarchivehandler.cpp | 118 + Externals/wxWidgets3/src/common/wincmn.cpp | 96 +- Externals/wxWidgets3/src/common/windowid.cpp | 57 +- Externals/wxWidgets3/src/common/wxcrt.cpp | 4 +- Externals/wxWidgets3/src/common/xlocale.cpp | 99 +- Externals/wxWidgets3/src/common/xti.cpp | 50 +- Externals/wxWidgets3/src/common/xtistrm.cpp | 14 +- Externals/wxWidgets3/src/common/xtixml.cpp | 6 +- Externals/wxWidgets3/src/common/zipstrm.cpp | 4 +- Externals/wxWidgets3/src/common/zstream.cpp | 4 +- .../wxWidgets3/src/generic/aboutdlgg.cpp | 37 +- Externals/wxWidgets3/src/generic/accel.cpp | 4 +- Externals/wxWidgets3/src/generic/animateg.cpp | 4 +- .../wxWidgets3/src/generic/bannerwindow.cpp | 344 +++ .../wxWidgets3/src/generic/buttonbar.cpp | 7 +- Externals/wxWidgets3/src/generic/calctrlg.cpp | 34 +- Externals/wxWidgets3/src/generic/choicdgg.cpp | 33 +- .../wxWidgets3/src/generic/collpaneg.cpp | 8 +- Externals/wxWidgets3/src/generic/colrdlgg.cpp | 8 +- Externals/wxWidgets3/src/generic/combog.cpp | 15 +- Externals/wxWidgets3/src/generic/datavgen.cpp | 2299 ++++++++++------- Externals/wxWidgets3/src/generic/datectlg.cpp | 12 +- Externals/wxWidgets3/src/generic/dbgrptg.cpp | 4 +- Externals/wxWidgets3/src/generic/dcpsg.cpp | 27 +- Externals/wxWidgets3/src/generic/descrip.mms | 16 +- Externals/wxWidgets3/src/generic/dirctrlg.cpp | 22 +- Externals/wxWidgets3/src/generic/dirdlgg.cpp | 4 +- Externals/wxWidgets3/src/generic/dragimgg.cpp | 22 +- .../wxWidgets3/src/generic/filectrlg.cpp | 14 +- Externals/wxWidgets3/src/generic/filedlgg.cpp | 6 +- .../wxWidgets3/src/generic/filepickerg.cpp | 91 +- Externals/wxWidgets3/src/generic/fontdlgg.cpp | 10 +- .../wxWidgets3/src/generic/fontpickerg.cpp | 4 +- Externals/wxWidgets3/src/generic/graphicc.cpp | 826 +++++- Externals/wxWidgets3/src/generic/grid.cpp | 46 +- Externals/wxWidgets3/src/generic/gridctrl.cpp | 69 +- .../wxWidgets3/src/generic/grideditors.cpp | 166 +- Externals/wxWidgets3/src/generic/gridsel.cpp | 167 +- .../wxWidgets3/src/generic/headerctrlg.cpp | 4 +- Externals/wxWidgets3/src/generic/htmllbox.cpp | 4 +- .../wxWidgets3/src/generic/hyperlinkg.cpp | 32 +- Externals/wxWidgets3/src/generic/imaglist.cpp | 10 +- Externals/wxWidgets3/src/generic/listctrl.cpp | 299 ++- Externals/wxWidgets3/src/generic/logg.cpp | 20 +- Externals/wxWidgets3/src/generic/mask.cpp | 8 +- Externals/wxWidgets3/src/generic/msgdlgg.cpp | 17 +- Externals/wxWidgets3/src/generic/odcombo.cpp | 5 +- Externals/wxWidgets3/src/generic/panelg.cpp | 69 - Externals/wxWidgets3/src/generic/prntdlgg.cpp | 10 +- Externals/wxWidgets3/src/generic/progdlgg.cpp | 35 +- Externals/wxWidgets3/src/generic/regiong.cpp | 4 +- Externals/wxWidgets3/src/generic/renderg.cpp | 12 +- .../wxWidgets3/src/generic/richtooltipg.cpp | 673 +++++ Externals/wxWidgets3/src/generic/scrlwing.cpp | 13 +- Externals/wxWidgets3/src/generic/spinctlg.cpp | 46 +- Externals/wxWidgets3/src/generic/splash.cpp | 50 +- Externals/wxWidgets3/src/generic/splitter.cpp | 94 +- Externals/wxWidgets3/src/generic/srchctlg.cpp | 133 +- Externals/wxWidgets3/src/generic/statusbr.cpp | 8 +- .../wxWidgets3/src/generic/timectrlg.cpp | 668 +++++ Externals/wxWidgets3/src/generic/timer.cpp | 64 +- Externals/wxWidgets3/src/generic/tipwin.cpp | 4 +- Externals/wxWidgets3/src/generic/treectlg.cpp | 11 +- Externals/wxWidgets3/src/generic/treelist.cpp | 1677 ++++++++++++ Externals/wxWidgets3/src/generic/vlbox.cpp | 5 +- Externals/wxWidgets3/src/generic/vscroll.cpp | 13 +- Externals/wxWidgets3/src/generic/wizard.cpp | 24 +- Externals/wxWidgets3/src/gtk/aboutdlg.cpp | 6 +- Externals/wxWidgets3/src/gtk/animate.cpp | 3 +- Externals/wxWidgets3/src/gtk/anybutton.cpp | 422 +++ Externals/wxWidgets3/src/gtk/app.cpp | 4 +- Externals/wxWidgets3/src/gtk/artgtk.cpp | 8 +- .../{assertdlg_gtk.c => assertdlg_gtk.cpp} | 72 +- Externals/wxWidgets3/src/gtk/bitmap.cpp | 15 +- Externals/wxWidgets3/src/gtk/bmpcbox.cpp | 6 +- Externals/wxWidgets3/src/gtk/brush.cpp | 8 +- Externals/wxWidgets3/src/gtk/button.cpp | 422 +-- Externals/wxWidgets3/src/gtk/calctrl.cpp | 121 +- Externals/wxWidgets3/src/gtk/checkbox.cpp | 4 +- Externals/wxWidgets3/src/gtk/choice.cpp | 6 +- Externals/wxWidgets3/src/gtk/clipbrd.cpp | 55 +- Externals/wxWidgets3/src/gtk/clrpicker.cpp | 3 +- Externals/wxWidgets3/src/gtk/collpane.cpp | 11 +- Externals/wxWidgets3/src/gtk/colordlg.cpp | 23 +- Externals/wxWidgets3/src/gtk/colour.cpp | 16 +- Externals/wxWidgets3/src/gtk/combobox.cpp | 29 +- Externals/wxWidgets3/src/gtk/control.cpp | 8 +- Externals/wxWidgets3/src/gtk/cursor.cpp | 36 +- Externals/wxWidgets3/src/gtk/dataobj.cpp | 6 +- Externals/wxWidgets3/src/gtk/dataview.cpp | 860 +++--- Externals/wxWidgets3/src/gtk/dcclient.cpp | 98 +- Externals/wxWidgets3/src/gtk/dcmemory.cpp | 18 +- Externals/wxWidgets3/src/gtk/dcscreen.cpp | 11 +- Externals/wxWidgets3/src/gtk/descrip.mms | 19 +- Externals/wxWidgets3/src/gtk/dirdlg.cpp | 20 +- Externals/wxWidgets3/src/gtk/dnd.cpp | 23 +- Externals/wxWidgets3/src/gtk/filedlg.cpp | 34 +- Externals/wxWidgets3/src/gtk/filepicker.cpp | 28 +- Externals/wxWidgets3/src/gtk/font.cpp | 112 +- Externals/wxWidgets3/src/gtk/fontdlg.cpp | 8 +- Externals/wxWidgets3/src/gtk/fontpicker.cpp | 4 +- Externals/wxWidgets3/src/gtk/frame.cpp | 6 +- Externals/wxWidgets3/src/gtk/glcanvas.cpp | 7 +- Externals/wxWidgets3/src/gtk/gnome/gprint.cpp | 33 +- Externals/wxWidgets3/src/gtk/hyperlink.cpp | 10 +- Externals/wxWidgets3/src/gtk/listbox.cpp | 25 +- Externals/wxWidgets3/src/gtk/mdi.cpp | 32 +- Externals/wxWidgets3/src/gtk/menu.cpp | 144 +- Externals/wxWidgets3/src/gtk/minifram.cpp | 41 +- Externals/wxWidgets3/src/gtk/msgdlg.cpp | 82 +- Externals/wxWidgets3/src/gtk/nativewin.cpp | 7 +- Externals/wxWidgets3/src/gtk/nonownedwnd.cpp | 308 +++ Externals/wxWidgets3/src/gtk/notebook.cpp | 65 +- Externals/wxWidgets3/src/gtk/pen.cpp | 18 +- Externals/wxWidgets3/src/gtk/popupwin.cpp | 12 +- Externals/wxWidgets3/src/gtk/print.cpp | 59 +- Externals/wxWidgets3/src/gtk/radiobox.cpp | 28 +- Externals/wxWidgets3/src/gtk/radiobut.cpp | 12 +- Externals/wxWidgets3/src/gtk/region.cpp | 64 +- Externals/wxWidgets3/src/gtk/renderer.cpp | 47 +- Externals/wxWidgets3/src/gtk/scrolbar.cpp | 35 +- Externals/wxWidgets3/src/gtk/scrolwin.cpp | 17 +- Externals/wxWidgets3/src/gtk/settings.cpp | 21 +- Externals/wxWidgets3/src/gtk/slider.cpp | 34 +- Externals/wxWidgets3/src/gtk/sockgtk.cpp | 31 +- Externals/wxWidgets3/src/gtk/spinctrl.cpp | 16 +- Externals/wxWidgets3/src/gtk/statbmp.cpp | 6 +- Externals/wxWidgets3/src/gtk/statbox.cpp | 14 +- Externals/wxWidgets3/src/gtk/stattext.cpp | 53 +- Externals/wxWidgets3/src/gtk/taskbar.cpp | 29 +- Externals/wxWidgets3/src/gtk/textctrl.cpp | 119 +- Externals/wxWidgets3/src/gtk/textentry.cpp | 16 +- Externals/wxWidgets3/src/gtk/tglbtn.cpp | 220 +- Externals/wxWidgets3/src/gtk/toolbar.cpp | 52 +- Externals/wxWidgets3/src/gtk/tooltip.cpp | 65 +- Externals/wxWidgets3/src/gtk/toplevel.cpp | 314 ++- Externals/wxWidgets3/src/gtk/treeentry_gtk.c | 6 +- Externals/wxWidgets3/src/gtk/utilsgtk.cpp | 62 +- .../wxWidgets3/src/gtk/webview_webkit.cpp | 924 +++++++ Externals/wxWidgets3/src/gtk/win_gtk.cpp | 42 +- Externals/wxWidgets3/src/gtk/window.cpp | 1078 ++++---- Externals/wxWidgets3/src/msw/accel.cpp | 4 +- Externals/wxWidgets3/src/msw/anybutton.cpp | 1244 +++++++++ Externals/wxWidgets3/src/msw/artmsw.cpp | 8 +- Externals/wxWidgets3/src/msw/bitmap.cpp | 36 +- Externals/wxWidgets3/src/msw/bmpbuttn.cpp | 55 +- Externals/wxWidgets3/src/msw/bmpcbox.cpp | 12 +- Externals/wxWidgets3/src/msw/brush.cpp | 10 +- Externals/wxWidgets3/src/msw/button.cpp | 1158 +-------- Externals/wxWidgets3/src/msw/calctrl.cpp | 45 +- Externals/wxWidgets3/src/msw/checkbox.cpp | 17 +- Externals/wxWidgets3/src/msw/choice.cpp | 25 +- Externals/wxWidgets3/src/msw/clipbrd.cpp | 12 +- Externals/wxWidgets3/src/msw/combo.cpp | 24 +- Externals/wxWidgets3/src/msw/control.cpp | 6 +- Externals/wxWidgets3/src/msw/cursor.cpp | 13 +- Externals/wxWidgets3/src/msw/datectrl.cpp | 168 +- Externals/wxWidgets3/src/msw/datetimectrl.cpp | 156 ++ Externals/wxWidgets3/src/msw/dc.cpp | 227 +- Externals/wxWidgets3/src/msw/dcclient.cpp | 13 +- Externals/wxWidgets3/src/msw/dcmemory.cpp | 12 +- Externals/wxWidgets3/src/msw/dcprint.cpp | 4 +- Externals/wxWidgets3/src/msw/dde.cpp | 8 +- Externals/wxWidgets3/src/msw/debughlp.cpp | 31 +- Externals/wxWidgets3/src/msw/dialog.cpp | 11 +- Externals/wxWidgets3/src/msw/dialup.cpp | 8 +- Externals/wxWidgets3/src/msw/dib.cpp | 6 +- Externals/wxWidgets3/src/msw/display.cpp | 88 +- Externals/wxWidgets3/src/msw/dlmsw.cpp | 58 +- Externals/wxWidgets3/src/msw/dragimag.cpp | 46 +- Externals/wxWidgets3/src/msw/enhmeta.cpp | 10 +- Externals/wxWidgets3/src/msw/evtloop.cpp | 22 +- Externals/wxWidgets3/src/msw/filedlg.cpp | 83 +- Externals/wxWidgets3/src/msw/font.cpp | 64 +- Externals/wxWidgets3/src/msw/fontdlg.cpp | 6 +- Externals/wxWidgets3/src/msw/frame.cpp | 73 +- Externals/wxWidgets3/src/msw/fswatcher.cpp | 62 +- Externals/wxWidgets3/src/msw/gdiimage.cpp | 8 +- Externals/wxWidgets3/src/msw/gdiplus.cpp | 24 +- Externals/wxWidgets3/src/msw/glcanvas.cpp | 10 +- Externals/wxWidgets3/src/msw/graphics.cpp | 432 +++- Externals/wxWidgets3/src/msw/headerctrl.cpp | 4 +- Externals/wxWidgets3/src/msw/imaglist.cpp | 6 +- Externals/wxWidgets3/src/msw/joystick.cpp | 8 +- Externals/wxWidgets3/src/msw/listbox.cpp | 12 +- Externals/wxWidgets3/src/msw/listctrl.cpp | 134 +- Externals/wxWidgets3/src/msw/mediactrl_am.cpp | 12 +- Externals/wxWidgets3/src/msw/menu.cpp | 333 ++- Externals/wxWidgets3/src/msw/menuitem.cpp | 52 +- Externals/wxWidgets3/src/msw/mimetype.cpp | 4 +- Externals/wxWidgets3/src/msw/msgdlg.cpp | 88 +- Externals/wxWidgets3/src/msw/nonownedwnd.cpp | 184 ++ Externals/wxWidgets3/src/msw/notebook.cpp | 24 +- Externals/wxWidgets3/src/msw/notifmsg.cpp | 16 +- Externals/wxWidgets3/src/msw/ole/activex.cpp | 80 +- Externals/wxWidgets3/src/msw/ole/dataobj.cpp | 8 +- Externals/wxWidgets3/src/msw/ole/dropsrc.cpp | 4 +- Externals/wxWidgets3/src/msw/ole/oleutils.cpp | 14 +- Externals/wxWidgets3/src/msw/palette.cpp | 14 +- Externals/wxWidgets3/src/msw/panel.cpp | 17 +- Externals/wxWidgets3/src/msw/pen.cpp | 20 +- Externals/wxWidgets3/src/msw/printdlg.cpp | 99 +- Externals/wxWidgets3/src/msw/progdlg.cpp | 40 +- Externals/wxWidgets3/src/msw/radiobox.cpp | 12 +- Externals/wxWidgets3/src/msw/region.cpp | 7 +- Externals/wxWidgets3/src/msw/registry.cpp | 6 +- Externals/wxWidgets3/src/msw/renderer.cpp | 44 +- Externals/wxWidgets3/src/msw/richtooltip.cpp | 200 ++ Externals/wxWidgets3/src/msw/scrolbar.cpp | 6 +- Externals/wxWidgets3/src/msw/slider.cpp | 217 +- Externals/wxWidgets3/src/msw/sockmsw.cpp | 10 +- Externals/wxWidgets3/src/msw/sound.cpp | 10 +- Externals/wxWidgets3/src/msw/spinctrl.cpp | 40 +- Externals/wxWidgets3/src/msw/stackwalk.cpp | 15 +- Externals/wxWidgets3/src/msw/statbmp.cpp | 4 +- Externals/wxWidgets3/src/msw/stattext.cpp | 4 +- Externals/wxWidgets3/src/msw/statusbar.cpp | 83 +- Externals/wxWidgets3/src/msw/taskbar.cpp | 4 +- Externals/wxWidgets3/src/msw/textctrl.cpp | 153 +- Externals/wxWidgets3/src/msw/textentry.cpp | 639 ++++- Externals/wxWidgets3/src/msw/tglbtn.cpp | 231 +- Externals/wxWidgets3/src/msw/thread.cpp | 23 +- Externals/wxWidgets3/src/msw/timectrl.cpp | 61 + Externals/wxWidgets3/src/msw/timer.cpp | 8 +- Externals/wxWidgets3/src/msw/toolbar.cpp | 59 +- Externals/wxWidgets3/src/msw/toplevel.cpp | 311 ++- Externals/wxWidgets3/src/msw/treectrl.cpp | 77 +- Externals/wxWidgets3/src/msw/uiaction.cpp | 20 +- Externals/wxWidgets3/src/msw/utils.cpp | 48 +- Externals/wxWidgets3/src/msw/utilsexc.cpp | 32 +- Externals/wxWidgets3/src/msw/utilsgui.cpp | 4 +- Externals/wxWidgets3/src/msw/webview_ie.cpp | 1369 ++++++++++ .../wxWidgets3/src/msw/wince/tbarwce.cpp | 4 +- Externals/wxWidgets3/src/msw/window.cpp | 230 +- Externals/wxWidgets3/src/osx/accel.cpp | 8 +- .../wxWidgets3/src/osx/anybutton_osx.cpp | 95 + Externals/wxWidgets3/src/osx/artmac.cpp | 4 +- Externals/wxWidgets3/src/osx/brush.cpp | 8 +- Externals/wxWidgets3/src/osx/button_osx.cpp | 76 +- .../wxWidgets3/src/osx/carbon/anybutton.cpp | 113 + Externals/wxWidgets3/src/osx/carbon/app.cpp | 430 ++- .../wxWidgets3/src/osx/carbon/button.cpp | 92 +- .../wxWidgets3/src/osx/carbon/clipbrd.cpp | 8 +- .../wxWidgets3/src/osx/carbon/colordlgosx.mm | 4 +- .../wxWidgets3/src/osx/carbon/combobox.cpp | 14 +- .../wxWidgets3/src/osx/carbon/cursor.cpp | 4 +- .../wxWidgets3/src/osx/carbon/dataobj.cpp | 12 +- .../wxWidgets3/src/osx/carbon/dataview.cpp | 70 +- .../wxWidgets3/src/osx/carbon/dcclient.cpp | 6 +- .../wxWidgets3/src/osx/carbon/dcprint.cpp | 67 +- .../wxWidgets3/src/osx/carbon/evtloop.cpp | 12 +- Externals/wxWidgets3/src/osx/carbon/font.cpp | 16 +- .../wxWidgets3/src/osx/carbon/fontdlg.cpp | 28 +- .../wxWidgets3/src/osx/carbon/fontdlgosx.mm | 27 +- Externals/wxWidgets3/src/osx/carbon/frame.cpp | 11 +- .../wxWidgets3/src/osx/carbon/glcanvas.cpp | 37 +- .../wxWidgets3/src/osx/carbon/graphics.cpp | 329 ++- Externals/wxWidgets3/src/osx/carbon/icon.cpp | 12 +- .../wxWidgets3/src/osx/carbon/listbox.cpp | 6 +- .../src/osx/carbon/listctrl_mac.cpp | 58 +- Externals/wxWidgets3/src/osx/carbon/mdi.cpp | 8 +- Externals/wxWidgets3/src/osx/carbon/menu.cpp | 27 +- .../wxWidgets3/src/osx/carbon/metafile.cpp | 24 +- .../wxWidgets3/src/osx/carbon/nonownedwnd.cpp | 6 +- .../wxWidgets3/src/osx/carbon/notebmac.cpp | 4 +- .../wxWidgets3/src/osx/carbon/region.cpp | 162 +- .../wxWidgets3/src/osx/carbon/renderer.cpp | 27 +- .../wxWidgets3/src/osx/carbon/slider.cpp | 20 +- Externals/wxWidgets3/src/osx/carbon/sound.cpp | 8 +- .../wxWidgets3/src/osx/carbon/statbmp.cpp | 6 +- .../wxWidgets3/src/osx/carbon/taskbar.cpp | 4 +- .../wxWidgets3/src/osx/carbon/thread.cpp | 7 +- Externals/wxWidgets3/src/osx/carbon/uma.cpp | 8 +- Externals/wxWidgets3/src/osx/carbon/utils.cpp | 4 +- .../wxWidgets3/src/osx/carbon/utilscocoa.mm | 9 +- .../wxWidgets3/src/osx/carbon/window.cpp | 4 +- Externals/wxWidgets3/src/osx/checkbox_osx.cpp | 20 +- Externals/wxWidgets3/src/osx/choice_osx.cpp | 10 +- .../wxWidgets3/src/osx/cocoa/anybutton.mm | 49 + Externals/wxWidgets3/src/osx/cocoa/button.mm | 99 +- .../wxWidgets3/src/osx/cocoa/combobox.mm | 14 +- .../wxWidgets3/src/osx/cocoa/dataview.mm | 163 +- .../wxWidgets3/src/osx/cocoa/datetimectrl.mm | 179 ++ Externals/wxWidgets3/src/osx/cocoa/dirdlg.mm | 13 +- Externals/wxWidgets3/src/osx/cocoa/dnd.mm | 29 +- Externals/wxWidgets3/src/osx/cocoa/evtloop.mm | 69 +- Externals/wxWidgets3/src/osx/cocoa/filedlg.mm | 70 +- Externals/wxWidgets3/src/osx/cocoa/gauge.mm | 33 +- Externals/wxWidgets3/src/osx/cocoa/listbox.mm | 6 +- Externals/wxWidgets3/src/osx/cocoa/menu.mm | 43 +- .../wxWidgets3/src/osx/cocoa/menuitem.mm | 35 +- Externals/wxWidgets3/src/osx/cocoa/msgdlg.mm | 42 +- .../wxWidgets3/src/osx/cocoa/nonownedwnd.mm | 150 +- .../wxWidgets3/src/osx/cocoa/notebook.mm | 6 +- .../wxWidgets3/src/osx/cocoa/printdlg.mm | 6 +- Externals/wxWidgets3/src/osx/cocoa/slider.mm | 9 +- .../wxWidgets3/src/osx/cocoa/spinbutt.mm | 11 +- .../wxWidgets3/src/osx/cocoa/srchctrl.mm | 28 +- Externals/wxWidgets3/src/osx/cocoa/taskbar.mm | 4 +- .../wxWidgets3/src/osx/cocoa/textctrl.mm | 181 +- Externals/wxWidgets3/src/osx/cocoa/tglbtn.mm | 4 +- Externals/wxWidgets3/src/osx/cocoa/toolbar.mm | 91 +- Externals/wxWidgets3/src/osx/cocoa/utils.mm | 54 +- Externals/wxWidgets3/src/osx/cocoa/window.mm | 631 +++-- Externals/wxWidgets3/src/osx/combobox_osx.cpp | 16 +- Externals/wxWidgets3/src/osx/core/bitmap.cpp | 216 +- Externals/wxWidgets3/src/osx/core/colour.cpp | 5 +- .../wxWidgets3/src/osx/core/dcmemory.cpp | 10 +- .../wxWidgets3/src/osx/core/evtloop_cf.cpp | 50 +- .../wxWidgets3/src/osx/core/fontenum.cpp | 15 +- Externals/wxWidgets3/src/osx/core/hid.cpp | 18 +- .../wxWidgets3/src/osx/core/hidjoystick.cpp | 10 +- .../wxWidgets3/src/osx/core/mimetype.cpp | 52 +- .../wxWidgets3/src/osx/core/printmac.cpp | 87 +- Externals/wxWidgets3/src/osx/core/sound.cpp | 4 +- .../wxWidgets3/src/osx/core/utilsexc_base.cpp | 19 +- Externals/wxWidgets3/src/osx/dataview_osx.cpp | 33 +- Externals/wxWidgets3/src/osx/datectrl_osx.cpp | 90 + .../wxWidgets3/src/osx/datetimectrl_osx.cpp | 55 + Externals/wxWidgets3/src/osx/dialog_osx.cpp | 4 +- Externals/wxWidgets3/src/osx/dnd_osx.cpp | 8 +- Externals/wxWidgets3/src/osx/imaglist.cpp | 6 +- .../wxWidgets3/src/osx/iphone/anybutton.mm | 56 + Externals/wxWidgets3/src/osx/iphone/button.mm | 35 +- .../wxWidgets3/src/osx/iphone/evtloop.mm | 6 +- .../wxWidgets3/src/osx/iphone/nonownedwnd.mm | 14 +- .../wxWidgets3/src/osx/iphone/toolbar.mm | 4 +- Externals/wxWidgets3/src/osx/iphone/window.mm | 9 +- Externals/wxWidgets3/src/osx/listbox_osx.cpp | 5 +- Externals/wxWidgets3/src/osx/menu_osx.cpp | 59 +- Externals/wxWidgets3/src/osx/menuitem_osx.cpp | 4 +- .../wxWidgets3/src/osx/nonownedwnd_osx.cpp | 76 +- Externals/wxWidgets3/src/osx/notebook_osx.cpp | 13 +- Externals/wxWidgets3/src/osx/pen.cpp | 16 +- Externals/wxWidgets3/src/osx/printdlg_osx.cpp | 10 +- Externals/wxWidgets3/src/osx/sound_osx.cpp | 4 +- Externals/wxWidgets3/src/osx/spinctrl_osx.cpp | 12 +- Externals/wxWidgets3/src/osx/textctrl_osx.cpp | 35 +- .../wxWidgets3/src/osx/textentry_osx.cpp | 78 +- Externals/wxWidgets3/src/osx/tglbtn_osx.cpp | 74 +- Externals/wxWidgets3/src/osx/timectrl_osx.cpp | 80 + Externals/wxWidgets3/src/osx/toplevel_osx.cpp | 7 +- Externals/wxWidgets3/src/osx/uiaction_osx.cpp | 252 +- Externals/wxWidgets3/src/osx/utils_osx.cpp | 38 +- .../wxWidgets3/src/osx/webview_webkit.mm | 1318 ++++++++++ Externals/wxWidgets3/src/osx/window_osx.cpp | 199 +- Externals/wxWidgets3/src/unix/dialup.cpp | 7 +- Externals/wxWidgets3/src/unix/fontutil.cpp | 28 +- .../wxWidgets3/src/unix/fswatcher_kqueue.cpp | 29 +- Externals/wxWidgets3/src/unix/mediactrl.cpp | 29 +- Externals/wxWidgets3/src/unix/mimetype.cpp | 4 +- Externals/wxWidgets3/src/unix/sound.cpp | 10 +- Externals/wxWidgets3/src/unix/threadpsx.cpp | 6 +- Externals/wxWidgets3/src/unix/timerunx.cpp | 24 +- Externals/wxWidgets3/src/unix/uiactionx11.cpp | 3 +- Externals/wxWidgets3/src/unix/utilsunx.cpp | 4 +- Externals/wxWidgets3/src/unix/utilsx11.cpp | 4 +- Externals/wxWidgets3/wx/setup.h | 2 - Externals/wxWidgets3/wx/wxcocoa.h | 87 +- Externals/wxWidgets3/wx/wxgtk.h | 142 +- .../wxWidgets3/wx/{wxmsw.h => wxmsw_old.h} | 0 SConstruct | 10 +- Source/Core/DolphinWX/Src/WXInputBase.cpp | 2 +- 906 files changed, 39468 insertions(+), 17244 deletions(-) create mode 100755 Externals/wxWidgets3/build_wx.sh create mode 100644 Externals/wxWidgets3/include/wx/affinematrix2d.h create mode 100644 Externals/wxWidgets3/include/wx/affinematrix2dbase.h create mode 100644 Externals/wxWidgets3/include/wx/anybutton.h create mode 100644 Externals/wxWidgets3/include/wx/bannerwindow.h create mode 100644 Externals/wxWidgets3/include/wx/custombgwin.h create mode 100644 Externals/wxWidgets3/include/wx/datetimectrl.h create mode 100644 Externals/wxWidgets3/include/wx/eventfilter.h create mode 100644 Externals/wxWidgets3/include/wx/generic/custombgwin.h create mode 100644 Externals/wxWidgets3/include/wx/generic/private/richtooltip.h create mode 100644 Externals/wxWidgets3/include/wx/generic/timectrl.h create mode 100644 Externals/wxWidgets3/include/wx/gtk/anybutton.h create mode 100644 Externals/wxWidgets3/include/wx/gtk/nonownedwnd.h create mode 100644 Externals/wxWidgets3/include/wx/gtk/private/event.h create mode 100644 Externals/wxWidgets3/include/wx/gtk/private/gtk2-compat.h create mode 100644 Externals/wxWidgets3/include/wx/gtk/private/list.h create mode 100644 Externals/wxWidgets3/include/wx/gtk/webview_webkit.h create mode 100644 Externals/wxWidgets3/include/wx/gtk/webviewhistoryitem_webkit.h create mode 100644 Externals/wxWidgets3/include/wx/itemid.h create mode 100644 Externals/wxWidgets3/include/wx/msw/anybutton.h create mode 100644 Externals/wxWidgets3/include/wx/msw/custombgwin.h create mode 100644 Externals/wxWidgets3/include/wx/msw/datetimectrl.h create mode 100644 Externals/wxWidgets3/include/wx/msw/nonownedwnd.h create mode 100644 Externals/wxWidgets3/include/wx/msw/private/hiddenwin.h create mode 100644 Externals/wxWidgets3/include/wx/msw/timectrl.h create mode 100644 Externals/wxWidgets3/include/wx/msw/webview_ie.h create mode 100644 Externals/wxWidgets3/include/wx/msw/webviewhistoryitem_ie.h create mode 100644 Externals/wxWidgets3/include/wx/osx/anybutton.h create mode 100644 Externals/wxWidgets3/include/wx/osx/cocoa/private/date.h create mode 100644 Externals/wxWidgets3/include/wx/osx/core/private/datetimectrl.h create mode 100644 Externals/wxWidgets3/include/wx/osx/datectrl.h create mode 100644 Externals/wxWidgets3/include/wx/osx/datetimectrl.h create mode 100644 Externals/wxWidgets3/include/wx/osx/timectrl.h create mode 100644 Externals/wxWidgets3/include/wx/osx/webview_webkit.h create mode 100644 Externals/wxWidgets3/include/wx/osx/webviewhistoryitem_webkit.h create mode 100644 Externals/wxWidgets3/include/wx/persist/splitter.h create mode 100644 Externals/wxWidgets3/include/wx/private/richtooltip.h create mode 100644 Externals/wxWidgets3/include/wx/richtooltip.h create mode 100644 Externals/wxWidgets3/include/wx/textcompleter.h create mode 100644 Externals/wxWidgets3/include/wx/time.h create mode 100644 Externals/wxWidgets3/include/wx/timectrl.h create mode 100644 Externals/wxWidgets3/include/wx/treelist.h create mode 100644 Externals/wxWidgets3/include/wx/webview.h create mode 100644 Externals/wxWidgets3/include/wx/webviewarchivehandler.h create mode 100644 Externals/wxWidgets3/include/wx/withimages.h create mode 100644 Externals/wxWidgets3/src/common/affinematrix2d.cpp create mode 100644 Externals/wxWidgets3/src/common/richtooltipcmn.cpp create mode 100644 Externals/wxWidgets3/src/common/time.cpp create mode 100644 Externals/wxWidgets3/src/common/webview.cpp create mode 100644 Externals/wxWidgets3/src/common/webviewarchivehandler.cpp create mode 100644 Externals/wxWidgets3/src/generic/bannerwindow.cpp delete mode 100644 Externals/wxWidgets3/src/generic/panelg.cpp create mode 100644 Externals/wxWidgets3/src/generic/richtooltipg.cpp create mode 100644 Externals/wxWidgets3/src/generic/timectrlg.cpp create mode 100644 Externals/wxWidgets3/src/generic/treelist.cpp create mode 100644 Externals/wxWidgets3/src/gtk/anybutton.cpp rename Externals/wxWidgets3/src/gtk/{assertdlg_gtk.c => assertdlg_gtk.cpp} (90%) create mode 100644 Externals/wxWidgets3/src/gtk/nonownedwnd.cpp create mode 100644 Externals/wxWidgets3/src/gtk/webview_webkit.cpp create mode 100644 Externals/wxWidgets3/src/msw/anybutton.cpp create mode 100644 Externals/wxWidgets3/src/msw/datetimectrl.cpp create mode 100644 Externals/wxWidgets3/src/msw/nonownedwnd.cpp create mode 100644 Externals/wxWidgets3/src/msw/richtooltip.cpp create mode 100644 Externals/wxWidgets3/src/msw/timectrl.cpp create mode 100644 Externals/wxWidgets3/src/msw/webview_ie.cpp create mode 100644 Externals/wxWidgets3/src/osx/anybutton_osx.cpp create mode 100644 Externals/wxWidgets3/src/osx/carbon/anybutton.cpp create mode 100644 Externals/wxWidgets3/src/osx/cocoa/anybutton.mm create mode 100644 Externals/wxWidgets3/src/osx/cocoa/datetimectrl.mm create mode 100644 Externals/wxWidgets3/src/osx/datectrl_osx.cpp create mode 100644 Externals/wxWidgets3/src/osx/datetimectrl_osx.cpp create mode 100644 Externals/wxWidgets3/src/osx/iphone/anybutton.mm create mode 100644 Externals/wxWidgets3/src/osx/timectrl_osx.cpp create mode 100644 Externals/wxWidgets3/src/osx/webview_webkit.mm rename Externals/wxWidgets3/wx/{wxmsw.h => wxmsw_old.h} (100%) diff --git a/Externals/wxWidgets3/SConscript b/Externals/wxWidgets3/SConscript index 4385282e66..c894dcb2a0 100644 --- a/Externals/wxWidgets3/SConscript +++ b/Externals/wxWidgets3/SConscript @@ -13,7 +13,7 @@ wxenv = env.Clone() wxenv['CCFLAGS'] += ['-Wno-deprecated-declarations', '-Wno-shadow'] wxenv['CPPDEFINES'] += ['WXBUILDING'] -# gtk, msw, osx and shared files as of r67291 +# gtk, msw, osx and shared files as of r70933 aui = [ 'src/aui/auibar.cpp', @@ -27,6 +27,7 @@ aui = [ common = [ 'src/common/accelcmn.cpp', #'src/common/accesscmn.cpp', + 'src/common/affinematrix2d.cpp', 'src/common/anidecod.cpp', 'src/common/animatecmn.cpp', 'src/common/any.cpp', @@ -231,6 +232,7 @@ common = [ 'src/common/textcmn.cpp', 'src/common/textentrycmn.cpp', 'src/common/textfile.cpp', + 'src/common/time.cpp', 'src/common/timercmn.cpp', 'src/common/timerimpl.cpp', 'src/common/tokenzr.cpp', @@ -249,6 +251,7 @@ common = [ 'src/common/valnum.cpp', 'src/common/valtext.cpp', 'src/common/variant.cpp', + #'src/common/webview.cpp', 'src/common/wfstream.cpp', 'src/common/wincmn.cpp', 'src/common/windowid.cpp', @@ -264,25 +267,9 @@ common = [ 'src/common/zstream.cpp', ] -expat = [ - #'src/expat/lib/xmlparse.c', - #'src/expat/lib/xmlrole.c', - #'src/expat/lib/xmltok.c', - #'src/expat/lib/xmltok_impl.c', - #'src/expat/lib/xmltok_ns.c', - #'src/expat/xmlwf/codepage.c', - #'src/expat/xmlwf/ct.c', - #'src/expat/xmlwf/readfilemap.c', - #'src/expat/xmlwf/unixfilemap.c', - #'src/expat/xmlwf/win32filemap.c', - #'src/expat/xmlwf/xmlfile.c', - #'src/expat/xmlwf/xmlmime.c', - #'src/expat/xmlwf/xmlwf.c', - #'src/expat/xmlwf/xmlwin32url.cxx', - ] - generic = [ 'src/generic/aboutdlgg.cpp', + 'src/generic/bannerwindow.cpp', 'src/generic/bmpcboxg.cpp', 'src/generic/busyinfo.cpp', 'src/generic/buttonbar.cpp', @@ -327,7 +314,6 @@ generic = [ 'src/generic/notifmsgg.cpp', 'src/generic/numdlgg.cpp', 'src/generic/odcombo.cpp', - 'src/generic/panelg.cpp', 'src/generic/printps.cpp', 'src/generic/prntdlgg.cpp', 'src/generic/progdlgg.cpp', @@ -348,12 +334,14 @@ generic = [ 'src/generic/statusbr.cpp', 'src/generic/tabg.cpp', 'src/generic/textdlgg.cpp', + 'src/generic/timectrlg.cpp', #'src/generic/timer.cpp', 'src/generic/tipdlg.cpp', 'src/generic/tipwin.cpp', 'src/generic/toolbkg.cpp', 'src/generic/treebkg.cpp', 'src/generic/treectlg.cpp', + 'src/generic/treelist.cpp', 'src/generic/vlbox.cpp', 'src/generic/vscroll.cpp', 'src/generic/wizard.cpp', @@ -379,9 +367,10 @@ genericosx = [ gtk = [ 'src/gtk/aboutdlg.cpp', 'src/gtk/animate.cpp', + 'src/gtk/anybutton.cpp', 'src/gtk/app.cpp', 'src/gtk/artgtk.cpp', - 'src/gtk/assertdlg_gtk.c', + 'src/gtk/assertdlg_gtk.cpp', 'src/gtk/bitmap.cpp', 'src/gtk/bmpbuttn.cpp', 'src/gtk/bmpcbox.cpp', @@ -432,6 +421,7 @@ gtk = [ 'src/gtk/mnemonics.cpp', 'src/gtk/msgdlg.cpp', 'src/gtk/nativewin.cpp', + 'src/gtk/nonownedwnd.cpp', 'src/gtk/notebook.cpp', 'src/gtk/pen.cpp', 'src/gtk/popupwin.cpp', @@ -462,93 +452,15 @@ gtk = [ 'src/gtk/toplevel.cpp', 'src/gtk/treeentry_gtk.c', 'src/gtk/utilsgtk.cpp', + #'src/gtk/webview_webkit.cpp', 'src/gtk/win_gtk.cpp', 'src/gtk/window.cpp', ] -html = [ - 'src/html/chm.cpp', - 'src/html/helpctrl.cpp', - 'src/html/helpdata.cpp', - 'src/html/helpdlg.cpp', - 'src/html/helpfrm.cpp', - 'src/html/helpwnd.cpp', - 'src/html/htmlcell.cpp', - #'src/html/htmlctrl/webkit/webkit.mm', - 'src/html/htmlfilt.cpp', - 'src/html/htmlpars.cpp', - 'src/html/htmltag.cpp', - 'src/html/htmlwin.cpp', - 'src/html/htmprint.cpp', - 'src/html/m_dflist.cpp', - 'src/html/m_fonts.cpp', - 'src/html/m_hline.cpp', - 'src/html/m_image.cpp', - 'src/html/m_layout.cpp', - 'src/html/m_links.cpp', - 'src/html/m_list.cpp', - 'src/html/m_pre.cpp', - 'src/html/m_span.cpp', - 'src/html/m_style.cpp', - 'src/html/m_tables.cpp', - 'src/html/styleparams.cpp', - 'src/html/winpars.cpp', - ] - -jpeg = [ - 'src/jpeg/jcapimin.c', - 'src/jpeg/jcapistd.c', - 'src/jpeg/jccoefct.c', - 'src/jpeg/jccolor.c', - 'src/jpeg/jcdctmgr.c', - 'src/jpeg/jchuff.c', - 'src/jpeg/jcinit.c', - 'src/jpeg/jcmainct.c', - 'src/jpeg/jcmarker.c', - 'src/jpeg/jcmaster.c', - 'src/jpeg/jcomapi.c', - 'src/jpeg/jcparam.c', - 'src/jpeg/jcphuff.c', - 'src/jpeg/jcprepct.c', - 'src/jpeg/jcsample.c', - 'src/jpeg/jctrans.c', - 'src/jpeg/jdapimin.c', - 'src/jpeg/jdapistd.c', - 'src/jpeg/jdatadst.c', - 'src/jpeg/jdatasrc.c', - 'src/jpeg/jdcoefct.c', - 'src/jpeg/jdcolor.c', - 'src/jpeg/jddctmgr.c', - 'src/jpeg/jdhuff.c', - 'src/jpeg/jdinput.c', - 'src/jpeg/jdmainct.c', - 'src/jpeg/jdmarker.c', - 'src/jpeg/jdmaster.c', - 'src/jpeg/jdmerge.c', - 'src/jpeg/jdphuff.c', - 'src/jpeg/jdpostct.c', - 'src/jpeg/jdsample.c', - 'src/jpeg/jdtrans.c', - 'src/jpeg/jerror.c', - 'src/jpeg/jfdctflt.c', - 'src/jpeg/jfdctfst.c', - 'src/jpeg/jfdctint.c', - 'src/jpeg/jidctflt.c', - 'src/jpeg/jidctfst.c', - 'src/jpeg/jidctint.c', - 'src/jpeg/jidctred.c', - 'src/jpeg/jmemansi.c', - 'src/jpeg/jmemmgr.c', - 'src/jpeg/jmemname.c', - 'src/jpeg/jmemnobs.c', - 'src/jpeg/jquant1.c', - 'src/jpeg/jquant2.c', - 'src/jpeg/jutils.c', - ] - msw = [ 'src/msw/aboutdlg.cpp', 'src/msw/accel.cpp', + 'src/msw/anybutton.cpp', 'src/msw/app.cpp', 'src/msw/artmsw.cpp', 'src/msw/basemsw.cpp', @@ -574,6 +486,7 @@ msw = [ 'src/msw/data.cpp', 'src/msw/datecontrols.cpp', 'src/msw/datectrl.cpp', + 'src/msw/datetimectrl.cpp', 'src/msw/dc.cpp', 'src/msw/dcclient.cpp', 'src/msw/dcmemory.cpp', @@ -631,6 +544,7 @@ msw = [ 'src/msw/mslu.cpp', 'src/msw/nativdlg.cpp', 'src/msw/nativewin.cpp', + 'src/msw/nonownedwnd.cpp', 'src/msw/notebook.cpp', 'src/msw/notifmsg.cpp', 'src/msw/ole/access.cpp', @@ -678,6 +592,7 @@ msw = [ 'src/msw/textentry.cpp', 'src/msw/tglbtn.cpp', 'src/msw/thread.cpp', + 'src/msw/timectrl.cpp', 'src/msw/timer.cpp', 'src/msw/toolbar.cpp', 'src/msw/tooltip.cpp', @@ -691,6 +606,7 @@ msw = [ 'src/msw/uxtheme.cpp', 'src/msw/version.rc', 'src/msw/volume.cpp', + #'src/msw/webview_ie.cpp', 'src/msw/wince/checklst.cpp', 'src/msw/wince/choicece.cpp', 'src/msw/wince/crt.cpp', @@ -708,6 +624,7 @@ msw = [ osx = [ 'src/osx/accel.cpp', + 'src/osx/anybutton_osx.cpp', 'src/osx/artmac.cpp', 'src/osx/bmpbuttn_osx.cpp', 'src/osx/brush.cpp', @@ -717,6 +634,8 @@ osx = [ 'src/osx/choice_osx.cpp', 'src/osx/combobox_osx.cpp', 'src/osx/dataview_osx.cpp', + 'src/osx/datectrl_osx.cpp', + 'src/osx/datetimectrl_osx.cpp', 'src/osx/dialog_osx.cpp', 'src/osx/dnd_osx.cpp', 'src/osx/fontutil.cpp', @@ -746,12 +665,15 @@ osx = [ 'src/osx/textctrl_osx.cpp', 'src/osx/textentry_osx.cpp', 'src/osx/tglbtn_osx.cpp', + 'src/osx/timectrl_osx.cpp', 'src/osx/toolbar_osx.cpp', 'src/osx/toplevel_osx.cpp', 'src/osx/uiaction_osx.cpp', 'src/osx/utils_osx.cpp', + #'src/osx/webview_webkit.mm', 'src/osx/window_osx.cpp', #'src/osx/carbon/aboutdlg.cpp', + 'src/osx/carbon/anybutton.cpp', 'src/osx/carbon/app.cpp', #'src/osx/carbon/bmpbuttn.cpp', #'src/osx/carbon/button.cpp', @@ -829,12 +751,14 @@ osx = [ 'src/osx/carbon/utilscocoa.mm', #'src/osx/carbon/window.cpp', 'src/osx/cocoa/aboutdlg.mm', + 'src/osx/cocoa/anybutton.mm', 'src/osx/cocoa/button.mm', 'src/osx/cocoa/checkbox.mm', 'src/osx/cocoa/choice.mm', 'src/osx/cocoa/colour.mm', 'src/osx/cocoa/combobox.mm', 'src/osx/cocoa/dataview.mm', + 'src/osx/cocoa/datetimectrl.mm', 'src/osx/cocoa/dialog.mm', 'src/osx/cocoa/dirdlg.mm', 'src/osx/cocoa/dnd.mm', @@ -902,228 +826,6 @@ osx = [ #'src/osx/iphone/window.mm', ] -png = [ - 'src/png/png.c', - 'src/png/pngerror.c', - 'src/png/pngget.c', - 'src/png/pngmem.c', - 'src/png/pngpread.c', - 'src/png/pngread.c', - 'src/png/pngrio.c', - 'src/png/pngrtran.c', - 'src/png/pngrutil.c', - 'src/png/pngset.c', - 'src/png/pngtrans.c', - 'src/png/pngwio.c', - 'src/png/pngwrite.c', - 'src/png/pngwtran.c', - 'src/png/pngwutil.c', - ] - -propgrid = [ - 'src/propgrid/advprops.cpp', - 'src/propgrid/editors.cpp', - 'src/propgrid/manager.cpp', - 'src/propgrid/property.cpp', - 'src/propgrid/propgrid.cpp', - 'src/propgrid/propgridiface.cpp', - 'src/propgrid/propgridpagestate.cpp', - 'src/propgrid/props.cpp', - ] - -regex = [ - 'src/regex/regcomp.c', - 'src/regex/regerror.c', - 'src/regex/regexec.c', - 'src/regex/regfree.c', - ] - -ribbon = [ - 'src/ribbon/art_aui.cpp', - 'src/ribbon/art_internal.cpp', - 'src/ribbon/art_msw.cpp', - 'src/ribbon/bar.cpp', - 'src/ribbon/buttonbar.cpp', - 'src/ribbon/control.cpp', - 'src/ribbon/gallery.cpp', - 'src/ribbon/page.cpp', - 'src/ribbon/panel.cpp', - 'src/ribbon/toolbar.cpp', - ] - -richtext = [ - #'src/richtext/richtextbackgroundpage.cpp', - #'src/richtext/richtextborderspage.cpp', - 'src/richtext/richtextbuffer.cpp', - #'src/richtext/richtextbulletspage.cpp', - 'src/richtext/richtextctrl.cpp', - #'src/richtext/richtextfontpage.cpp', - 'src/richtext/richtextformatdlg.cpp', - 'src/richtext/richtexthtml.cpp', - 'src/richtext/richtextimagedlg.cpp', - #'src/richtext/richtextindentspage.cpp', - #'src/richtext/richtextliststylepage.cpp', - #'src/richtext/richtextmarginspage.cpp', - 'src/richtext/richtextprint.cpp', - #'src/richtext/richtextsizepage.cpp', - 'src/richtext/richtextstyledlg.cpp', - #'src/richtext/richtextstylepage.cpp', - 'src/richtext/richtextstyles.cpp', - 'src/richtext/richtextsymboldlg.cpp', - #'src/richtext/richtexttabspage.cpp', - 'src/richtext/richtextxml.cpp', - ] - -stc = [ - 'src/stc/PlatWX.cpp', - 'src/stc/ScintillaWX.cpp', - 'src/stc/scintilla/src/AutoComplete.cxx', - 'src/stc/scintilla/src/CallTip.cxx', - 'src/stc/scintilla/src/CellBuffer.cxx', - 'src/stc/scintilla/src/CharClassify.cxx', - 'src/stc/scintilla/src/ContractionState.cxx', - 'src/stc/scintilla/src/Decoration.cxx', - 'src/stc/scintilla/src/Document.cxx', - 'src/stc/scintilla/src/DocumentAccessor.cxx', - 'src/stc/scintilla/src/Editor.cxx', - 'src/stc/scintilla/src/ExternalLexer.cxx', - 'src/stc/scintilla/src/Indicator.cxx', - 'src/stc/scintilla/src/KeyMap.cxx', - 'src/stc/scintilla/src/KeyWords.cxx', - 'src/stc/scintilla/src/LexAPDL.cxx', - 'src/stc/scintilla/src/LexASY.cxx', - 'src/stc/scintilla/src/LexAU3.cxx', - 'src/stc/scintilla/src/LexAVE.cxx', - 'src/stc/scintilla/src/LexAbaqus.cxx', - 'src/stc/scintilla/src/LexAda.cxx', - 'src/stc/scintilla/src/LexAsm.cxx', - 'src/stc/scintilla/src/LexAsn1.cxx', - 'src/stc/scintilla/src/LexBaan.cxx', - 'src/stc/scintilla/src/LexBash.cxx', - 'src/stc/scintilla/src/LexBasic.cxx', - 'src/stc/scintilla/src/LexBullant.cxx', - 'src/stc/scintilla/src/LexCLW.cxx', - 'src/stc/scintilla/src/LexCOBOL.cxx', - 'src/stc/scintilla/src/LexCPP.cxx', - 'src/stc/scintilla/src/LexCSS.cxx', - 'src/stc/scintilla/src/LexCaml.cxx', - 'src/stc/scintilla/src/LexCmake.cxx', - 'src/stc/scintilla/src/LexConf.cxx', - 'src/stc/scintilla/src/LexCrontab.cxx', - 'src/stc/scintilla/src/LexCsound.cxx', - 'src/stc/scintilla/src/LexD.cxx', - 'src/stc/scintilla/src/LexEScript.cxx', - 'src/stc/scintilla/src/LexEiffel.cxx', - 'src/stc/scintilla/src/LexErlang.cxx', - 'src/stc/scintilla/src/LexFlagship.cxx', - 'src/stc/scintilla/src/LexForth.cxx', - 'src/stc/scintilla/src/LexFortran.cxx', - 'src/stc/scintilla/src/LexGAP.cxx', - 'src/stc/scintilla/src/LexGui4Cli.cxx', - 'src/stc/scintilla/src/LexHTML.cxx', - 'src/stc/scintilla/src/LexHaskell.cxx', - 'src/stc/scintilla/src/LexInno.cxx', - 'src/stc/scintilla/src/LexKix.cxx', - 'src/stc/scintilla/src/LexLisp.cxx', - 'src/stc/scintilla/src/LexLout.cxx', - 'src/stc/scintilla/src/LexLua.cxx', - 'src/stc/scintilla/src/LexMMIXAL.cxx', - 'src/stc/scintilla/src/LexMPT.cxx', - 'src/stc/scintilla/src/LexMSSQL.cxx', - 'src/stc/scintilla/src/LexMagik.cxx', - 'src/stc/scintilla/src/LexMarkdown.cxx', - 'src/stc/scintilla/src/LexMatlab.cxx', - 'src/stc/scintilla/src/LexMetapost.cxx', - 'src/stc/scintilla/src/LexMySQL.cxx', - 'src/stc/scintilla/src/LexNimrod.cxx', - 'src/stc/scintilla/src/LexNsis.cxx', - 'src/stc/scintilla/src/LexOpal.cxx', - 'src/stc/scintilla/src/LexOthers.cxx', - 'src/stc/scintilla/src/LexPB.cxx', - 'src/stc/scintilla/src/LexPLM.cxx', - 'src/stc/scintilla/src/LexPOV.cxx', - 'src/stc/scintilla/src/LexPS.cxx', - 'src/stc/scintilla/src/LexPascal.cxx', - 'src/stc/scintilla/src/LexPerl.cxx', - 'src/stc/scintilla/src/LexPowerPro.cxx', - 'src/stc/scintilla/src/LexPowerShell.cxx', - 'src/stc/scintilla/src/LexProgress.cxx', - 'src/stc/scintilla/src/LexPython.cxx', - 'src/stc/scintilla/src/LexR.cxx', - 'src/stc/scintilla/src/LexRebol.cxx', - 'src/stc/scintilla/src/LexRuby.cxx', - 'src/stc/scintilla/src/LexSML.cxx', - 'src/stc/scintilla/src/LexSQL.cxx', - 'src/stc/scintilla/src/LexScriptol.cxx', - 'src/stc/scintilla/src/LexSmalltalk.cxx', - 'src/stc/scintilla/src/LexSorcus.cxx', - 'src/stc/scintilla/src/LexSpecman.cxx', - 'src/stc/scintilla/src/LexSpice.cxx', - 'src/stc/scintilla/src/LexTACL.cxx', - 'src/stc/scintilla/src/LexTADS3.cxx', - 'src/stc/scintilla/src/LexTAL.cxx', - 'src/stc/scintilla/src/LexTCL.cxx', - 'src/stc/scintilla/src/LexTeX.cxx', - 'src/stc/scintilla/src/LexVB.cxx', - 'src/stc/scintilla/src/LexVHDL.cxx', - 'src/stc/scintilla/src/LexVerilog.cxx', - 'src/stc/scintilla/src/LexYAML.cxx', - 'src/stc/scintilla/src/LineMarker.cxx', - 'src/stc/scintilla/src/PerLine.cxx', - 'src/stc/scintilla/src/PositionCache.cxx', - 'src/stc/scintilla/src/PropSet.cxx', - 'src/stc/scintilla/src/RESearch.cxx', - 'src/stc/scintilla/src/RunStyles.cxx', - 'src/stc/scintilla/src/ScintillaBase.cxx', - 'src/stc/scintilla/src/Selection.cxx', - 'src/stc/scintilla/src/Style.cxx', - 'src/stc/scintilla/src/StyleContext.cxx', - 'src/stc/scintilla/src/UniConversion.cxx', - 'src/stc/scintilla/src/ViewStyle.cxx', - 'src/stc/scintilla/src/WindowAccessor.cxx', - 'src/stc/scintilla/src/XPM.cxx', - 'src/stc/stc.cpp', - ] - -tiff = [ - 'src/tiff/libtiff/tif_aux.c', - 'src/tiff/libtiff/tif_close.c', - 'src/tiff/libtiff/tif_codec.c', - 'src/tiff/libtiff/tif_color.c', - 'src/tiff/libtiff/tif_compress.c', - 'src/tiff/libtiff/tif_dir.c', - 'src/tiff/libtiff/tif_dirinfo.c', - 'src/tiff/libtiff/tif_dirread.c', - 'src/tiff/libtiff/tif_dirwrite.c', - 'src/tiff/libtiff/tif_dumpmode.c', - 'src/tiff/libtiff/tif_error.c', - 'src/tiff/libtiff/tif_extension.c', - 'src/tiff/libtiff/tif_fax3.c', - 'src/tiff/libtiff/tif_fax3sm.c', - 'src/tiff/libtiff/tif_flush.c', - 'src/tiff/libtiff/tif_getimage.c', - 'src/tiff/libtiff/tif_jpeg.c', - 'src/tiff/libtiff/tif_luv.c', - 'src/tiff/libtiff/tif_lzw.c', - 'src/tiff/libtiff/tif_next.c', - 'src/tiff/libtiff/tif_ojpeg.c', - 'src/tiff/libtiff/tif_open.c', - 'src/tiff/libtiff/tif_packbits.c', - 'src/tiff/libtiff/tif_pixarlog.c', - 'src/tiff/libtiff/tif_predict.c', - 'src/tiff/libtiff/tif_print.c', - 'src/tiff/libtiff/tif_read.c', - 'src/tiff/libtiff/tif_strip.c', - 'src/tiff/libtiff/tif_swab.c', - 'src/tiff/libtiff/tif_thunder.c', - 'src/tiff/libtiff/tif_tile.c', - 'src/tiff/libtiff/tif_unix.c', - 'src/tiff/libtiff/tif_version.c', - 'src/tiff/libtiff/tif_warning.c', - 'src/tiff/libtiff/tif_write.c', - 'src/tiff/libtiff/tif_zip.c', - ] - unix = [ 'src/unix/apptraits.cpp', 'src/unix/appunix.cpp', @@ -1160,89 +862,6 @@ unixgtk = [ 'src/unix/utilsx11.cpp', ] -xrc = [ - 'src/xml/xml.cpp', - 'src/xrc/xh_animatctrl.cpp', - 'src/xrc/xh_bmp.cpp', - 'src/xrc/xh_bmpbt.cpp', - 'src/xrc/xh_bmpcbox.cpp', - 'src/xrc/xh_bttn.cpp', - 'src/xrc/xh_cald.cpp', - 'src/xrc/xh_chckb.cpp', - 'src/xrc/xh_chckl.cpp', - 'src/xrc/xh_choic.cpp', - 'src/xrc/xh_choicbk.cpp', - 'src/xrc/xh_clrpicker.cpp', - 'src/xrc/xh_cmdlinkbn.cpp', - 'src/xrc/xh_collpane.cpp', - 'src/xrc/xh_combo.cpp', - 'src/xrc/xh_comboctrl.cpp', - 'src/xrc/xh_datectrl.cpp', - 'src/xrc/xh_dirpicker.cpp', - 'src/xrc/xh_dlg.cpp', - 'src/xrc/xh_editlbox.cpp', - 'src/xrc/xh_filectrl.cpp', - 'src/xrc/xh_filepicker.cpp', - 'src/xrc/xh_fontpicker.cpp', - 'src/xrc/xh_frame.cpp', - 'src/xrc/xh_gauge.cpp', - 'src/xrc/xh_gdctl.cpp', - 'src/xrc/xh_grid.cpp', - 'src/xrc/xh_html.cpp', - 'src/xrc/xh_htmllbox.cpp', - 'src/xrc/xh_hyperlink.cpp', - 'src/xrc/xh_listb.cpp', - 'src/xrc/xh_listbk.cpp', - 'src/xrc/xh_listc.cpp', - 'src/xrc/xh_mdi.cpp', - 'src/xrc/xh_menu.cpp', - 'src/xrc/xh_notbk.cpp', - 'src/xrc/xh_odcombo.cpp', - 'src/xrc/xh_panel.cpp', - 'src/xrc/xh_propdlg.cpp', - 'src/xrc/xh_radbt.cpp', - 'src/xrc/xh_radbx.cpp', - 'src/xrc/xh_richtext.cpp', - 'src/xrc/xh_scrol.cpp', - 'src/xrc/xh_scwin.cpp', - 'src/xrc/xh_sizer.cpp', - 'src/xrc/xh_slidr.cpp', - 'src/xrc/xh_spin.cpp', - 'src/xrc/xh_split.cpp', - 'src/xrc/xh_srchctrl.cpp', - 'src/xrc/xh_statbar.cpp', - 'src/xrc/xh_stbmp.cpp', - 'src/xrc/xh_stbox.cpp', - 'src/xrc/xh_stlin.cpp', - 'src/xrc/xh_sttxt.cpp', - 'src/xrc/xh_text.cpp', - 'src/xrc/xh_tglbtn.cpp', - 'src/xrc/xh_toolb.cpp', - 'src/xrc/xh_toolbk.cpp', - 'src/xrc/xh_tree.cpp', - 'src/xrc/xh_treebk.cpp', - 'src/xrc/xh_unkwn.cpp', - 'src/xrc/xh_wizrd.cpp', - 'src/xrc/xmladv.cpp', - 'src/xrc/xmlres.cpp', - 'src/xrc/xmlrsall.cpp', - ] - -zlib = [ - 'src/zlib/adler32.c', - 'src/zlib/compress.c', - 'src/zlib/crc32.c', - 'src/zlib/deflate.c', - 'src/zlib/gzio.c', - 'src/zlib/infback.c', - 'src/zlib/inffast.c', - 'src/zlib/inflate.c', - 'src/zlib/inftrees.c', - 'src/zlib/trees.c', - 'src/zlib/uncompr.c', - 'src/zlib/zutil.c', - ] - files = aui + common + generic if sys.platform == 'win32': diff --git a/Externals/wxWidgets3/build_wx.sh b/Externals/wxWidgets3/build_wx.sh new file mode 100755 index 0000000000..2173572bfa --- /dev/null +++ b/Externals/wxWidgets3/build_wx.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +svn co -r 70933 http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk wxWidgets +cd wxWidgets + +case $OSTYPE in +darwin*) +BACKEND="osx_cocoa" +;; +linux*) +BACKEND="gtk" +;; +esac + +mkdir build-local +cd build-local + +../configure --with-$BACKEND --disable-shared --enable-unicode --disable-compat28 --disable-exceptions --disable-fswatcher --without-regex --without-expat --disable-xml --disable-ribbon --disable-propgrid --disable-stc --disable-html --disable-richtext --without-libjpeg --without-libtiff --disable-webview --disable-markup +make diff --git a/Externals/wxWidgets3/include/wx/aboutdlg.h b/Externals/wxWidgets3/include/wx/aboutdlg.h index 0becacd2a0..0552f91fd1 100644 --- a/Externals/wxWidgets3/include/wx/aboutdlg.h +++ b/Externals/wxWidgets3/include/wx/aboutdlg.h @@ -3,7 +3,7 @@ // Purpose: declaration of wxAboutDialog class // Author: Vadim Zeitlin // Created: 2006-10-07 -// RCS-ID: $Id: aboutdlg.h 61534 2009-07-25 22:53:23Z VZ $ +// RCS-ID: $Id: aboutdlg.h 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 2006 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -69,7 +69,7 @@ public: // icon to be shown in the dialog, defaults to the main frame icon void SetIcon(const wxIcon& icon) { m_icon = icon; } - bool HasIcon() const { return m_icon.Ok(); } + bool HasIcon() const { return m_icon.IsOk(); } wxIcon GetIcon() const; // web site for the program and its description (defaults to URL itself if diff --git a/Externals/wxWidgets3/include/wx/accel.h b/Externals/wxWidgets3/include/wx/accel.h index f4edd93047..200feffe4d 100644 --- a/Externals/wxWidgets3/include/wx/accel.h +++ b/Externals/wxWidgets3/include/wx/accel.h @@ -4,7 +4,7 @@ // Author: Julian Smart, Robert Roebling, Vadim Zeitlin // Modified by: // Created: 31.05.01 (extracted from other files) -// RCS-ID: $Id: accel.h 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: accel.h 68718 2011-08-16 11:55:39Z SC $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -34,10 +34,11 @@ enum wxAcceleratorEntryFlags wxACCEL_CTRL = 0x0002, // hold Ctrl key down wxACCEL_SHIFT = 0x0004, // hold Shift key down #if defined(__WXMAC__) || defined(__WXCOCOA__) - wxACCEL_CMD = 0x0008 // Command key on OS X + wxACCEL_RAW_CTRL= 0x0008, // #else - wxACCEL_CMD = wxACCEL_CTRL + wxACCEL_RAW_CTRL= wxACCEL_CTRL, #endif + wxACCEL_CMD = wxACCEL_CTRL }; // ---------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/include/wx/affinematrix2d.h b/Externals/wxWidgets3/include/wx/affinematrix2d.h new file mode 100644 index 0000000000..6516cd46f5 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/affinematrix2d.h @@ -0,0 +1,51 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/affinematrix2d.h +// Purpose: wxAffineMatrix2D class. +// Author: Based on wxTransformMatrix by Chris Breeze, Julian Smart +// Created: 2011-04-05 +// Copyright: (c) wxWidgets team +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_AFFINEMATRIX2D_H_ +#define _WX_AFFINEMATRIX2D_H_ + +#include "wx/defs.h" + +#if wxUSE_GEOMETRY + +#include "wx/affinematrix2dbase.h" + +// A simple implementation of wxAffineMatrix2DBase interface done entirely in +// wxWidgets. +class WXDLLIMPEXP_CORE wxAffineMatrix2D : public wxAffineMatrix2DBase +{ +public: + wxAffineMatrix2D() : m_11(1), m_12(0), + m_21(0), m_22(1), + m_tx(0), m_ty(0) + { + } + + // Implement base class pure virtual methods. + virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr); + virtual void Get(wxMatrix2D* mat2D, wxPoint2DDouble* tr) const; + virtual void Concat(const wxAffineMatrix2DBase& t); + virtual bool Invert(); + virtual bool IsIdentity() const; + virtual bool IsEqual(const wxAffineMatrix2DBase& t) const; + virtual void Translate(wxDouble dx, wxDouble dy); + virtual void Scale(wxDouble xScale, wxDouble yScale); + virtual void Rotate(wxDouble ccRadians); + +protected: + virtual wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const; + virtual wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const; + +private: + wxDouble m_11, m_12, m_21, m_22, m_tx, m_ty; +}; + +#endif // wxUSE_GEOMETRY + +#endif // _WX_AFFINEMATRIX2D_H_ diff --git a/Externals/wxWidgets3/include/wx/affinematrix2dbase.h b/Externals/wxWidgets3/include/wx/affinematrix2dbase.h new file mode 100644 index 0000000000..94b1955aa3 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/affinematrix2dbase.h @@ -0,0 +1,127 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/affinematrix2dbase.h +// Purpose: Common interface for 2D transformation matrices. +// Author: Catalin Raceanu +// Created: 2011-04-06 +// Copyright: (c) wxWidgets team +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_AFFINEMATRIX2DBASE_H_ +#define _WX_AFFINEMATRIX2DBASE_H_ + +#include "wx/defs.h" + +#if wxUSE_GEOMETRY + +#include "wx/geometry.h" + +struct wxMatrix2D +{ + wxMatrix2D(wxDouble v11 = 1, + wxDouble v12 = 0, + wxDouble v21 = 0, + wxDouble v22 = 1) + { + m_11 = v11; m_12 = v12; + m_21 = v21; m_22 = v22; + } + + wxDouble m_11, m_12, m_21, m_22; +}; + +// A 2x3 matrix representing an affine 2D transformation. +// +// This is an abstract base class implemented by wxAffineMatrix2D only so far, +// but in the future we also plan to derive wxGraphicsMatrix from it (it should +// also be documented then as currently only wxAffineMatrix2D itself is). +class WXDLLIMPEXP_CORE wxAffineMatrix2DBase +{ +public: + wxAffineMatrix2DBase() {} + virtual ~wxAffineMatrix2DBase() {} + + // sets the matrix to the respective values + virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr) = 0; + + // gets the component valuess of the matrix + virtual void Get(wxMatrix2D* mat2D, wxPoint2DDouble* tr) const = 0; + + // concatenates the matrix + virtual void Concat(const wxAffineMatrix2DBase& t) = 0; + + // makes this the inverse matrix + virtual bool Invert() = 0; + + // return true if this is the identity matrix + virtual bool IsIdentity() const = 0; + + // returns true if the elements of the transformation matrix are equal ? + virtual bool IsEqual(const wxAffineMatrix2DBase& t) const = 0; + bool operator==(const wxAffineMatrix2DBase& t) const { return IsEqual(t); } + bool operator!=(const wxAffineMatrix2DBase& t) const { return !IsEqual(t); } + + + // + // transformations + // + + // add the translation to this matrix + virtual void Translate(wxDouble dx, wxDouble dy) = 0; + + // add the scale to this matrix + virtual void Scale(wxDouble xScale, wxDouble yScale) = 0; + + // add the rotation to this matrix (counter clockwise, radians) + virtual void Rotate(wxDouble ccRadians) = 0; + + // add mirroring to this matrix + void Mirror(int direction = wxHORIZONTAL) + { + wxDouble x = (direction & wxHORIZONTAL) ? -1 : 1; + wxDouble y = (direction & wxVERTICAL) ? -1 : 1; + Scale(x, y); + } + + + // applies that matrix to the point + wxPoint2DDouble TransformPoint(const wxPoint2DDouble& src) const + { + return DoTransformPoint(src); + } + + void TransformPoint(wxDouble* x, wxDouble* y) const + { + wxCHECK_RET( x && y, "Can't be NULL" ); + + const wxPoint2DDouble dst = DoTransformPoint(wxPoint2DDouble(*x, *y)); + *x = dst.m_x; + *y = dst.m_y; + } + + // applies the matrix except for translations + wxPoint2DDouble TransformDistance(const wxPoint2DDouble& src) const + { + return DoTransformDistance(src); + } + + void TransformDistance(wxDouble* dx, wxDouble* dy) const + { + wxCHECK_RET( dx && dy, "Can't be NULL" ); + + const wxPoint2DDouble + dst = DoTransformDistance(wxPoint2DDouble(*dx, *dy)); + *dx = dst.m_x; + *dy = dst.m_y; + } + +protected: + virtual + wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const = 0; + virtual + wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const = 0; +}; + +#endif // wxUSE_GEOMETRY + +#endif // _WX_AFFINEMATRIX2DBASE_H_ diff --git a/Externals/wxWidgets3/include/wx/anybutton.h b/Externals/wxWidgets3/include/wx/anybutton.h new file mode 100644 index 0000000000..4275c6bfd8 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/anybutton.h @@ -0,0 +1,200 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/anybutton.h +// Purpose: wxAnyButtonBase class +// Author: Vadim Zetlin +// Created: 2000-08-15 (extracted from button.h) +// RCS-ID: $Id: anybutton.h 70345 2012-01-15 01:05:28Z VZ $ +// Copyright: (c) Vadim Zetlin +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_ANYBUTTON_H_BASE_ +#define _WX_ANYBUTTON_H_BASE_ + +#include "wx/defs.h" + +#ifdef wxHAS_ANY_BUTTON + +// ---------------------------------------------------------------------------- +// wxAnyButton specific flags +// ---------------------------------------------------------------------------- + +// These flags affect label alignment +#define wxBU_LEFT 0x0040 +#define wxBU_TOP 0x0080 +#define wxBU_RIGHT 0x0100 +#define wxBU_BOTTOM 0x0200 +#define wxBU_ALIGN_MASK ( wxBU_LEFT | wxBU_TOP | wxBU_RIGHT | wxBU_BOTTOM ) + +// These two flags are obsolete +#define wxBU_NOAUTODRAW 0x0000 +#define wxBU_AUTODRAW 0x0004 + +// by default, the buttons will be created with some (system dependent) +// minimal size to make them look nicer, giving this style will make them as +// small as possible +#define wxBU_EXACTFIT 0x0001 + +// this flag can be used to disable using the text label in the button: it is +// mostly useful when creating buttons showing bitmap and having stock id as +// without it both the standard label corresponding to the stock id and the +// bitmap would be shown +#define wxBU_NOTEXT 0x0002 + + +#include "wx/bitmap.h" +#include "wx/control.h" + +// ---------------------------------------------------------------------------- +// wxAnyButton: common button functionality +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxAnyButtonBase : public wxControl +{ +public: + wxAnyButtonBase() { } + + // show the image in the button in addition to the label: this method is + // supported on all (major) platforms + void SetBitmap(const wxBitmap& bitmap, wxDirection dir = wxLEFT) + { + SetBitmapLabel(bitmap); + SetBitmapPosition(dir); + } + + wxBitmap GetBitmap() const { return DoGetBitmap(State_Normal); } + + // Methods for setting individual images for different states: normal, + // selected (meaning pushed or pressed), focused (meaning normal state for + // a focused button), disabled or hover (a.k.a. hot or current). + // + // Remember that SetBitmap() itself must be called before any other + // SetBitmapXXX() methods (except for SetBitmapLabel() which is a synonym + // for it anyhow) and that all bitmaps passed to these functions should be + // of the same size. + void SetBitmapLabel(const wxBitmap& bitmap) + { DoSetBitmap(bitmap, State_Normal); } + void SetBitmapPressed(const wxBitmap& bitmap) + { DoSetBitmap(bitmap, State_Pressed); } + void SetBitmapDisabled(const wxBitmap& bitmap) + { DoSetBitmap(bitmap, State_Disabled); } + void SetBitmapCurrent(const wxBitmap& bitmap) + { DoSetBitmap(bitmap, State_Current); } + void SetBitmapFocus(const wxBitmap& bitmap) + { DoSetBitmap(bitmap, State_Focused); } + + wxBitmap GetBitmapLabel() const { return DoGetBitmap(State_Normal); } + wxBitmap GetBitmapPressed() const { return DoGetBitmap(State_Pressed); } + wxBitmap GetBitmapDisabled() const { return DoGetBitmap(State_Disabled); } + wxBitmap GetBitmapCurrent() const { return DoGetBitmap(State_Current); } + wxBitmap GetBitmapFocus() const { return DoGetBitmap(State_Focused); } + + + // set the margins around the image + void SetBitmapMargins(wxCoord x, wxCoord y) { DoSetBitmapMargins(x, y); } + void SetBitmapMargins(const wxSize& sz) { DoSetBitmapMargins(sz.x, sz.y); } + wxSize GetBitmapMargins() { return DoGetBitmapMargins(); } + + // set the image position relative to the text, i.e. wxLEFT means that the + // image is to the left of the text (this is the default) + void SetBitmapPosition(wxDirection dir); + + + // Buttons on MSW can look bad if they are not native colours, because + // then they become owner-drawn and not theme-drawn. Disable it here + // in wxAnyButtonBase to make it consistent. + virtual bool ShouldInheritColours() const { return false; } + + // wxUniv-compatible and deprecated equivalents to SetBitmapXXX() +#if WXWIN_COMPATIBILITY_2_8 + void SetImageLabel(const wxBitmap& bitmap) { SetBitmap(bitmap); } + void SetImageMargins(wxCoord x, wxCoord y) { SetBitmapMargins(x, y); } +#endif // WXWIN_COMPATIBILITY_2_8 + + // backwards compatible names for pressed/current bitmaps: they're not + // deprecated as there is nothing really wrong with using them and no real + // advantage to using the new names but the new names are still preferred + wxBitmap GetBitmapSelected() const { return GetBitmapPressed(); } + wxBitmap GetBitmapHover() const { return GetBitmapCurrent(); } + + void SetBitmapSelected(const wxBitmap& bitmap) { SetBitmapPressed(bitmap); } + void SetBitmapHover(const wxBitmap& bitmap) { SetBitmapCurrent(bitmap); } + + + // this enum is not part of wx public API, it is public because it is used + // in non wxAnyButton-derived classes internally + // + // also notice that MSW code relies on the values of the enum elements, do + // not change them without revising src/msw/button.cpp + enum State + { + State_Normal, + State_Current, // a.k.a. hot or "hovering" + State_Pressed, // a.k.a. "selected" in public API for some reason + State_Disabled, + State_Focused, + State_Max + }; + + // return true if this button shouldn't show the text label, either because + // it doesn't have it or because it was explicitly disabled with wxBU_NOTEXT + bool DontShowLabel() const + { + return HasFlag(wxBU_NOTEXT) || GetLabel().empty(); + } + + // return true if we do show the label + bool ShowsLabel() const + { + return !DontShowLabel(); + } + +protected: + // choose the default border for this window + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + + virtual wxBitmap DoGetBitmap(State WXUNUSED(which)) const + { return wxBitmap(); } + virtual void DoSetBitmap(const wxBitmap& WXUNUSED(bitmap), + State WXUNUSED(which)) + { } + + virtual wxSize DoGetBitmapMargins() const + { return wxSize(0, 0); } + + virtual void DoSetBitmapMargins(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) + { } + + virtual void DoSetBitmapPosition(wxDirection WXUNUSED(dir)) + { } + + virtual bool DoGetAuthNeeded() const { return false; } + virtual void DoSetAuthNeeded(bool WXUNUSED(show)) { } + + + wxDECLARE_NO_COPY_CLASS(wxAnyButtonBase); +}; + +#if defined(__WXUNIVERSAL__) + #include "wx/univ/anybutton.h" +#elif defined(__WXMSW__) + #include "wx/msw/anybutton.h" +//#elif defined(__WXMOTIF__) +// #include "wx/motif/anybutton.h" +#elif defined(__WXGTK20__) + #include "wx/gtk/anybutton.h" +//#elif defined(__WXGTK__) +// #include "wx/gtk1/anybutton.h" +#elif defined(__WXMAC__) + #include "wx/osx/anybutton.h" +//#elif defined(__WXCOCOA__) +// #include "wx/cocoa/anybutton.h" +//#elif defined(__WXPM__) +// #include "wx/os2/anybutton.h" +#else + typedef wxAnyButtonBase wxAnyButton; +#endif + +#endif // wxHAS_ANY_BUTTON + +#endif // _WX_ANYBUTTON_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/app.h b/Externals/wxWidgets3/include/wx/app.h index d4b1fae4f1..64f1220629 100644 --- a/Externals/wxWidgets3/include/wx/app.h +++ b/Externals/wxWidgets3/include/wx/app.h @@ -5,7 +5,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: app.h 66648 2011-01-08 06:42:41Z PC $ +// RCS-ID: $Id: app.h 70353 2012-01-15 14:46:41Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -18,6 +18,7 @@ // ---------------------------------------------------------------------------- #include "wx/event.h" // for the base class +#include "wx/eventfilter.h" // (and another one) #include "wx/build.h" #include "wx/cmdargs.h" // for wxCmdLineArgsArray used by wxApp::argv #include "wx/init.h" // we must declare wxEntry() @@ -70,7 +71,8 @@ extern WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete; // wxAppConsoleBase: wxApp for non-GUI applications // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_BASE wxAppConsoleBase : public wxEvtHandler +class WXDLLIMPEXP_BASE wxAppConsoleBase : public wxEvtHandler, + public wxEventFilter { public: // ctor and dtor @@ -238,13 +240,8 @@ public: // event processing functions // -------------------------- - // this method allows to filter all the events processed by the program, so - // you should try to return quickly from it to avoid slowing down the - // program to the crawl - // - // return value should be -1 to continue with the normal event processing, - // or TRUE or FALSE to stop further processing and pretend that the event - // had been already processed or won't be processed at all, respectively + // Implement the inherited wxEventFilter method but just return -1 from it + // to indicate that default processing should take place. virtual int FilterEvent(wxEvent& event); // return true if we're running event loop, i.e. if the events can @@ -595,10 +592,10 @@ public: // ------------------------------------------------------------------------ // Get display mode that is used use. This is only used in framebuffer - // wxWin ports (such as wxMGL or wxDFB). + // wxWin ports such as wxDFB. virtual wxVideoMode GetDisplayMode() const; // Set display mode to use. This is only used in framebuffer wxWin - // ports (such as wxMGL or wxDFB). This method should be called from + // ports such as wxDFB. This method should be called from // wxApp::OnInitGui virtual bool SetDisplayMode(const wxVideoMode& WXUNUSED(info)) { return true; } @@ -684,14 +681,10 @@ protected: // now include the declaration of the real class // ---------------------------------------------------------------------------- -#if defined(__WXPALMOS__) - #include "wx/palmos/app.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #include "wx/msw/app.h" #elif defined(__WXMOTIF__) #include "wx/motif/app.h" -#elif defined(__WXMGL__) - #include "wx/mgl/app.h" #elif defined(__WXDFB__) #include "wx/dfb/app.h" #elif defined(__WXGTK20__) diff --git a/Externals/wxWidgets3/include/wx/apptrait.h b/Externals/wxWidgets3/include/wx/apptrait.h index 2e29c20e5b..4dbf8d218c 100644 --- a/Externals/wxWidgets3/include/wx/apptrait.h +++ b/Externals/wxWidgets3/include/wx/apptrait.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 19.06.2003 -// RCS-ID: $Id: apptrait.h 61488 2009-07-21 14:16:44Z VZ $ +// RCS-ID: $Id: apptrait.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -177,9 +177,7 @@ private: // NB: test for __UNIX__ before __WXMAC__ as under Darwin we want to use the // Unix code (and otherwise __UNIX__ wouldn't be defined) // ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port -#if defined(__WXPALMOS__) - #include "wx/palmos/apptbase.h" -#elif defined(__WIN32__) +#if defined(__WIN32__) #include "wx/msw/apptbase.h" #elif defined(__UNIX__) && !defined(__EMX__) #include "wx/unix/apptbase.h" @@ -274,9 +272,7 @@ public: // ---------------------------------------------------------------------------- // ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port -#if defined(__WXPALMOS__) - #include "wx/palmos/apptrait.h" -#elif defined(__WIN32__) +#if defined(__WIN32__) #include "wx/msw/apptrait.h" #elif defined(__OS2__) #include "wx/os2/apptrait.h" diff --git a/Externals/wxWidgets3/include/wx/arrstr.h b/Externals/wxWidgets3/include/wx/arrstr.h index ad8a52e62c..76343c71e5 100644 --- a/Externals/wxWidgets3/include/wx/arrstr.h +++ b/Externals/wxWidgets3/include/wx/arrstr.h @@ -4,7 +4,7 @@ // Author: Mattia Barbon and Vadim Zeitlin // Modified by: // Created: 07/07/03 -// RCS-ID: $Id: arrstr.h 66724 2011-01-20 08:38:36Z SC $ +// RCS-ID: $Id: arrstr.h 67343 2011-03-30 14:16:04Z VZ $ // Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -28,7 +28,7 @@ inline int wxCMPFUNC_CONV wxStringSortDescending(wxString* s1, wxString* s2) return wxStringSortAscending(s2, s1); } -#if wxUSE_STL +#if wxUSE_STD_CONTAINERS #include "wx/dynarray.h" @@ -100,7 +100,7 @@ private: } }; -#else // if !wxUSE_STL +#else // if !wxUSE_STD_CONTAINERS // this shouldn't be defined for compilers not supporting template methods or // without std::distance() @@ -384,7 +384,7 @@ public: { Copy(array); } }; -#endif // !wxUSE_STL +#endif // !wxUSE_STD_CONTAINERS // this class provides a temporary wxString* from a // wxArrayString diff --git a/Externals/wxWidgets3/include/wx/atomic.h b/Externals/wxWidgets3/include/wx/atomic.h index 38b0f8171f..0c53ebef93 100644 --- a/Externals/wxWidgets3/include/wx/atomic.h +++ b/Externals/wxWidgets3/include/wx/atomic.h @@ -3,7 +3,7 @@ // Purpose: functions to manipulate atomically integers and pointers // Author: Armel Asselin // Created: 12/13/2006 -// RCS-ID: $Id: atomic.h 53954 2008-06-02 20:42:23Z VZ $ +// RCS-ID: $Id: atomic.h 70808 2012-03-04 20:31:42Z VZ $ // Copyright: (c) Armel Asselin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -43,7 +43,7 @@ inline wxUint32 wxAtomicDec (wxUint32 &value) } -#elif defined(__WXMSW__) +#elif defined(__WINDOWS__) // include standard Windows headers #include "wx/msw/wrapwin.h" diff --git a/Externals/wxWidgets3/include/wx/aui/auibar.h b/Externals/wxWidgets3/include/wx/aui/auibar.h index d73b8caed1..3440840a3b 100644 --- a/Externals/wxWidgets3/include/wx/aui/auibar.h +++ b/Externals/wxWidgets3/include/wx/aui/auibar.h @@ -4,7 +4,7 @@ // Author: Benjamin I. Williams // Modified by: // Created: 2008-08-04 -// RCS-ID: $Id: auibar.h 66546 2011-01-03 18:43:30Z VZ $ +// RCS-ID: $Id: auibar.h 69594 2011-10-30 16:51:10Z VZ $ // Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved. // Licence: wxWindows Library Licence, Version 3.1 /////////////////////////////////////////////////////////////////////////////// @@ -65,44 +65,44 @@ enum wxAuiToolBarToolTextOrientation class WXDLLIMPEXP_AUI wxAuiToolBarEvent : public wxNotifyEvent { public: - wxAuiToolBarEvent(wxEventType command_type = wxEVT_NULL, - int win_id = 0) - : wxNotifyEvent(command_type, win_id) + wxAuiToolBarEvent(wxEventType commandType = wxEVT_NULL, + int winId = 0) + : wxNotifyEvent(commandType, winId) { - is_dropdown_clicked = false; - click_pt = wxPoint(-1, -1); - rect = wxRect(-1,-1, 0, 0); - tool_id = -1; + m_isDropdownClicked = false; + m_clickPt = wxPoint(-1, -1); + m_rect = wxRect(-1,-1, 0, 0); + m_toolId = -1; } #ifndef SWIG wxAuiToolBarEvent(const wxAuiToolBarEvent& c) : wxNotifyEvent(c) { - is_dropdown_clicked = c.is_dropdown_clicked; - click_pt = c.click_pt; - rect = c.rect; - tool_id = c.tool_id; + m_isDropdownClicked = c.m_isDropdownClicked; + m_clickPt = c.m_clickPt; + m_rect = c.m_rect; + m_toolId = c.m_toolId; } #endif wxEvent *Clone() const { return new wxAuiToolBarEvent(*this); } - bool IsDropDownClicked() const { return is_dropdown_clicked; } - void SetDropDownClicked(bool c) { is_dropdown_clicked = c; } + bool IsDropDownClicked() const { return m_isDropdownClicked; } + void SetDropDownClicked(bool c) { m_isDropdownClicked = c; } - wxPoint GetClickPoint() const { return click_pt; } - void SetClickPoint(const wxPoint& p) { click_pt = p; } + wxPoint GetClickPoint() const { return m_clickPt; } + void SetClickPoint(const wxPoint& p) { m_clickPt = p; } - wxRect GetItemRect() const { return rect; } - void SetItemRect(const wxRect& r) { rect = r; } + wxRect GetItemRect() const { return m_rect; } + void SetItemRect(const wxRect& r) { m_rect = r; } - int GetToolId() const { return tool_id; } - void SetToolId(int toolid) { tool_id = toolid; } + int GetToolId() const { return m_toolId; } + void SetToolId(int toolId) { m_toolId = toolId; } private: - bool is_dropdown_clicked; - wxPoint click_pt; - wxRect rect; - int tool_id; + bool m_isDropdownClicked; + wxPoint m_clickPt; + wxRect m_rect; + int m_toolId; private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiToolBarEvent) @@ -117,18 +117,18 @@ public: wxAuiToolBarItem() { - window = NULL; - sizer_item = NULL; - spacer_pixels = 0; - toolid = 0; - kind = wxITEM_NORMAL; - state = 0; // normal, enabled - proportion = 0; - active = true; - dropdown = true; - sticky = true; - user_data = 0; - alignment = wxALIGN_CENTER; + m_window = NULL; + m_sizerItem = NULL; + m_spacerPixels = 0; + m_toolId = 0; + m_kind = wxITEM_NORMAL; + m_state = 0; // normal, enabled + m_proportion = 0; + m_active = true; + m_dropDown = true; + m_sticky = true; + m_userData = 0; + m_alignment = wxALIGN_CENTER; } wxAuiToolBarItem(const wxAuiToolBarItem& c) @@ -144,106 +144,106 @@ public: void Assign(const wxAuiToolBarItem& c) { - window = c.window; - label = c.label; - bitmap = c.bitmap; - disabled_bitmap = c.disabled_bitmap; - hover_bitmap = c.hover_bitmap; - short_help = c.short_help; - long_help = c.long_help; - sizer_item = c.sizer_item; - min_size = c.min_size; - spacer_pixels = c.spacer_pixels; - toolid = c.toolid; - kind = c.kind; - state = c.state; - proportion = c.proportion; - active = c.active; - dropdown = c.dropdown; - sticky = c.sticky; - user_data = c.user_data; - alignment = c.alignment; + m_window = c.m_window; + m_label = c.m_label; + m_bitmap = c.m_bitmap; + m_disabledBitmap = c.m_disabledBitmap; + m_hoverBitmap = c.m_hoverBitmap; + m_shortHelp = c.m_shortHelp; + m_longHelp = c.m_longHelp; + m_sizerItem = c.m_sizerItem; + m_minSize = c.m_minSize; + m_spacerPixels = c.m_spacerPixels; + m_toolId = c.m_toolId; + m_kind = c.m_kind; + m_state = c.m_state; + m_proportion = c.m_proportion; + m_active = c.m_active; + m_dropDown = c.m_dropDown; + m_sticky = c.m_sticky; + m_userData = c.m_userData; + m_alignment = c.m_alignment; } - void SetWindow(wxWindow* w) { window = w; } - wxWindow* GetWindow() { return window; } + void SetWindow(wxWindow* w) { m_window = w; } + wxWindow* GetWindow() { return m_window; } - void SetId(int new_id) { toolid = new_id; } - int GetId() const { return toolid; } + void SetId(int newId) { m_toolId = newId; } + int GetId() const { return m_toolId; } - void SetKind(int new_kind) { kind = new_kind; } - int GetKind() const { return kind; } + void SetKind(int newKind) { m_kind = newKind; } + int GetKind() const { return m_kind; } - void SetState(int new_state) { state = new_state; } - int GetState() const { return state; } + void SetState(int newState) { m_state = newState; } + int GetState() const { return m_state; } - void SetSizerItem(wxSizerItem* s) { sizer_item = s; } - wxSizerItem* GetSizerItem() const { return sizer_item; } + void SetSizerItem(wxSizerItem* s) { m_sizerItem = s; } + wxSizerItem* GetSizerItem() const { return m_sizerItem; } - void SetLabel(const wxString& s) { label = s; } - const wxString& GetLabel() const { return label; } + void SetLabel(const wxString& s) { m_label = s; } + const wxString& GetLabel() const { return m_label; } - void SetBitmap(const wxBitmap& bmp) { bitmap = bmp; } - const wxBitmap& GetBitmap() const { return bitmap; } + void SetBitmap(const wxBitmap& bmp) { m_bitmap = bmp; } + const wxBitmap& GetBitmap() const { return m_bitmap; } - void SetDisabledBitmap(const wxBitmap& bmp) { disabled_bitmap = bmp; } - const wxBitmap& GetDisabledBitmap() const { return disabled_bitmap; } + void SetDisabledBitmap(const wxBitmap& bmp) { m_disabledBitmap = bmp; } + const wxBitmap& GetDisabledBitmap() const { return m_disabledBitmap; } - void SetHoverBitmap(const wxBitmap& bmp) { hover_bitmap = bmp; } - const wxBitmap& GetHoverBitmap() const { return hover_bitmap; } + void SetHoverBitmap(const wxBitmap& bmp) { m_hoverBitmap = bmp; } + const wxBitmap& GetHoverBitmap() const { return m_hoverBitmap; } - void SetShortHelp(const wxString& s) { short_help = s; } - const wxString& GetShortHelp() const { return short_help; } + void SetShortHelp(const wxString& s) { m_shortHelp = s; } + const wxString& GetShortHelp() const { return m_shortHelp; } - void SetLongHelp(const wxString& s) { long_help = s; } - const wxString& GetLongHelp() const { return long_help; } + void SetLongHelp(const wxString& s) { m_longHelp = s; } + const wxString& GetLongHelp() const { return m_longHelp; } - void SetMinSize(const wxSize& s) { min_size = s; } - const wxSize& GetMinSize() const { return min_size; } + void SetMinSize(const wxSize& s) { m_minSize = s; } + const wxSize& GetMinSize() const { return m_minSize; } - void SetSpacerPixels(int s) { spacer_pixels = s; } - int GetSpacerPixels() const { return spacer_pixels; } + void SetSpacerPixels(int s) { m_spacerPixels = s; } + int GetSpacerPixels() const { return m_spacerPixels; } - void SetProportion(int p) { proportion = p; } - int GetProportion() const { return proportion; } + void SetProportion(int p) { m_proportion = p; } + int GetProportion() const { return m_proportion; } - void SetActive(bool b) { active = b; } - bool IsActive() const { return active; } + void SetActive(bool b) { m_active = b; } + bool IsActive() const { return m_active; } - void SetHasDropDown(bool b) { dropdown = b; } - bool HasDropDown() const { return dropdown; } + void SetHasDropDown(bool b) { m_dropDown = b; } + bool HasDropDown() const { return m_dropDown; } - void SetSticky(bool b) { sticky = b; } - bool IsSticky() const { return sticky; } + void SetSticky(bool b) { m_sticky = b; } + bool IsSticky() const { return m_sticky; } - void SetUserData(long l) { user_data = l; } - long GetUserData() const { return user_data; } + void SetUserData(long l) { m_userData = l; } + long GetUserData() const { return m_userData; } - void SetAlignment(int l) { alignment = l; } - int GetAlignment() const { return alignment; } + void SetAlignment(int l) { m_alignment = l; } + int GetAlignment() const { return m_alignment; } private: - wxWindow* window; // item's associated window - wxString label; // label displayed on the item - wxBitmap bitmap; // item's bitmap - wxBitmap disabled_bitmap; // item's disabled bitmap - wxBitmap hover_bitmap; // item's hover bitmap - wxString short_help; // short help (for tooltip) - wxString long_help; // long help (for status bar) - wxSizerItem* sizer_item; // sizer item - wxSize min_size; // item's minimum size - int spacer_pixels; // size of a spacer - int toolid; // item's id - int kind; // item's kind - int state; // state - int proportion; // proportion - bool active; // true if the item is currently active - bool dropdown; // true if the item has a dropdown button - bool sticky; // overrides button states if true (always active) - long user_data; // user-specified data - int alignment; // sizer alignment flag, defaults to wxCENTER, may be wxEXPAND or any other + wxWindow* m_window; // item's associated window + wxString m_label; // label displayed on the item + wxBitmap m_bitmap; // item's bitmap + wxBitmap m_disabledBitmap; // item's disabled bitmap + wxBitmap m_hoverBitmap; // item's hover bitmap + wxString m_shortHelp; // short help (for tooltip) + wxString m_longHelp; // long help (for status bar) + wxSizerItem* m_sizerItem; // sizer item + wxSize m_minSize; // item's minimum size + int m_spacerPixels; // size of a spacer + int m_toolId; // item's id + int m_kind; // item's kind + int m_state; // state + int m_proportion; // proportion + bool m_active; // true if the item is currently active + bool m_dropDown; // true if the item has a dropdown button + bool m_sticky; // overrides button states if true (always active) + long m_userData; // user-specified data + int m_alignment; // sizer alignment flag, defaults to wxCENTER, may be wxEXPAND or any other }; #ifndef SWIG @@ -325,8 +325,8 @@ public: wxWindow* wnd, const wxAuiToolBarItem& item) = 0; - virtual int GetElementSize(int element_id) = 0; - virtual void SetElementSize(int element_id, int size) = 0; + virtual int GetElementSize(int elementId) = 0; + virtual void SetElementSize(int elementId, int size) = 0; virtual int ShowDropDown( wxWindow* wnd, @@ -407,30 +407,30 @@ public: const wxAuiToolBarItem& item); virtual int GetElementSize(int element); - virtual void SetElementSize(int element_id, int size); + virtual void SetElementSize(int elementId, int size); virtual int ShowDropDown(wxWindow* wnd, const wxAuiToolBarItemArray& items); protected: - wxBitmap m_button_dropdown_bmp; - wxBitmap m_disabled_button_dropdown_bmp; - wxBitmap m_overflow_bmp; - wxBitmap m_disabled_overflow_bmp; - wxColour m_base_colour; - wxColour m_highlight_colour; + wxBitmap m_buttonDropDownBmp; + wxBitmap m_disabledButtonDropDownBmp; + wxBitmap m_overflowBmp; + wxBitmap m_disabledOverflowBmp; + wxColour m_baseColour; + wxColour m_highlightColour; wxFont m_font; unsigned int m_flags; - int m_text_orientation; + int m_textOrientation; - wxPen m_gripper_pen1; - wxPen m_gripper_pen2; - wxPen m_gripper_pen3; + wxPen m_gripperPen1; + wxPen m_gripperPen2; + wxPen m_gripperPen3; - int m_separator_size; - int m_gripper_size; - int m_overflow_size; + int m_separatorSize; + int m_gripperSize; + int m_overflowSize; }; @@ -456,40 +456,40 @@ public: bool SetFont(const wxFont& font); - wxAuiToolBarItem* AddTool(int tool_id, + wxAuiToolBarItem* AddTool(int toolId, const wxString& label, const wxBitmap& bitmap, - const wxString& short_help_string = wxEmptyString, + const wxString& shortHelpString = wxEmptyString, wxItemKind kind = wxITEM_NORMAL); - wxAuiToolBarItem* AddTool(int tool_id, + wxAuiToolBarItem* AddTool(int toolId, const wxString& label, const wxBitmap& bitmap, - const wxBitmap& disabled_bitmap, + const wxBitmap& disabledBitmap, wxItemKind kind, - const wxString& short_help_string, - const wxString& long_help_string, - wxObject* client_data); + const wxString& shortHelpString, + const wxString& longHelpString, + wxObject* clientData); - wxAuiToolBarItem* AddTool(int tool_id, + wxAuiToolBarItem* AddTool(int toolId, const wxBitmap& bitmap, - const wxBitmap& disabled_bitmap, + const wxBitmap& disabledBitmap, bool toggle = false, - wxObject* client_data = NULL, - const wxString& short_help_string = wxEmptyString, - const wxString& long_help_string = wxEmptyString) + wxObject* clientData = NULL, + const wxString& shortHelpString = wxEmptyString, + const wxString& longHelpString = wxEmptyString) { - return AddTool(tool_id, + return AddTool(toolId, wxEmptyString, bitmap, - disabled_bitmap, + disabledBitmap, toggle ? wxITEM_CHECK : wxITEM_NORMAL, - short_help_string, - long_help_string, - client_data); + shortHelpString, + longHelpString, + clientData); } - wxAuiToolBarItem* AddLabel(int tool_id, + wxAuiToolBarItem* AddLabel(int toolId, const wxString& label = wxEmptyString, const int width = -1); wxAuiToolBarItem* AddControl(wxControl* control, @@ -500,22 +500,22 @@ public: bool Realize(); - wxControl* FindControl(int window_id); + wxControl* FindControl(int windowId); wxAuiToolBarItem* FindToolByPosition(wxCoord x, wxCoord y) const; wxAuiToolBarItem* FindToolByIndex(int idx) const; - wxAuiToolBarItem* FindTool(int tool_id) const; + wxAuiToolBarItem* FindTool(int toolId) const; void ClearTools() { Clear() ; } void Clear(); - bool DeleteTool(int tool_id); - bool DeleteByIndex(int tool_id); + bool DeleteTool(int toolId); + bool DeleteByIndex(int toolId); size_t GetToolCount() const; - int GetToolPos(int tool_id) const { return GetToolIndex(tool_id); } - int GetToolIndex(int tool_id) const; - bool GetToolFits(int tool_id) const; - wxRect GetToolRect(int tool_id) const; - bool GetToolFitsByIndex(int tool_id) const; + int GetToolPos(int toolId) const { return GetToolIndex(toolId); } + int GetToolIndex(int toolId) const; + bool GetToolFits(int toolId) const; + wxRect GetToolRect(int toolId) const; + bool GetToolFitsByIndex(int toolId) const; bool GetToolBarFits() const; void SetMargins(const wxSize& size) { SetMargins(size.x, size.x, size.y, size.y); } @@ -531,14 +531,14 @@ public: bool GetGripperVisible() const; void SetGripperVisible(bool visible); - void ToggleTool(int tool_id, bool state); - bool GetToolToggled(int tool_id) const; + void ToggleTool(int toolId, bool state); + bool GetToolToggled(int toolId) const; - void EnableTool(int tool_id, bool state); - bool GetToolEnabled(int tool_id) const; + void EnableTool(int toolId, bool state); + bool GetToolEnabled(int toolId) const; - void SetToolDropDown(int tool_id, bool dropdown); - bool GetToolDropDown(int tool_id) const; + void SetToolDropDown(int toolId, bool dropdown); + bool GetToolDropDown(int toolId) const; void SetToolBorderPadding(int padding); int GetToolBorderPadding() const; @@ -549,34 +549,37 @@ public: void SetToolPacking(int packing); int GetToolPacking() const; - void SetToolProportion(int tool_id, int proportion); - int GetToolProportion(int tool_id) const; + void SetToolProportion(int toolId, int proportion); + int GetToolProportion(int toolId) const; void SetToolSeparation(int separation); int GetToolSeparation() const; - void SetToolSticky(int tool_id, bool sticky); - bool GetToolSticky(int tool_id) const; + void SetToolSticky(int toolId, bool sticky); + bool GetToolSticky(int toolId) const; - wxString GetToolLabel(int tool_id) const; - void SetToolLabel(int tool_id, const wxString& label); + wxString GetToolLabel(int toolId) const; + void SetToolLabel(int toolId, const wxString& label); - wxBitmap GetToolBitmap(int tool_id) const; - void SetToolBitmap(int tool_id, const wxBitmap& bitmap); + wxBitmap GetToolBitmap(int toolId) const; + void SetToolBitmap(int toolId, const wxBitmap& bitmap); - wxString GetToolShortHelp(int tool_id) const; - void SetToolShortHelp(int tool_id, const wxString& help_string); + wxString GetToolShortHelp(int toolId) const; + void SetToolShortHelp(int toolId, const wxString& helpString); - wxString GetToolLongHelp(int tool_id) const; - void SetToolLongHelp(int tool_id, const wxString& help_string); + wxString GetToolLongHelp(int toolId) const; + void SetToolLongHelp(int toolId, const wxString& helpString); void SetCustomOverflowItems(const wxAuiToolBarItemArray& prepend, const wxAuiToolBarItemArray& append); // get size of hint rectangle for a particular dock location - wxSize GetHintSize(int dock_direction) const; + wxSize GetHintSize(int dockDirection) const; bool IsPaneValid(const wxAuiPaneInfo& pane) const; + // Override to call DoIdleUpdate(). + virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE); + protected: virtual void OnCustomRender(wxDC& WXUNUSED(dc), @@ -624,30 +627,30 @@ protected: wxAuiToolBarItemArray m_items; // array of toolbar items wxAuiToolBarArt* m_art; // art provider wxBoxSizer* m_sizer; // main sizer for toolbar - wxAuiToolBarItem* m_action_item; // item that's being acted upon (pressed) - wxAuiToolBarItem* m_tip_item; // item that has its tooltip shown + wxAuiToolBarItem* m_actionItem; // item that's being acted upon (pressed) + wxAuiToolBarItem* m_tipItem; // item that has its tooltip shown wxBitmap m_bitmap; // double-buffer bitmap - wxSizerItem* m_gripper_sizer_item; - wxSizerItem* m_overflow_sizer_item; - wxSize m_absolute_min_size; - wxPoint m_action_pos; // position of left-mouse down - wxAuiToolBarItemArray m_custom_overflow_prepend; - wxAuiToolBarItemArray m_custom_overflow_append; + wxSizerItem* m_gripperSizerItem; + wxSizerItem* m_overflowSizerItem; + wxSize m_absoluteMinSize; + wxPoint m_actionPos; // position of left-mouse down + wxAuiToolBarItemArray m_customOverflowPrepend; + wxAuiToolBarItemArray m_customOverflowAppend; - int m_button_width; - int m_button_height; - int m_sizer_element_count; - int m_left_padding; - int m_right_padding; - int m_top_padding; - int m_bottom_padding; - int m_tool_packing; - int m_tool_border_padding; - int m_tool_text_orientation; - int m_overflow_state; + int m_buttonWidth; + int m_buttonHeight; + int m_sizerElementCount; + int m_leftPadding; + int m_rightPadding; + int m_topPadding; + int m_bottomPadding; + int m_toolPacking; + int m_toolBorderPadding; + int m_toolTextOrientation; + int m_overflowState; bool m_dragging; - bool m_gripper_visible; - bool m_overflow_visible; + bool m_gripperVisible; + bool m_overflowVisible; long m_style; bool RealizeHelper(wxClientDC& dc, bool horizontal); diff --git a/Externals/wxWidgets3/include/wx/aui/auibook.h b/Externals/wxWidgets3/include/wx/aui/auibook.h index 5fa37345d2..e8e4527ff6 100644 --- a/Externals/wxWidgets3/include/wx/aui/auibook.h +++ b/Externals/wxWidgets3/include/wx/aui/auibook.h @@ -24,7 +24,7 @@ #include "wx/aui/framemanager.h" #include "wx/aui/dockart.h" #include "wx/aui/floatpane.h" -#include "wx/control.h" +#include "wx/bookctrl.h" class wxAuiNotebook; @@ -60,40 +60,28 @@ enum wxAuiNotebookOption // aui notebook event class -class WXDLLIMPEXP_AUI wxAuiNotebookEvent : public wxNotifyEvent +class WXDLLIMPEXP_AUI wxAuiNotebookEvent : public wxBookCtrlEvent { public: - wxAuiNotebookEvent(wxEventType command_type = wxEVT_NULL, - int win_id = 0) - : wxNotifyEvent(command_type, win_id) + wxAuiNotebookEvent(wxEventType commandType = wxEVT_NULL, + int winId = 0) + : wxBookCtrlEvent(commandType, winId) { - old_selection = -1; - selection = -1; - drag_source = NULL; + m_dragSource = NULL; } #ifndef SWIG - wxAuiNotebookEvent(const wxAuiNotebookEvent& c) : wxNotifyEvent(c) + wxAuiNotebookEvent(const wxAuiNotebookEvent& c) : wxBookCtrlEvent(c) { - old_selection = c.old_selection; - selection = c.selection; - drag_source = c.drag_source; + m_dragSource = c.m_dragSource; } #endif wxEvent *Clone() const { return new wxAuiNotebookEvent(*this); } - void SetSelection(int s) { selection = s; m_commandInt = s; } - int GetSelection() const { return selection; } + void SetDragSource(wxAuiNotebook* s) { m_dragSource = s; } + wxAuiNotebook* GetDragSource() const { return m_dragSource; } - void SetOldSelection(int s) { old_selection = s; } - int GetOldSelection() const { return old_selection; } - - void SetDragSource(wxAuiNotebook* s) { drag_source = s; } - wxAuiNotebook* GetDragSource() const { return drag_source; } - -public: - int old_selection; - int selection; - wxAuiNotebook* drag_source; +private: + wxAuiNotebook* m_dragSource; #ifndef SWIG private: @@ -117,10 +105,10 @@ class WXDLLIMPEXP_AUI wxAuiTabContainerButton public: int id; // button's id - int cur_state; // current state (normal, hover, pressed, etc.) + int curState; // current state (normal, hover, pressed, etc.) int location; // buttons location (wxLEFT, wxRIGHT, or wxCENTER) wxBitmap bitmap; // button's hover bitmap - wxBitmap dis_bitmap; // button's disabled bitmap + wxBitmap disBitmap; // button's disabled bitmap wxRect rect; // button's hit rectangle }; @@ -143,12 +131,14 @@ public: virtual wxAuiTabArt* Clone() = 0; virtual void SetFlags(unsigned int flags) = 0; - virtual void SetSizingInfo(const wxSize& tab_ctrl_size, - size_t tab_count) = 0; + virtual void SetSizingInfo(const wxSize& tabCtrlSize, + size_t tabCount) = 0; virtual void SetNormalFont(const wxFont& font) = 0; virtual void SetSelectedFont(const wxFont& font) = 0; virtual void SetMeasuringFont(const wxFont& font) = 0; + virtual void SetColour(const wxColour& colour) = 0; + virtual void SetActiveColour(const wxColour& colour) = 0; virtual void DrawBackground( wxDC& dc, @@ -158,20 +148,20 @@ public: virtual void DrawTab(wxDC& dc, wxWindow* wnd, const wxAuiNotebookPage& pane, - const wxRect& in_rect, - int close_button_state, - wxRect* out_tab_rect, - wxRect* out_button_rect, - int* x_extent) = 0; + const wxRect& inRect, + int closeButtonState, + wxRect* outTabRect, + wxRect* outButtonRect, + int* xExtent) = 0; virtual void DrawButton( wxDC& dc, wxWindow* wnd, - const wxRect& in_rect, - int bitmap_id, - int button_state, + const wxRect& inRect, + int bitmapId, + int buttonState, int orientation, - wxRect* out_rect) = 0; + wxRect* outRect) = 0; virtual wxSize GetTabSize( wxDC& dc, @@ -179,20 +169,20 @@ public: const wxString& caption, const wxBitmap& bitmap, bool active, - int close_button_state, - int* x_extent) = 0; + int closeButtonState, + int* xExtent) = 0; virtual int ShowDropDown( wxWindow* wnd, const wxAuiNotebookPageArray& items, - int active_idx) = 0; + int activeIdx) = 0; virtual int GetIndentSize() = 0; virtual int GetBestTabCtrlSize( wxWindow* wnd, const wxAuiNotebookPageArray& pages, - const wxSize& required_bmp_size) = 0; + const wxSize& requiredBmpSize) = 0; }; @@ -206,12 +196,14 @@ public: wxAuiTabArt* Clone(); void SetFlags(unsigned int flags); - void SetSizingInfo(const wxSize& tab_ctrl_size, - size_t tab_count); + void SetSizingInfo(const wxSize& tabCtrlSize, + size_t tabCount); void SetNormalFont(const wxFont& font); void SetSelectedFont(const wxFont& font); void SetMeasuringFont(const wxFont& font); + void SetColour(const wxColour& colour); + void SetActiveColour(const wxColour& colour); void DrawBackground( wxDC& dc, @@ -221,20 +213,20 @@ public: void DrawTab(wxDC& dc, wxWindow* wnd, const wxAuiNotebookPage& pane, - const wxRect& in_rect, - int close_button_state, - wxRect* out_tab_rect, - wxRect* out_button_rect, - int* x_extent); + const wxRect& inRect, + int closeButtonState, + wxRect* outTabRect, + wxRect* outButtonRect, + int* xExtent); void DrawButton( wxDC& dc, wxWindow* wnd, - const wxRect& in_rect, - int bitmap_id, - int button_state, + const wxRect& inRect, + int bitmapId, + int buttonState, int orientation, - wxRect* out_rect); + wxRect* outRect); int GetIndentSize(); @@ -244,38 +236,39 @@ public: const wxString& caption, const wxBitmap& bitmap, bool active, - int close_button_state, - int* x_extent); + int closeButtonState, + int* xExtent); int ShowDropDown( wxWindow* wnd, const wxAuiNotebookPageArray& items, - int active_idx); + int activeIdx); int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages, - const wxSize& required_bmp_size); + const wxSize& requiredBmpSize); protected: - wxFont m_normal_font; - wxFont m_selected_font; - wxFont m_measuring_font; - wxColour m_base_colour; - wxPen m_base_colour_pen; - wxPen m_border_pen; - wxBrush m_base_colour_brush; - wxBitmap m_active_close_bmp; - wxBitmap m_disabled_close_bmp; - wxBitmap m_active_left_bmp; - wxBitmap m_disabled_left_bmp; - wxBitmap m_active_right_bmp; - wxBitmap m_disabled_right_bmp; - wxBitmap m_active_windowlist_bmp; - wxBitmap m_disabled_windowlist_bmp; + wxFont m_normalFont; + wxFont m_selectedFont; + wxFont m_measuringFont; + wxColour m_baseColour; + wxPen m_baseColourPen; + wxPen m_borderPen; + wxBrush m_baseColourBrush; + wxColour m_activeColour; + wxBitmap m_activeCloseBmp; + wxBitmap m_disabledCloseBmp; + wxBitmap m_activeLeftBmp; + wxBitmap m_disabledLeftBmp; + wxBitmap m_activeRightBmp; + wxBitmap m_disabledRightBmp; + wxBitmap m_activeWindowListBmp; + wxBitmap m_disabledWindowListBmp; - int m_fixed_tab_width; - int m_tab_ctrl_height; + int m_fixedTabWidth; + int m_tabCtrlHeight; unsigned int m_flags; }; @@ -291,12 +284,14 @@ public: wxAuiTabArt* Clone(); void SetFlags(unsigned int flags); - void SetSizingInfo(const wxSize& tab_ctrl_size, - size_t tab_count); + void SetSizingInfo(const wxSize& tabCtrlSize, + size_t tabCount); void SetNormalFont(const wxFont& font); void SetSelectedFont(const wxFont& font); void SetMeasuringFont(const wxFont& font); + void SetColour(const wxColour& colour); + void SetActiveColour(const wxColour& colour); void DrawBackground( wxDC& dc, @@ -306,20 +301,20 @@ public: void DrawTab(wxDC& dc, wxWindow* wnd, const wxAuiNotebookPage& pane, - const wxRect& in_rect, - int close_button_state, - wxRect* out_tab_rect, - wxRect* out_button_rect, - int* x_extent); + const wxRect& inRect, + int closeButtonState, + wxRect* outTabRect, + wxRect* outButtonRect, + int* xExtent); void DrawButton( wxDC& dc, wxWindow* wnd, - const wxRect& in_rect, - int bitmap_id, - int button_state, + const wxRect& inRect, + int bitmapId, + int buttonState, int orientation, - wxRect* out_rect); + wxRect* outRect); int GetIndentSize(); @@ -329,38 +324,38 @@ public: const wxString& caption, const wxBitmap& bitmap, bool active, - int close_button_state, - int* x_extent); + int closeButtonState, + int* xExtent); int ShowDropDown( wxWindow* wnd, const wxAuiNotebookPageArray& items, - int active_idx); + int activeIdx); int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages, - const wxSize& required_bmp_size); + const wxSize& requiredBmpSize); protected: - wxFont m_normal_font; - wxFont m_selected_font; - wxFont m_measuring_font; - wxPen m_normal_bkpen; - wxPen m_selected_bkpen; - wxBrush m_normal_bkbrush; - wxBrush m_selected_bkbrush; - wxBrush m_bkbrush; - wxBitmap m_active_close_bmp; - wxBitmap m_disabled_close_bmp; - wxBitmap m_active_left_bmp; - wxBitmap m_disabled_left_bmp; - wxBitmap m_active_right_bmp; - wxBitmap m_disabled_right_bmp; - wxBitmap m_active_windowlist_bmp; - wxBitmap m_disabled_windowlist_bmp; + wxFont m_normalFont; + wxFont m_selectedFont; + wxFont m_measuringFont; + wxPen m_normalBkPen; + wxPen m_selectedBkPen; + wxBrush m_normalBkBrush; + wxBrush m_selectedBkBrush; + wxBrush m_bkBrush; + wxBitmap m_activeCloseBmp; + wxBitmap m_disabledCloseBmp; + wxBitmap m_activeLeftBmp; + wxBitmap m_disabledLeftBmp; + wxBitmap m_activeRightBmp; + wxBitmap m_disabledRightBmp; + wxBitmap m_activeWindowListBmp; + wxBitmap m_disabledWindowListBmp; - int m_fixed_tab_width; + int m_fixedTabWidth; unsigned int m_flags; }; @@ -387,7 +382,7 @@ public: bool AddPage(wxWindow* page, const wxAuiNotebookPage& info); bool InsertPage(wxWindow* page, const wxAuiNotebookPage& info, size_t idx); - bool MovePage(wxWindow* page, size_t new_idx); + bool MovePage(wxWindow* page, size_t newIdx); bool RemovePage(wxWindow* page); bool SetActivePage(wxWindow* page); bool SetActivePage(size_t page); @@ -401,17 +396,19 @@ public: wxAuiNotebookPage& GetPage(size_t idx); const wxAuiNotebookPage& GetPage(size_t idx) const; wxAuiNotebookPageArray& GetPages(); - void SetNormalFont(const wxFont& normal_font); - void SetSelectedFont(const wxFont& selected_font); - void SetMeasuringFont(const wxFont& measuring_font); + void SetNormalFont(const wxFont& normalFont); + void SetSelectedFont(const wxFont& selectedFont); + void SetMeasuringFont(const wxFont& measuringFont); + void SetColour(const wxColour& colour); + void SetActiveColour(const wxColour& colour); void DoShowHide(); void SetRect(const wxRect& rect); void RemoveButton(int id); void AddButton(int id, int location, - const wxBitmap& normal_bitmap = wxNullBitmap, - const wxBitmap& disabled_bitmap = wxNullBitmap); + const wxBitmap& normalBitmap = wxNullBitmap, + const wxBitmap& disabledBitmap = wxNullBitmap); size_t GetTabOffset() const; void SetTabOffset(size_t offset); @@ -431,9 +428,9 @@ protected: wxAuiTabArt* m_art; wxAuiNotebookPageArray m_pages; wxAuiTabContainerButtonArray m_buttons; - wxAuiTabContainerButtonArray m_tab_close_buttons; + wxAuiTabContainerButtonArray m_tabCloseButtons; wxRect m_rect; - size_t m_tab_offset; + size_t m_tabOffset; unsigned int m_flags; }; @@ -452,7 +449,7 @@ public: ~wxAuiTabCtrl(); - bool IsDragging() const { return m_is_dragging; } + bool IsDragging() const { return m_isDragging; } protected: // choose the default border for this window @@ -478,11 +475,11 @@ protected: protected: - wxPoint m_click_pt; - wxWindow* m_click_tab; - bool m_is_dragging; - wxAuiTabContainerButton* m_hover_button; - wxAuiTabContainerButton* m_pressed_button; + wxPoint m_clickPt; + wxWindow* m_clickTab; + bool m_isDragging; + wxAuiTabContainerButton* m_hoverButton; + wxAuiTabContainerButton* m_pressedButton; #ifndef SWIG DECLARE_CLASS(wxAuiTabCtrl) @@ -493,18 +490,22 @@ protected: -class WXDLLIMPEXP_AUI wxAuiNotebook : public wxControl +class WXDLLIMPEXP_AUI wxAuiNotebook : public wxNavigationEnabled { public: - wxAuiNotebook(); + wxAuiNotebook() { Init(); } wxAuiNotebook(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxAUI_NB_DEFAULT_STYLE); + long style = wxAUI_NB_DEFAULT_STYLE) + { + Init(); + Create(parent, id, pos, size, style); + } virtual ~wxAuiNotebook(); @@ -526,7 +527,7 @@ public: bool select = false, const wxBitmap& bitmap = wxNullBitmap); - bool InsertPage(size_t page_idx, + bool InsertPage(size_t pageIdx, wxWindow* page, const wxString& caption, bool select = false, @@ -536,16 +537,16 @@ public: bool RemovePage(size_t page); size_t GetPageCount() const; - wxWindow* GetPage(size_t page_idx) const; - int GetPageIndex(wxWindow* page_wnd) const; + wxWindow* GetPage(size_t pageIdx) const; + int GetPageIndex(wxWindow* pageWnd) const; bool SetPageText(size_t page, const wxString& text); - wxString GetPageText(size_t page_idx) const; + wxString GetPageText(size_t pageIdx) const; bool SetPageBitmap(size_t page, const wxBitmap& bitmap); - wxBitmap GetPageBitmap(size_t page_idx) const; + wxBitmap GetPageBitmap(size_t pageIdx) const; - size_t SetSelection(size_t new_page); + int SetSelection(size_t newPage); int GetSelection() const; virtual void Split(size_t page, int direction); @@ -585,7 +586,28 @@ public: // Redo sizing after thawing virtual void Thaw(); + //wxBookCtrlBase functions + + virtual void SetPageSize (const wxSize &size); + virtual int HitTest (const wxPoint &pt, long *flags=NULL) const; + + virtual int GetPageImage(size_t n) const; + virtual bool SetPageImage(size_t n, int imageId); + + wxWindow* GetCurrentPage () const; + + virtual int ChangeSelection(size_t n); + + virtual bool AddPage(wxWindow *page, const wxString &text, bool select, + int imageId); + virtual bool DeleteAllPages(); + virtual bool InsertPage(size_t index, wxWindow *page, const wxString &text, + bool select, int imageId); + protected: + // Common part of all ctors. + void Init(); + // choose the default border for this window virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } @@ -598,12 +620,18 @@ protected: virtual int CalculateTabCtrlHeight(); virtual wxSize CalculateNewSplitSize(); + // remove the page and return a pointer to it + virtual wxWindow *DoRemovePage(size_t WXUNUSED(page)) { return NULL; } + + //A general selection function + virtual int DoModifySelection(size_t n, bool events); + protected: void DoSizing(); void InitNotebook(long style); wxAuiTabCtrl* GetTabCtrlFromPoint(const wxPoint& pt); - wxWindow* GetTabFrameFromTabCtrl(wxWindow* tab_ctrl); + wxWindow* GetTabFrameFromTabCtrl(wxWindow* tabCtrl); wxAuiTabCtrl* GetActiveTabCtrl(); bool FindTab(wxWindow* page, wxAuiTabCtrl** ctrl, int* idx); void RemoveEmptyTabFrames(); @@ -618,6 +646,7 @@ protected: void OnTabBeginDrag(wxAuiNotebookEvent& evt); void OnTabDragMotion(wxAuiNotebookEvent& evt); void OnTabEndDrag(wxAuiNotebookEvent& evt); + void OnTabCancelDrag(wxAuiNotebookEvent& evt); void OnTabButton(wxAuiNotebookEvent& evt); void OnTabMiddleDown(wxAuiNotebookEvent& evt); void OnTabMiddleUp(wxAuiNotebookEvent& evt); @@ -638,26 +667,23 @@ protected: wxAuiManager m_mgr; wxAuiTabContainer m_tabs; - int m_curpage; - int m_tab_id_counter; - wxWindow* m_dummy_wnd; + int m_curPage; + int m_tabIdCounter; + wxWindow* m_dummyWnd; - wxSize m_requested_bmp_size; - int m_requested_tabctrl_height; - wxFont m_selected_font; - wxFont m_normal_font; - int m_tab_ctrl_height; + wxSize m_requestedBmpSize; + int m_requestedTabCtrlHeight; + wxFont m_selectedFont; + wxFont m_normalFont; + int m_tabCtrlHeight; - int m_last_drag_x; + int m_lastDragX; unsigned int m_flags; #ifndef SWIG DECLARE_CLASS(wxAuiNotebook) DECLARE_EVENT_TABLE() #endif - - WX_DECLARE_CONTROL_CONTAINER(); - }; diff --git a/Externals/wxWidgets3/include/wx/aui/dockart.h b/Externals/wxWidgets3/include/wx/aui/dockart.h index beaa0dc9fa..fbc2ba7593 100644 --- a/Externals/wxWidgets3/include/wx/aui/dockart.h +++ b/Externals/wxWidgets3/include/wx/aui/dockart.h @@ -4,7 +4,7 @@ // Author: Benjamin I. Williams // Modified by: // Created: 2005-05-17 -// RCS-ID: $Id: dockart.h 66670 2011-01-12 13:39:36Z VZ $ +// RCS-ID: $Id: dockart.h 69590 2011-10-30 14:20:03Z VZ $ // Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved. // Licence: wxWindows Library Licence, Version 3.1 /////////////////////////////////////////////////////////////////////////////// @@ -37,7 +37,7 @@ public: virtual ~wxAuiDockArt() { } virtual int GetMetric(int id) = 0; - virtual void SetMetric(int id, int new_val) = 0; + virtual void SetMetric(int id, int newVal) = 0; virtual void SetFont(int id, const wxFont& font) = 0; virtual wxFont GetFont(int id) = 0; virtual wxColour GetColour(int id) = 0; @@ -74,7 +74,7 @@ public: virtual void DrawPaneButton(wxDC& dc, wxWindow* window, int button, - int button_state, + int buttonState, const wxRect& rect, wxAuiPaneInfo& pane) = 0; }; @@ -90,8 +90,8 @@ public: wxAuiDefaultDockArt(); - int GetMetric(int metric_id); - void SetMetric(int metric_id, int new_val); + int GetMetric(int metricId); + void SetMetric(int metricId, int newVal); wxColour GetColour(int id); void SetColour(int id, const wxColor& colour); void SetFont(int id, const wxFont& font); @@ -126,7 +126,7 @@ public: void DrawPaneButton(wxDC& dc, wxWindow *window, int button, - int button_state, + int buttonState, const wxRect& rect, wxAuiPaneInfo& pane); @@ -142,35 +142,35 @@ protected: protected: - wxPen m_border_pen; - wxBrush m_sash_brush; - wxBrush m_background_brush; - wxBrush m_gripper_brush; - wxFont m_caption_font; - wxBitmap m_inactive_close_bitmap; - wxBitmap m_inactive_pin_bitmap; - wxBitmap m_inactive_maximize_bitmap; - wxBitmap m_inactive_restore_bitmap; - wxBitmap m_active_close_bitmap; - wxBitmap m_active_pin_bitmap; - wxBitmap m_active_maximize_bitmap; - wxBitmap m_active_restore_bitmap; - wxPen m_gripper_pen1; - wxPen m_gripper_pen2; - wxPen m_gripper_pen3; - wxColour m_base_colour; - wxColour m_active_caption_colour; - wxColour m_active_caption_gradient_colour; - wxColour m_active_caption_text_colour; - wxColour m_inactive_caption_colour; - wxColour m_inactive_caption_gradient_colour; - wxColour m_inactive_caption_text_colour; - int m_border_size; - int m_caption_size; - int m_sash_size; - int m_button_size; - int m_gripper_size; - int m_gradient_type; + wxPen m_borderPen; + wxBrush m_sashBrush; + wxBrush m_backgroundBrush; + wxBrush m_gripperBrush; + wxFont m_captionFont; + wxBitmap m_inactiveCloseBitmap; + wxBitmap m_inactivePinBitmap; + wxBitmap m_inactiveMaximizeBitmap; + wxBitmap m_inactiveRestoreBitmap; + wxBitmap m_activeCloseBitmap; + wxBitmap m_activePinBitmap; + wxBitmap m_activeMaximizeBitmap; + wxBitmap m_activeRestoreBitmap; + wxPen m_gripperPen1; + wxPen m_gripperPen2; + wxPen m_gripperPen3; + wxColour m_baseColour; + wxColour m_activeCaptionColour; + wxColour m_activeCaptionGradientColour; + wxColour m_activeCaptionTextColour; + wxColour m_inactiveCaptionColour; + wxColour m_inactiveCaptionGradientColour; + wxColour m_inactiveCaptionTextColour; + int m_borderSize; + int m_captionSize; + int m_sashSize; + int m_buttonSize; + int m_gripperSize; + int m_gradientType; }; diff --git a/Externals/wxWidgets3/include/wx/aui/floatpane.h b/Externals/wxWidgets3/include/wx/aui/floatpane.h index 76d1cb54b2..d88614555d 100644 --- a/Externals/wxWidgets3/include/wx/aui/floatpane.h +++ b/Externals/wxWidgets3/include/wx/aui/floatpane.h @@ -4,7 +4,7 @@ // Author: Benjamin I. Williams // Modified by: // Created: 2005-05-17 -// RCS-ID: $Id: floatpane.h 61724 2009-08-21 10:41:26Z VZ $ +// RCS-ID: $Id: floatpane.h 69590 2011-10-30 14:20:03Z VZ $ // Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved. // Licence: wxWindows Library Licence, Version 3.1 /////////////////////////////////////////////////////////////////////////////// @@ -33,7 +33,7 @@ class WXDLLIMPEXP_AUI wxAuiFloatingFrame : public wxAuiFloatingFrameBaseClass { public: wxAuiFloatingFrame(wxWindow* parent, - wxAuiManager* owner_mgr, + wxAuiManager* ownerMgr, const wxAuiPaneInfo& pane, wxWindowID id = wxID_ANY, long style = wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | @@ -46,7 +46,7 @@ public: protected: virtual void OnMoveStart(); - virtual void OnMoving(const wxRect& window_rect, wxDirection dir); + virtual void OnMoving(const wxRect& windowRect, wxDirection dir); virtual void OnMoveFinished(); private: @@ -58,16 +58,16 @@ private: static bool isMouseDown(); private: - wxWindow* m_pane_window; // pane window being managed - bool m_solid_drag; // true if system uses solid window drag + wxWindow* m_paneWindow; // pane window being managed + bool m_solidDrag; // true if system uses solid window drag bool m_moving; - wxRect m_last_rect; - wxRect m_last2_rect; - wxRect m_last3_rect; - wxSize m_last_size; + wxRect m_lastRect; + wxRect m_last2Rect; + wxRect m_last3Rect; + wxSize m_lastSize; wxDirection m_lastDirection; - wxWeakRef m_owner_mgr; + wxWeakRef m_ownerMgr; wxAuiManager m_mgr; #ifndef SWIG diff --git a/Externals/wxWidgets3/include/wx/aui/framemanager.h b/Externals/wxWidgets3/include/wx/aui/framemanager.h index 211171ebb6..c11491617f 100644 --- a/Externals/wxWidgets3/include/wx/aui/framemanager.h +++ b/Externals/wxWidgets3/include/wx/aui/framemanager.h @@ -4,7 +4,7 @@ // Author: Benjamin I. Williams // Modified by: // Created: 2005-05-17 -// RCS-ID: $Id: framemanager.h 66673 2011-01-12 18:04:39Z PC $ +// RCS-ID: $Id: framemanager.h 70807 2012-03-04 20:31:34Z VZ $ // Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved. // Licence: wxWindows Library Licence, Version 3.1 /////////////////////////////////////////////////////////////////////////////// @@ -458,7 +458,7 @@ class WXDLLIMPEXP_AUI wxAuiManager : public wxEvtHandler public: - wxAuiManager(wxWindow* managed_wnd = NULL, + wxAuiManager(wxWindow* managedWnd = NULL, unsigned int flags = wxAUI_MGR_DEFAULT); virtual ~wxAuiManager(); void UnInit(); @@ -466,12 +466,12 @@ public: void SetFlags(unsigned int flags); unsigned int GetFlags() const; - void SetManagedWindow(wxWindow* managed_wnd); + void SetManagedWindow(wxWindow* managedWnd); wxWindow* GetManagedWindow() const; static wxAuiManager* GetManager(wxWindow* window); - void SetArtProvider(wxAuiDockArt* art_provider); + void SetArtProvider(wxAuiDockArt* artProvider); wxAuiDockArt* GetArtProvider() const; wxAuiPaneInfo& GetPane(wxWindow* window); @@ -479,35 +479,35 @@ public: wxAuiPaneInfoArray& GetAllPanes(); bool AddPane(wxWindow* window, - const wxAuiPaneInfo& pane_info); + const wxAuiPaneInfo& paneInfo); bool AddPane(wxWindow* window, - const wxAuiPaneInfo& pane_info, - const wxPoint& drop_pos); + const wxAuiPaneInfo& paneInfo, + const wxPoint& dropPos); bool AddPane(wxWindow* window, int direction = wxLEFT, const wxString& caption = wxEmptyString); bool InsertPane(wxWindow* window, - const wxAuiPaneInfo& insert_location, - int insert_level = wxAUI_INSERT_PANE); + const wxAuiPaneInfo& insertLocation, + int insertLevel = wxAUI_INSERT_PANE); bool DetachPane(wxWindow* window); void Update(); wxString SavePaneInfo(wxAuiPaneInfo& pane); - void LoadPaneInfo(wxString pane_part, wxAuiPaneInfo &pane); + void LoadPaneInfo(wxString panePart, wxAuiPaneInfo &pane); wxString SavePerspective(); bool LoadPerspective(const wxString& perspective, bool update = true); - void SetDockSizeConstraint(double width_pct, double height_pct); - void GetDockSizeConstraint(double* width_pct, double* height_pct) const; + void SetDockSizeConstraint(double widthPct, double heightPct); + void GetDockSizeConstraint(double* widthPct, double* heightPct) const; - void ClosePane(wxAuiPaneInfo& pane_info); - void MaximizePane(wxAuiPaneInfo& pane_info); - void RestorePane(wxAuiPaneInfo& pane_info); + void ClosePane(wxAuiPaneInfo& paneInfo); + void MaximizePane(wxAuiPaneInfo& paneInfo); + void RestorePane(wxAuiPaneInfo& paneInfo); void RestoreMaximizedPane(); public: @@ -516,16 +516,16 @@ public: virtual bool CanDockPanel(const wxAuiPaneInfo & p); void StartPaneDrag( - wxWindow* pane_window, + wxWindow* paneWindow, const wxPoint& offset); wxRect CalculateHintRect( - wxWindow* pane_window, + wxWindow* paneWindow, const wxPoint& pt, const wxPoint& offset); void DrawHintRect( - wxWindow* pane_window, + wxWindow* paneWindow, const wxPoint& pt, const wxPoint& offset); @@ -552,26 +552,26 @@ protected: wxAuiDockInfo& dock, wxAuiPaneInfo& pane, wxAuiDockUIPartArray& uiparts, - bool spacer_only); + bool spacerOnly); void LayoutAddDock(wxSizer* container, wxAuiDockInfo& dock, - wxAuiDockUIPartArray& uiparts, - bool spacer_only); + wxAuiDockUIPartArray& uiParts, + bool spacerOnly); wxSizer* LayoutAll(wxAuiPaneInfoArray& panes, wxAuiDockInfoArray& docks, - wxAuiDockUIPartArray& uiparts, - bool spacer_only = false); + wxAuiDockUIPartArray & uiParts, + bool spacerOnly = false); virtual bool ProcessDockResult(wxAuiPaneInfo& target, - const wxAuiPaneInfo& new_pos); + const wxAuiPaneInfo& newPos); bool DoDrop(wxAuiDockInfoArray& docks, wxAuiPaneInfoArray& panes, wxAuiPaneInfo& drop, const wxPoint& pt, - const wxPoint& action_offset = wxPoint(0,0)); + const wxPoint& actionOffset = wxPoint(0,0)); wxAuiDockUIPart* HitTest(int x, int y); wxAuiDockUIPart* GetPanePart(wxWindow* pane); @@ -585,7 +585,7 @@ protected: void Render(wxDC* dc); void Repaint(wxDC* dc = NULL); void ProcessMgrEvent(wxAuiManagerEvent& event); - void UpdateButtonOnScreen(wxAuiDockUIPart* button_ui_part, + void UpdateButtonOnScreen(wxAuiDockUIPart* buttonUiPart, const wxMouseEvent& event); void GetPanePositionsAndSizes(wxAuiDockInfo& dock, wxArrayInt& positions, @@ -594,6 +594,8 @@ protected: /// Ends a resize action, or for live update, resizes the sash bool DoEndResizeAction(wxMouseEvent& event); + void SetActivePane(wxWindow* active_pane); + public: // public events (which can be invoked externally) @@ -636,29 +638,29 @@ protected: wxAuiPaneInfoArray m_panes; // array of panes structures wxAuiDockInfoArray m_docks; // array of docks structures - wxAuiDockUIPartArray m_uiparts; // array of UI parts (captions, buttons, etc) + wxAuiDockUIPartArray m_uiParts; // array of UI parts (captions, buttons, etc) int m_action; // current mouse action - wxPoint m_action_start; // position where the action click started - wxPoint m_action_offset; // offset from upper left of the item clicked - wxAuiDockUIPart* m_action_part; // ptr to the part the action happened to - wxWindow* m_action_window; // action frame or window (NULL if none) - wxRect m_action_hintrect; // hint rectangle for the action - wxRect m_last_rect; - wxAuiDockUIPart* m_hover_button;// button uipart being hovered over - wxRect m_last_hint; // last hint rectangle - wxPoint m_last_mouse_move; // last mouse move position (see OnMotion) + wxPoint m_actionStart; // position where the action click started + wxPoint m_actionOffset; // offset from upper left of the item clicked + wxAuiDockUIPart* m_actionPart; // ptr to the part the action happened to + wxWindow* m_actionWindow; // action frame or window (NULL if none) + wxRect m_actionHintRect; // hint rectangle for the action + wxRect m_lastRect; + wxAuiDockUIPart* m_hoverButton;// button uipart being hovered over + wxRect m_lastHint; // last hint rectangle + wxPoint m_lastMouseMove; // last mouse move position (see OnMotion) int m_currentDragItem; bool m_skipping; - bool m_has_maximized; + bool m_hasMaximized; - double m_dock_constraint_x; // 0.0 .. 1.0; max pct of window width a dock can consume - double m_dock_constraint_y; // 0.0 .. 1.0; max pct of window height a dock can consume + double m_dockConstraintX; // 0.0 .. 1.0; max pct of window width a dock can consume + double m_dockConstraintY; // 0.0 .. 1.0; max pct of window height a dock can consume - wxFrame* m_hint_wnd; // transparent hint window, if supported by platform - wxTimer m_hint_fadetimer; // transparent fade timer - wxByte m_hint_fadeamt; // transparent fade amount - wxByte m_hint_fademax; // maximum value of hint fade + wxFrame* m_hintWnd; // transparent hint window, if supported by platform + wxTimer m_hintFadeTimer; // transparent fade timer + wxByte m_hintFadeAmt; // transparent fade amount + wxByte m_hintFadeMax; // maximum value of hint fade void* m_reserved; @@ -839,6 +841,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_BUTTON, wxAuiManagerEv wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_CLOSE, wxAuiManagerEvent ); wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_MAXIMIZE, wxAuiManagerEvent ); wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_RESTORE, wxAuiManagerEvent ); +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_ACTIVATED, wxAuiManagerEvent ); wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_RENDER, wxAuiManagerEvent ); wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_FIND_MANAGER, wxAuiManagerEvent ); @@ -855,6 +858,8 @@ typedef void (wxEvtHandler::*wxAuiManagerEventFunction)(wxAuiManagerEvent&); wx__DECLARE_EVT0(wxEVT_AUI_PANE_MAXIMIZE, wxAuiManagerEventHandler(func)) #define EVT_AUI_PANE_RESTORE(func) \ wx__DECLARE_EVT0(wxEVT_AUI_PANE_RESTORE, wxAuiManagerEventHandler(func)) +#define EVT_AUI_PANE_ACTIVATED(func) \ + wx__DECLARE_EVT0(wxEVT_AUI_PANE_ACTIVATED, wxAuiManagerEventHandler(func)) #define EVT_AUI_RENDER(func) \ wx__DECLARE_EVT0(wxEVT_AUI_RENDER, wxAuiManagerEventHandler(func)) #define EVT_AUI_FIND_MANAGER(func) \ @@ -866,6 +871,7 @@ typedef void (wxEvtHandler::*wxAuiManagerEventFunction)(wxAuiManagerEvent&); %constant wxEventType wxEVT_AUI_PANE_CLOSE; %constant wxEventType wxEVT_AUI_PANE_MAXIMIZE; %constant wxEventType wxEVT_AUI_PANE_RESTORE; +%constant wxEventType wxEVT_AUI_PANE_ACTIVATED; %constant wxEventType wxEVT_AUI_RENDER; %constant wxEventType wxEVT_AUI_FIND_MANAGER; @@ -874,6 +880,7 @@ typedef void (wxEvtHandler::*wxAuiManagerEventFunction)(wxAuiManagerEvent&); EVT_AUI_PANE_CLOSE = wx.PyEventBinder( wxEVT_AUI_PANE_CLOSE ) EVT_AUI_PANE_MAXIMIZE = wx.PyEventBinder( wxEVT_AUI_PANE_MAXIMIZE ) EVT_AUI_PANE_RESTORE = wx.PyEventBinder( wxEVT_AUI_PANE_RESTORE ) + EVT_AUI_PANE_ACTIVATED = wx.PyEventBinder( wxEVT_AUI_PANE_ACTIVATED ) EVT_AUI_RENDER = wx.PyEventBinder( wxEVT_AUI_RENDER ) EVT_AUI_FIND_MANAGER = wx.PyEventBinder( wxEVT_AUI_FIND_MANAGER ) } diff --git a/Externals/wxWidgets3/include/wx/aui/tabmdi.h b/Externals/wxWidgets3/include/wx/aui/tabmdi.h index ce9d812348..6a680845b3 100644 --- a/Externals/wxWidgets3/include/wx/aui/tabmdi.h +++ b/Externals/wxWidgets3/include/wx/aui/tabmdi.h @@ -4,7 +4,7 @@ // Author: Hans Van Leemputten // Modified by: Benjamin I. Williams / Kirix Corporation // Created: 29/07/2002 -// RCS-ID: $Id: tabmdi.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: tabmdi.h 70909 2012-03-15 13:49:54Z VZ $ // Copyright: (c) Hans Van Leemputten // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -101,6 +101,7 @@ protected: void AddWindowMenu(wxMenuBar *pMenuBar); void DoHandleMenu(wxCommandEvent &event); + void DoHandleUpdateUI(wxUpdateUIEvent &event); #endif // wxUSE_MENUS virtual bool ProcessEvent(wxEvent& event); @@ -138,7 +139,7 @@ public: const wxString& name = wxFrameNameStr); #if wxUSE_MENUS - virtual void SetMenuBar(wxMenuBar *menu_bar); + virtual void SetMenuBar(wxMenuBar *menuBar); virtual wxMenuBar *GetMenuBar() const; #endif // wxUSE_MENUS @@ -199,7 +200,7 @@ public: protected: void Init(); - virtual void DoSetSize(int x, int y, int width, int height, int size_flags); + virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags); virtual void DoMoveWindow(int x, int y, int width, int height); // no size hints @@ -215,12 +216,12 @@ public: protected: wxAuiMDIParentFrame* m_pMDIParentFrame; - wxRect m_mdi_newrect; - wxRect m_mdi_currect; + wxRect m_mdiNewRect; + wxRect m_mdiCurRect; wxString m_title; wxIcon m_icon; - wxIconBundle m_icon_bundle; - bool m_activate_on_create; + wxIconBundle m_iconBundle; + bool m_activateOnCreate; #if wxUSE_MENUS wxMenuBar* m_pMenuBar; @@ -244,7 +245,6 @@ class WXDLLIMPEXP_AUI wxAuiMDIClientWindow : public wxAuiNotebook public: wxAuiMDIClientWindow(); wxAuiMDIClientWindow(wxAuiMDIParentFrame *parent, long style = 0); - ~wxAuiMDIClientWindow(); virtual bool CreateClient(wxAuiMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL); @@ -253,7 +253,7 @@ public: protected: - void PageChanged(int old_selection, int new_selection); + void PageChanged(int oldSelection, int newSelection); void OnPageClose(wxAuiNotebookEvent& evt); void OnPageChanged(wxAuiNotebookEvent& evt); void OnSize(wxSizeEvent& evt); diff --git a/Externals/wxWidgets3/include/wx/bannerwindow.h b/Externals/wxWidgets3/include/wx/bannerwindow.h new file mode 100644 index 0000000000..1ce3bc3170 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/bannerwindow.h @@ -0,0 +1,145 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/bannerwindow.h +// Purpose: wxBannerWindow class declaration +// Author: Vadim Zeitlin +// Created: 2011-08-16 +// RCS-ID: $Id: bannerwindow.h 69859 2011-11-28 18:58:52Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_BANNERWINDOW_H_ +#define _WX_BANNERWINDOW_H_ + +#include "wx/defs.h" + +#if wxUSE_BANNERWINDOW + +#include "wx/bitmap.h" +#include "wx/event.h" +#include "wx/window.h" + +class WXDLLIMPEXP_FWD_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxColour; +class WXDLLIMPEXP_FWD_CORE wxDC; + +extern WXDLLIMPEXP_DATA_ADV(const char) wxBannerWindowNameStr[]; + +// ---------------------------------------------------------------------------- +// A simple banner window showing either a bitmap or text. +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_ADV wxBannerWindow : public wxWindow +{ +public: + // Default constructor, use Create() later. + wxBannerWindow() { Init(); } + + // Convenient constructor that should be used in the majority of cases. + // + // The banner orientation changes how the text in it is displayed and also + // defines where is the bitmap truncated if it's too big to fit but doesn't + // do anything for the banner position, this is supposed to be taken care + // of in the usual way, e.g. using sizers. + wxBannerWindow(wxWindow* parent, wxDirection dir = wxLEFT) + { + Init(); + + Create(parent, wxID_ANY, dir); + } + + // Full constructor provided for consistency with the other classes only. + wxBannerWindow(wxWindow* parent, + wxWindowID winid, + wxDirection dir = wxLEFT, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxBannerWindowNameStr) + { + Init(); + + Create(parent, winid, dir, pos, size, style, name); + } + + // Can be only called on objects created with the default constructor. + bool Create(wxWindow* parent, + wxWindowID winid, + wxDirection dir = wxLEFT, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxBannerWindowNameStr); + + + // Provide an existing bitmap to show. For wxLEFT orientation the bitmap is + // truncated from the top, for wxTOP and wxBOTTOM -- from the right and for + // wxRIGHT -- from the bottom, so put the most important part of the bitmap + // information in the opposite direction. + void SetBitmap(const wxBitmap& bmp); + + // Set the text to display. This is mutually exclusive with SetBitmap(). + // Title is rendered in bold and should be single line, message can have + // multiple lines but is not wrapped automatically. + void SetText(const wxString& title, const wxString& message); + + // Set the colours between which the gradient runs. This can be combined + // with SetText() but not SetBitmap(). + void SetGradient(const wxColour& start, const wxColour& end); + +protected: + virtual wxSize DoGetBestClientSize() const; + +private: + // Common part of all constructors. + void Init(); + + // Fully invalidates the window. + void OnSize(wxSizeEvent& event); + + // Redraws the window using either m_bitmap or m_title/m_message. + void OnPaint(wxPaintEvent& event); + + // Helper of OnPaint(): draw the bitmap at the correct position depending + // on our orientation. + void DrawBitmapBackground(wxDC& dc); + + // Helper of OnPaint(): draw the text in the appropriate direction. + void DrawBannerTextLine(wxDC& dc, const wxString& str, const wxPoint& pos); + + // Return the font to use for the title. Currently this is hardcoded as a + // larger bold version of the standard window font but could be made + // configurable in the future. + wxFont GetTitleFont() const; + + // Return the colour to use for extending the bitmap. Non-const as it + // updates m_colBitmapBg if needed. + wxColour GetBitmapBg(); + + + // The window side along which the banner is laid out. + wxDirection m_direction; + + // If valid, this bitmap is drawn as is. + wxBitmap m_bitmap; + + // If bitmap is valid, this is the colour we use to extend it if the bitmap + // is smaller than this window. It is computed on demand by GetBitmapBg(). + wxColour m_colBitmapBg; + + // The title and main message to draw, used if m_bitmap is invalid. + wxString m_title, + m_message; + + // Start and stop gradient colours, only used when drawing text. + wxColour m_colStart, + m_colEnd; + + wxDECLARE_EVENT_TABLE(); + + wxDECLARE_NO_COPY_CLASS(wxBannerWindow); +}; + +#endif // wxUSE_BANNERWINDOW + +#endif // _WX_BANNERWINDOW_H_ diff --git a/Externals/wxWidgets3/include/wx/bitmap.h b/Externals/wxWidgets3/include/wx/bitmap.h index 73c7ba965e..ab9046803c 100644 --- a/Externals/wxWidgets3/include/wx/bitmap.h +++ b/Externals/wxWidgets3/include/wx/bitmap.h @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // Modified by: // Created: 22.04.01 -// RCS-ID: $Id: bitmap.h 66086 2010-11-10 13:51:51Z VZ $ +// RCS-ID: $Id: bitmap.h 70353 2012-01-15 14:46:41Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -68,8 +68,7 @@ protected: virtual bool InitFromMonoBitmap(const wxBitmap& bitmap) = 0; }; -#if defined(__WXMGL__) || \ - defined(__WXDFB__) || \ +#if defined(__WXDFB__) || \ defined(__WXMAC__) || \ defined(__WXGTK__) || \ defined(__WXCOCOA__) || \ @@ -84,9 +83,9 @@ protected: #define wxBITMAP_SCREEN_DEPTH (-1) -// All ports except wxMSW,wxOS2,wxPalmOS use wxBitmapHandler and wxBitmapBase as base class -// for wxBitmapHandler; wxMSW,wxOS2,wxPalmOS use wxGDIImageHandler as base class -// since it allows some code reuse there. +// All ports except wxMSW and wxOS2 use wxBitmapHandler and wxBitmapBase as +// base class for wxBitmapHandler; wxMSW and wxOS2 use wxGDIImageHandler as +// base class since it allows some code reuse there. #if wxUSE_BITMAP_BASE // ---------------------------------------------------------------------------- @@ -237,10 +236,7 @@ protected: // the wxBITMAP_DEFAULT_TYPE constant defines the default argument value // for wxBitmap's ctor and wxBitmap::LoadFile() functions. -#if defined(__WXPALMOS__) - #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_BMP_RESOURCE - #include "wx/palmos/bitmap.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_BMP_RESOURCE #include "wx/msw/bitmap.h" #elif defined(__WXMOTIF__) @@ -255,11 +251,8 @@ protected: #elif defined(__WXX11__) #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_XPM #include "wx/x11/bitmap.h" -#elif defined(__WXMGL__) - #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_RESOURCE - #include "wx/mgl/bitmap.h" #elif defined(__WXDFB__) - #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_RESOURCE + #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_BMP_RESOURCE #include "wx/dfb/bitmap.h" #elif defined(__WXMAC__) #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_PICT_RESOURCE @@ -287,7 +280,7 @@ ConvertToDisabled(unsigned char brightness) const #endif // wxUSE_IMAGE // we must include generic mask.h after wxBitmap definition -#if defined(__WXMGL__) || defined(__WXDFB__) +#if defined(__WXDFB__) #define wxUSE_GENERIC_MASK 1 #else #define wxUSE_GENERIC_MASK 0 diff --git a/Externals/wxWidgets3/include/wx/bmpbuttn.h b/Externals/wxWidgets3/include/wx/bmpbuttn.h index 2b6c39fcd4..c2632b88f6 100644 --- a/Externals/wxWidgets3/include/wx/bmpbuttn.h +++ b/Externals/wxWidgets3/include/wx/bmpbuttn.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 25.08.00 -// RCS-ID: $Id: bmpbuttn.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: bmpbuttn.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) 2000 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -130,8 +130,6 @@ protected: #include "wx/cocoa/bmpbuttn.h" #elif defined(__WXPM__) #include "wx/os2/bmpbuttn.h" -#elif defined(__WXPALMOS__) - #include "wx/palmos/bmpbuttn.h" #endif #endif // wxUSE_BMPBUTTON diff --git a/Externals/wxWidgets3/include/wx/bookctrl.h b/Externals/wxWidgets3/include/wx/bookctrl.h index 471c278ff6..b3a6809690 100644 --- a/Externals/wxWidgets3/include/wx/bookctrl.h +++ b/Externals/wxWidgets3/include/wx/bookctrl.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 19.08.03 -// RCS-ID: $Id: bookctrl.h 65967 2010-10-31 13:33:34Z VZ $ +// RCS-ID: $Id: bookctrl.h 69082 2011-09-14 08:24:06Z SJL $ // Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -22,6 +22,7 @@ #include "wx/control.h" #include "wx/dynarray.h" +#include "wx/withimages.h" WX_DEFINE_EXPORTED_ARRAY_PTR(wxWindow *, wxArrayPages); @@ -54,7 +55,8 @@ enum // wxBookCtrlBase // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxBookCtrlBase : public wxControl +class WXDLLIMPEXP_CORE wxBookCtrlBase : public wxControl, + public wxWithImages { public: // construction @@ -85,9 +87,6 @@ public: long style = 0, const wxString& name = wxEmptyString); - // dtor - virtual ~wxBookCtrlBase(); - // accessors // --------- @@ -106,7 +105,7 @@ public: } // get the currently selected page or wxNOT_FOUND if none - int GetSelection() const { return m_selection; } + virtual int GetSelection() const { return m_selection; } // set/get the title of a page virtual bool SetPageText(size_t n, const wxString& strText) = 0; @@ -117,15 +116,6 @@ public: // images belong to the same image list) // --------------------------------------------------------------------- - // sets the image list to use, it is *not* deleted by the control - virtual void SetImageList(wxImageList *imageList); - - // as SetImageList() but we will delete the image list ourselves - void AssignImageList(wxImageList *imageList); - - // get pointer (may be NULL) to the associated image list - wxImageList* GetImageList() const { return m_imageList; } - // sets/returns item's image index in the current image list virtual int GetPageImage(size_t n) const = 0; virtual bool SetPageImage(size_t n, int imageId) = 0; @@ -191,7 +181,7 @@ public: virtual bool AddPage(wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = -1) + int imageId = NO_IMAGE) { DoInvalidateBestSize(); return InsertPage(GetPageCount(), page, text, bSelect, imageId); @@ -202,7 +192,7 @@ public: wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = -1) = 0; + int imageId = NO_IMAGE) = 0; // set the currently selected page, return the index of the previously // selected one (or wxNOT_FOUND on error) @@ -320,12 +310,6 @@ protected: // the array of all pages of this control wxArrayPages m_pages; - // the associated image list or NULL - wxImageList *m_imageList; - - // true if we must delete m_imageList - bool m_ownsImageList; - // get the page area virtual wxRect GetPageRect() const; diff --git a/Externals/wxWidgets3/include/wx/brush.h b/Externals/wxWidgets3/include/wx/brush.h index 0791d38002..7dbb89425d 100644 --- a/Externals/wxWidgets3/include/wx/brush.h +++ b/Externals/wxWidgets3/include/wx/brush.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: -// RCS-ID: $Id: brush.h 66054 2010-11-07 13:16:20Z VZ $ +// RCS-ID: $Id: brush.h 70353 2012-01-15 14:46:41Z VZ $ // Copyright: Julian Smart // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -70,9 +70,7 @@ public: } }; -#if defined(__WXPALMOS__) - #include "wx/palmos/brush.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #include "wx/msw/brush.h" #elif defined(__WXMOTIF__) || defined(__WXX11__) #include "wx/x11/brush.h" @@ -80,8 +78,6 @@ public: #include "wx/gtk/brush.h" #elif defined(__WXGTK__) #include "wx/gtk1/brush.h" -#elif defined(__WXMGL__) - #include "wx/mgl/brush.h" #elif defined(__WXDFB__) #include "wx/dfb/brush.h" #elif defined(__WXMAC__) diff --git a/Externals/wxWidgets3/include/wx/buffer.h b/Externals/wxWidgets3/include/wx/buffer.h index 161e935af6..8b57207f1d 100644 --- a/Externals/wxWidgets3/include/wx/buffer.h +++ b/Externals/wxWidgets3/include/wx/buffer.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 12.04.99 -// RCS-ID: $Id: buffer.h 66780 2011-01-27 11:00:26Z SC $ +// RCS-ID: $Id: buffer.h 70417 2012-01-20 22:11:51Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -15,9 +15,7 @@ #include "wx/chartype.h" #include "wx/wxcrtbase.h" -#ifndef __WXPALMOS5__ #include // malloc() and free() -#endif // ! __WXPALMOS5__ class WXDLLIMPEXP_FWD_BASE wxCStrData; @@ -314,6 +312,10 @@ public: if ( !str ) return false; + // For consistency with the ctor taking just the length, NUL-terminate + // the buffer. + str[len] = (CharType)0; + if ( this->m_data == this->GetNullData() ) { this->m_data = new Data(str, len); @@ -537,6 +539,8 @@ public: size_t GetBufSize() const { return m_bufdata->m_size; } size_t GetDataLen() const { return m_bufdata->m_len; } + bool IsEmpty() const { return GetDataLen() == 0; } + void SetBufSize(size_t size) { m_bufdata->ResizeIfNeeded(size); } void SetDataLen(size_t len) { @@ -544,6 +548,8 @@ public: m_bufdata->m_len = len; } + void Clear() { SetDataLen(0); } + // Ensure the buffer is big enough and return a pointer to it void *GetWriteBuf(size_t sizeNeeded) { diff --git a/Externals/wxWidgets3/include/wx/build.h b/Externals/wxWidgets3/include/wx/build.h index a82e56db81..ac0393fb99 100644 --- a/Externals/wxWidgets3/include/wx/build.h +++ b/Externals/wxWidgets3/include/wx/build.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin, Vaclav Slavik // Modified by: // Created: 07.05.02 -// RCS-ID: $Id: build.h 64531 2010-06-09 13:23:13Z FM $ +// RCS-ID: $Id: build.h 67343 2011-03-30 14:16:04Z VZ $ // Copyright: (c) 2002 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -85,7 +85,7 @@ #endif // deriving wxWin containers from STL ones changes them completely: -#if wxUSE_STL +#if wxUSE_STD_CONTAINERS #define __WX_BO_STL ",STL containers" #else #define __WX_BO_STL ",wx containers" diff --git a/Externals/wxWidgets3/include/wx/button.h b/Externals/wxWidgets3/include/wx/button.h index d69cbe4b58..d164eee800 100644 --- a/Externals/wxWidgets3/include/wx/button.h +++ b/Externals/wxWidgets3/include/wx/button.h @@ -4,7 +4,7 @@ // Author: Vadim Zetlin // Modified by: // Created: 15.08.00 -// RCS-ID: $Id: button.h 65680 2010-09-30 11:44:45Z VZ $ +// RCS-ID: $Id: button.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) Vadim Zetlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -14,44 +14,9 @@ #include "wx/defs.h" -// ---------------------------------------------------------------------------- -// wxButton flags shared with other classes -// ---------------------------------------------------------------------------- - -#if wxUSE_TOGGLEBTN || wxUSE_BUTTON - -// These flags affect label alignment -#define wxBU_LEFT 0x0040 -#define wxBU_TOP 0x0080 -#define wxBU_RIGHT 0x0100 -#define wxBU_BOTTOM 0x0200 -#define wxBU_ALIGN_MASK ( wxBU_LEFT | wxBU_TOP | wxBU_RIGHT | wxBU_BOTTOM ) -#endif - #if wxUSE_BUTTON -// ---------------------------------------------------------------------------- -// wxButton specific flags -// ---------------------------------------------------------------------------- - -// These two flags are obsolete -#define wxBU_NOAUTODRAW 0x0000 -#define wxBU_AUTODRAW 0x0004 - -// by default, the buttons will be created with some (system dependent) -// minimal size to make them look nicer, giving this style will make them as -// small as possible -#define wxBU_EXACTFIT 0x0001 - -// this flag can be used to disable using the text label in the button: it is -// mostly useful when creating buttons showing bitmap and having stock id as -// without it both the standard label corresponding to the stock id and the -// bitmap would be shown -#define wxBU_NOTEXT 0x0002 - - -#include "wx/bitmap.h" -#include "wx/control.h" +#include "wx/anybutton.h" extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[]; @@ -59,7 +24,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[]; // wxButton: a push button // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxButtonBase : public wxControl +class WXDLLIMPEXP_CORE wxButtonBase : public wxAnyButton { public: wxButtonBase() { } @@ -70,132 +35,15 @@ public: void SetAuthNeeded(bool show = true) { DoSetAuthNeeded(show); } bool GetAuthNeeded() const { return DoGetAuthNeeded(); } - // show the image in the button in addition to the label: this method is - // supported on all (major) platforms - void SetBitmap(const wxBitmap& bitmap, wxDirection dir = wxLEFT) - { - SetBitmapLabel(bitmap); - SetBitmapPosition(dir); - } - - wxBitmap GetBitmap() const { return DoGetBitmap(State_Normal); } - - // Methods for setting individual images for different states: normal, - // selected (meaning pushed or pressed), focused (meaning normal state for - // a focused button), disabled or hover (a.k.a. hot or current). - // - // Remember that SetBitmap() itself must be called before any other - // SetBitmapXXX() methods (except for SetBitmapLabel() which is a synonym - // for it anyhow) and that all bitmaps passed to these functions should be - // of the same size. - void SetBitmapLabel(const wxBitmap& bitmap) - { DoSetBitmap(bitmap, State_Normal); } - void SetBitmapPressed(const wxBitmap& bitmap) - { DoSetBitmap(bitmap, State_Pressed); } - void SetBitmapDisabled(const wxBitmap& bitmap) - { DoSetBitmap(bitmap, State_Disabled); } - void SetBitmapCurrent(const wxBitmap& bitmap) - { DoSetBitmap(bitmap, State_Current); } - void SetBitmapFocus(const wxBitmap& bitmap) - { DoSetBitmap(bitmap, State_Focused); } - - wxBitmap GetBitmapLabel() const { return DoGetBitmap(State_Normal); } - wxBitmap GetBitmapPressed() const { return DoGetBitmap(State_Pressed); } - wxBitmap GetBitmapDisabled() const { return DoGetBitmap(State_Disabled); } - wxBitmap GetBitmapCurrent() const { return DoGetBitmap(State_Current); } - wxBitmap GetBitmapFocus() const { return DoGetBitmap(State_Focused); } - - - // set the margins around the image - void SetBitmapMargins(wxCoord x, wxCoord y) { DoSetBitmapMargins(x, y); } - void SetBitmapMargins(const wxSize& sz) { DoSetBitmapMargins(sz.x, sz.y); } - wxSize GetBitmapMargins() { return DoGetBitmapMargins(); } - - // set the image position relative to the text, i.e. wxLEFT means that the - // image is to the left of the text (this is the default) - void SetBitmapPosition(wxDirection dir); - - // make this button the default button in its top level window // // returns the old default item (possibly NULL) virtual wxWindow *SetDefault(); - // Buttons on MSW can look bad if they are not native colours, because - // then they become owner-drawn and not theme-drawn. Disable it here - // in wxButtonBase to make it consistent. - virtual bool ShouldInheritColours() const { return false; } - // returns the default button size for this platform static wxSize GetDefaultSize(); - // wxUniv-compatible and deprecated equivalents to SetBitmapXXX() -#if WXWIN_COMPATIBILITY_2_8 - void SetImageLabel(const wxBitmap& bitmap) { SetBitmap(bitmap); } - void SetImageMargins(wxCoord x, wxCoord y) { SetBitmapMargins(x, y); } -#endif // WXWIN_COMPATIBILITY_2_8 - - // backwards compatible names for pressed/current bitmaps: they're not - // deprecated as there is nothing really wrong with using them and no real - // advantage to using the new names but the new names are still preferred - wxBitmap GetBitmapSelected() const { return GetBitmapPressed(); } - wxBitmap GetBitmapHover() const { return GetBitmapCurrent(); } - - void SetBitmapSelected(const wxBitmap& bitmap) { SetBitmapPressed(bitmap); } - void SetBitmapHover(const wxBitmap& bitmap) { SetBitmapCurrent(bitmap); } - - - // this enum is not part of wx public API, it is public because it is used - // in non wxButton-derived classes internally - // - // also notice that MSW code relies on the values of the enum elements, do - // not change them without revising src/msw/button.cpp - enum State - { - State_Normal, - State_Current, // a.k.a. hot or "hovering" - State_Pressed, // a.k.a. "selected" in public API for some reason - State_Disabled, - State_Focused, - State_Max - }; - - // return true if this button shouldn't show the text label, either because - // it doesn't have it or because it was explicitly disabled with wxBU_NOTEXT - bool DontShowLabel() const - { - return HasFlag(wxBU_NOTEXT) || GetLabel().empty(); - } - - // return true if we do show the label - bool ShowsLabel() const - { - return !DontShowLabel(); - } - protected: - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - - virtual bool DoGetAuthNeeded() const { return false; } - virtual void DoSetAuthNeeded(bool WXUNUSED(show)) { } - - virtual wxBitmap DoGetBitmap(State WXUNUSED(which)) const - { return wxBitmap(); } - virtual void DoSetBitmap(const wxBitmap& WXUNUSED(bitmap), - State WXUNUSED(which)) - { } - - virtual wxSize DoGetBitmapMargins() const - { return wxSize(0, 0); } - - virtual void DoSetBitmapMargins(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) - { } - - virtual void DoSetBitmapPosition(wxDirection WXUNUSED(dir)) - { } - - wxDECLARE_NO_COPY_CLASS(wxButtonBase); }; @@ -215,11 +63,8 @@ protected: #include "wx/cocoa/button.h" #elif defined(__WXPM__) #include "wx/os2/button.h" -#elif defined(__WXPALMOS__) - #include "wx/palmos/button.h" #endif #endif // wxUSE_BUTTON -#endif - // _WX_BUTTON_H_BASE_ +#endif // _WX_BUTTON_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/cairo.h b/Externals/wxWidgets3/include/wx/cairo.h index 2518a89a21..eb83424aa3 100644 --- a/Externals/wxWidgets3/include/wx/cairo.h +++ b/Externals/wxWidgets3/include/wx/cairo.h @@ -3,7 +3,7 @@ // Purpose: Cairo library // Author: Anthony Bretaudeau // Created: 2007-08-25 -// RCS-ID: $Id: cairo.h 67232 2011-03-18 15:10:15Z DS $ +// RCS-ID: $Id: cairo.h 68935 2011-08-27 23:26:53Z RD $ // Copyright: (c) Anthony Bretaudeau // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -16,129 +16,13 @@ #include "wx/dynlib.h" #include - -class wxCairoLibrary +extern "C" { -public: - // return the pointer to the global instance of this class or NULL if we - // failed to load/initialize it - static wxCairoLibrary *Get(); + +bool wxCairoInit(); +void wxCairoCleanUp(); - - // for internal use only - static void CleanUp(); - -private: - // the single wxCairoLibrary instance or NULL - static wxCairoLibrary *ms_lib; - - wxCairoLibrary(); - ~wxCairoLibrary(); - - bool IsOk(); - bool InitializeMethods(); - - wxDynamicLibrary m_libCairo; - wxDynamicLibrary m_libPangoCairo; - - // true if we successfully loaded the libraries and can use them - // - // note that this field must have this name as it's used by wxDL_XXX macros - bool m_ok; - -public: - wxDL_VOIDMETHOD_DEFINE( cairo_arc, - (cairo_t *cr, double xc, double yc, double radius, double angle1, double angle2), (cr, xc, yc, radius, angle1, angle2) ) - wxDL_VOIDMETHOD_DEFINE( cairo_arc_negative, - (cairo_t *cr, double xc, double yc, double radius, double angle1, double angle2), (cr, xc, yc, radius, angle1, angle2) ) - wxDL_VOIDMETHOD_DEFINE( cairo_clip, - (cairo_t *cr), (cr) ) - wxDL_VOIDMETHOD_DEFINE( cairo_close_path, - (cairo_t *cr), (cr) ) - wxDL_METHOD_DEFINE( cairo_t*, cairo_create, - (cairo_surface_t *target), (target), NULL) - wxDL_VOIDMETHOD_DEFINE( cairo_curve_to, - (cairo_t *cr, double x1, double y1, double x2, double y2, double x3, double y3), (cr, x1, y1, x2, y2, x3, y3) ) - wxDL_VOIDMETHOD_DEFINE( cairo_destroy, - (cairo_t *cr), (cr) ) - wxDL_VOIDMETHOD_DEFINE( cairo_fill, - (cairo_t *cr), (cr) ) - wxDL_VOIDMETHOD_DEFINE( cairo_fill_preserve, - (cairo_t *cr), (cr) ) - wxDL_METHOD_DEFINE( cairo_surface_t*, cairo_get_target, - (cairo_t *cr), (cr), NULL) - wxDL_METHOD_DEFINE( cairo_surface_t*, cairo_image_surface_create_for_data, - (unsigned char *data, cairo_format_t format, int width, int height, int stride), (data, format, width, height, stride), NULL) - wxDL_VOIDMETHOD_DEFINE( cairo_line_to, - (cairo_t *cr, double x, double y), (cr, x, y) ) - wxDL_VOIDMETHOD_DEFINE( cairo_move_to, - (cairo_t *cr, double x, double y), (cr, x, y) ) - wxDL_VOIDMETHOD_DEFINE( cairo_new_path, - (cairo_t *cr), (cr) ) - wxDL_VOIDMETHOD_DEFINE( cairo_paint, - (cairo_t *cr), (cr) ) - wxDL_VOIDMETHOD_DEFINE( cairo_pattern_add_color_stop_rgba, - (cairo_pattern_t *pattern, double offset, double red, double green, double blue, double alpha), (pattern, offset, red, green, blue, alpha) ) - wxDL_METHOD_DEFINE( cairo_pattern_t*, cairo_pattern_create_for_surface, - (cairo_surface_t *surface), (surface), NULL) - wxDL_METHOD_DEFINE( cairo_pattern_t*, cairo_pattern_create_linear, - (double x0, double y0, double x1, double y1), (x0, y0, x1, y1), NULL) - wxDL_METHOD_DEFINE( cairo_pattern_t*, cairo_pattern_create_radial, - (double cx0, double cy0, double radius0, double cx1, double cy1, double radius1), (cx0, cy0, radius0, cx1, cy1, radius1), NULL) - wxDL_VOIDMETHOD_DEFINE( cairo_pattern_destroy, - (cairo_pattern_t *pattern), (pattern) ) - wxDL_VOIDMETHOD_DEFINE( cairo_pattern_set_extend, - (cairo_pattern_t *pattern, cairo_extend_t extend), (pattern, extend) ) - wxDL_VOIDMETHOD_DEFINE( cairo_pattern_set_filter, - (cairo_pattern_t *pattern, cairo_filter_t filter), (pattern, filter) ) - wxDL_VOIDMETHOD_DEFINE( cairo_rectangle, - (cairo_t *cr, double x, double y, double width, double height), (cr, x, y, width, height) ) - wxDL_METHOD_DEFINE( cairo_t*, cairo_reference, - (cairo_t *cr), (cr), NULL ) - wxDL_VOIDMETHOD_DEFINE( cairo_reset_clip, - (cairo_t *cr), (cr) ) - wxDL_VOIDMETHOD_DEFINE( cairo_restore, - (cairo_t *cr), (cr) ) - wxDL_VOIDMETHOD_DEFINE( cairo_rotate, - (cairo_t *cr, double angle), (cr, angle) ) - wxDL_VOIDMETHOD_DEFINE( cairo_save, - (cairo_t *cr), (cr) ) - wxDL_VOIDMETHOD_DEFINE( cairo_scale, - (cairo_t *cr, double sx, double sy), (cr, sx, sy) ) - wxDL_VOIDMETHOD_DEFINE( cairo_set_dash, - (cairo_t *cr, const double *dashes, int num_dashes, double offset), (cr, dashes, num_dashes, offset) ) - wxDL_VOIDMETHOD_DEFINE( cairo_set_fill_rule, - (cairo_t *cr, cairo_fill_rule_t fill_rule), (cr, fill_rule) ) - wxDL_VOIDMETHOD_DEFINE( cairo_set_line_cap, - (cairo_t *cr, cairo_line_cap_t line_cap), (cr, line_cap) ) - wxDL_VOIDMETHOD_DEFINE( cairo_set_line_join, - (cairo_t *cr, cairo_line_join_t line_join), (cr, line_join) ) - wxDL_VOIDMETHOD_DEFINE( cairo_set_line_width, - (cairo_t *cr, double width), (cr, width) ) - wxDL_VOIDMETHOD_DEFINE( cairo_set_operator, - (cairo_t *cr, cairo_operator_t op), (cr, op) ) - wxDL_VOIDMETHOD_DEFINE( cairo_set_source, - (cairo_t *cr, cairo_pattern_t *source), (cr, source) ) - wxDL_VOIDMETHOD_DEFINE( cairo_set_source_rgba, - (cairo_t *cr, double red, double green, double blue, double alpha), (cr, red, green, blue, alpha) ) - wxDL_VOIDMETHOD_DEFINE( cairo_stroke, - (cairo_t *cr), (cr) ) - wxDL_VOIDMETHOD_DEFINE( cairo_stroke_preserve, - (cairo_t *cr), (cr) ) - wxDL_METHOD_DEFINE( cairo_surface_t*, cairo_surface_create_similar, - (cairo_surface_t *other, cairo_content_t content, int width, int height), (other, content, width, height), NULL) - wxDL_VOIDMETHOD_DEFINE( cairo_surface_destroy, - (cairo_surface_t *surface), (surface) ) - wxDL_VOIDMETHOD_DEFINE( cairo_translate, - (cairo_t *cr, double tx, double ty), (cr, tx, ty) ) - - wxDL_VOIDMETHOD_DEFINE( pango_cairo_update_layout, - (cairo_t *cr, PangoLayout *layout), (cr, layout) ) - wxDL_VOIDMETHOD_DEFINE( pango_cairo_show_layout, - (cairo_t *cr, PangoLayout *layout), (cr, layout) ) - - wxDECLARE_NO_COPY_CLASS(wxCairoLibrary); -}; +} #endif // wxUSE_CAIRO diff --git a/Externals/wxWidgets3/include/wx/calctrl.h b/Externals/wxWidgets3/include/wx/calctrl.h index 801edf0959..7c2921d8e0 100644 --- a/Externals/wxWidgets3/include/wx/calctrl.h +++ b/Externals/wxWidgets3/include/wx/calctrl.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 29.12.99 -// RCS-ID: $Id: calctrl.h 58718 2009-02-07 18:59:25Z VZ $ +// RCS-ID: $Id: calctrl.h 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 1999 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -112,10 +112,10 @@ public: void SetHoliday(bool holiday) { m_holiday = holiday; } // accessors - bool HasTextColour() const { return m_colText.Ok(); } - bool HasBackgroundColour() const { return m_colBack.Ok(); } - bool HasBorderColour() const { return m_colBorder.Ok(); } - bool HasFont() const { return m_font.Ok(); } + bool HasTextColour() const { return m_colText.IsOk(); } + bool HasBackgroundColour() const { return m_colBack.IsOk(); } + bool HasBorderColour() const { return m_colBorder.IsOk(); } + bool HasFont() const { return m_font.IsOk(); } bool HasBorder() const { return m_border != wxCAL_BORDER_NONE; } bool IsHoliday() const { return m_holiday; } diff --git a/Externals/wxWidgets3/include/wx/chartype.h b/Externals/wxWidgets3/include/wx/chartype.h index 41eb59d9d6..d122b4c71c 100644 --- a/Externals/wxWidgets3/include/wx/chartype.h +++ b/Externals/wxWidgets3/include/wx/chartype.h @@ -4,7 +4,7 @@ * Author: Joel Farley, Ove KÃ¥ven * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee * Created: 1998/06/12 - * RCS-ID: $Id: chartype.h 66968 2011-02-19 13:44:19Z VZ $ + * RCS-ID: $Id: chartype.h 70345 2012-01-15 01:05:28Z VZ $ * Copyright: (c) 1998-2006 wxWidgets dev team * Licence: wxWindows licence */ @@ -105,8 +105,6 @@ #define wxHAVE_TCHAR_SUPPORT #elif defined(__DMC__) #define wxHAVE_TCHAR_SUPPORT -#elif defined(__WXPALMOS__) - #include #elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 ) #define wxHAVE_TCHAR_SUPPORT #include diff --git a/Externals/wxWidgets3/include/wx/checkbox.h b/Externals/wxWidgets3/include/wx/checkbox.h index f3dc6ddc52..507bf31fea 100644 --- a/Externals/wxWidgets3/include/wx/checkbox.h +++ b/Externals/wxWidgets3/include/wx/checkbox.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 07.09.00 -// RCS-ID: $Id: checkbox.h 65942 2010-10-28 14:23:09Z VZ $ +// RCS-ID: $Id: checkbox.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -41,18 +41,6 @@ */ #define wxCHK_ALLOW_3RD_STATE_FOR_USER 0x2000 -/* - * The possible states of a 3-state checkbox (Compatible - * with the 2-state checkbox). - */ -enum wxCheckBoxState -{ - wxCHK_UNCHECKED, - wxCHK_CHECKED, - wxCHK_UNDETERMINED /* 3-state checkbox only */ -}; - - extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[]; // ---------------------------------------------------------------------------- @@ -196,8 +184,6 @@ private: #elif defined(__WXPM__) #undef wxHAS_3STATE_CHECKBOX #include "wx/os2/checkbox.h" -#elif defined(__WXPALMOS__) - #include "wx/palmos/checkbox.h" #endif #endif // wxUSE_CHECKBOX diff --git a/Externals/wxWidgets3/include/wx/chkconf.h b/Externals/wxWidgets3/include/wx/chkconf.h index 723c71fb67..80f104911b 100644 --- a/Externals/wxWidgets3/include/wx/chkconf.h +++ b/Externals/wxWidgets3/include/wx/chkconf.h @@ -4,7 +4,7 @@ * Author: Vadim Zeitlin * Modified by: * Created: 09.08.00 - * RCS-ID: $Id: chkconf.h 67280 2011-03-22 14:17:38Z DS $ + * RCS-ID: $Id: chkconf.h 70703 2012-02-26 20:24:25Z VZ $ * Copyright: (c) 2000 Vadim Zeitlin * Licence: wxWindows licence */ @@ -57,11 +57,6 @@ global features */ -/* GUI build by default */ -#if !defined(wxUSE_GUI) -# define wxUSE_GUI 1 -#endif /* !defined(wxUSE_GUI) */ - /* If we're compiling without support for threads/exceptions we have to disable the corresponding features. @@ -299,6 +294,22 @@ # endif #endif /* !defined(wxUSE_SOCKETS) */ +#ifndef wxUSE_STD_CONTAINERS +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_STD_CONTAINERS must be defined, please read comment near the top of this file." +# else +# define wxUSE_STD_CONTAINERS 0 +# endif +#endif /* !defined(wxUSE_STD_CONTAINERS) */ + +#ifndef wxUSE_STD_STRING_CONV_IN_WXSTRING +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_STD_STRING_CONV_IN_WXSTRING must be defined, please read comment near the top of this file." +# else +# define wxUSE_STD_STRING_CONV_IN_WXSTRING 0 +# endif +#endif /* !defined(wxUSE_STD_STRING_CONV_IN_WXSTRING) */ + #ifndef wxUSE_STREAMS # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_STREAMS must be defined, please read comment near the top of this file." @@ -599,6 +610,14 @@ # endif #endif /* !defined(wxUSE_DATEPICKCTRL) */ +#ifndef wxUSE_DC_TRANSFORM_MATRIX +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_DC_TRANSFORM_MATRIX must be defined, please read comment near the top of this file." +# else +# define wxUSE_DC_TRANSFORM_MATRIX 1 +# endif +#endif /* wxUSE_DC_TRANSFORM_MATRIX */ + #ifndef wxUSE_DIRPICKERCTRL # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_DIRPICKERCTRL must be defined, please read comment near the top of this file." @@ -729,7 +748,7 @@ #endif /* !defined(wxUSE_HTML) */ #ifndef wxUSE_LIBMSPACK -# if !defined(__UNIX__) || defined(__WXPALMOS__) +# if !defined(__UNIX__) /* set to 0 on platforms that don't have libmspack */ # define wxUSE_LIBMSPACK 0 # else @@ -955,7 +974,15 @@ # else # define wxUSE_RICHMSGDLG 0 # endif -#endif /* !defined(wxUSE_RIBBON) */ +#endif /* !defined(wxUSE_RICHMSGDLG) */ + +#ifndef wxUSE_RICHTOOLTIP +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_RICHTOOLTIP must be defined, please read comment near the top of this file." +# else +# define wxUSE_RICHTOOLTIP 0 +# endif +#endif /* !defined(wxUSE_RICHTOOLTIP) */ #ifndef wxUSE_SASH # ifdef wxABORT_ON_CONFIG_ERROR @@ -1077,6 +1104,14 @@ # endif #endif /* !defined(wxUSE_TEXTCTRL) */ +#ifndef wxUSE_TIMEPICKCTRL +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_TIMEPICKCTRL must be defined, please read comment near the top of this file." +# else +# define wxUSE_TIMEPICKCTRL 0 +# endif +#endif /* !defined(wxUSE_TIMEPICKCTRL) */ + #ifndef wxUSE_TIPWINDOW # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_TIPWINDOW must be defined, please read comment near the top of this file." @@ -1109,6 +1144,14 @@ # endif #endif /* !defined(wxUSE_TREECTRL) */ +#ifndef wxUSE_TREELISTCTRL +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_TREELISTCTRL must be defined, please read comment near the top of this file." +# else +# define wxUSE_TREELISTCTRL 0 +# endif +#endif /* !defined(wxUSE_TREELISTCTRL) */ + #ifndef wxUSE_UIACTIONSIMULATOR # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_UIACTIONSIMULATOR must be defined, please read comment near the top of this file." @@ -1125,6 +1168,14 @@ # endif #endif /* !defined(wxUSE_VALIDATORS) */ +#ifndef wxUSE_WEBVIEW +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_WEBVIEW must be defined, please read comment near the top of this file." +# else +# define wxUSE_WEBVIEW 0 +# endif +#endif /* !defined(wxUSE_WEBVIEW) */ + #ifndef wxUSE_WXHTML_HELP # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_WXHTML_HELP must be defined, please read comment near the top of this file." @@ -1150,9 +1201,7 @@ checks use wxUSE_XXX symbols in #if tests. */ -#if defined(__WXPALMOS__) -# include "wx/palmos/chkconf.h" -#elif defined(__WXWINCE__) +#if defined(__WXWINCE__) # include "wx/msw/wince/chkconf.h" #elif defined(__WXMSW__) # include "wx/msw/chkconf.h" @@ -1164,14 +1213,14 @@ # include "wx/osx/chkconf.h" #elif defined(__OS2__) # include "wx/os2/chkconf.h" -#elif defined(__WXMGL__) -# include "wx/mgl/chkconf.h" #elif defined(__WXDFB__) # include "wx/dfb/chkconf.h" #elif defined(__WXMOTIF__) # include "wx/motif/chkconf.h" #elif defined(__WXX11__) # include "wx/x11/chkconf.h" +#elif defined(__WXANDROID__) +# include "wx/android/chkconf.h" #endif /* @@ -1439,7 +1488,8 @@ wxUSE_STATUSBAR || \ wxUSE_TEXTCTRL || \ wxUSE_TOOLBAR || \ - wxUSE_TREECTRL + wxUSE_TREECTRL || \ + wxUSE_TREELISTCTRL # if !wxUSE_CONTROLS # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_CONTROLS unset but some controls used" @@ -1582,9 +1632,7 @@ #ifndef wxUSE_NATIVE_STATUSBAR # define wxUSE_NATIVE_STATUSBAR 0 #elif wxUSE_NATIVE_STATUSBAR -# if defined(__WXUNIVERSAL__) || !( defined(__WXMSW__) || \ - defined(__WXMAC__) || \ - defined(__WXPALMOS__) ) +# if defined(__WXUNIVERSAL__) || !(defined(__WXMSW__) || defined(__WXMAC__)) # undef wxUSE_NATIVE_STATUSBAR # define wxUSE_NATIVE_STATUSBAR 0 # endif @@ -1672,16 +1720,16 @@ # endif #endif /* wxUSE_CALENDARCTRL */ -#if wxUSE_DATEPICKCTRL +#if wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL # if !wxUSE_DATETIME # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxDatePickerCtrl requires wxUSE_DATETIME" +# error "wxDatePickerCtrl and wxTimePickerCtrl requires wxUSE_DATETIME" # else # undef wxUSE_DATETIME # define wxUSE_DATETIME 1 # endif # endif -#endif /* wxUSE_DATEPICKCTRL */ +#endif /* wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL */ #if wxUSE_CHECKLISTBOX # if !wxUSE_LISTBOX @@ -1705,6 +1753,17 @@ # endif #endif /* wxUSE_CHOICEDLG */ +#if wxUSE_FILECTRL +# if !wxUSE_DATETIME +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxFileCtrl requires wxDateTime" +# else +# undef wxUSE_DATETIME +# define wxUSE_DATETIME 1 +# endif +# endif +#endif /* wxUSE_FILECTRL */ + #if wxUSE_HELP # if !wxUSE_BMPBUTTON # ifdef wxABORT_ON_CONFIG_ERROR @@ -1935,7 +1994,7 @@ #endif /* wxUSE_FILEDLG */ #if !wxUSE_GAUGE || !wxUSE_BUTTON -# if wxUSE_PROGRESSDLG && !defined(__WXPALMOS__) +# if wxUSE_PROGRESSDLG # ifdef wxABORT_ON_CONFIG_ERROR # error "Generic progress dialog requires wxUSE_GAUGE and wxUSE_BUTTON" # else @@ -1977,7 +2036,7 @@ #endif #if !wxUSE_IMAGLIST -# if wxUSE_TREECTRL || wxUSE_NOTEBOOK || wxUSE_LISTCTRL +# if wxUSE_TREECTRL || wxUSE_NOTEBOOK || wxUSE_LISTCTRL || wxUSE_TREELISTCTRL # ifdef wxABORT_ON_CONFIG_ERROR # error "wxImageList must be compiled as well" # else @@ -1996,7 +2055,7 @@ # define wxUSE_RADIOBTN 1 # endif # endif -# if !wxUSE_STATBOX && !defined(__WXPALMOS__) +# if !wxUSE_STATBOX # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_RADIOBOX requires wxUSE_STATBOX" # else @@ -2104,6 +2163,24 @@ # endif #endif /* wxUSE_VARIANT */ +#if wxUSE_TREELISTCTRL && !wxUSE_DATAVIEWCTRL +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_TREELISTCTRL requires wxDataViewCtrl" +# else +# undef wxUSE_TREELISTCTRL +# define wxUSE_TREELISTCTRL 0 +# endif +#endif /* wxUSE_TREELISTCTRL */ + +#if wxUSE_WEBVIEW && !(wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE) +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_WEBVIEW requires at least one backend" +# else +# undef wxUSE_WEBVIEW +# define wxUSE_WEBVIEW 0 +# endif +#endif /* wxUSE_WEBVIEW && !any web view backend */ + #endif /* wxUSE_GUI */ #endif /* _WX_CHKCONF_H_ */ diff --git a/Externals/wxWidgets3/include/wx/choice.h b/Externals/wxWidgets3/include/wx/choice.h index e1f9c20456..e7854fb3cc 100644 --- a/Externals/wxWidgets3/include/wx/choice.h +++ b/Externals/wxWidgets3/include/wx/choice.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 26.07.99 -// RCS-ID: $Id: choice.h 58757 2009-02-08 11:45:59Z VZ $ +// RCS-ID: $Id: choice.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -84,8 +84,6 @@ private: #include "wx/cocoa/choice.h" #elif defined(__WXPM__) #include "wx/os2/choice.h" -#elif defined(__WXPALMOS__) - #include "wx/palmos/choice.h" #endif #endif // wxUSE_CHOICE diff --git a/Externals/wxWidgets3/include/wx/choicebk.h b/Externals/wxWidgets3/include/wx/choicebk.h index 322d931d66..abd37cbb7d 100644 --- a/Externals/wxWidgets3/include/wx/choicebk.h +++ b/Externals/wxWidgets3/include/wx/choicebk.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: Wlodzimierz ABX Skiba from wx/listbook.h // Created: 15.09.04 -// RCS-ID: $Id: choicebk.h 66233 2010-11-22 01:23:21Z VZ $ +// RCS-ID: $Id: choicebk.h 68810 2011-08-21 14:08:49Z VZ $ // Copyright: (c) Vadim Zeitlin, Wlodzimierz Skiba // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -68,7 +68,7 @@ public: wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = -1); + int imageId = NO_IMAGE); virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); } virtual int ChangeSelection(size_t n) { return DoSetSelection(n); } diff --git a/Externals/wxWidgets3/include/wx/clipbrd.h b/Externals/wxWidgets3/include/wx/clipbrd.h index 9ba7f3734b..f9ff4df6af 100644 --- a/Externals/wxWidgets3/include/wx/clipbrd.h +++ b/Externals/wxWidgets3/include/wx/clipbrd.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 19.10.99 -// RCS-ID: $Id: clipbrd.h 61485 2009-07-20 23:54:08Z VZ $ +// RCS-ID: $Id: clipbrd.h 70353 2012-01-15 14:46:41Z VZ $ // Copyright: (c) wxWidgets Team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -160,8 +160,6 @@ typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&); #include "wx/gtk1/clipbrd.h" #elif defined(__WXX11__) #include "wx/x11/clipbrd.h" -#elif defined(__WXMGL__) - #include "wx/mgl/clipbrd.h" #elif defined(__WXMAC__) #include "wx/osx/clipbrd.h" #elif defined(__WXCOCOA__) diff --git a/Externals/wxWidgets3/include/wx/cmdline.h b/Externals/wxWidgets3/include/wx/cmdline.h index af67c9c558..8d02fa3a68 100644 --- a/Externals/wxWidgets3/include/wx/cmdline.h +++ b/Externals/wxWidgets3/include/wx/cmdline.h @@ -5,7 +5,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 04.01.00 -// RCS-ID: $Id: cmdline.h 66253 2010-11-24 00:42:53Z VZ $ +// RCS-ID: $Id: cmdline.h 69797 2011-11-22 13:18:58Z VZ $ // Copyright: (c) 2000 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -183,12 +183,25 @@ public: void AddSwitch(const wxString& name, const wxString& lng = wxEmptyString, const wxString& desc = wxEmptyString, int flags = 0); + void AddLongSwitch(const wxString& lng, + const wxString& desc = wxEmptyString, + int flags = 0) + { + AddSwitch(wxString(), lng, desc, flags); + } // an option taking a value of the given type void AddOption(const wxString& name, const wxString& lng = wxEmptyString, const wxString& desc = wxEmptyString, wxCmdLineParamType type = wxCMD_LINE_VAL_STRING, int flags = 0); + void AddLongOption(const wxString& lng, + const wxString& desc = wxEmptyString, + wxCmdLineParamType type = wxCMD_LINE_VAL_STRING, + int flags = 0) + { + AddOption(wxString(), lng, desc, type, flags); + } // a parameter void AddParam(const wxString& desc = wxEmptyString, diff --git a/Externals/wxWidgets3/include/wx/cmdproc.h b/Externals/wxWidgets3/include/wx/cmdproc.h index dc738da629..e1692cbef5 100644 --- a/Externals/wxWidgets3/include/wx/cmdproc.h +++ b/Externals/wxWidgets3/include/wx/cmdproc.h @@ -4,7 +4,7 @@ // Author: Julian Smart (extracted from docview.h by VZ) // Modified by: // Created: 05.11.00 -// RCS-ID: $Id: cmdproc.h 58757 2009-02-08 11:45:59Z VZ $ +// RCS-ID: $Id: cmdproc.h 70459 2012-01-25 00:05:09Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -97,10 +97,7 @@ public: virtual void ClearCommands(); // Has the current project been changed? - virtual bool IsDirty() const - { - return m_currentCommand && (m_lastSavedCommand != m_currentCommand); - } + virtual bool IsDirty() const; // Mark the current command as the one where the last save took place void MarkAsSaved() diff --git a/Externals/wxWidgets3/include/wx/cmndata.h b/Externals/wxWidgets3/include/wx/cmndata.h index e803f49711..ce330fde5e 100644 --- a/Externals/wxWidgets3/include/wx/cmndata.h +++ b/Externals/wxWidgets3/include/wx/cmndata.h @@ -4,7 +4,7 @@ // Author: Julian Smart and others // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: cmndata.h 66615 2011-01-07 05:26:57Z PC $ +// RCS-ID: $Id: cmndata.h 70636 2012-02-20 21:55:55Z VZ $ // Copyright: (c) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -189,7 +189,7 @@ public: // Is this data OK for showing the print dialog? bool Ok() const { return IsOk(); } - bool IsOk() const { return m_printData.Ok() ; } + bool IsOk() const { return m_printData.IsOk() ; } wxPrintData& GetPrintData() { return m_printData; } void SetPrintData(const wxPrintData& printData) { m_printData = printData; } @@ -249,7 +249,7 @@ public: // Is this data OK for showing the page setup dialog? bool Ok() const { return IsOk(); } - bool IsOk() const { return m_printData.Ok() ; } + bool IsOk() const { return m_printData.IsOk() ; } // If a corresponding paper type is found in the paper database, will set the m_printData // paper size id member as well. @@ -280,7 +280,7 @@ public: // Use paper id in wxPrintData to set this object's paper size void CalculatePaperSizeFromId(); - wxPageSetupDialogData& operator=(const wxPageSetupData& data); + wxPageSetupDialogData& operator=(const wxPageSetupDialogData& data); wxPageSetupDialogData& operator=(const wxPrintData& data); wxPrintData& GetPrintData() { return m_printData; } diff --git a/Externals/wxWidgets3/include/wx/cocoa/chkconf.h b/Externals/wxWidgets3/include/wx/cocoa/chkconf.h index 450df1692d..0b2516cc44 100644 --- a/Externals/wxWidgets3/include/wx/cocoa/chkconf.h +++ b/Externals/wxWidgets3/include/wx/cocoa/chkconf.h @@ -3,7 +3,7 @@ * Purpose: wxCocoa-specific config settings checks * Author: Vadim Zeitlin * Created: 2008-09-11 - * RCS-ID: $Id: chkconf.h 55546 2008-09-11 11:20:33Z VZ $ + * RCS-ID: $Id: chkconf.h 67497 2011-04-15 19:18:34Z DS $ * Copyright: (c) 2008 Vadim Zeitlin * Licence: wxWindows licence */ @@ -19,4 +19,4 @@ #undef wxUSE_LOG_DIALOG #define wxUSE_LOG_DIALOG 0 -#endif // _WX_COCOA_CHKCONF_H_ +#endif /* _WX_COCOA_CHKCONF_H_ */ diff --git a/Externals/wxWidgets3/include/wx/cocoa/dc.h b/Externals/wxWidgets3/include/wx/cocoa/dc.h index 4c043ce8e7..e388eccaec 100644 --- a/Externals/wxWidgets3/include/wx/cocoa/dc.h +++ b/Externals/wxWidgets3/include/wx/cocoa/dc.h @@ -4,7 +4,7 @@ // Author: David Elliott // Modified by: // Created: 2003/04/01 -// RCS-ID: $Id: dc.h 58757 2009-02-08 11:45:59Z VZ $ +// RCS-ID: $Id: dc.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) 2003 David Elliott // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -80,10 +80,10 @@ public: virtual void Clear(); virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; } - virtual void EndDoc(void) {}; + virtual void EndDoc(void) {} - virtual void StartPage(void) {}; - virtual void EndPage(void) {}; + virtual void StartPage(void) {} + virtual void EndPage(void) {} virtual void SetFont(const wxFont& font); virtual void SetPen(const wxPen& pen); diff --git a/Externals/wxWidgets3/include/wx/cocoa/font.h b/Externals/wxWidgets3/include/wx/cocoa/font.h index 3f61c4fd1b..4783532b44 100644 --- a/Externals/wxWidgets3/include/wx/cocoa/font.h +++ b/Externals/wxWidgets3/include/wx/cocoa/font.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: font.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: font.h 70445 2012-01-23 11:28:21Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -75,6 +75,19 @@ public: SetPixelSize(pixelSize); } + wxFont(int pointSize, + wxFontFamily family, + int flags = wxFONTFLAG_DEFAULT, + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT) + { + Create(pointSize, family, + GetStyleFromFlags(flags), + GetWeightFromFlags(flags), + GetUnderlinedFromFlags(flags), + face, encoding); + } + /*! @abstract Construction with opaque wxNativeFontInfo */ wxFont(const wxNativeFontInfo& info) diff --git a/Externals/wxWidgets3/include/wx/cocoa/notebook.h b/Externals/wxWidgets3/include/wx/cocoa/notebook.h index 46be4d570c..fade3ac3a6 100644 --- a/Externals/wxWidgets3/include/wx/cocoa/notebook.h +++ b/Externals/wxWidgets3/include/wx/cocoa/notebook.h @@ -4,7 +4,7 @@ // Author: David Elliott // Modified by: // Created: 2004/04/08 -// RCS-ID: $Id: notebook.h 65930 2010-10-27 16:54:24Z VZ $ +// RCS-ID: $Id: notebook.h 68810 2011-08-21 14:08:49Z VZ $ // Copyright: (c) 2004 David Elliott // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -97,7 +97,7 @@ public: wxNotebookPage *win, const wxString& strText, bool bSelect = false, - int imageId = -1 ); + int imageId = NO_IMAGE ); protected: }; diff --git a/Externals/wxWidgets3/include/wx/cocoa/sound.h b/Externals/wxWidgets3/include/wx/cocoa/sound.h index 2d22dfdff3..09bc45523d 100644 --- a/Externals/wxWidgets3/include/wx/cocoa/sound.h +++ b/Externals/wxWidgets3/include/wx/cocoa/sound.h @@ -5,7 +5,7 @@ // Authors: David Elliott, Ryan Norton // Modified by: // Created: 2004-10-02 -// RCS-ID: $Id: sound.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: sound.h 69178 2011-09-21 15:08:02Z VZ $ // Copyright: (c) 2004 David Elliott, Ryan Norton // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -25,7 +25,7 @@ public: wxSound(const wxString& fileName, bool isResource = false) : m_cocoaNSSound(NULL) { Create(fileName, isResource); } - wxSound(int size, const wxByte* data) + wxSound(size_t size, const void* data) : m_cocoaNSSound(NULL) { LoadWAV(data,size,true); } wxSound(const wxSound& sound); // why not? @@ -43,7 +43,7 @@ public: { return m_cocoaNSSound; } protected: bool DoPlay(unsigned flags) const; - bool LoadWAV(const wxUint8 *data, size_t length, bool copyData); + bool LoadWAV(const void* data, size_t length, bool copyData); private: WX_NSSound m_cocoaNSSound; static const wxObjcAutoRefFromAlloc sm_cocoaDelegate; diff --git a/Externals/wxWidgets3/include/wx/colordlg.h b/Externals/wxWidgets3/include/wx/colordlg.h index 1b339788d2..4632e99698 100644 --- a/Externals/wxWidgets3/include/wx/colordlg.h +++ b/Externals/wxWidgets3/include/wx/colordlg.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitiln // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: colordlg.h 66615 2011-01-07 05:26:57Z PC $ +// RCS-ID: $Id: colordlg.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -24,8 +24,6 @@ #include "wx/osx/colordlg.h" #elif defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) #include "wx/gtk/colordlg.h" -#elif defined(__WXPALMOS__) - #include "wx/palmos/colordlg.h" #else #include "wx/generic/colrdlgg.h" diff --git a/Externals/wxWidgets3/include/wx/colour.h b/Externals/wxWidgets3/include/wx/colour.h index 08dd20910c..0c9cf08565 100644 --- a/Externals/wxWidgets3/include/wx/colour.h +++ b/Externals/wxWidgets3/include/wx/colour.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: Francesco Montorsi // Created: -// RCS-ID: $Id: colour.h 66966 2011-02-19 12:32:59Z VZ $ +// RCS-ID: $Id: colour.h 70353 2012-01-15 14:46:41Z VZ $ // Copyright: Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -213,9 +213,7 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxColourBase* col); -#if defined(__WXPALMOS__) - #include "wx/generic/colour.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #include "wx/msw/colour.h" #elif defined(__WXMOTIF__) #include "wx/motif/colour.h" @@ -223,8 +221,6 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxColourBase* col); #include "wx/gtk/colour.h" #elif defined(__WXGTK__) #include "wx/gtk1/colour.h" -#elif defined(__WXMGL__) - #include "wx/generic/colour.h" #elif defined(__WXDFB__) #include "wx/generic/colour.h" #elif defined(__WXX11__) diff --git a/Externals/wxWidgets3/include/wx/combo.h b/Externals/wxWidgets3/include/wx/combo.h index 98a6094ff7..f624f7cd59 100644 --- a/Externals/wxWidgets3/include/wx/combo.h +++ b/Externals/wxWidgets3/include/wx/combo.h @@ -4,7 +4,7 @@ // Author: Jaakko Salli // Modified by: // Created: Apr-30-2006 -// RCS-ID: $Id: combo.h 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: combo.h 69942 2011-12-07 14:05:11Z VZ $ // Copyright: (c) Jaakko Salli // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -560,7 +560,8 @@ protected: // Standard textctrl positioning routine. Just give it platform-dependant // textctrl coordinate adjustment. - virtual void PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust ); + virtual void PositionTextCtrl( int textCtrlXAdjust = 0, + int textCtrlYAdjust = 0); // event handlers void OnSizeEvent( wxSizeEvent& event ); @@ -641,7 +642,7 @@ protected: // main (ie. topmost) window of a composite control (default = this) wxWindow* m_mainCtrlWnd; - // used to prevent immediate re-popupping incase closed popup + // used to prevent immediate re-popupping in case closed popup // by clicking on the combo control (needed because of inconsistent // transient implementation across platforms). wxLongLong m_timeCanAcceptClick; @@ -767,6 +768,13 @@ public: // Return true for success. virtual bool Create(wxWindow* parent) = 0; + // Calls Destroy() for the popup control (i.e. one returned by + // GetControl()) and makes sure that 'this' is deleted at the end. + // Default implementation works for both cases where popup control + // class is multiple inherited or created on heap as a separate + // object. + virtual void DestroyPopup(); + // We must have an associated control which is subclassed by the combobox. virtual wxWindow *GetControl() = 0; diff --git a/Externals/wxWidgets3/include/wx/combobox.h b/Externals/wxWidgets3/include/wx/combobox.h index 63ae722bea..a28dae2454 100644 --- a/Externals/wxWidgets3/include/wx/combobox.h +++ b/Externals/wxWidgets3/include/wx/combobox.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 24.12.00 -// RCS-ID: $Id: combobox.h 63242 2010-01-24 01:00:45Z VZ $ +// RCS-ID: $Id: combobox.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) 1996-2000 wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -36,7 +36,13 @@ public: wxItemContainer::Clear(); } - bool IsEmpty() const { return wxItemContainer::IsEmpty(); } + // IsEmpty() is ambiguous because we inherit it from both wxItemContainer + // and wxTextEntry, and even if defined it here to help the compiler with + // choosing one of them, it would still be confusing for the human users of + // this class. So instead define the clearly named methods below and leave + // IsEmpty() ambiguous to trigger a compilation error if it's used. + bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } + bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); } // also bring in GetSelection() versions of both base classes in scope // @@ -47,8 +53,8 @@ public: virtual int GetSelection() const = 0; virtual void GetSelection(long *from, long *to) const = 0; - virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); }; - virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); }; + virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); } + virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); } // may return value different from GetSelection() when the combobox // dropdown is shown and the user selected, but not yet accepted, a value diff --git a/Externals/wxWidgets3/include/wx/compositewin.h b/Externals/wxWidgets3/include/wx/compositewin.h index 390607d71f..2c6503aaeb 100644 --- a/Externals/wxWidgets3/include/wx/compositewin.h +++ b/Externals/wxWidgets3/include/wx/compositewin.h @@ -3,7 +3,7 @@ // Purpose: wxCompositeWindow<> declaration // Author: Vadim Zeitlin // Created: 2011-01-02 -// RCS-ID: $Id: compositewin.h 66931 2011-02-16 23:45:04Z VZ $ +// RCS-ID: $Id: compositewin.h 69470 2011-10-19 16:20:01Z VS $ // Copyright: (c) 2011 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -12,22 +12,15 @@ #define _WX_COMPOSITEWIN_H_ #include "wx/window.h" +#include "wx/containr.h" + +class WXDLLIMPEXP_FWD_CORE wxToolTip; // NB: This is an experimental and, as for now, undocumented class used only by // wxWidgets itself internally. Don't use it in your code until its API is // officially stabilized unless you are ready to change it with the next // wxWidgets release. -// FIXME-VC6: This compiler can't compile DoSetForAllParts() template function, -// it can't determine whether the deduced type should be "T" or "const T&". And -// without this function wxCompositeWindow is pretty useless so simply disable -// this code for it, this does mean that setting colours/fonts/... for -// composite controls won't work in the library compiled with it but so far -// this only affects the generic wxDatePickerCtrl which is not used by default -// under MSW anyhow so it doesn't seem to be worth it to spend time and uglify -// the code to fix it. -#ifndef __VISUALC6__ - // ---------------------------------------------------------------------------- // wxCompositeWindow is a helper for implementing composite windows: to define // a class using subwindows, simply inherit from it specialized with the real @@ -42,7 +35,25 @@ public: typedef W BaseWindowClass; // Default ctor doesn't do anything. - wxCompositeWindow() { } + wxCompositeWindow() + { + this->Connect + ( + wxEVT_CREATE, + wxWindowCreateEventHandler(wxCompositeWindow::OnWindowCreate) + ); + + } + +#ifndef __VISUALC6__ + // FIXME-VC6: This compiler can't compile DoSetForAllParts() template function, + // it can't determine whether the deduced type should be "T" or "const T&". And + // without this function wxCompositeWindow is pretty useless so simply disable + // this code for it, this does mean that setting colours/fonts/... for + // composite controls won't work in the library compiled with it but so far + // this only affects the generic wxDatePickerCtrl which is not used by default + // under MSW anyhow so it doesn't seem to be worth it to spend time and uglify + // the code to fix it. // Override all wxWindow methods which must be forwarded to the composite // window parts. @@ -59,7 +70,7 @@ public: if ( !BaseWindowClass::SetForegroundColour(colour) ) return false; - DoSetForAllParts(&wxWindowBase::SetForegroundColour, colour); + SetForAllParts(&wxWindowBase::SetForegroundColour, colour); return true; } @@ -69,7 +80,7 @@ public: if ( !BaseWindowClass::SetBackgroundColour(colour) ) return false; - DoSetForAllParts(&wxWindowBase::SetBackgroundColour, colour); + SetForAllParts(&wxWindowBase::SetBackgroundColour, colour); return true; } @@ -79,7 +90,7 @@ public: if ( !BaseWindowClass::SetFont(font) ) return false; - DoSetForAllParts(&wxWindowBase::SetFont, font); + SetForAllParts(&wxWindowBase::SetFont, font); return true; } @@ -89,18 +100,112 @@ public: if ( !BaseWindowClass::SetCursor(cursor) ) return false; - DoSetForAllParts(&wxWindowBase::SetCursor, cursor); + SetForAllParts(&wxWindowBase::SetCursor, cursor); return true; } +#if wxUSE_TOOLTIPS + virtual void DoSetToolTip(wxToolTip *tip) + { + BaseWindowClass::DoSetToolTip(tip); + + SetForAllParts(&wxWindowBase::CopyToolTip, tip); + } +#endif // wxUSE_TOOLTIPS + +#endif // !__VISUALC6__ + + virtual void SetFocus() + { + wxSetFocusToChild(this, NULL); + } + private: // Must be implemented by the derived class to return all children to which // the public methods we override should forward to. virtual wxWindowList GetCompositeWindowParts() const = 0; + void OnWindowCreate(wxWindowCreateEvent& event) + { + event.Skip(); + + // Attach a few event handlers to all parts of the composite window. + // This makes the composite window behave more like a simple control + // and allows other code (such as wxDataViewCtrl's inline editing + // support) to hook into its event processing. + + wxWindow *child = event.GetWindow(); + if ( child == this ) + return; // not a child, we don't want to Connect() to ourselves + + // Always capture wxEVT_KILL_FOCUS: + child->Connect(wxEVT_KILL_FOCUS, + wxFocusEventHandler(wxCompositeWindow::OnKillFocus), + NULL, this); + + // Some events should be only handled for non-toplevel children. For + // example, we want to close the control in wxDataViewCtrl when Enter + // is pressed in the inline editor, but not when it's pressed in a + // popup dialog it opens. + wxWindow *win = child; + while ( win && win != this ) + { + if ( win->IsTopLevel() ) + return; + win = win->GetParent(); + } + + child->Connect(wxEVT_CHAR, + wxKeyEventHandler(wxCompositeWindow::OnChar), + NULL, this); + } + + void OnChar(wxKeyEvent& event) + { + if ( !this->ProcessWindowEvent(event) ) + event.Skip(); + } + + void OnKillFocus(wxFocusEvent& event) + { + // Ignore focus changes within the composite control: + wxWindow *win = event.GetWindow(); + while ( win ) + { + if ( win == this ) + { + event.Skip(); + return; + } + + // Note that we don't use IsTopLevel() check here, because we do + // want to ignore focus changes going to toplevel window that have + // the composite control as its parent; these would typically be + // some kind of control's popup window. + win = win->GetParent(); + } + + // The event shouldn't be ignored, forward it to the main control: + if ( !this->ProcessWindowEvent(event) ) + event.Skip(); + } + +#ifndef __VISUALC6__ template - void DoSetForAllParts(bool (wxWindowBase::*func)(const T&), const T& arg) + void SetForAllParts(bool (wxWindowBase::*func)(const T&), const T& arg) + { + DoSetForAllParts(func, arg); + } + + template + void SetForAllParts(bool (wxWindowBase::*func)(T*), T* arg) + { + DoSetForAllParts(func, arg); + } + + template + void DoSetForAllParts(bool (wxWindowBase::*func)(T), T arg) { // Simply call the setters for all parts of this composite window. const wxWindowList parts = GetCompositeWindowParts(); @@ -110,20 +215,16 @@ private: { wxWindow * const child = *i; - (child->*func)(arg); + // Allow NULL elements in the list, this makes the code of derived + // composite controls which may have optionally shown children + // simpler and it doesn't cost us much here. + if ( child ) + (child->*func)(arg); } } +#endif // !__VISUALC6__ wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxCompositeWindow, W); }; -#else // __VISUALC6__ - -template -class wxCompositeWindow : public W -{ -}; - -#endif // !__VISUALC6__/__VISUALC6__ - #endif // _WX_COMPOSITEWIN_H_ diff --git a/Externals/wxWidgets3/include/wx/config.h b/Externals/wxWidgets3/include/wx/config.h index 3c2dbad63a..672e0a5cf2 100644 --- a/Externals/wxWidgets3/include/wx/config.h +++ b/Externals/wxWidgets3/include/wx/config.h @@ -5,7 +5,7 @@ // Modified by: // Created: // Copyright: (c) Julian Smart -// RCS-ID: $Id: config.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: config.h 70808 2012-03-04 20:31:42Z VZ $ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -22,15 +22,12 @@ // under Windows we prefer to use the native implementation but can be forced // to use the file-based one -#if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE +#if defined(__WINDOWS__) && wxUSE_CONFIG_NATIVE #include "wx/msw/regconf.h" #define wxConfig wxRegConfig #elif defined(__WXOS2__) && wxUSE_CONFIG_NATIVE #include "wx/os2/iniconf.h" #define wxConfig wxIniConfig -#elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE - #include "wx/palmos/prefconf.h" - #define wxConfig wxPrefConfig #else // either we're under Unix or wish to always use config files #include "wx/fileconf.h" #define wxConfig wxFileConfig diff --git a/Externals/wxWidgets3/include/wx/containr.h b/Externals/wxWidgets3/include/wx/containr.h index c961a772da..a509df834c 100644 --- a/Externals/wxWidgets3/include/wx/containr.h +++ b/Externals/wxWidgets3/include/wx/containr.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////////// // Name: wx/containr.h -// Purpose: wxControlContainer class declration: a "mix-in" class which -// implements the TAB navigation between the controls +// Purpose: wxControlContainer and wxNavigationEnabled declarations // Author: Vadim Zeitlin // Modified by: // Created: 06.08.01 -// RCS-ID: $Id: containr.h 61508 2009-07-23 20:30:22Z VZ $ -// Copyright: (c) 2001 Vadim Zeitlin +// RCS-ID: $Id: containr.h 70805 2012-03-04 09:42:51Z SC $ +// Copyright: (c) 2001, 2011 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -15,16 +14,20 @@ #include "wx/defs.h" +#ifndef wxHAS_NATIVE_TAB_TRAVERSAL + // We need wxEVT_XXX declarations in this case. + #include "wx/event.h" +#endif + class WXDLLIMPEXP_FWD_CORE wxWindow; class WXDLLIMPEXP_FWD_CORE wxWindowBase; /* - Implementation note: wxControlContainer is not a real mix-in but rather - a class meant to be aggregated with (and not inherited from). Although - logically it should be a mix-in, doing it like this has no advantage from - the point of view of the existing code but does have some problems (we'd - need to play tricks with event handlers which may be difficult to do - safely). The price we pay for this simplicity is the ugly macros below. + This header declares wxControlContainer class however it's not a real + container of controls but rather just a helper used to implement TAB + navigation among the window children. You should rarely need to use it + directly, derive from the documented public wxNavigationEnabled<> class to + implement TAB navigation in a custom composite window. */ // ---------------------------------------------------------------------------- @@ -102,6 +105,161 @@ private: bool m_inSetFocus; }; +#ifdef wxHAS_NATIVE_TAB_TRAVERSAL + +// ---------------------------------------------------------------------------- +// wxControlContainer for native TAB navigation +// ---------------------------------------------------------------------------- + +// this must be a real class as we forward-declare it elsewhere +class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase +{ +protected: + // set the focus to the child which had it the last time + virtual bool SetFocusToChild(); +}; + +#else // !wxHAS_NATIVE_TAB_TRAVERSAL + +// ---------------------------------------------------------------------------- +// wxControlContainer for TAB navigation implemented in wx itself +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase +{ +public: + // default ctor, SetContainerWindow() must be called later + wxControlContainer(); + + // the methods to be called from the window event handlers + void HandleOnNavigationKey(wxNavigationKeyEvent& event); + void HandleOnFocus(wxFocusEvent& event); + void HandleOnWindowDestroy(wxWindowBase *child); + + // called from OnChildFocus() handler, i.e. when one of our (grand) + // children gets the focus + void SetLastFocus(wxWindow *win); + +protected: + + wxDECLARE_NO_COPY_CLASS(wxControlContainer); +}; + +#endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL + +// this function is for wxWidgets internal use only +extern WXDLLIMPEXP_CORE bool wxSetFocusToChild(wxWindow *win, wxWindow **child); + +// ---------------------------------------------------------------------------- +// wxNavigationEnabled: Derive from this class to support keyboard navigation +// among window children in a wxWindow-derived class. The details of this class +// don't matter, you just need to derive from it to make navigation work. +// ---------------------------------------------------------------------------- + +// The template parameter W must be a wxWindow-derived class. +template +class wxNavigationEnabled : public W +{ +public: + typedef W BaseWindowClass; + + wxNavigationEnabled() + { + m_container.SetContainerWindow(this); + +#ifndef wxHAS_NATIVE_TAB_TRAVERSAL + BaseWindowClass::Connect(wxEVT_NAVIGATION_KEY, + wxNavigationKeyEventHandler(wxNavigationEnabled::OnNavigationKey)); + + BaseWindowClass::Connect(wxEVT_SET_FOCUS, + wxFocusEventHandler(wxNavigationEnabled::OnFocus)); + + BaseWindowClass::Connect(wxEVT_CHILD_FOCUS, + wxChildFocusEventHandler(wxNavigationEnabled::OnChildFocus)); +#endif // !wxHAS_NATIVE_TAB_TRAVERSAL + } + + WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocus() const + { + return m_container.AcceptsFocus(); + } + + WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusRecursively() const + { + return m_container.AcceptsFocusRecursively(); + } + + WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusFromKeyboard() const + { + return m_container.AcceptsFocusFromKeyboard(); + } + + WXDLLIMPEXP_INLINE_CORE virtual void AddChild(wxWindowBase *child) + { + BaseWindowClass::AddChild(child); + + m_container.UpdateCanFocus(); + } + + WXDLLIMPEXP_INLINE_CORE virtual void RemoveChild(wxWindowBase *child) + { +#ifndef wxHAS_NATIVE_TAB_TRAVERSAL + m_container.HandleOnWindowDestroy(child); +#endif // !wxHAS_NATIVE_TAB_TRAVERSAL + + BaseWindowClass::RemoveChild(child); + + m_container.UpdateCanFocus(); + } + + WXDLLIMPEXP_INLINE_CORE virtual void SetFocus() + { + if ( !m_container.DoSetFocus() ) + BaseWindowClass::SetFocus(); + } + + void SetFocusIgnoringChildren() + { + BaseWindowClass::SetFocus(); + } + + void AcceptFocus(bool acceptFocus) + { + m_container.SetCanFocus(acceptFocus); + } + +protected: +#ifndef wxHAS_NATIVE_TAB_TRAVERSAL + void OnNavigationKey(wxNavigationKeyEvent& event) + { + m_container.HandleOnNavigationKey(event); + } + + void OnFocus(wxFocusEvent& event) + { + m_container.HandleOnFocus(event); + } + + void OnChildFocus(wxChildFocusEvent& event) + { + m_container.SetLastFocus(event.GetWindow()); + event.Skip(); + } +#endif // !wxHAS_NATIVE_TAB_TRAVERSAL + + wxControlContainer m_container; + + + wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxNavigationEnabled, W); +}; + +// ---------------------------------------------------------------------------- +// Compatibility macros from now on, do NOT use them and preferably do not even +// look at them. +// ---------------------------------------------------------------------------- + +#if WXWIN_COMPATIBILITY_2_8 + // common part of WX_DECLARE_CONTROL_CONTAINER in the native and generic cases, // it should be used in the wxWindow-derived class declaration #define WX_DECLARE_CONTROL_CONTAINER_BASE() \ @@ -156,20 +314,9 @@ protected: \ return m_container.AcceptsFocusFromKeyboard(); \ } + #ifdef wxHAS_NATIVE_TAB_TRAVERSAL -// ---------------------------------------------------------------------------- -// wxControlContainer for native TAB navigation -// ---------------------------------------------------------------------------- - -// this must be a real class as we forward-declare it elsewhere -class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase -{ -protected: - // set the focus to the child which had it the last time - virtual bool SetFocusToChild(); -}; - #define WX_EVENT_TABLE_CONTROL_CONTAINER(classname) #define WX_DECLARE_CONTROL_CONTAINER WX_DECLARE_CONTROL_CONTAINER_BASE @@ -191,38 +338,6 @@ protected: #else // !wxHAS_NATIVE_TAB_TRAVERSAL -class WXDLLIMPEXP_FWD_CORE wxFocusEvent; -class WXDLLIMPEXP_FWD_CORE wxNavigationKeyEvent; - -// ---------------------------------------------------------------------------- -// wxControlContainer for TAB navigation implemented in wx itself -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase -{ -public: - // default ctor, SetContainerWindow() must be called later - wxControlContainer(); - - // the methods to be called from the window event handlers - void HandleOnNavigationKey(wxNavigationKeyEvent& event); - void HandleOnFocus(wxFocusEvent& event); - void HandleOnWindowDestroy(wxWindowBase *child); - - // called from OnChildFocus() handler, i.e. when one of our (grand) - // children gets the focus - void SetLastFocus(wxWindow *win); - -protected: - - wxDECLARE_NO_COPY_CLASS(wxControlContainer); -}; - -// ---------------------------------------------------------------------------- -// macros which may be used by the classes wishing to implement TAB navigation -// among their children -// ---------------------------------------------------------------------------- - // declare the methods to be forwarded #define WX_DECLARE_CONTROL_CONTAINER() \ WX_DECLARE_CONTROL_CONTAINER_BASE(); \ @@ -274,7 +389,6 @@ public: \ #endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL -// this function is for wxWidgets internal use only -extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child); +#endif // WXWIN_COMPATIBILITY_2_8 #endif // _WX_CONTAINR_H_ diff --git a/Externals/wxWidgets3/include/wx/control.h b/Externals/wxWidgets3/include/wx/control.h index 6c859b6868..778ec1870e 100644 --- a/Externals/wxWidgets3/include/wx/control.h +++ b/Externals/wxWidgets3/include/wx/control.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 26.07.99 -// RCS-ID: $Id: control.h 67062 2011-02-27 12:48:07Z VZ $ +// RCS-ID: $Id: control.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -221,8 +221,6 @@ protected: #if defined(__WXUNIVERSAL__) #include "wx/univ/control.h" -#elif defined(__WXPALMOS__) - #include "wx/palmos/control.h" #elif defined(__WXMSW__) #include "wx/msw/control.h" #elif defined(__WXMOTIF__) diff --git a/Externals/wxWidgets3/include/wx/convauto.h b/Externals/wxWidgets3/include/wx/convauto.h index ac5f02d7f1..0d9303959d 100644 --- a/Externals/wxWidgets3/include/wx/convauto.h +++ b/Externals/wxWidgets3/include/wx/convauto.h @@ -3,7 +3,7 @@ // Purpose: wxConvAuto class declaration // Author: Vadim Zeitlin // Created: 2006-04-03 -// RCS-ID: $Id: convauto.h 63991 2010-04-16 10:43:18Z VS $ +// RCS-ID: $Id: convauto.h 69675 2011-11-05 11:23:41Z VZ $ // Copyright: (c) 2006 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -18,6 +18,18 @@ // wxConvAuto: uses BOM to automatically detect input encoding // ---------------------------------------------------------------------------- +// All currently recognized BOM values. +enum wxBOM +{ + wxBOM_Unknown = -1, + wxBOM_None, + wxBOM_UTF32BE, + wxBOM_UTF32LE, + wxBOM_UTF16BE, + wxBOM_UTF16LE, + wxBOM_UTF8 +}; + class WXDLLIMPEXP_BASE wxConvAuto : public wxMBConv { public: @@ -69,29 +81,27 @@ public: virtual wxMBConv *Clone() const { return new wxConvAuto(*this); } -private: - // all currently recognized BOM values - enum BOMType - { - BOM_Unknown = -1, - BOM_None, - BOM_UTF32BE, - BOM_UTF32LE, - BOM_UTF16BE, - BOM_UTF16LE, - BOM_UTF8 - }; - // return the BOM type of this buffer - static BOMType DetectBOM(const char *src, size_t srcLen); + static wxBOM DetectBOM(const char *src, size_t srcLen); + // return the characters composing the given BOM. + static const char* GetBOMChars(wxBOM bomType, size_t* count); + + wxBOM GetBOM() const + { + return m_bomType; + } + +private: // common part of all ctors void Init() { - // no need to initialize m_bomType and m_consumedBOM here, this will be - // done when m_conv is created + // We don't initialize m_encDefault here as different ctors do it + // differently. m_conv = NULL; + m_bomType = wxBOM_Unknown; m_ownsConv = false; + m_consumedBOM = false; } // initialize m_conv with the UTF-8 conversion @@ -102,7 +112,7 @@ private: } // create the correct conversion object for the given BOM type - void InitFromBOM(BOMType bomType); + void InitFromBOM(wxBOM bomType); // create the correct conversion object for the BOM present in the // beginning of the buffer @@ -128,7 +138,7 @@ private: wxFontEncoding m_encDefault; // our BOM type - BOMType m_bomType; + wxBOM m_bomType; // true if we allocated m_conv ourselves, false if we just use an existing // global conversion diff --git a/Externals/wxWidgets3/include/wx/cppunit.h b/Externals/wxWidgets3/include/wx/cppunit.h index 831b6891a0..7c5a114bf5 100644 --- a/Externals/wxWidgets3/include/wx/cppunit.h +++ b/Externals/wxWidgets3/include/wx/cppunit.h @@ -3,7 +3,7 @@ // Purpose: wrapper header for CppUnit headers // Author: Vadim Zeitlin // Created: 15.02.04 -// RCS-ID: $Id: cppunit.h 66711 2011-01-19 10:47:49Z VZ $ +// RCS-ID: $Id: cppunit.h 69241 2011-09-30 14:00:52Z JJ $ // Copyright: (c) 2004 Vadim Zeitlin // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -200,6 +200,10 @@ WX_CPPUNIT_ALLOW_EQUALS_TO_INT(short) WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned) WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned long) +#if defined( __VMS ) && defined( __ia64 ) +WX_CPPUNIT_ALLOW_EQUALS_TO_INT(std::basic_streambuf::pos_type); +#endif + #ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxLongLong_t) WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned wxLongLong_t) diff --git a/Externals/wxWidgets3/include/wx/ctrlsub.h b/Externals/wxWidgets3/include/wx/ctrlsub.h index 70a69d1103..198aae24c6 100644 --- a/Externals/wxWidgets3/include/wx/ctrlsub.h +++ b/Externals/wxWidgets3/include/wx/ctrlsub.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 22.10.99 -// RCS-ID: $Id: ctrlsub.h 65040 2010-07-22 12:09:15Z VZ $ +// RCS-ID: $Id: ctrlsub.h 68460 2011-07-30 11:30:08Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -395,41 +395,48 @@ private: wxClientDataType m_clientDataItemsType; }; -// this macro must (unfortunately) be used in any class deriving from both -// wxItemContainer and wxControl because otherwise there is ambiguity when -// calling GetClientXXX() functions -- the compiler can't choose between the -// two versions -#define wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST \ - void SetClientData(void *data) \ - { wxEvtHandler::SetClientData(data); } \ - void *GetClientData() const \ - { return wxEvtHandler::GetClientData(); } \ - void SetClientObject(wxClientData *data) \ - { wxEvtHandler::SetClientObject(data); } \ - wxClientData *GetClientObject() const \ - { return wxEvtHandler::GetClientObject(); } \ - void SetClientData(unsigned int n, void* clientData) \ - { wxItemContainer::SetClientData(n, clientData); } \ - void* GetClientData(unsigned int n) const \ - { return wxItemContainer::GetClientData(n); } \ - void SetClientObject(unsigned int n, wxClientData* clientData) \ - { wxItemContainer::SetClientObject(n, clientData); } \ - wxClientData* GetClientObject(unsigned int n) const \ - { return wxItemContainer::GetClientObject(n); } +// Inheriting directly from a wxWindow-derived class and wxItemContainer +// unfortunately introduces an ambiguity for all GetClientXXX() methods as they +// are inherited twice: the "global" versions from wxWindow and the per-item +// versions taking the index from wxItemContainer. +// +// So we need to explicitly resolve them and this helper template class is +// provided to do it. To use it, simply inherit from wxWindowWithItems instead of Window and Container interface directly. +template +class wxWindowWithItems : public W, public C +{ +public: + typedef W BaseWindowClass; + typedef C BaseContainerInterface; -class WXDLLIMPEXP_CORE wxControlWithItemsBase : public wxControl, - public wxItemContainer + wxWindowWithItems() { } + + void SetClientData(void *data) + { BaseWindowClass::SetClientData(data); } + void *GetClientData() const + { return BaseWindowClass::GetClientData(); } + void SetClientObject(wxClientData *data) + { BaseWindowClass::SetClientObject(data); } + wxClientData *GetClientObject() const + { return BaseWindowClass::GetClientObject(); } + + void SetClientData(unsigned int n, void* clientData) + { wxItemContainer::SetClientData(n, clientData); } + void* GetClientData(unsigned int n) const + { return wxItemContainer::GetClientData(n); } + void SetClientObject(unsigned int n, wxClientData* clientData) + { wxItemContainer::SetClientObject(n, clientData); } + wxClientData* GetClientObject(unsigned int n) const + { return wxItemContainer::GetClientObject(n); } +}; + +class WXDLLIMPEXP_CORE wxControlWithItemsBase : + public wxWindowWithItems { public: wxControlWithItemsBase() { } - // we have to redefine these functions here to avoid ambiguities in classes - // deriving from us which would arise otherwise because both base classses - // have the methods with the same names - hopefully, a smart compiler can - // optimize away these simple inline wrappers so we don't suffer much from - // this - wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST - // usually the controls like list/combo boxes have their own background // colour virtual bool ShouldInheritColours() const { return false; } diff --git a/Externals/wxWidgets3/include/wx/cursor.h b/Externals/wxWidgets3/include/wx/cursor.h index 82bd282b45..a0ce868609 100644 --- a/Externals/wxWidgets3/include/wx/cursor.h +++ b/Externals/wxWidgets3/include/wx/cursor.h @@ -5,7 +5,7 @@ // Modified by: // Created: // Copyright: (c) Julian Smart -// RCS-ID: $Id: cursor.h 60648 2009-05-16 10:42:48Z FM $ +// RCS-ID: $Id: cursor.h 70353 2012-01-15 14:46:41Z VZ $ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -34,10 +34,7 @@ public: */ -#if defined(__WXPALMOS__) - #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE - #include "wx/palmos/cursor.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE #include "wx/msw/cursor.h" #elif defined(__WXMOTIF__) @@ -52,9 +49,6 @@ public: #elif defined(__WXX11__) #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XPM #include "wx/x11/cursor.h" -#elif defined(__WXMGL__) - #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE - #include "wx/mgl/cursor.h" #elif defined(__WXDFB__) #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE #include "wx/dfb/cursor.h" @@ -62,7 +56,7 @@ public: #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_MACCURSOR_RESOURCE #include "wx/osx/cursor.h" #elif defined(__WXCOCOA__) - #define wxCURSOR_DEFAULT_TYPE 0 + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_MACCURSOR_RESOURCE #include "wx/cocoa/cursor.h" #elif defined(__WXPM__) #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE diff --git a/Externals/wxWidgets3/include/wx/custombgwin.h b/Externals/wxWidgets3/include/wx/custombgwin.h new file mode 100644 index 0000000000..62ef32261f --- /dev/null +++ b/Externals/wxWidgets3/include/wx/custombgwin.h @@ -0,0 +1,53 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/custombgwin.h +// Purpose: Class adding support for custom window backgrounds. +// Author: Vadim Zeitlin +// Created: 2011-10-10 +// RCS-ID: $Id: custombgwin.h 69930 2011-12-04 23:57:36Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_CUSTOMBGWIN_H_ +#define _WX_CUSTOMBGWIN_H_ + +// ---------------------------------------------------------------------------- +// wxCustomBackgroundWindow: Adds support for custom backgrounds to any +// wxWindow-derived class. +// ---------------------------------------------------------------------------- + +class wxCustomBackgroundWindowBase +{ +public: + // Trivial default ctor. + wxCustomBackgroundWindowBase() { } + + // Also a trivial but virtual -- to suppress g++ warnings -- dtor. + virtual ~wxCustomBackgroundWindowBase() { } + + // Use the given bitmap to tile the background of this window. This bitmap + // will show through any transparent children. + // + // Notice that you must not prevent the base class EVT_ERASE_BACKGROUND + // handler from running (i.e. not to handle this event yourself) for this + // to work. + void SetBackgroundBitmap(const wxBitmap& bmp) + { + DoSetBackgroundBitmap(bmp); + } + +protected: + virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) = 0; + + wxDECLARE_NO_COPY_CLASS(wxCustomBackgroundWindowBase); +}; + +#if defined(__WXUNIVERSAL__) + #include "wx/univ/custombgwin.h" +#elif defined(__WXMSW__) + #include "wx/msw/custombgwin.h" +#else + #include "wx/generic/custombgwin.h" +#endif + +#endif // _WX_CUSTOMBGWIN_H_ diff --git a/Externals/wxWidgets3/include/wx/dataview.h b/Externals/wxWidgets3/include/wx/dataview.h index cc9d85efa9..3e81791cd0 100644 --- a/Externals/wxWidgets3/include/wx/dataview.h +++ b/Externals/wxWidgets3/include/wx/dataview.h @@ -4,7 +4,7 @@ // Author: Robert Roebling // Modified by: Bo Yang // Created: 08.01.06 -// RCS-ID: $Id: dataview.h 66783 2011-01-27 11:53:51Z SC $ +// RCS-ID: $Id: dataview.h 70377 2012-01-17 14:05:17Z VS $ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -21,9 +21,11 @@ #include "wx/variant.h" #include "wx/dynarray.h" #include "wx/icon.h" +#include "wx/itemid.h" #include "wx/weakref.h" #include "wx/vector.h" #include "wx/dataobj.h" +#include "wx/withimages.h" class WXDLLIMPEXP_FWD_CORE wxImageList; @@ -44,7 +46,6 @@ class WXDLLIMPEXP_FWD_CORE wxImageList; // wxDataViewCtrl globals // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_FWD_ADV wxDataViewItem; class WXDLLIMPEXP_FWD_ADV wxDataViewModel; class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl; class WXDLLIMPEXP_FWD_ADV wxDataViewColumn; @@ -78,33 +79,14 @@ extern WXDLLIMPEXP_DATA_ADV(const char) wxDataViewCtrlNameStr[]; // wxDataViewItem // --------------------------------------------------------- -class WXDLLIMPEXP_ADV wxDataViewItem +// Make it a class and not a typedef to allow forward declaring it. +class wxDataViewItem : public wxItemId { public: - wxDataViewItem( void* id = NULL ) - { m_id = id; } - wxDataViewItem( const wxDataViewItem &item ) - { m_id = item.m_id; } - bool IsOk() const { return m_id != NULL; } - void* GetID() const { return m_id; } - operator const void* () const { return m_id; } - -private: - void* m_id; + wxDataViewItem() : wxItemId() { } + wxEXPLICIT wxDataViewItem(void* pItem) : wxItemId(pItem) { } }; -inline -bool operator==(const wxDataViewItem& left, const wxDataViewItem& right) -{ - return left.GetID() == right.GetID(); -} - -inline -bool operator!=(const wxDataViewItem& left, const wxDataViewItem& right) -{ - return !(left == right); -} - WX_DEFINE_ARRAY(wxDataViewItem, wxDataViewItemArray); // --------------------------------------------------------- @@ -161,16 +143,20 @@ public: void SetColour(const wxColour& colour) { m_colour = colour; } void SetBold( bool set ) { m_bold = set; } void SetItalic( bool set ) { m_italic = set; } + void SetBackgroundColour(const wxColour& colour) { m_bgColour = colour; } // accessors - bool HasColour() const { return m_colour.Ok(); } + bool HasColour() const { return m_colour.IsOk(); } const wxColour& GetColour() const { return m_colour; } bool HasFont() const { return m_bold || m_italic; } bool GetBold() const { return m_bold; } bool GetItalic() const { return m_italic; } - bool IsDefault() const { return !(HasColour() || HasFont()); } + bool HasBackgroundColour() const { return m_bgColour.IsOk(); } + const wxColour& GetBackgroundColour() const { return m_bgColour; } + + bool IsDefault() const { return !(HasColour() || HasFont() || HasBackgroundColour()); } // Return the font based on the given one with this attribute applied to it. wxFont GetEffectiveFont(const wxFont& font) const; @@ -179,6 +165,7 @@ private: wxColour m_colour; bool m_bold; bool m_italic; + wxColour m_bgColour; }; @@ -681,7 +668,18 @@ public: wxDataViewItem GetCurrentItem() const; void SetCurrentItem(const wxDataViewItem& item); - virtual wxDataViewItem GetSelection() const = 0; + // Currently focused column of the current item or NULL if no column has focus + virtual wxDataViewColumn *GetCurrentColumn() const = 0; + + // Selection: both GetSelection() and GetSelections() can be used for the + // controls both with and without wxDV_MULTIPLE style. For single selection + // controls GetSelections() is not very useful however. And for multi + // selection controls GetSelection() returns an invalid item if more than + // one item is selected. Use GetSelectedItemsCount() or HasSelection() to + // check if any items are selected at all. + virtual int GetSelectedItemsCount() const = 0; + bool HasSelection() const { return GetSelectedItemsCount() != 0; } + wxDataViewItem GetSelection() const; virtual int GetSelections( wxDataViewItemArray & sel ) const = 0; virtual void SetSelections( const wxDataViewItemArray & sel ) = 0; virtual void Select( const wxDataViewItem & item ) = 0; @@ -701,6 +699,13 @@ public: virtual void HitTest( const wxPoint & point, wxDataViewItem &item, wxDataViewColumn* &column ) const = 0; virtual wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn *column = NULL ) const = 0; + virtual bool SetRowHeight( int WXUNUSED(rowHeight) ) { return false; } + + virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) = 0; + + // Use EditItem() instead + wxDEPRECATED( void StartEditor(const wxDataViewItem& item, unsigned int column) ); + #if wxUSE_DRAG_AND_DROP virtual bool EnableDragSource(const wxDataFormat& WXUNUSED(format)) { return false; } @@ -757,7 +762,8 @@ public: m_column(NULL), m_pos(-1,-1), m_cacheFrom(0), - m_cacheTo(0) + m_cacheTo(0), + m_editCancelled(false) #if wxUSE_DRAG_AND_DROP , m_dataObject(NULL), m_dataBuffer(NULL), @@ -774,7 +780,8 @@ public: m_column(event.m_column), m_pos(event.m_pos), m_cacheFrom(event.m_cacheFrom), - m_cacheTo(event.m_cacheTo) + m_cacheTo(event.m_cacheTo), + m_editCancelled(event.m_editCancelled) #if wxUSE_DRAG_AND_DROP , m_dataObject(event.m_dataObject), m_dataFormat(event.m_dataFormat), @@ -795,6 +802,10 @@ public: const wxVariant &GetValue() const { return m_value; } void SetValue( const wxVariant &value ) { m_value = value; } + // for wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE only + bool IsEditCancelled() const { return m_editCancelled; } + void SetEditCanceled(bool editCancelled) { m_editCancelled = editCancelled; } + // for wxEVT_DATAVIEW_COLUMN_HEADER_CLICKED only void SetDataViewColumn( wxDataViewColumn *col ) { m_column = col; } wxDataViewColumn *GetDataViewColumn() const { return m_column; } @@ -834,6 +845,7 @@ protected: wxPoint m_pos; int m_cacheFrom; int m_cacheTo; + bool m_editCancelled; #if wxUSE_DRAG_AND_DROP wxDataObject *m_dataObject; @@ -1202,7 +1214,7 @@ public: virtual bool HasDefaultCompare() const { return true; } virtual unsigned int GetColumnCount() const - { return 1; }; + { return 1; } virtual wxString GetColumnType( unsigned int WXUNUSED(col) ) const { return wxT("wxDataViewIconText"); } @@ -1216,10 +1228,11 @@ public: //----------------------------------------------------------------------------- -class WXDLLIMPEXP_ADV wxDataViewTreeCtrl: public wxDataViewCtrl +class WXDLLIMPEXP_ADV wxDataViewTreeCtrl: public wxDataViewCtrl, + public wxWithImages { public: - wxDataViewTreeCtrl() { Init(); } + wxDataViewTreeCtrl() { } wxDataViewTreeCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -1227,13 +1240,9 @@ public: long style = wxDV_NO_HEADER | wxDV_ROW_LINES, const wxValidator& validator = wxDefaultValidator) { - Init(); - Create(parent, id, pos, size, style, validator); } - virtual ~wxDataViewTreeCtrl(); - bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -1249,24 +1258,21 @@ public: bool IsContainer( const wxDataViewItem& item ) const { return GetStore()->IsContainer(item); } - void SetImageList( wxImageList *imagelist ); - wxImageList* GetImageList() { return m_imageList; } - wxDataViewItem AppendItem( const wxDataViewItem& parent, - const wxString &text, int icon = -1, wxClientData *data = NULL ); + const wxString &text, int icon = NO_IMAGE, wxClientData *data = NULL ); wxDataViewItem PrependItem( const wxDataViewItem& parent, - const wxString &text, int icon = -1, wxClientData *data = NULL ); + const wxString &text, int icon = NO_IMAGE, wxClientData *data = NULL ); wxDataViewItem InsertItem( const wxDataViewItem& parent, const wxDataViewItem& previous, - const wxString &text, int icon = -1, wxClientData *data = NULL ); + const wxString &text, int icon = NO_IMAGE, wxClientData *data = NULL ); wxDataViewItem PrependContainer( const wxDataViewItem& parent, - const wxString &text, int icon = -1, int expanded = -1, + const wxString &text, int icon = NO_IMAGE, int expanded = NO_IMAGE, wxClientData *data = NULL ); wxDataViewItem AppendContainer( const wxDataViewItem& parent, - const wxString &text, int icon = -1, int expanded = -1, + const wxString &text, int icon = NO_IMAGE, int expanded = NO_IMAGE, wxClientData *data = NULL ); wxDataViewItem InsertContainer( const wxDataViewItem& parent, const wxDataViewItem& previous, - const wxString &text, int icon = -1, int expanded = -1, + const wxString &text, int icon = NO_IMAGE, int expanded = NO_IMAGE, wxClientData *data = NULL ); wxDataViewItem GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const @@ -1296,14 +1302,6 @@ public: void OnCollapsed( wxDataViewEvent &event ); void OnSize( wxSizeEvent &event ); -private: - void Init() - { - m_imageList = NULL; - } - - wxImageList *m_imageList; - private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewTreeCtrl) diff --git a/Externals/wxWidgets3/include/wx/datectrl.h b/Externals/wxWidgets3/include/wx/datectrl.h index 576db17f48..8b16f0a9f2 100644 --- a/Externals/wxWidgets3/include/wx/datectrl.h +++ b/Externals/wxWidgets3/include/wx/datectrl.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 2005-01-09 -// RCS-ID: $Id: datectrl.h 61508 2009-07-23 20:30:22Z VZ $ +// RCS-ID: $Id: datectrl.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) 2005 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -16,8 +16,7 @@ #if wxUSE_DATEPICKCTRL -#include "wx/control.h" // the base class -#include "wx/datetime.h" +#include "wx/datetimectrl.h" // the base class #define wxDatePickerCtrlNameStr wxT("datectrl") @@ -46,7 +45,7 @@ enum // wxDatePickerCtrl: allow the user to enter the date // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_ADV wxDatePickerCtrlBase : public wxControl +class WXDLLIMPEXP_ADV wxDatePickerCtrlBase : public wxDateTimePickerCtrl { public: /* @@ -63,23 +62,26 @@ public: const wxString& name = wxDatePickerCtrlNameStr); */ - // set/get the date - virtual void SetValue(const wxDateTime& dt) = 0; - virtual wxDateTime GetValue() const = 0; + /* + We inherit the methods to set/get the date from the base class. - // set/get the allowed valid range for the dates, if either/both of them - // are invalid, there is no corresponding limit and if neither is set - // GetRange() returns false + virtual void SetValue(const wxDateTime& dt) = 0; + virtual wxDateTime GetValue() const = 0; + */ + + // And add methods to set/get the allowed valid range for the dates. If + // either/both of them are invalid, there is no corresponding limit and if + // neither is set, GetRange() returns false. virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) = 0; virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const = 0; }; -#if defined(__WXPALMOS__) - #include "wx/palmos/datectrl.h" +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) + #include "wx/msw/datectrl.h" #define wxHAS_NATIVE_DATEPICKCTRL -#elif defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - #include "wx/msw/datectrl.h" +#elif defined(__WXOSX_COCOA__) && !defined(__WXUNIVERSAL__) + #include "wx/osx/datectrl.h" #define wxHAS_NATIVE_DATEPICKCTRL #else diff --git a/Externals/wxWidgets3/include/wx/dateevt.h b/Externals/wxWidgets3/include/wx/dateevt.h index 8833bdd0de..7b10dd63b7 100644 --- a/Externals/wxWidgets3/include/wx/dateevt.h +++ b/Externals/wxWidgets3/include/wx/dateevt.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 2005-01-10 -// RCS-ID: $Id: dateevt.h 58718 2009-02-07 18:59:25Z VZ $ +// RCS-ID: $Id: dateevt.h 69224 2011-09-29 13:43:15Z VZ $ // Copyright: (c) 2005 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -17,7 +17,7 @@ #include "wx/window.h" // ---------------------------------------------------------------------------- -// wxDateEvent: used by wxCalendarCtrl and wxDatePickerCtrl +// wxDateEvent: used by wxCalendarCtrl, wxDatePickerCtrl and wxTimePickerCtrl. // ---------------------------------------------------------------------------- class WXDLLIMPEXP_ADV wxDateEvent : public wxCommandEvent @@ -48,6 +48,7 @@ private: // ---------------------------------------------------------------------------- wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_ADV, wxEVT_DATE_CHANGED, wxDateEvent); +wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_ADV, wxEVT_TIME_CHANGED, wxDateEvent); typedef void (wxEvtHandler::*wxDateEventFunction)(wxDateEvent&); @@ -57,5 +58,8 @@ typedef void (wxEvtHandler::*wxDateEventFunction)(wxDateEvent&); #define EVT_DATE_CHANGED(id, fn) \ wx__DECLARE_EVT1(wxEVT_DATE_CHANGED, id, wxDateEventHandler(fn)) +#define EVT_TIME_CHANGED(id, fn) \ + wx__DECLARE_EVT1(wxEVT_TIME_CHANGED, id, wxDateEventHandler(fn)) + #endif // _WX_DATEEVT_H_ diff --git a/Externals/wxWidgets3/include/wx/datetime.h b/Externals/wxWidgets3/include/wx/datetime.h index 448f6575d1..79cf5f1b7a 100644 --- a/Externals/wxWidgets3/include/wx/datetime.h +++ b/Externals/wxWidgets3/include/wx/datetime.h @@ -5,7 +5,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 10.02.99 -// RCS-ID: $Id: datetime.h 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: datetime.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,7 +19,7 @@ #ifdef __WXWINCE__ #include "wx/msw/wince/time.h" -#elif !defined(__WXPALMOS5__) +#else #include #endif // OS @@ -31,7 +31,7 @@ class WXDLLIMPEXP_FWD_BASE wxDateTime; class WXDLLIMPEXP_FWD_BASE wxTimeSpan; class WXDLLIMPEXP_FWD_BASE wxDateSpan; -#ifdef __WXMSW__ +#ifdef __WINDOWS__ struct _SYSTEMTIME; #endif @@ -53,27 +53,6 @@ struct _SYSTEMTIME; * 5. wxDateTimeHolidayAuthority for Easter and other christian feasts */ -/* Two wrapper functions for thread safety */ -#ifdef HAVE_LOCALTIME_R -#define wxLocaltime_r localtime_r -#else -WXDLLIMPEXP_BASE struct tm *wxLocaltime_r(const time_t*, struct tm*); -#if wxUSE_THREADS && !defined(__WINDOWS__) && !defined(__WATCOMC__) - // On Windows, localtime _is_ threadsafe! -#warning using pseudo thread-safe wrapper for localtime to emulate localtime_r -#endif -#endif - -#ifdef HAVE_GMTIME_R -#define wxGmtime_r gmtime_r -#else -WXDLLIMPEXP_BASE struct tm *wxGmtime_r(const time_t*, struct tm*); -#if wxUSE_THREADS && !defined(__WINDOWS__) && !defined(__WATCOMC__) - // On Windows, gmtime _is_ threadsafe! -#warning using pseudo thread-safe wrapper for gmtime to emulate gmtime_r -#endif -#endif - /* The three (main) classes declared in this header represent: @@ -627,7 +606,7 @@ public: wxDateTime_t minute = 0, wxDateTime_t second = 0, wxDateTime_t millisec = 0); -#ifdef __WXMSW__ +#ifdef __WINDOWS__ wxDateTime(const struct _SYSTEMTIME& st) { SetFromMSWSysTime(st); @@ -949,7 +928,7 @@ public: // SYSTEMTIME format // ------------------------------------------------------------------------ -#ifdef __WXMSW__ +#ifdef __WINDOWS__ // convert SYSTEMTIME to wxDateTime wxDateTime& SetFromMSWSysTime(const struct _SYSTEMTIME& st); @@ -959,7 +938,7 @@ public: // same as above but only take date part into account, time is always zero wxDateTime& SetFromMSWSysDate(const struct _SYSTEMTIME& st); void GetAsMSWSysDate(struct _SYSTEMTIME* st) const; -#endif // __WXMSW__ +#endif // __WINDOWS__ // comparison (see also functions below for operator versions) // ------------------------------------------------------------------------ diff --git a/Externals/wxWidgets3/include/wx/datetimectrl.h b/Externals/wxWidgets3/include/wx/datetimectrl.h new file mode 100644 index 0000000000..8632d5f12e --- /dev/null +++ b/Externals/wxWidgets3/include/wx/datetimectrl.h @@ -0,0 +1,48 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/timectrl.h +// Purpose: Declaration of wxDateTimePickerCtrl class. +// Author: Vadim Zeitlin +// Created: 2011-09-22 +// RCS-ID: $Id: datetimectrl.h 70071 2011-12-20 21:27:14Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_DATETIME_CTRL_H_ +#define _WX_DATETIME_CTRL_H_ + +#include "wx/defs.h" + +#if wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL + +#define wxNEEDS_DATETIMEPICKCTRL + +#include "wx/control.h" // the base class + +#include "wx/datetime.h" + +// ---------------------------------------------------------------------------- +// wxDateTimePickerCtrl: Private common base class of wx{Date,Time}PickerCtrl. +// ---------------------------------------------------------------------------- + +// This class is an implementation detail and should not be used directly, only +// use the documented API of wxDateTimePickerCtrl and wxTimePickerCtrl. +class WXDLLIMPEXP_ADV wxDateTimePickerCtrlBase : public wxControl +{ +public: + // Set/get the date or time (in the latter case, time part is ignored). + virtual void SetValue(const wxDateTime& dt) = 0; + virtual wxDateTime GetValue() const = 0; +}; + +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) + #include "wx/msw/datetimectrl.h" +#elif defined(__WXOSX_COCOA__) && !defined(__WXUNIVERSAL__) + #include "wx/osx/datetimectrl.h" +#else + typedef wxDateTimePickerCtrlBase wxDateTimePickerCtrl; +#endif + +#endif // wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL + +#endif // _WX_DATETIME_CTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/dc.h b/Externals/wxWidgets3/include/wx/dc.h index 974666f5d2..2e66988c37 100644 --- a/Externals/wxWidgets3/include/wx/dc.h +++ b/Externals/wxWidgets3/include/wx/dc.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 05/25/99 -// RCS-ID: $Id: dc.h 67063 2011-02-27 12:48:13Z VZ $ +// RCS-ID: $Id: dc.h 68935 2011-08-27 23:26:53Z RD $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -30,6 +30,7 @@ #include "wx/math.h" #include "wx/image.h" #include "wx/region.h" +#include "wx/affinematrix2d.h" #define wxUSE_NEW_DC 1 @@ -42,6 +43,10 @@ class WXDLLIMPEXP_FWD_CORE wxMemoryDC; class WXDLLIMPEXP_FWD_CORE wxPrinterDC; class WXDLLIMPEXP_FWD_CORE wxPrintData; +#if wxUSE_GRAPHICS_CONTEXT +class WXDLLIMPEXP_FWD_CORE wxGraphicsContext; +#endif + // Logical ops enum wxRasterOperationMode { @@ -470,7 +475,7 @@ public: } virtual void SetLogicalScale(double x, double y); - virtual void GetLogicalScale(double *x, double *y) + virtual void GetLogicalScale(double *x, double *y) const { if ( x ) *x = m_logicalScaleX; if ( y ) *y = m_logicalScaleY; @@ -490,6 +495,20 @@ public: if ( y ) *y = m_deviceOriginY; } +#if wxUSE_DC_TRANSFORM_MATRIX + // Transform matrix support is not available in most ports right now + // (currently only wxMSW provides it) so do nothing in these methods by + // default. + virtual bool CanUseTransformMatrix() const + { return false; } + virtual bool SetTransformMatrix(const wxAffineMatrix2D& WXUNUSED(matrix)) + { return false; } + virtual wxAffineMatrix2D GetTransformMatrix() const + { return wxAffineMatrix2D(); } + virtual void ResetTransformMatrix() + { } +#endif // wxUSE_DC_TRANSFORM_MATRIX + virtual void SetDeviceLocalOrigin( wxCoord x, wxCoord y ); virtual void ComputeScaleAndOrigin(); @@ -497,6 +516,19 @@ public: // this needs to overidden if the axis is inverted virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp); +#ifdef __WXMSW__ + // Native Windows functions using the underlying HDC don't honour GDI+ + // transformations which may be applied to it. Using this function we can + // transform the coordinates manually before passing them to such functions + // (as in e.g. wxRendererMSW code). It doesn't do anything if this is not a + // wxGCDC. + virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const + { + return r; + } +#endif // __WXMSW__ + + // --------------------------------------------------------- // the actual drawing API @@ -612,6 +644,13 @@ public: virtual int GetResolution() const { return -1; } +#if wxUSE_GRAPHICS_CONTEXT + virtual wxGraphicsContext* GetGraphicsContext() const + { return NULL; } + virtual void SetGraphicsContext( wxGraphicsContext* WXUNUSED(ctx) ) + {} +#endif + private: wxDC *m_owner; @@ -981,7 +1020,7 @@ public: void SetLogicalScale(double x, double y) { m_pimpl->SetLogicalScale( x, y ); } - void GetLogicalScale(double *x, double *y) + void GetLogicalScale(double *x, double *y) const { m_pimpl->GetLogicalScale( x, y ); } void SetLogicalOrigin(wxCoord x, wxCoord y) @@ -1001,6 +1040,20 @@ public: void SetAxisOrientation(bool xLeftRight, bool yBottomUp) { m_pimpl->SetAxisOrientation(xLeftRight, yBottomUp); } +#if wxUSE_DC_TRANSFORM_MATRIX + bool CanUseTransformMatrix() const + { return m_pimpl->CanUseTransformMatrix(); } + + bool SetTransformMatrix(const wxAffineMatrix2D &matrix) + { return m_pimpl->SetTransformMatrix(matrix); } + + wxAffineMatrix2D GetTransformMatrix() const + { return m_pimpl->GetTransformMatrix(); } + + void ResetTransformMatrix() + { m_pimpl->ResetTransformMatrix(); } +#endif // wxUSE_DC_TRANSFORM_MATRIX + // mostly internal void SetDeviceLocalOrigin( wxCoord x, wxCoord y ) { m_pimpl->SetDeviceLocalOrigin( x, y ); } @@ -1287,6 +1340,17 @@ public: TempHDC GetTempHDC() { return TempHDC(*this); } #endif // __WXMSW__ +#if wxUSE_GRAPHICS_CONTEXT + virtual wxGraphicsContext* GetGraphicsContext() const + { + return m_pimpl->GetGraphicsContext(); + } + virtual void SetGraphicsContext( wxGraphicsContext* ctx ) + { + m_pimpl->SetGraphicsContext(ctx); + } +#endif + protected: // ctor takes ownership of the pointer wxDC(wxDCImpl *pimpl) : m_pimpl(pimpl) { } @@ -1315,13 +1379,13 @@ public: ~wxDCTextColourChanger() { - if ( m_colFgOld.Ok() ) + if ( m_colFgOld.IsOk() ) m_dc.SetTextForeground(m_colFgOld); } void Set(const wxColour& col) { - if ( !m_colFgOld.Ok() ) + if ( !m_colFgOld.IsOk() ) m_colFgOld = m_dc.GetTextForeground(); m_dc.SetTextForeground(col); } @@ -1349,7 +1413,7 @@ public: ~wxDCPenChanger() { - if ( m_penOld.Ok() ) + if ( m_penOld.IsOk() ) m_dc.SetPen(m_penOld); } @@ -1376,7 +1440,7 @@ public: ~wxDCBrushChanger() { - if ( m_brushOld.Ok() ) + if ( m_brushOld.IsOk() ) m_dc.SetBrush(m_brushOld); } @@ -1432,14 +1496,14 @@ public: void Set(const wxFont& font) { - if ( !m_fontOld.Ok() ) + if ( !m_fontOld.IsOk() ) m_fontOld = m_dc.GetFont(); m_dc.SetFont(font); } ~wxDCFontChanger() { - if ( m_fontOld.Ok() ) + if ( m_fontOld.IsOk() ) m_dc.SetFont(m_fontOld); } diff --git a/Externals/wxWidgets3/include/wx/dcgraph.h b/Externals/wxWidgets3/include/wx/dcgraph.h index 071c1d68b3..b636f239de 100644 --- a/Externals/wxWidgets3/include/wx/dcgraph.h +++ b/Externals/wxWidgets3/include/wx/dcgraph.h @@ -5,7 +5,7 @@ // Modified by: // Created: // Copyright: (c) Stefan Csomor -// RCS-ID: $Id: dcgraph.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: dcgraph.h 68935 2011-08-27 23:26:53Z RD $ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -29,10 +29,15 @@ public: #if wxUSE_PRINTING_ARCHITECTURE wxGCDC( const wxPrinterDC& dc ); #endif +#if defined(__WXMSW__) && wxUSE_ENH_METAFILE + wxGCDC( const wxEnhMetaFileDC& dc ); +#endif + wxGCDC(wxGraphicsContext* context); + wxGCDC(); virtual ~wxGCDC(); - wxGraphicsContext* GetGraphicsContext(); + wxGraphicsContext* GetGraphicsContext() const; void SetGraphicsContext( wxGraphicsContext* ctx ); #ifdef __WXMSW__ @@ -55,6 +60,9 @@ public: wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc ); #if wxUSE_PRINTING_ARCHITECTURE wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ); +#endif +#if defined(__WXMSW__) && wxUSE_ENH_METAFILE + wxGCDCImpl( wxDC *owner, const wxEnhMetaFileDC& dc ); #endif wxGCDCImpl( wxDC *owner ); @@ -103,7 +111,7 @@ public: virtual void ComputeScaleAndOrigin(); - wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; } + wxGraphicsContext* GetGraphicsContext() const { return m_graphicContext; } virtual void SetGraphicsContext( wxGraphicsContext* ctx ); // the true implementations @@ -193,6 +201,10 @@ public: virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const; +#ifdef __WXMSW__ + virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const; +#endif // __WXMSW__ + protected: // scaling variables bool m_logicalFunctionSupported; diff --git a/Externals/wxWidgets3/include/wx/dde.h b/Externals/wxWidgets3/include/wx/dde.h index a39678c697..1c15a1f3ce 100644 --- a/Externals/wxWidgets3/include/wx/dde.h +++ b/Externals/wxWidgets3/include/wx/dde.h @@ -5,7 +5,7 @@ // Modified by: // Created: // Copyright: (c) Julian Smart -// RCS-ID: $Id: dde.h 47254 2007-07-09 10:09:52Z VS $ +// RCS-ID: $Id: dde.h 70808 2012-03-04 20:31:42Z VZ $ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -22,10 +22,10 @@ WX_DECLARE_USER_EXPORTED_LIST(wxDDEClient, wxDDEClientList, WXDLLIMPEXP_BASE); WX_DECLARE_USER_EXPORTED_LIST(wxDDEServer, wxDDEServerList, WXDLLIMPEXP_BASE); WX_DECLARE_USER_EXPORTED_LIST(wxDDEConnection, wxDDEConnectionList, WXDLLIMPEXP_BASE); -#if defined(__WXMSW__) +#if defined(__WINDOWS__) #include "wx/msw/dde.h" #else - #error DDE is only supported on MSW + #error DDE is only supported under Windows #endif #endif diff --git a/Externals/wxWidgets3/include/wx/debug.h b/Externals/wxWidgets3/include/wx/debug.h index f66cf4681e..589ae85f67 100644 --- a/Externals/wxWidgets3/include/wx/debug.h +++ b/Externals/wxWidgets3/include/wx/debug.h @@ -3,7 +3,7 @@ // Purpose: Misc debug functions and macros // Author: Vadim Zeitlin // Created: 29/01/98 -// RCS-ID: $Id: debug.h 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: debug.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) 1998-2009 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -11,7 +11,7 @@ #ifndef _WX_DEBUG_H_ #define _WX_DEBUG_H_ -#if !defined(__WXPALMOS5__) && !defined(__WXWINCE__) +#if !defined(__WXWINCE__) #include #endif // systems without assert.h @@ -162,7 +162,7 @@ inline void wxDisableAsserts() { wxSetAssertHandler(NULL); } /* wxOnAssert() is used by the debugging macros defined below. Different - overloads are needed because these macros can be used with or without _T(). + overloads are needed because these macros can be used with or without wxT(). All of them are implemented in src/common/appcmn.cpp and unconditionally call wxTheAssertHandler so the caller must check that it is non-NULL @@ -172,7 +172,7 @@ inline void wxDisableAsserts() { wxSetAssertHandler(NULL); } #if wxUSE_UNICODE // these overloads are the ones typically used by debugging macros: we have to -// provide wxChar* msg version because it's common to use _T() in the macros +// provide wxChar* msg version because it's common to use wxT() in the macros // and finally, we can't use const wx(char)* msg = NULL, because that would // be ambiguous // @@ -299,6 +299,13 @@ extern void WXDLLIMPEXP_BASE wxOnAssert(const char *file, #define wxASSERT_LEVEL_2(cond) #endif +// This is simply a wrapper for the standard abort() which is not available +// under all platforms. +// +// It isn't really debug-related but there doesn't seem to be any better place +// for it, so declare it here and define it in appbase.cpp, together with +// wxTrap(). +extern void WXDLLIMPEXP_BASE wxAbort(); /* wxCHECK macros always check their conditions, setting debug level to 0 only diff --git a/Externals/wxWidgets3/include/wx/defs.h b/Externals/wxWidgets3/include/wx/defs.h index 42fa627b78..bb6afaa107 100644 --- a/Externals/wxWidgets3/include/wx/defs.h +++ b/Externals/wxWidgets3/include/wx/defs.h @@ -4,7 +4,7 @@ * Author: Julian Smart and others * Modified by: Ryan Norton (Converted to C) * Created: 01/02/97 - * RCS-ID: $Id: defs.h 66711 2011-01-19 10:47:49Z VZ $ + * RCS-ID: $Id: defs.h 70353 2012-01-15 14:46:41Z VZ $ * Copyright: (c) Julian Smart * Licence: wxWindows licence */ @@ -14,8 +14,10 @@ #ifndef _WX_DEFS_H_ #define _WX_DEFS_H_ -// NOTE: this symbol will be replaced with "WXWIN_COMPATIBILITY_3_0" as soon -// as the development branch for 3.1 is created +/* + NOTE: this symbol will be replaced with "WXWIN_COMPATIBILITY_3_0" as soon + as the development branch for 3.1 is created + */ #define FUTURE_WXWIN_COMPATIBILITY_3_0 1 #define wxDEPRECATED_FUTURE( x ) x @@ -29,11 +31,8 @@ /* Make sure the environment is set correctly */ # if defined(__WXMSW__) && defined(__X__) # error "Target can't be both X and Windows" -# elif defined(__WXMSW__) && defined(__PALMOS__) -# error "Target can't be both PalmOS and Windows" # elif !defined(__WXMOTIF__) && \ !defined(__WXMSW__) && \ - !defined(__WXPALMOS__)&& \ !defined(__WXGTK__) && \ !defined(__WXPM__) && \ !defined(__WXOSX_CARBON__) && \ @@ -41,7 +40,6 @@ !defined(__WXOSX_IPHONE__) && \ !defined(__WXCOCOA__) && \ !defined(__X__) && \ - !defined(__WXMGL__) && \ !defined(__WXDFB__) && \ !defined(__WXX11__) && \ wxUSE_GUI @@ -79,8 +77,10 @@ # pragma warning(disable:4514) /* unreferenced inline func has been removed */ # pragma warning(disable:4710) /* function not inlined */ - // TODO: this warning should really be enabled as it can be genuinely - // useful, check where does it occur in wxWidgets + /* + TODO: this warning should really be enabled as it can be genuinely + useful, check where does it occur in wxWidgets + */ #pragma warning(disable: 4127) /* conditional expression is constant */ /* There are too many false positivies for this one, particularly when @@ -89,6 +89,16 @@ class 'bar'" */ # pragma warning(disable:4251) + /* + This is a similar warning which occurs when deriving from standard + containers. MSDN even mentions that it can be ignored in this case + (albeit only in debug build while the warning is the same in release + too and seems equally harmless). + */ +#if wxUSE_STD_CONTAINERS +# pragma warning(disable:4275) +#endif /* wxUSE_STD_CONTAINERS */ + # ifdef __VISUALC5__ /* For VC++ 5.0 for release mode, the warning 'C4702: unreachable code */ /* is buggy, and occurs for code that does actually get executed */ @@ -115,7 +125,7 @@ */ #ifdef __VISUALC6__ #pragma warning(disable: 4284) - #endif // VC6 + #endif /* VC6 */ /* When compiling with VC++ 7 /Wp64 option we get thousands of warnings for @@ -388,15 +398,15 @@ typedef short int WXTYPE; #ifndef HAVE_WOSTREAM - // Mingw <= 3.4 and all versions of Cygwin as well as any gcc version (so - // far) targeting PalmOS don't have std::wostream - #if defined(__PALMOS__) || \ - (defined(__MINGW32__) && !wxCHECK_GCC_VERSION(4, 0)) || \ + /* + Mingw <= 3.4 and all versions of Cygwin don't have std::wostream + */ + #if (defined(__MINGW32__) && !wxCHECK_GCC_VERSION(4, 0)) || \ defined(__CYGWIN__) #define wxNO_WOSTREAM #endif - // VC++ doesn't have it in the old iostream library + /* VC++ doesn't have it in the old iostream library */ #if defined(__VISUALC__) && wxUSE_IOSTREAMH #define wxNO_WOSTREAM #endif @@ -408,12 +418,12 @@ typedef short int WXTYPE; #undef wxNO_WOSTREAM #endif /* HAVE_WOSTREAM */ -// ---------------------------------------------------------------------------- -// other C++ features -// ---------------------------------------------------------------------------- +/* ---------------------------------------------------------------------------- */ +/* other C++ features */ +/* ---------------------------------------------------------------------------- */ #ifndef HAVE_PARTIAL_SPECIALIZATION - // be optimistic by default + /* be optimistic by default */ #define HAVE_PARTIAL_SPECIALIZATION #endif @@ -421,17 +431,17 @@ typedef short int WXTYPE; #if __VISUALC__ < 1310 #undef HAVE_PARTIAL_SPECIALIZATION #endif -#endif // __VISUALC__ +#endif /* __VISUALC__ */ #ifndef HAVE_TEMPLATE_OVERLOAD_RESOLUTION - // assume the compiler can use type or const expressions as template - // arguments if it supports partial specialization -- except if it's a - // Borland one which can't + /* assume the compiler can use type or const expressions as template + arguments if it supports partial specialization -- except if it's a + Borland one which can't */ #if defined(HAVE_PARTIAL_SPECIALIZATION) && !defined(__BORLANDC__) #define HAVE_TEMPLATE_OVERLOAD_RESOLUTION - #endif // __BORLANDC__ -#endif // !defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION) + #endif /* (HAVE_PARTIAL_SPECIALIZATION) && !defined(__BORLANDC__) */ +#endif /* !defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION) */ /* ---------------------------------------------------------------------------- */ /* portable calling conventions macros */ @@ -513,15 +523,14 @@ typedef short int WXTYPE; #define wxDEPRECATED(x) x #endif -/* - explicitly specifying inline allows gcc < 3.4 to - handle the deprecation attribute even in the constructor. - doesn't seem to work on Apple's gcc 4.0.1 unless using -O0 -*/ -#if wxCHECK_GCC_VERSION(3, 4) || defined( __DARWIN__ ) - #define wxDEPRECATED_CONSTRUCTOR(x) x -#else +#if defined(__GNUC__) && !wxCHECK_GCC_VERSION(3, 4) + /* + We need to add dummy "inline" to allow gcc < 3.4 to handle the + deprecation attribute on the constructors. + */ #define wxDEPRECATED_CONSTRUCTOR(x) wxDEPRECATED( inline x) +#else + #define wxDEPRECATED_CONSTRUCTOR(x) wxDEPRECATED(x) #endif /* @@ -564,7 +573,7 @@ typedef short int WXTYPE; /* NULL declaration: it must be defined as 0 for C++ programs (in particular, */ /* it must not be defined as "(void *)0" which is standard for C but completely */ /* breaks C++ code) */ -#if !defined(__HANDHELDPC__) && !defined(__PALMOS__) +#if !defined(__HANDHELDPC__) #include #endif @@ -767,7 +776,7 @@ enum { wxDefaultCoord = -1 }; /* define fixed length types */ /* ---------------------------------------------------------------------------- */ -#if defined(__WXPALMOS__) || defined(__MINGW32__) +#if defined(__MINGW32__) #if !defined(__MWERKS__) #include #endif @@ -819,19 +828,7 @@ typedef wxUint16 wxWord; */ /* 32bit */ -#ifdef __PALMOS__ - typedef int wxInt32; - typedef unsigned int wxUint32; - #define SIZEOF_INT 4 - #define SIZEOF_LONG 4 - #define SIZEOF_WCHAR_T 2 - #define SIZEOF_SIZE_T 4 - #ifdef __WXPALMOS6__ - #define wxSIZE_T_IS_UINT - #endif - #define SIZEOF_VOID_P 4 - #define SIZEOF_SIZE_T 4 -#elif defined(__WINDOWS__) +#if defined(__WINDOWS__) #if defined(__WIN32__) typedef int wxInt32; typedef unsigned int wxUint32; @@ -1018,14 +1015,6 @@ typedef wxUint32 wxDword; #error "The 64 bit integer support in CodeWarrior has been disabled." #error "See the documentation on the 'longlong' pragma." #endif -#elif defined(__WXPALMOS__) - #if defined(__WXPALMOS6__) - #define wxLongLong_t int64_t - #else - #define wxLongLong_t long long - #endif /* __WXPALMOS6__ */ - #define wxLongLongSuffix ll - #define wxLongLongFmtSpec "ll" #elif defined(__VISAGECPP__) && __IBMCPP__ >= 400 #define wxLongLong_t long long #elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8) || \ @@ -1045,16 +1034,7 @@ typedef wxUint32 wxDword; #ifdef wxLongLong_t - - #ifdef __WXPALMOS__ - #if defined(__WXPALMOS6__) - #define wxULongLong_t uint64_t - #else - #define wxULongLong_t unsigned long long - #endif /* __WXPALMOS6__ */ - #else - #define wxULongLong_t unsigned wxLongLong_t - #endif + #define wxULongLong_t unsigned wxLongLong_t /* wxLL() and wxULL() macros allow to define 64 bit constants in a @@ -1064,8 +1044,10 @@ typedef wxUint32 wxDword; #define wxLL(x) wxCONCAT(x, wxLongLongSuffix) #define wxULL(x) wxCONCAT(x, wxCONCAT(u, wxLongLongSuffix)) #else - // Currently only Borland compiler has broken concatenation operator - // and this compiler is known to use [u]i64 suffix. + /* + Currently only Borland compiler has broken concatenation operator + and this compiler is known to use [u]i64 suffix. + */ #define wxLL(x) wxAPPEND_i64(x) #define wxULL(x) wxAPPEND_ui64(x) #endif @@ -1102,8 +1084,6 @@ typedef wxUint32 wxDword; #if defined(_SSIZE_T_) || defined(_SSIZE_T_DEFINED) #define HAVE_SSIZE_T #endif -#elif defined(__PALMOS__) - #define HAVE_SSIZE_T #elif wxCHECK_WATCOM_VERSION(1,4) #define HAVE_SSIZE_T #endif @@ -1114,7 +1094,7 @@ typedef wxUint32 wxDword; #ifdef __UNIX__ #include #endif -#else // !HAVE_SSIZE_T +#else /* !HAVE_SSIZE_T */ #if SIZEOF_SIZE_T == 4 typedef wxInt32 ssize_t; #elif SIZEOF_SIZE_T == 8 @@ -1127,11 +1107,13 @@ typedef wxUint32 wxDword; #define HAVE_SSIZE_T #endif -// we can't rely on Windows _W64 being defined as windows.h may not be included -// so define our own equivalent: this should be used with types like WXLPARAM -// or WXWPARAM which are 64 bit under Win64 to avoid warnings each time we cast -// it to a pointer or a handle (which results in hundreds of warnings as Win32 -// API often passes pointers in them) +/* + We can't rely on Windows _W64 being defined as windows.h may not be + included so define our own equivalent: this should be used with types + like WXLPARAM or WXWPARAM which are 64 bit under Win64 to avoid warnings + each time we cast it to a pointer or a handle (which results in hundreds + of warnings as Win32 API often passes pointers in them) + */ #if wxCHECK_VISUALC_VERSION(7) #define wxW64 __w64 #else @@ -1142,7 +1124,13 @@ typedef wxUint32 wxDword; Define signed and unsigned integral types big enough to contain all of long, size_t and void *. */ -#if SIZEOF_SIZE_T >= SIZEOF_VOID_P +#if SIZEOF_LONG >= SIZEOF_VOID_P + /* + Normal case when long is the largest integral type. + */ + typedef long wxIntPtr; + typedef unsigned long wxUIntPtr; +#elif SIZEOF_SIZE_T >= SIZEOF_VOID_P /* Win64 case: size_t is the only integral type big enough for "void *". @@ -1152,12 +1140,6 @@ typedef wxUint32 wxDword; */ typedef wxW64 ssize_t wxIntPtr; typedef size_t wxUIntPtr; -#elif SIZEOF_LONG >= SIZEOF_VOID_P - /* - Normal case when long is the largest integral type. - */ - typedef long wxIntPtr; - typedef unsigned long wxUIntPtr; #else /* This should never happen for the current architectures but if you're @@ -1447,12 +1429,12 @@ typedef double wxDouble; /* ---------------------------------------------------------------------------- */ #if defined(__GNUC__) && !wxCHECK_GCC_VERSION( 3, 4 ) - // GCC <= 3.4 has buggy template support + /* GCC <= 3.4 has buggy template support */ # define wxUSE_MEMBER_TEMPLATES 0 #endif #if defined(_MSC_VER) && _MSC_VER <= 1200 - // MSVC <= 6.0 has buggy template support + /* MSVC <= 6.0 has buggy template support */ # define wxUSE_MEMBER_TEMPLATES 0 # define wxUSE_FUNC_TEMPLATE_POINTER 0 #endif @@ -1532,9 +1514,11 @@ enum wxDirection enum wxAlignment { - // 0 is a valid wxAlignment value (both wxALIGN_LEFT and wxALIGN_TOP use - // it) so define a symbolic name for an invalid alignment value which can - // be assumed to be different from anything else + /* + 0 is a valid wxAlignment value (both wxALIGN_LEFT and wxALIGN_TOP + use it) so define a symbolic name for an invalid alignment value + which can be assumed to be different from anything else + */ wxALIGN_INVALID = -1, wxALIGN_NOT = 0x0000, @@ -1557,10 +1541,12 @@ enum wxAlignment /* misc. flags for wxSizer items */ enum wxSizerFlagBits { - // wxADJUST_MINSIZE doesn't do anything any more but we still define it for - // compatibility. Notice that it may be also predefined (as 0, hopefully) - // in the user code in order to use it even in !WXWIN_COMPATIBILITY_2_8 - // builds so don't redefine it in such case. + /* + wxADJUST_MINSIZE doesn't do anything any more but we still define + it for compatibility. Notice that it may be also predefined (as 0, + hopefully) in the user code in order to use it even in + !WXWIN_COMPATIBILITY_2_8 builds so don't redefine it in such case. + */ #if WXWIN_COMPATIBILITY_2_8 && !defined(wxADJUST_MINSIZE) wxADJUST_MINSIZE = 0, #endif @@ -1848,14 +1834,12 @@ enum wxBorder /* Old names for compatibility */ #define wxRA_HORIZONTAL wxHORIZONTAL #define wxRA_VERTICAL wxVERTICAL -#define wxRA_USE_CHECKBOX 0x0010 /* alternative native subcontrols (wxPalmOS) */ /* * wxRadioButton style flag */ #define wxRB_GROUP 0x0004 #define wxRB_SINGLE 0x0008 -#define wxRB_USE_CHECKBOX 0x0010 /* alternative native control (wxPalmOS) */ /* * wxScrollBar flags @@ -1929,12 +1913,12 @@ enum wxBorder #define wxICON_STOP wxICON_HAND #define wxICON_ASTERISK wxICON_INFORMATION -#define wxFORWARD 0x00001000 -#define wxBACKWARD 0x00002000 -#define wxRESET 0x00004000 -#define wxHELP 0x00008000 -#define wxMORE 0x00010000 -#define wxSETUP 0x00020000 +#define wxHELP 0x00001000 +#define wxFORWARD 0x00002000 +#define wxBACKWARD 0x00004000 +#define wxRESET 0x00008000 +#define wxMORE 0x00010000 +#define wxSETUP 0x00020000 #define wxICON_NONE 0x00040000 #define wxICON_MASK \ @@ -1945,29 +1929,37 @@ enum wxBorder */ enum wxBackgroundStyle { - // background is erased in the EVT_ERASE_BACKGROUND handler or using the - // system default background if no such handler is defined (this is the - // default style) + /* + background is erased in the EVT_ERASE_BACKGROUND handler or using + the system default background if no such handler is defined (this + is the default style) + */ wxBG_STYLE_ERASE, - // background is erased by the system, no EVT_ERASE_BACKGROUND event is - // generated at all + /* + background is erased by the system, no EVT_ERASE_BACKGROUND event + is generated at all + */ wxBG_STYLE_SYSTEM, - // background is erased in EVT_PAINT handler and not erased at all before - // it, this should be used if the paint handler paints over the entire - // window to avoid flicker + /* + background is erased in EVT_PAINT handler and not erased at all + before it, this should be used if the paint handler paints over + the entire window to avoid flicker + */ wxBG_STYLE_PAINT, - // this is a Mac-only style, don't use in portable code + /* this is a Mac-only style, don't use in portable code */ wxBG_STYLE_TRANSPARENT, - // this style is deprecated and doesn't do anything, don't use + /* this style is deprecated and doesn't do anything, don't use */ wxBG_STYLE_COLOUR, - // this style is deprecated and is synonymous with wxBG_STYLE_PAINT, use - // the new name + /* + this style is deprecated and is synonymous with + wxBG_STYLE_PAINT, use the new name + */ wxBG_STYLE_CUSTOM = wxBG_STYLE_PAINT }; @@ -2203,6 +2195,18 @@ enum wxItemKind wxITEM_MAX }; +/* + * The possible states of a 3-state checkbox (Compatible + * with the 2-state checkbox). + */ +enum wxCheckBoxState +{ + wxCHK_UNCHECKED, + wxCHK_CHECKED, + wxCHK_UNDETERMINED /* 3-state checkbox only */ +}; + + /* hit test results */ enum wxHitTest { @@ -2297,7 +2301,7 @@ enum wxDeprecatedGUIConstants wxTRANSPARENT, /* Brush & Pen Stippling. Note that a stippled pen cannot be dashed!! */ - /* Note also that stippling a Pen IS meaningfull, because a Line is */ + /* Note also that stippling a Pen IS meaningful, because a Line is */ wxSTIPPLE_MASK_OPAQUE, /* mask is used for blitting monochrome using text fore and back ground colors */ wxSTIPPLE_MASK, /* mask is used for masking areas in the stipple bitmap (TO DO) */ /* drawn with a Pen, and without any Brush -- and it can be stippled. */ @@ -2354,7 +2358,34 @@ enum wxKeyCode { WXK_NONE = 0, - WXK_BACK = 8, // backspace + WXK_CONTROL_A = 1, + WXK_CONTROL_B, + WXK_CONTROL_C, + WXK_CONTROL_D, + WXK_CONTROL_E, + WXK_CONTROL_F, + WXK_CONTROL_G, + WXK_CONTROL_H, + WXK_CONTROL_I, + WXK_CONTROL_J, + WXK_CONTROL_K, + WXK_CONTROL_L, + WXK_CONTROL_M, + WXK_CONTROL_N, + WXK_CONTROL_O, + WXK_CONTROL_P, + WXK_CONTROL_Q, + WXK_CONTROL_R, + WXK_CONTROL_S, + WXK_CONTROL_T, + WXK_CONTROL_U, + WXK_CONTROL_V, + WXK_CONTROL_W, + WXK_CONTROL_X, + WXK_CONTROL_Y, + WXK_CONTROL_Z, + + WXK_BACK = 8, /* backspace */ WXK_TAB = 9, WXK_RETURN = 13, WXK_ESCAPE = 27, @@ -2477,7 +2508,12 @@ enum wxKeyCode WXK_WINDOWS_LEFT, WXK_WINDOWS_RIGHT, WXK_WINDOWS_MENU , - WXK_COMMAND, +#ifdef __WXOSX__ + WXK_RAW_CONTROL, +#else + WXK_RAW_CONTROL = WXK_CONTROL, +#endif + WXK_COMMAND = WXK_CONTROL, /* Hardware-specific buttons */ WXK_SPECIAL1 = 193, @@ -2513,10 +2549,11 @@ enum wxKeyModifier wxMOD_META = 0x0008, wxMOD_WIN = wxMOD_META, #if defined(__WXMAC__) || defined(__WXCOCOA__) - wxMOD_CMD = wxMOD_META, + wxMOD_RAW_CONTROL = 0x0010, #else - wxMOD_CMD = wxMOD_CONTROL, + wxMOD_RAW_CONTROL = wxMOD_CONTROL, #endif + wxMOD_CMD = wxMOD_CONTROL, wxMOD_ALL = 0xffff }; @@ -2733,7 +2770,7 @@ typedef int (* LINKAGEMODE wxListIterateFunction)(void *current); #endif #if defined(__CYGWIN__) && defined(__WXMSW__) -# if wxUSE_STL || defined(wxUSE_STD_STRING) +# if wxUSE_STD_CONTAINERS || defined(wxUSE_STD_STRING) /* NASTY HACK because the gethostname in sys/unistd.h which the gnu stl includes and wx builds with by default clash with each other @@ -2786,7 +2823,7 @@ typedef void* WXDisplay; typedef const void * CFTypeRef; -// typedef const struct __CFString * CFStringRef; +/* typedef const struct __CFString * CFStringRef; */ #define DECLARE_WXOSX_OPAQUE_CFREF( name ) typedef struct __##name* name##Ref; #define DECLARE_WXOSX_OPAQUE_CONST_CFREF( name ) typedef const struct __##name* name##Ref; @@ -2964,42 +3001,7 @@ typedef WX_NSString* WXGLPixelFormat; #endif -#endif // __WXMAC__ - -#if defined(__WXPALMOS__) - -typedef void * WXHWND; -typedef void * WXHANDLE; -typedef void * WXHICON; -typedef void * WXHFONT; -typedef void * WXHMENU; -typedef void * WXHPEN; -typedef void * WXHBRUSH; -typedef void * WXHPALETTE; -typedef void * WXHCURSOR; -typedef void * WXHRGN; -typedef void * WXHACCEL; -typedef void * WXHINSTANCE; -typedef void * WXHBITMAP; -typedef void * WXHIMAGELIST; -typedef void * WXHGLOBAL; -typedef void * WXHDC; -typedef unsigned int WXUINT; -typedef unsigned long WXDWORD; -typedef unsigned short WXWORD; - -typedef unsigned long WXCOLORREF; -typedef struct tagMSG WXMSG; - -typedef WXHWND WXWINHANDLE; /* WinHandle of PalmOS */ -typedef WXWINHANDLE WXWidget; - -typedef void * WXFORMPTR; -typedef void * WXEVENTPTR; -typedef void * WXRECTANGLEPTR; - -#endif /* __WXPALMOS__ */ - +#endif /* __WXMAC__ */ /* ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port */ #if defined(__WIN32__) @@ -3208,53 +3210,45 @@ typedef long WXPixel; /* safety catch in src/motif/colour.cpp */ #ifdef __WXGTK__ /* Stand-ins for GLIB types */ -typedef char gchar; -typedef signed char gint8; -typedef int gint; -typedef unsigned guint; -typedef unsigned long gulong; -typedef void* gpointer; typedef struct _GSList GSList; /* Stand-ins for GDK types */ typedef struct _GdkColor GdkColor; -typedef struct _GdkColormap GdkColormap; -typedef struct _GdkFont GdkFont; -typedef struct _GdkGC GdkGC; -typedef struct _GdkVisual GdkVisual; - -#ifdef __WXGTK20__ -typedef struct _GdkAtom *GdkAtom; -typedef struct _GdkDrawable GdkWindow; -typedef struct _GdkDrawable GdkBitmap; -typedef struct _GdkDrawable GdkPixmap; -#else /* GTK+ 1.2 */ -typedef gulong GdkAtom; -typedef struct _GdkWindow GdkWindow; -typedef struct _GdkWindow GdkBitmap; -typedef struct _GdkWindow GdkPixmap; -#endif /* GTK+ 1.2/2.0 */ - typedef struct _GdkCursor GdkCursor; -typedef struct _GdkRegion GdkRegion; typedef struct _GdkDragContext GdkDragContext; -#ifdef HAVE_XIM -typedef struct _GdkIC GdkIC; -typedef struct _GdkICAttr GdkICAttr; +#if defined(__WXGTK20__) + typedef struct _GdkAtom* GdkAtom; +#else + typedef unsigned long GdkAtom; +#endif + +#if !defined(__WXGTK30__) + typedef struct _GdkColormap GdkColormap; + typedef struct _GdkFont GdkFont; + typedef struct _GdkGC GdkGC; + typedef struct _GdkRegion GdkRegion; +#endif + +#if defined(__WXGTK30__) + typedef struct _GdkWindow GdkWindow; +#elif defined(__WXGTK20__) + typedef struct _GdkDrawable GdkWindow; + typedef struct _GdkDrawable GdkPixmap; +#else + typedef struct _GdkWindow GdkWindow; + typedef struct _GdkWindow GdkBitmap; + typedef struct _GdkWindow GdkPixmap; #endif /* Stand-ins for GTK types */ typedef struct _GtkWidget GtkWidget; typedef struct _GtkRcStyle GtkRcStyle; typedef struct _GtkAdjustment GtkAdjustment; -typedef struct _GtkList GtkList; typedef struct _GtkToolbar GtkToolbar; -typedef struct _GtkTooltips GtkTooltips; typedef struct _GtkNotebook GtkNotebook; typedef struct _GtkNotebookPage GtkNotebookPage; typedef struct _GtkAccelGroup GtkAccelGroup; -typedef struct _GtkItemFactory GtkItemFactory; typedef struct _GtkSelectionData GtkSelectionData; typedef struct _GtkTextBuffer GtkTextBuffer; typedef struct _GtkRange GtkRange; @@ -3282,10 +3276,6 @@ typedef struct _PangoLayout PangoLayout; typedef struct _PangoFontDescription PangoFontDescription; #endif -#ifdef __WXMGL__ -typedef struct window_t *WXWidget; -#endif /* MGL */ - #ifdef __WXDFB__ /* DirectFB doesn't have the concept of non-TLW window, so use something arbitrary */ @@ -3328,7 +3318,7 @@ typedef const void* WXWidget; private: \ classname& operator=(const classname&) -// deprecated variants _not_ requiring a semicolon after them +/* deprecated variants _not_ requiring a semicolon after them */ #define DECLARE_NO_COPY_CLASS(classname) \ wxDECLARE_NO_COPY_CLASS(classname); #define DECLARE_NO_COPY_TEMPLATE_CLASS(classname, arg) \ diff --git a/Externals/wxWidgets3/include/wx/dialog.h b/Externals/wxWidgets3/include/wx/dialog.h index 67191522a6..3ce0c53ccc 100644 --- a/Externals/wxWidgets3/include/wx/dialog.h +++ b/Externals/wxWidgets3/include/wx/dialog.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 29.06.99 -// RCS-ID: $Id: dialog.h 66087 2010-11-10 13:51:57Z VZ $ +// RCS-ID: $Id: dialog.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -26,7 +26,7 @@ class wxTextSizerWrapper; // Also see the bit summary table in wx/toplevel.h. -#define wxDIALOG_NO_PARENT 0x0100 // Don't make owned by apps top window +#define wxDIALOG_NO_PARENT 0x00000020 // Don't make owned by apps top window #ifdef __WXWINCE__ #define wxDEFAULT_DIALOG_STYLE (wxCAPTION | wxMAXIMIZE | wxCLOSE_BOX | wxNO_BORDER) @@ -350,9 +350,7 @@ public: #if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__) #include "wx/univ/dialog.h" #else - #if defined(__WXPALMOS__) - #include "wx/palmos/dialog.h" - #elif defined(__WXMSW__) + #if defined(__WXMSW__) #include "wx/msw/dialog.h" #elif defined(__WXMOTIF__) #include "wx/motif/dialog.h" @@ -394,5 +392,8 @@ typedef void (wxEvtHandler::*wxWindowModalDialogEventFunction)(wxWindowModalDial #define wxWindowModalDialogEventHandler(func) \ wxEVENT_HANDLER_CAST(wxWindowModalDialogEventFunction, func) +#define EVT_WINDOW_MODAL_DIALOG_CLOSED(winid, func) \ + wx__DECLARE_EVT1(wxEVT_WINDOW_MODAL_DIALOG_CLOSED, winid, wxWindowModalDialogEventHandler(func)) + #endif // _WX_DIALOG_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/dialup.h b/Externals/wxWidgets3/include/wx/dialup.h index f52303f2b0..ba591ebe71 100644 --- a/Externals/wxWidgets3/include/wx/dialup.h +++ b/Externals/wxWidgets3/include/wx/dialup.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 07.07.99 -// RCS-ID: $Id: dialup.h 58757 2009-02-08 11:45:59Z VZ $ +// RCS-ID: $Id: dialup.h 67384 2011-04-03 20:31:32Z DS $ // Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -171,7 +171,7 @@ public: bool IsConnectedEvent() const { return GetEventType() == wxEVT_DIALUP_CONNECTED; } - // does this event come from wxDialUpManager::Dial() or from some extrenal + // does this event come from wxDialUpManager::Dial() or from some external // process (i.e. does it result from our own attempt to establish the // connection)? bool IsOwnEvent() const { return m_id != 0; } diff --git a/Externals/wxWidgets3/include/wx/dirdlg.h b/Externals/wxWidgets3/include/wx/dirdlg.h index 49f6d9630e..16f7beef5d 100644 --- a/Externals/wxWidgets3/include/wx/dirdlg.h +++ b/Externals/wxWidgets3/include/wx/dirdlg.h @@ -5,7 +5,7 @@ // Modified by: // Created: // Copyright: (c) Robert Roebling -// RCS-ID: $Id: dirdlg.h 54125 2008-06-11 19:17:41Z SC $ +// RCS-ID: $Id: dirdlg.h 70353 2012-01-15 14:46:41Z VZ $ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -116,9 +116,7 @@ protected: #include "wx/cocoa/dirdlg.h" // Native Cocoa #elif defined(__WXMOTIF__) || \ defined(__WXX11__) || \ - defined(__WXMGL__) || \ defined(__WXCOCOA__) || \ - defined(__WXPALMOS__) || \ defined(__WXPM__) #include "wx/generic/dirdlgg.h" // Other ports use generic implementation #define wxDirDialog wxGenericDirDialog diff --git a/Externals/wxWidgets3/include/wx/dlimpexp.h b/Externals/wxWidgets3/include/wx/dlimpexp.h index 9efcf5328a..1042938b40 100644 --- a/Externals/wxWidgets3/include/wx/dlimpexp.h +++ b/Externals/wxWidgets3/include/wx/dlimpexp.h @@ -4,7 +4,7 @@ * Author: Vadim Zeitlin * Modified by: * Created: 16.10.2003 (extracted from wx/defs.h) - * RCS-ID: $Id: dlimpexp.h 61944 2009-09-16 12:06:02Z PJC $ + * RCS-ID: $Id: dlimpexp.h 69049 2011-09-10 18:09:12Z SJL $ * Copyright: (c) 2003 Vadim Zeitlin * Licence: wxWindows licence */ @@ -22,14 +22,25 @@ #elif defined(__WINDOWS__) /* __declspec works in BC++ 5 and later, Watcom C++ 11.0 and later as well - as VC++ and gcc + as VC++. */ -# if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__GNUC__) || defined(__WATCOMC__) +# if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__) # define WXEXPORT __declspec(dllexport) # define WXIMPORT __declspec(dllimport) -# else /* compiler doesn't support __declspec() */ -# define WXEXPORT -# define WXIMPORT + /* + While gcc also supports __declspec(dllexport), it creates unusably huge + DLL files since gcc 4.5 (while taking horribly long amounts of time), + see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43601. Because of this + we rely on binutils auto export/import support which seems to work + quite well for 4.5+. + */ +# elif defined(__GNUC__) && !wxCHECK_GCC_VERSION(4, 5) + /* + __declspec could be used here too but let's use the native + __attribute__ instead for clarity. + */ +# define WXEXPORT __attribute__((dllexport)) +# define WXIMPORT __attribute__((dllimport)) # endif #elif defined(__WXPM__) # if defined (__WATCOMC__) @@ -91,6 +102,7 @@ # define WXMAKINGDLL_RICHTEXT # define WXMAKINGDLL_MEDIA # define WXMAKINGDLL_STC +# define WXMAKINGDLL_WEBVIEW #endif /* WXMAKINGDLL */ /* @@ -263,6 +275,17 @@ # define WXDLLIMPEXP_DATA_STC(type) type #endif +#ifdef WXMAKINGDLL_WEBVIEW +# define WXDLLIMPEXP_WEBVIEW WXEXPORT +# define WXDLLIMPEXP_DATA_WEBVIEW(type) WXEXPORT type +#elif defined(WXUSINGDLL) +# define WXDLLIMPEXP_WEBVIEW WXIMPORT +# define WXDLLIMPEXP_DATA_WEBVIEW(type) WXIMPORT type +#else /* not making nor using DLL */ +# define WXDLLIMPEXP_WEBVIEW +# define WXDLLIMPEXP_DATA_WEBVIEW(type) type +#endif + /* GCC warns about using __attribute__ (and also __declspec in mingw32 case) on forward declarations while MSVC complains about forward declarations without @@ -284,6 +307,7 @@ #define WXDLLIMPEXP_FWD_RICHTEXT #define WXDLLIMPEXP_FWD_MEDIA #define WXDLLIMPEXP_FWD_STC + #define WXDLLIMPEXP_FWD_WEBVIEW #else #define WXDLLIMPEXP_FWD_BASE WXDLLIMPEXP_BASE #define WXDLLIMPEXP_FWD_NET WXDLLIMPEXP_NET @@ -299,6 +323,7 @@ #define WXDLLIMPEXP_FWD_RICHTEXT WXDLLIMPEXP_RICHTEXT #define WXDLLIMPEXP_FWD_MEDIA WXDLLIMPEXP_MEDIA #define WXDLLIMPEXP_FWD_STC WXDLLIMPEXP_STC + #define WXDLLIMPEXP_FWD_WEBVIEW WXDLLIMPEXP_WEBVIEW #endif /* for backwards compatibility, define suffix-less versions too */ diff --git a/Externals/wxWidgets3/include/wx/dlist.h b/Externals/wxWidgets3/include/wx/dlist.h index 164ed8680a..b69f617d9b 100644 --- a/Externals/wxWidgets3/include/wx/dlist.h +++ b/Externals/wxWidgets3/include/wx/dlist.h @@ -13,7 +13,7 @@ #include "wx/defs.h" #include "wx/utils.h" -#if wxUSE_STL +#if wxUSE_STD_CONTAINERS #include "wx/beforestd.h" #include @@ -199,7 +199,7 @@ public: } }; -#else // STL +#else // !wxUSE_STD_CONTAINERS template class wxDList @@ -845,6 +845,6 @@ public: } */ }; -#endif // wxUSE_STL/!wxUSE_STL +#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS #endif // _WX_DLIST_H_ diff --git a/Externals/wxWidgets3/include/wx/docview.h b/Externals/wxWidgets3/include/wx/docview.h index 3f48964a03..e15414e65f 100644 --- a/Externals/wxWidgets3/include/wx/docview.h +++ b/Externals/wxWidgets3/include/wx/docview.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: docview.h 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: docview.h 70098 2011-12-23 05:59:59Z PC $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,6 +17,7 @@ #if wxUSE_DOC_VIEW_ARCHITECTURE #include "wx/list.h" +#include "wx/dlist.h" #include "wx/string.h" #include "wx/frame.h" #include "wx/filehistory.h" @@ -172,6 +173,10 @@ public: // dialogs. Override if necessary. virtual wxWindow *GetDocumentWindow() const; + // Returns true if this document is a child document corresponding to a + // part of the parent document and not a disk file as usual. + bool IsChildDocument() const { return m_documentParent != NULL; } + protected: wxList m_documentViews; wxString m_documentFile; @@ -179,7 +184,12 @@ protected: wxString m_documentTypeName; wxDocTemplate* m_documentTemplate; bool m_documentModified; + + // if the document parent is non-NULL, it's a pseudo-document corresponding + // to a part of the parent document which can't be saved or loaded + // independently of its parent and is always closed when its parent is wxDocument* m_documentParent; + wxCommandProcessor* m_commandProcessor; bool m_savedYet; @@ -193,6 +203,10 @@ protected: wxString DoGetUserReadableName() const; private: + // list of all documents whose m_documentParent is this one + typedef wxDList DocsList; + DocsList m_childDocuments; + DECLARE_ABSTRACT_CLASS(wxDocument) wxDECLARE_NO_COPY_CLASS(wxDocument); }; @@ -386,6 +400,7 @@ public: void OnUpdateFileRevert(wxUpdateUIEvent& event); void OnUpdateFileNew(wxUpdateUIEvent& event); void OnUpdateFileSave(wxUpdateUIEvent& event); + void OnUpdateFileSaveAs(wxUpdateUIEvent& event); void OnUpdateUndo(wxUpdateUIEvent& event); void OnUpdateRedo(wxUpdateUIEvent& event); @@ -474,6 +489,13 @@ public: // Get the current document manager static wxDocManager* GetDocumentManager() { return sm_docManager; } +#if wxUSE_PRINTING_ARCHITECTURE + wxPageSetupDialogData& GetPageSetupDialogData() + { return m_pageSetupDialogData; } + const wxPageSetupDialogData& GetPageSetupDialogData() const + { return m_pageSetupDialogData; } +#endif // wxUSE_PRINTING_ARCHITECTURE + #if WXWIN_COMPATIBILITY_2_8 // deprecated, override GetDefaultName() instead wxDEPRECATED_BUT_USED_INTERNALLY( @@ -488,6 +510,11 @@ public: protected: + // Called when a file selected from the MRU list doesn't exist any more. + // The default behaviour is to remove the file from the MRU and notify the + // user about it but this method can be overridden to customize it. + virtual void OnMRUFileNotExist(unsigned n, const wxString& filename); + // Open the MRU file with the given index in our associated file history. void DoOpenMRUFile(unsigned n); #if wxUSE_PRINTING_ARCHITECTURE @@ -959,7 +986,7 @@ wxTransferStreamToFile(wxInputStream& stream, const wxString& filename); // these flags are not used anywhere by wxWidgets and kept only for an unlikely // case of existing user code using them for its own purposes -#ifdef WXWIN_COMPATIBILITY_2_8 +#if WXWIN_COMPATIBILITY_2_8 enum { wxDOC_SDI = 1, diff --git a/Externals/wxWidgets3/include/wx/dvrenderers.h b/Externals/wxWidgets3/include/wx/dvrenderers.h index 64054732ef..7c372739b8 100644 --- a/Externals/wxWidgets3/include/wx/dvrenderers.h +++ b/Externals/wxWidgets3/include/wx/dvrenderers.h @@ -3,7 +3,7 @@ // Purpose: Declare all wxDataViewCtrl classes // Author: Robert Roebling, Vadim Zeitlin // Created: 2009-11-08 (extracted from wx/dataview.h) -// RCS-ID: $Id: dvrenderers.h 67099 2011-03-01 12:16:49Z VS $ +// RCS-ID: $Id: dvrenderers.h 70050 2011-12-19 12:54:38Z VZ $ // Copyright: (c) 2006 Robert Roebling // (c) 2009 Vadim Zeitlin // Licence: wxWindows licence @@ -54,6 +54,21 @@ public: void SetIcon( const wxIcon &icon ) { m_icon = icon; } const wxIcon &GetIcon() const { return m_icon; } + bool IsSameAs(const wxDataViewIconText& other) const + { + return m_text == other.m_text && m_icon.IsSameAs(other.m_icon); + } + + bool operator==(const wxDataViewIconText& other) const + { + return IsSameAs(other); + } + + bool operator!=(const wxDataViewIconText& other) const + { + return !IsSameAs(other); + } + private: wxString m_text; wxIcon m_icon; @@ -61,19 +76,6 @@ private: DECLARE_DYNAMIC_CLASS(wxDataViewIconText) }; -inline -bool operator==(const wxDataViewIconText& left, const wxDataViewIconText& right) -{ - return left.GetText() == right.GetText() && - left.GetIcon().IsSameAs(right.GetIcon()); -} - -inline -bool operator!=(const wxDataViewIconText& left, const wxDataViewIconText& right) -{ - return !(left == right); -} - DECLARE_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV) // ---------------------------------------------------------------------------- @@ -145,11 +147,11 @@ public: // in-place editing virtual bool HasEditorCtrl() const { return false; } - virtual wxControl* CreateEditorCtrl(wxWindow * WXUNUSED(parent), - wxRect WXUNUSED(labelRect), - const wxVariant& WXUNUSED(value)) + virtual wxWindow* CreateEditorCtrl(wxWindow * WXUNUSED(parent), + wxRect WXUNUSED(labelRect), + const wxVariant& WXUNUSED(value)) { return NULL; } - virtual bool GetValueFromEditorCtrl(wxControl * WXUNUSED(editor), + virtual bool GetValueFromEditorCtrl(wxWindow * WXUNUSED(editor), wxVariant& WXUNUSED(value)) { return false; } @@ -157,7 +159,7 @@ public: virtual void CancelEditing(); virtual bool FinishEditing(); - wxControl *GetEditorCtrl() { return m_editorCtrl; } + wxWindow *GetEditorCtrl() { return m_editorCtrl; } virtual bool IsCustomRenderer() const { return false; } @@ -168,11 +170,12 @@ protected: wxString m_variantType; wxDataViewColumn *m_owner; - wxWeakRef m_editorCtrl; + wxWeakRef m_editorCtrl; wxDataViewItem m_item; // for m_editorCtrl - // internal utility: - const wxDataViewCtrl* GetView() const; + // internal utility, may be used anywhere the window associated with the + // renderer is required + wxDataViewCtrl* GetView() const; protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRendererBase) @@ -225,23 +228,32 @@ public: // Return the size of the item appropriate to its current value. virtual wxSize GetSize() const = 0; - // Define virtual function which are called when the item is activated - // (double-clicked or Enter is pressed on it), clicked or the user starts - // to drag it: by default they all simply return false indicating that the - // events are not handled + // Define virtual function which are called when a key is pressed on the + // item, clicked or the user starts to drag it: by default they all simply + // return false indicating that the events are not handled - virtual bool Activate(const wxRect& WXUNUSED(cell), - wxDataViewModel *WXUNUSED(model), - const wxDataViewItem & WXUNUSED(item), - unsigned int WXUNUSED(col)) - { return false; } + virtual bool ActivateCell(const wxRect& cell, + wxDataViewModel *model, + const wxDataViewItem & item, + unsigned int col, + const wxMouseEvent* mouseEvent); - virtual bool LeftClick(const wxPoint& WXUNUSED(cursor), - const wxRect& WXUNUSED(cell), - wxDataViewModel *WXUNUSED(model), - const wxDataViewItem & WXUNUSED(item), - unsigned int WXUNUSED(col) ) - { return false; } + // Deprecated, use (and override) ActivateCell() instead + wxDEPRECATED_BUT_USED_INTERNALLY_INLINE( + virtual bool Activate(wxRect WXUNUSED(cell), + wxDataViewModel *WXUNUSED(model), + const wxDataViewItem & WXUNUSED(item), + unsigned int WXUNUSED(col)), + return false; ) + + // Deprecated, use (and override) ActivateCell() instead + wxDEPRECATED_BUT_USED_INTERNALLY_INLINE( + virtual bool LeftClick(wxPoint WXUNUSED(cursor), + wxRect WXUNUSED(cell), + wxDataViewModel *WXUNUSED(model), + const wxDataViewItem & WXUNUSED(item), + unsigned int WXUNUSED(col)), + return false; ) virtual bool StartDrag(const wxPoint& WXUNUSED(cursor), const wxRect& WXUNUSED(cell), @@ -278,6 +290,9 @@ public: // platform-specific classes. virtual wxDC *GetDC() = 0; + // To draw background use the background colour in wxDataViewItemAttr + virtual void RenderBackground(wxDC* dc, const wxRect& rect); + // Prepare DC to use attributes and call Render(). void WXCallRender(wxRect rect, wxDC *dc, int state); @@ -322,8 +337,8 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, int alignment = wxDVR_DEFAULT_ALIGNMENT ); virtual bool HasEditorCtrl() const { return true; } - virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ); - virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ); + virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ); + virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); virtual bool Render( wxRect rect, wxDC *dc, int state ); virtual wxSize GetSize() const; virtual bool SetValue( const wxVariant &value ); @@ -347,8 +362,8 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, int alignment = wxDVR_DEFAULT_ALIGNMENT ); virtual bool HasEditorCtrl() const { return true; } - virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ); - virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ); + virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ); + virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); virtual bool Render( wxRect rect, wxDC *dc, int state ); virtual wxSize GetSize() const; virtual bool SetValue( const wxVariant &value ); @@ -373,8 +388,8 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, int alignment = wxDVR_DEFAULT_ALIGNMENT ); - virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ); - virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ); + virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ); + virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); virtual bool SetValue( const wxVariant &value ); virtual bool GetValue( wxVariant &value ) const; @@ -383,6 +398,37 @@ public: #endif // generic or Carbon versions +#if defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXGTK__) + +// ---------------------------------------------------------------------------- +// wxDataViewDateRenderer +// ---------------------------------------------------------------------------- + +#if wxUSE_DATEPICKCTRL +class WXDLLIMPEXP_ADV wxDataViewDateRenderer: public wxDataViewCustomRenderer +{ +public: + wxDataViewDateRenderer(const wxString &varianttype = wxT("datetime"), + wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, + int align = wxDVR_DEFAULT_ALIGNMENT); + + virtual bool HasEditorCtrl() const { return true; } + virtual wxWindow *CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant &value); + virtual bool GetValueFromEditorCtrl(wxWindow* editor, wxVariant &value); + virtual bool SetValue(const wxVariant &value); + virtual bool GetValue(wxVariant& value) const; + virtual bool Render( wxRect cell, wxDC *dc, int state ); + virtual wxSize GetSize() const; + +private: + wxDateTime m_date; +}; +#else // !wxUSE_DATEPICKCTRL +typedef wxDataViewTextRenderer wxDataViewDateRenderer; +#endif + +#endif // generic or GTK+ versions + // this class is obsolete, its functionality was merged in // wxDataViewTextRenderer itself now, don't use it any more #define wxDataViewTextRendererAttr wxDataViewTextRenderer diff --git a/Externals/wxWidgets3/include/wx/dynarray.h b/Externals/wxWidgets3/include/wx/dynarray.h index 5a1e932668..09237e0a77 100644 --- a/Externals/wxWidgets3/include/wx/dynarray.h +++ b/Externals/wxWidgets3/include/wx/dynarray.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 12.09.97 -// RCS-ID: $Id: dynarray.h 56600 2008-10-30 15:57:18Z VZ $ +// RCS-ID: $Id: dynarray.h 69688 2011-11-05 15:20:32Z VS $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -14,7 +14,7 @@ #include "wx/defs.h" -#if wxUSE_STL +#if wxUSE_STD_CONTAINERS #include "wx/beforestd.h" #include #include @@ -81,7 +81,7 @@ typedef int (wxCMPFUNC_CONV *CMPFUNC)(const void* pItem1, const void* pItem2); // you cast "SomeArray *" as "BaseArray *" and then delete it) // ---------------------------------------------------------------------------- -#if wxUSE_STL +#if wxUSE_STD_CONTAINERS template class wxArray_SortFunction @@ -151,7 +151,7 @@ public: \ e = rend(); \ for ( const_reverse_iterator i = b; i != e; ++i ) \ if ( *i == item ) \ - return (int)(i - b); \ + return (int)(e - i - 1); \ } \ else \ { \ @@ -203,12 +203,12 @@ public: \ } \ } -#else // if !wxUSE_STL +#else // if !wxUSE_STD_CONTAINERS #define _WX_DECLARE_BASEARRAY(T, name, classexp) \ classexp name \ { \ - typedef CMPFUNC SCMPFUNC; /* for compatibility wuth wxUSE_STL */ \ + typedef CMPFUNC SCMPFUNC; /* for compatibility wuth wxUSE_STD_CONTAINERS */ \ public: \ name(); \ name(const name& array); \ @@ -307,7 +307,7 @@ private: \ T *m_pItems; \ } -#endif // !wxUSE_STL +#endif // !wxUSE_STD_CONTAINERS // ============================================================================ // The private helper macros containing the core of the array classes @@ -325,7 +325,7 @@ private: \ // _WX_DEFINE_TYPEARRAY: array for simple types // ---------------------------------------------------------------------------- -#if wxUSE_STL +#if wxUSE_STD_CONTAINERS // in STL case we don't need the entire base arrays hack as standard container // don't suffer from alignment/storage problems as our home-grown do @@ -335,7 +335,7 @@ private: \ #define _WX_DEFINE_TYPEARRAY_PTR(T, name, base, classexp) \ _WX_DEFINE_TYPEARRAY(T, name, base, classexp) -#else // if !wxUSE_STL +#else // if !wxUSE_STD_CONTAINERS // common declaration used by both _WX_DEFINE_TYPEARRAY and // _WX_DEFINE_TYPEARRAY_PTR @@ -505,7 +505,7 @@ public: \ #define _WX_DEFINE_TYPEARRAY_PTR(T, name, base, classexp) \ _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, _WX_PTROP_NONE) -#endif // !wxUSE_STL +#endif // !wxUSE_STD_CONTAINERS // ---------------------------------------------------------------------------- // _WX_DEFINE_SORTED_TYPEARRAY: sorted array for simple data types @@ -546,6 +546,8 @@ public: \ \ size_t Add(T lItem) \ { return base::Add(lItem, (CMPFUNC)m_fnCompare); } \ + void push_back(T lItem) \ + { Add(lItem); } \ \ void RemoveAt(size_t uiIndex, size_t nRemove = 1) \ { base::erase(begin() + uiIndex, begin() + uiIndex + nRemove); } \ @@ -636,7 +638,7 @@ private: \ // that wants to export a wxArray daubed with your own import/export goo. // // Finally, you can define the macro below as something special to modify the -// arrays defined by a simple WX_FOO_ARRAY as well. By default is is empty. +// arrays defined by a simple WX_FOO_ARRAY as well. By default is empty. #define wxARRAY_DEFAULT_EXPORT // ---------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/include/wx/dynlib.h b/Externals/wxWidgets3/include/wx/dynlib.h index 687794221d..4e4e411dbc 100644 --- a/Externals/wxWidgets3/include/wx/dynlib.h +++ b/Externals/wxWidgets3/include/wx/dynlib.h @@ -4,7 +4,7 @@ // Author: Guilhem Lavaux, Vadim Zeitlin, Vaclav Slavik // Modified by: // Created: 20/07/98 -// RCS-ID: $Id: dynlib.h 64139 2010-04-25 12:07:37Z VS $ +// RCS-ID: $Id: dynlib.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998 Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -123,14 +123,14 @@ enum wxPluginCategory #define wxDL_INIT_FUNC(pfx, name, dynlib) \ pfx ## name = (name ## _t)(dynlib).RawGetSymbol(#name) -#ifdef __WXMSW__ +#ifdef __WINDOWS__ // same as wxDL_INIT_FUNC() but appends 'A' or 'W' to the function name, see // wxDynamicLibrary::GetSymbolAorW() #define wxDL_INIT_FUNC_AW(pfx, name, dynlib) \ pfx ## name = (name ## _t)(dynlib).GetSymbolAorW(#name) -#endif // __WXMSW__ +#endif // __WINDOWS__ // the following macros can be used to redirect a whole library to a class and // check at run-time if the library is present and contains all required @@ -304,7 +304,7 @@ public: #endif } -#ifdef __WXMSW__ +#ifdef __WINDOWS__ // this function is useful for loading functions from the standard Windows // DLLs: such functions have an 'A' (in ANSI build) or 'W' (in Unicode, or // wide character build) suffix if they take string parameters @@ -326,7 +326,7 @@ public: { return RawGetSymbolAorW(m_handle, name); } -#endif // __WXMSW__ +#endif // __WINDOWS__ // return all modules/shared libraries in the address space of this process // @@ -349,7 +349,7 @@ public: static wxString GetPluginsDirectory(); -#ifdef __WXMSW__ +#ifdef __WINDOWS__ // return the handle (HMODULE/HINSTANCE) of the DLL with the given name // and/or containing the specified address: for XP and later systems only // the address is used and the name is ignored but for the previous systems @@ -360,7 +360,7 @@ public: // need to be freed using FreeLibrary() but it also means that it can // become invalid if the DLL is unloaded static WXHMODULE MSWGetModuleHandle(const char *name, void *addr); -#endif // __WXMSW__ +#endif // __WINDOWS__ protected: // common part of GetSymbol() and HasSymbol() @@ -383,7 +383,7 @@ protected: wxDECLARE_NO_COPY_CLASS(wxDynamicLibrary); }; -#ifdef __WXMSW__ +#ifdef __WINDOWS__ // ---------------------------------------------------------------------------- // wxLoadedDLL is a MSW-only internal helper class allowing to dynamically bind @@ -404,7 +404,7 @@ public: } }; -#endif // __WXMSW__ +#endif // __WINDOWS__ // ---------------------------------------------------------------------------- // Interesting defines diff --git a/Externals/wxWidgets3/include/wx/encinfo.h b/Externals/wxWidgets3/include/wx/encinfo.h index 2b9b1896ab..bbe7229723 100644 --- a/Externals/wxWidgets3/include/wx/encinfo.h +++ b/Externals/wxWidgets3/include/wx/encinfo.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 19.09.2003 (extracted from wx/fontenc.h) -// RCS-ID: $Id: encinfo.h 52834 2008-03-26 15:06:00Z FM $ +// RCS-ID: $Id: encinfo.h 70353 2012-01-15 14:46:41Z VZ $ // Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -35,7 +35,6 @@ struct WXDLLIMPEXP_CORE wxNativeEncodingInfo { wxString facename; // may be empty meaning "any" -#ifndef __WXPALMOS__ wxFontEncoding encoding; // so that we know what this struct represents #if defined(__WXMSW__) || \ @@ -55,12 +54,9 @@ struct WXDLLIMPEXP_CORE wxNativeEncodingInfo xencoding; #elif defined(wxHAS_UTF8_FONTS) // ports using UTF-8 for text don't need encoding information for fonts -#elif defined(__WXMGL__) - int mglEncoding; #else #error "Unsupported toolkit" #endif -#endif // !__WXPALMOS__ // this struct is saved in config by wxFontMapper, so it should know to // serialise itself (implemented in platform-specific code) bool FromString(const wxString& s); diff --git a/Externals/wxWidgets3/include/wx/event.h b/Externals/wxWidgets3/include/wx/event.h index b08e545365..19610b0f18 100644 --- a/Externals/wxWidgets3/include/wx/event.h +++ b/Externals/wxWidgets3/include/wx/event.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: event.h 66209 2010-11-19 07:51:15Z RD $ +// RCS-ID: $Id: event.h 70703 2012-02-26 20:24:25Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -39,6 +39,7 @@ class WXDLLIMPEXP_FWD_BASE wxList; class WXDLLIMPEXP_FWD_BASE wxEvent; +class WXDLLIMPEXP_FWD_BASE wxEventFilter; #if wxUSE_GUI class WXDLLIMPEXP_FWD_CORE wxDC; class WXDLLIMPEXP_FWD_CORE wxMenu; @@ -224,10 +225,13 @@ public: const wxObjectEventFunctor &other = static_cast< const wxObjectEventFunctor & >( functor ); - // FIXME-VC6: amazing but true: replacing "method == NULL" here - // with "!method" makes VC6 crash with an ICE in DLL build (only!) + // FIXME-VC6: amazing but true: replacing "m_method == 0" here + // with "!m_method" makes VC6 crash with an ICE in DLL build (only!) + // Also notice that using "NULL" instead of "0" results in warnings + // about "using NULL in arithmetics" from arm-linux-androideabi-g++ + // 4.4.3 used for wxAndroid build. - return ( m_method == other.m_method || other.m_method == NULL ) && + return ( m_method == other.m_method || other.m_method == 0 ) && ( m_handler == other.m_handler || other.m_handler == NULL ); } else @@ -615,8 +619,9 @@ extern WXDLLIMPEXP_BASE const wxEventType wxEVT_FIRST; extern WXDLLIMPEXP_BASE const wxEventType wxEVT_USER_FIRST; // Need events declared to do this +class WXDLLIMPEXP_FWD_BASE wxIdleEvent; +class WXDLLIMPEXP_FWD_BASE wxThreadEvent; class WXDLLIMPEXP_FWD_CORE wxCommandEvent; -class WXDLLIMPEXP_FWD_CORE wxThreadEvent; class WXDLLIMPEXP_FWD_CORE wxMouseEvent; class WXDLLIMPEXP_FWD_CORE wxFocusEvent; class WXDLLIMPEXP_FWD_CORE wxChildFocusEvent; @@ -649,7 +654,6 @@ class WXDLLIMPEXP_FWD_CORE wxPaletteChangedEvent; class WXDLLIMPEXP_FWD_CORE wxJoystickEvent; class WXDLLIMPEXP_FWD_CORE wxDropFilesEvent; class WXDLLIMPEXP_FWD_CORE wxInitDialogEvent; -class WXDLLIMPEXP_FWD_CORE wxIdleEvent; class WXDLLIMPEXP_FWD_CORE wxUpdateUIEvent; class WXDLLIMPEXP_FWD_CORE wxClipboardTextEvent; class WXDLLIMPEXP_FWD_CORE wxHelpEvent; @@ -678,7 +682,7 @@ wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COMBOBOX_DROPDOWN, wxCo wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COMBOBOX_CLOSEUP, wxCommandEvent); // Thread events -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_THREAD, wxThreadEvent); +wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_THREAD, wxThreadEvent); // Mouse event types wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEFT_DOWN, wxMouseEvent); @@ -713,6 +717,10 @@ wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_KEY_UP, wxKeyEvent); #if wxUSE_HOTKEY wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_HOTKEY, wxKeyEvent); #endif +// This is a private event used by wxMSW code only and subject to change or +// disappear in the future. Don't use. +wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AFTER_CHAR, wxKeyEvent); + // Set cursor event wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SET_CURSOR, wxSetCursorEvent); @@ -1112,6 +1120,148 @@ private: wxDECLARE_NO_COPY_CLASS(wxEventProcessInHandlerOnly); }; + +class WXDLLIMPEXP_BASE wxEventBasicPayloadMixin +{ +public: + wxEventBasicPayloadMixin() + : m_commandInt(0), + m_extraLong(0) + { + } + + void SetString(const wxString& s) { m_cmdString = s; } + const wxString& GetString() const { return m_cmdString; } + + void SetInt(int i) { m_commandInt = i; } + int GetInt() const { return m_commandInt; } + + void SetExtraLong(long extraLong) { m_extraLong = extraLong; } + long GetExtraLong() const { return m_extraLong; } + +protected: + // Note: these variables have "cmd" or "command" in their name for backward compatibility: + // they used to be part of wxCommandEvent, not this mixin. + wxString m_cmdString; // String event argument + int m_commandInt; + long m_extraLong; // Additional information (e.g. select/deselect) + + wxDECLARE_NO_ASSIGN_CLASS(wxEventBasicPayloadMixin); +}; + +class WXDLLIMPEXP_BASE wxEventAnyPayloadMixin : public wxEventBasicPayloadMixin +{ +public: + wxEventAnyPayloadMixin() : wxEventBasicPayloadMixin() {} + +#if wxUSE_ANY && (!defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)) + template + void SetPayload(const T& payload) + { + m_payload = payload; + } + + template + T GetPayload() const + { + return m_payload.As(); + } + +protected: + wxAny m_payload; +#endif // wxUSE_ANY && (!defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)) + + wxDECLARE_NO_ASSIGN_CLASS(wxEventBasicPayloadMixin); +}; + + +// Idle event +/* + wxEVT_IDLE + */ + +// Whether to always send idle events to windows, or +// to only send update events to those with the +// wxWS_EX_PROCESS_IDLE style. + +enum wxIdleMode +{ + // Send idle events to all windows + wxIDLE_PROCESS_ALL, + + // Send idle events to windows that have + // the wxWS_EX_PROCESS_IDLE flag specified + wxIDLE_PROCESS_SPECIFIED +}; + +class WXDLLIMPEXP_BASE wxIdleEvent : public wxEvent +{ +public: + wxIdleEvent() + : wxEvent(0, wxEVT_IDLE), + m_requestMore(false) + { } + wxIdleEvent(const wxIdleEvent& event) + : wxEvent(event), + m_requestMore(event.m_requestMore) + { } + + void RequestMore(bool needMore = true) { m_requestMore = needMore; } + bool MoreRequested() const { return m_requestMore; } + + virtual wxEvent *Clone() const { return new wxIdleEvent(*this); } + + // Specify how wxWidgets will send idle events: to + // all windows, or only to those which specify that they + // will process the events. + static void SetMode(wxIdleMode mode) { sm_idleMode = mode; } + + // Returns the idle event mode + static wxIdleMode GetMode() { return sm_idleMode; } + +protected: + bool m_requestMore; + static wxIdleMode sm_idleMode; + +private: + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIdleEvent) +}; + + +// Thread event + +class WXDLLIMPEXP_BASE wxThreadEvent : public wxEvent, + public wxEventAnyPayloadMixin +{ +public: + wxThreadEvent(wxEventType eventType = wxEVT_THREAD, int id = wxID_ANY) + : wxEvent(id, eventType) + { } + + wxThreadEvent(const wxThreadEvent& event) + : wxEvent(event), + wxEventAnyPayloadMixin(event) + { + // make sure our string member (which uses COW, aka refcounting) is not + // shared by other wxString instances: + SetString(GetString().c_str()); + } + + virtual wxEvent *Clone() const + { + return new wxThreadEvent(*this); + } + + // this is important to avoid that calling wxEventLoopBase::YieldFor thread events + // gets processed when this is unwanted: + virtual wxEventCategory GetEventCategory() const + { return wxEVT_CATEGORY_THREAD; } + +private: + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxThreadEvent) +}; + + #if wxUSE_GUI @@ -1134,16 +1284,15 @@ private: wxEVT_COMMAND_TOGGLEBUTTON_CLICKED */ -class WXDLLIMPEXP_CORE wxCommandEvent : public wxEvent +class WXDLLIMPEXP_CORE wxCommandEvent : public wxEvent, + public wxEventBasicPayloadMixin { public: wxCommandEvent(wxEventType commandType = wxEVT_NULL, int winid = 0); wxCommandEvent(const wxCommandEvent& event) : wxEvent(event), - m_cmdString(event.m_cmdString), - m_commandInt(event.m_commandInt), - m_extraLong(event.m_extraLong), + wxEventBasicPayloadMixin(event), m_clientData(event.m_clientData), m_clientObject(event.m_clientObject) { } @@ -1156,32 +1305,23 @@ public: void SetClientObject(wxClientData* clientObject) { m_clientObject = clientObject; } wxClientData *GetClientObject() const { return m_clientObject; } + // Note: this shadows wxEventBasicPayloadMixin::GetString(), because it does some + // GUI-specific hacks + wxString GetString() const; + // Get listbox selection if single-choice int GetSelection() const { return m_commandInt; } - // Set/Get listbox/choice selection string - void SetString(const wxString& s) { m_cmdString = s; } - wxString GetString() const; - // Get checkbox value bool IsChecked() const { return m_commandInt != 0; } // true if the listbox event was a selection. bool IsSelection() const { return (m_extraLong != 0); } - void SetExtraLong(long extraLong) { m_extraLong = extraLong; } - long GetExtraLong() const { return m_extraLong; } - - void SetInt(int i) { m_commandInt = i; } - int GetInt() const { return m_commandInt; } - virtual wxEvent *Clone() const { return new wxCommandEvent(*this); } virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; } protected: - wxString m_cmdString; // String event argument - int m_commandInt; - long m_extraLong; // Additional information (e.g. select/deselect) void* m_clientData; // Arbitrary client data wxClientData* m_clientObject; // Arbitrary client object @@ -1221,60 +1361,6 @@ private: }; -// Thread event - -class WXDLLIMPEXP_CORE wxThreadEvent : public wxCommandEvent -{ -public: - wxThreadEvent(wxEventType eventType = wxEVT_COMMAND_THREAD, int id = wxID_ANY) - : wxCommandEvent(eventType, id) - { } - - wxThreadEvent(const wxThreadEvent& event) - : wxCommandEvent(event) - { - // make sure our string member (which uses COW, aka refcounting) is not - // shared by other wxString instances: - SetString(GetString().c_str()); - -#if wxUSE_ANY && (!defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)) - m_payload = event.m_payload; -#endif - } - - virtual wxEvent *Clone() const - { - return new wxThreadEvent(*this); - } - - // this is important to avoid that calling wxEventLoopBase::YieldFor thread events - // gets processed when this is unwanted: - virtual wxEventCategory GetEventCategory() const - { return wxEVT_CATEGORY_THREAD; } - -#if wxUSE_ANY && (!defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)) - template - void SetPayload(const T& payload) - { - m_payload = payload; - } - - template - T GetPayload() const - { - return m_payload.As(); - } - -protected: - wxAny m_payload; -#endif // wxUSE_ANY && (!defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)) - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxThreadEvent) -}; - - - // Scroll event class, derived form wxCommandEvent. wxScrollEvents are // sent by wxSlider and wxScrollBar. /* @@ -1360,18 +1446,6 @@ private: wxEVT_LEFT_DCLICK wxEVT_MIDDLE_DCLICK wxEVT_RIGHT_DCLICK - wxEVT_NC_LEFT_DOWN - wxEVT_NC_LEFT_UP, - wxEVT_NC_MIDDLE_DOWN, - wxEVT_NC_MIDDLE_UP, - wxEVT_NC_RIGHT_DOWN, - wxEVT_NC_RIGHT_UP, - wxEVT_NC_MOTION, - wxEVT_NC_ENTER_WINDOW, - wxEVT_NC_LEAVE_WINDOW, - wxEVT_NC_LEFT_DCLICK, - wxEVT_NC_MIDDLE_DCLICK, - wxEVT_NC_RIGHT_DCLICK, */ class WXDLLIMPEXP_CORE wxMouseEvent : public wxEvent, @@ -1420,8 +1494,8 @@ public: bool LeftDClick() const { return (m_eventType == wxEVT_LEFT_DCLICK); } bool MiddleDClick() const { return (m_eventType == wxEVT_MIDDLE_DCLICK); } bool RightDClick() const { return (m_eventType == wxEVT_RIGHT_DCLICK); } - bool Aux1DClick() const { return (m_eventType == wxEVT_AUX1_UP); } - bool Aux2DClick() const { return (m_eventType == wxEVT_AUX2_UP); } + bool Aux1DClick() const { return (m_eventType == wxEVT_AUX1_DCLICK); } + bool Aux2DClick() const { return (m_eventType == wxEVT_AUX2_DCLICK); } // True if a button is down and the mouse is moving bool Dragging() const @@ -1524,7 +1598,7 @@ public: void SetCursor(const wxCursor& cursor) { m_cursor = cursor; } const wxCursor& GetCursor() const { return m_cursor; } - bool HasCursor() const { return m_cursor.Ok(); } + bool HasCursor() const { return m_cursor.IsOk(); } virtual wxEvent *Clone() const { return new wxSetCursorEvent(*this); } @@ -1578,7 +1652,12 @@ class WXDLLIMPEXP_CORE wxKeyEvent : public wxEvent, { public: wxKeyEvent(wxEventType keyType = wxEVT_NULL); + + // Normal copy ctor and a ctor creating a new event for the same key as the + // given one but a different event type (this is used in implementation + // code only, do not use outside of the library). wxKeyEvent(const wxKeyEvent& evt); + wxKeyEvent(wxEventType eventType, const wxKeyEvent& evt); // get the key code: an ASCII7 char or an element of wxKeyCode enum int GetKeyCode() const { return (int)m_keyCode; } @@ -1619,6 +1698,15 @@ public: // Get Y position wxCoord GetY() const { return m_y; } + // Can be called from wxEVT_CHAR_HOOK handler to allow generation of normal + // key events even though the event had been handled (by default they would + // not be generated in this case). + void DoAllowNextEvent() { m_allowNext = true; } + + // Return the value of the "allow next" flag, for internal use only. + bool IsNextEventAllowed() const { return m_allowNext; } + + virtual wxEvent *Clone() const { return new wxKeyEvent(*this); } virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; } @@ -1634,16 +1722,7 @@ public: // implicitly defined operator=() so need to do it this way: *static_cast(this) = evt; - m_x = evt.m_x; - m_y = evt.m_y; - - m_keyCode = evt.m_keyCode; - - m_rawCode = evt.m_rawCode; - m_rawFlags = evt.m_rawFlags; -#if wxUSE_UNICODE - m_uniChar = evt.m_uniChar; -#endif + DoAssignMembers(evt); } return *this; } @@ -1665,6 +1744,37 @@ public: wxUint32 m_rawFlags; private: + // Set the event to propagate if necessary, i.e. if it's of wxEVT_CHAR_HOOK + // type. This is used by all ctors. + void InitPropagation() + { + if ( m_eventType == wxEVT_CHAR_HOOK ) + m_propagationLevel = wxEVENT_PROPAGATE_MAX; + + m_allowNext = false; + } + + // Copy only the event data present in this class, this is used by + // AssignKeyData() and copy ctor. + void DoAssignMembers(const wxKeyEvent& evt) + { + m_x = evt.m_x; + m_y = evt.m_y; + + m_keyCode = evt.m_keyCode; + + m_rawCode = evt.m_rawCode; + m_rawFlags = evt.m_rawFlags; +#if wxUSE_UNICODE + m_uniChar = evt.m_uniChar; +#endif + } + + // If this flag is true, the normal key events should still be generated + // even if wxEVT_CHAR_HOOK had been handled. By default it is false as + // handling wxEVT_CHAR_HOOK suppresses all the subsequent events. + bool m_allowNext; + DECLARE_DYNAMIC_CLASS(wxKeyEvent) }; @@ -1749,7 +1859,6 @@ private: /* wxEVT_PAINT wxEVT_NC_PAINT - wxEVT_PAINT_ICON */ #if wxDEBUG_LEVEL && (defined(__WXMSW__) || defined(__WXPM__)) @@ -2722,59 +2831,6 @@ private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxContextMenuEvent) }; -#endif // wxUSE_GUI - -// Idle event -/* - wxEVT_IDLE - */ - -// Whether to always send idle events to windows, or -// to only send update events to those with the -// wxWS_EX_PROCESS_IDLE style. - -enum wxIdleMode -{ - // Send idle events to all windows - wxIDLE_PROCESS_ALL, - - // Send idle events to windows that have - // the wxWS_EX_PROCESS_IDLE flag specified - wxIDLE_PROCESS_SPECIFIED -}; - -class WXDLLIMPEXP_BASE wxIdleEvent : public wxEvent -{ -public: - wxIdleEvent() - : wxEvent(0, wxEVT_IDLE), - m_requestMore(false) - { } - wxIdleEvent(const wxIdleEvent& event) - : wxEvent(event), - m_requestMore(event.m_requestMore) - { } - - void RequestMore(bool needMore = true) { m_requestMore = needMore; } - bool MoreRequested() const { return m_requestMore; } - - virtual wxEvent *Clone() const { return new wxIdleEvent(*this); } - - // Specify how wxWidgets will send idle events: to - // all windows, or only to those which specify that they - // will process the events. - static void SetMode(wxIdleMode mode) { sm_idleMode = mode; } - - // Returns the idle event mode - static wxIdleMode GetMode() { return sm_idleMode; } - -protected: - bool m_requestMore; - static wxIdleMode sm_idleMode; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIdleEvent) -}; /* TODO wxEVT_MOUSE_CAPTURE_CHANGED, @@ -2786,6 +2842,7 @@ private: wxEVT_COMPARE_ITEM */ +#endif // wxUSE_GUI // ============================================================================ @@ -2983,6 +3040,19 @@ public: bool IsUnlinked() const; + // Global event filters + // -------------------- + + // Add an event filter whose FilterEvent() method will be called for each + // and every event processed by wxWidgets. The filters are called in LIFO + // order and wxApp is registered as an event filter by default. The pointer + // must remain valid until it's removed with RemoveFilter() and is not + // deleted by wxEvtHandler. + static void AddFilter(wxEventFilter* filter); + + // Remove a filter previously installed with AddFilter(). + static void RemoveFilter(wxEventFilter* filter); + // Event queuing and processing // ---------------------------- @@ -3269,7 +3339,7 @@ protected: // base class implementation passes the event to wxTheApp virtual bool TryAfter(wxEvent& event); -#ifdef WXWIN_COMPATIBILITY_2_8 +#if WXWIN_COMPATIBILITY_2_8 // deprecated method: override TryBefore() instead of this one wxDEPRECATED_BUT_USED_INTERNALLY_INLINE( virtual bool TryValidator(wxEvent& WXUNUSED(event)), return false; ) @@ -3330,6 +3400,9 @@ private: // try to process events in all handlers chained to this one bool DoTryChain(wxEvent& event); + // Head of the event filter linked list. + static wxEventFilter* ms_filterList; + DECLARE_DYNAMIC_CLASS_NO_COPY(wxEvtHandler) }; @@ -3418,11 +3491,14 @@ inline void wxQueueEvent(wxEvtHandler *dest, wxEvent *event) typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&); typedef void (wxEvtHandler::*wxIdleEventFunction)(wxIdleEvent&); +typedef void (wxEvtHandler::*wxThreadEventFunction)(wxThreadEvent&); #define wxEventHandler(func) \ wxEVENT_HANDLER_CAST(wxEventFunction, func) #define wxIdleEventHandler(func) \ wxEVENT_HANDLER_CAST(wxIdleEventFunction, func) +#define wxThreadEventHandler(func) \ + wxEVENT_HANDLER_CAST(wxThreadEventFunction, func) #if wxUSE_GUI @@ -3451,7 +3527,6 @@ protected: }; typedef void (wxEvtHandler::*wxCommandEventFunction)(wxCommandEvent&); -typedef void (wxEvtHandler::*wxThreadEventFunction)(wxThreadEvent&); typedef void (wxEvtHandler::*wxScrollEventFunction)(wxScrollEvent&); typedef void (wxEvtHandler::*wxScrollWinEventFunction)(wxScrollWinEvent&); typedef void (wxEvtHandler::*wxSizeEventFunction)(wxSizeEvent&); @@ -3491,8 +3566,6 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent& #define wxCommandEventHandler(func) \ wxEVENT_HANDLER_CAST(wxCommandEventFunction, func) -#define wxThreadEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxThreadEventFunction, func) #define wxScrollEventHandler(func) \ wxEVENT_HANDLER_CAST(wxScrollEventFunction, func) #define wxScrollWinEventHandler(func) \ @@ -3976,7 +4049,9 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent& #define EVT_TEXT_PASTE(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_PASTE, winid, wxClipboardTextEventHandler(func)) // Thread events -#define EVT_THREAD(id, func) wx__DECLARE_EVT1(wxEVT_COMMAND_THREAD, id, wxThreadEventHandler(func)) +#define EVT_THREAD(id, func) wx__DECLARE_EVT1(wxEVT_THREAD, id, wxThreadEventHandler(func)) +// alias for backward compatibility with 2.9.0: +#define wxEVT_COMMAND_THREAD wxEVT_THREAD // ---------------------------------------------------------------------------- // Helper functions diff --git a/Externals/wxWidgets3/include/wx/eventfilter.h b/Externals/wxWidgets3/include/wx/eventfilter.h new file mode 100644 index 0000000000..5a110cb7c5 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/eventfilter.h @@ -0,0 +1,72 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/eventfilter.h +// Purpose: wxEventFilter class declaration. +// Author: Vadim Zeitlin +// Created: 2011-11-21 +// RCS-ID: $Id: eventfilter.h 70302 2012-01-09 14:04:25Z DS $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_EVENTFILTER_H_ +#define _WX_EVENTFILTER_H_ + +#include "wx/defs.h" + +class WXDLLIMPEXP_FWD_BASE wxEvent; +class WXDLLIMPEXP_FWD_BASE wxEvtHandler; + +// ---------------------------------------------------------------------------- +// wxEventFilter is used with wxEvtHandler::AddFilter() and ProcessEvent(). +// ---------------------------------------------------------------------------- + +class wxEventFilter +{ +public: + // Possible return values for FilterEvent(). + // + // Notice that the values of these enum elements are fixed due to backwards + // compatibility constraints. + enum + { + // Process event as usual. + Event_Skip = -1, + + // Don't process the event normally at all. + Event_Ignore = 0, + + // Event was already handled, don't process it normally. + Event_Processed = 1 + }; + + wxEventFilter() + { + m_next = NULL; + } + + virtual ~wxEventFilter() + { + wxASSERT_MSG( !m_next, "Forgot to call wxEvtHandler::RemoveFilter()?" ); + } + + // This method allows to filter all the events processed by the program, so + // you should try to return quickly from it to avoid slowing down the + // program to a crawl. + // + // Return value should be -1 to continue with the normal event processing, + // or true or false to stop further processing and pretend that the event + // had been already processed or won't be processed at all, respectively. + virtual int FilterEvent(wxEvent& event) = 0; + +private: + // Objects of this class are made to be stored in a linked list in + // wxEvtHandler so put the next node ponter directly in the class itself. + wxEventFilter* m_next; + + // And provide access to it for wxEvtHandler [only]. + friend class wxEvtHandler; + + wxDECLARE_NO_COPY_CLASS(wxEventFilter); +}; + +#endif // _WX_EVENTFILTER_H_ diff --git a/Externals/wxWidgets3/include/wx/evtloop.h b/Externals/wxWidgets3/include/wx/evtloop.h index ae45b8800a..97a3548d8e 100644 --- a/Externals/wxWidgets3/include/wx/evtloop.h +++ b/Externals/wxWidgets3/include/wx/evtloop.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 01.06.01 -// RCS-ID: $Id: evtloop.h 65057 2010-07-23 23:32:46Z VZ $ +// RCS-ID: $Id: evtloop.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) 2001 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -233,9 +233,7 @@ private: // integration with MFC) but currently this is not done for all ports yet (e.g. // wxX11) so fall back to the old wxGUIEventLoop definition below for them -#if defined(__WXPALMOS__) - #include "wx/palmos/evtloop.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) // this header defines both console and GUI loops for MSW #include "wx/msw/evtloop.h" #elif defined(__WXOSX__) diff --git a/Externals/wxWidgets3/include/wx/evtloopsrc.h b/Externals/wxWidgets3/include/wx/evtloopsrc.h index 1851e30dd6..20d8770b76 100644 --- a/Externals/wxWidgets3/include/wx/evtloopsrc.h +++ b/Externals/wxWidgets3/include/wx/evtloopsrc.h @@ -3,7 +3,7 @@ // Purpose: declaration of wxEventLoopSource class // Author: Vadim Zeitlin // Created: 2009-10-21 -// RCS-ID: $Id: evtloopsrc.h 64140 2010-04-25 21:33:16Z FM $ +// RCS-ID: $Id: evtloopsrc.h 69559 2011-10-27 21:10:30Z VZ $ // Copyright: (c) 2009 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -49,7 +49,7 @@ enum wxEVENT_SOURCE_EXCEPTION = 0x04, wxEVENT_SOURCE_ALL = wxEVENT_SOURCE_INPUT | wxEVENT_SOURCE_OUTPUT | - wxEVENT_SOURCE_EXCEPTION, + wxEVENT_SOURCE_EXCEPTION }; // wxEventLoopSource itself is an ABC and can't be created directly, currently diff --git a/Externals/wxWidgets3/include/wx/features.h b/Externals/wxWidgets3/include/wx/features.h index 66cabcba0d..0d8469917b 100644 --- a/Externals/wxWidgets3/include/wx/features.h +++ b/Externals/wxWidgets3/include/wx/features.h @@ -5,7 +5,7 @@ * Author: Vadim Zeitlin * Modified by: Ryan Norton (Converted to C) * Created: 18.03.02 -* RCS-ID: $Id: features.h 60526 2009-05-06 11:42:16Z VZ $ +* RCS-ID: $Id: features.h 69961 2011-12-08 15:58:45Z VZ $ * Copyright: (c) 2002 Vadim Zeitlin * Licence: wxWindows licence */ @@ -108,8 +108,16 @@ If this is defined, wxEvtHandler::Bind<>() is available (not all compilers have the required template support for this and in particular under Windows where only g++ and MSVC >= 7 currently support it. + + Recent Sun CC versions support this but perhaps older ones can compile this + code too, adjust the version check if this is the case (unfortunately we + can't easily test for the things used in wx/event.h in configure so we have + to maintain these checks manually). The same applies to xlC 7: perhaps + earlier versions can compile this code too but they were not tested. */ -#if wxCHECK_GCC_VERSION(3, 2) || wxCHECK_VISUALC_VERSION(7) +#if wxCHECK_GCC_VERSION(3, 2) || wxCHECK_VISUALC_VERSION(7) \ + || (defined(__SUNCC__) && __SUNCC__ >= 0x5100) \ + || (defined(__xlC__) && __xlC__ >= 0x700) #define wxHAS_EVENT_BIND #endif diff --git a/Externals/wxWidgets3/include/wx/filedlg.h b/Externals/wxWidgets3/include/wx/filedlg.h index e756cbcc6e..45178d2d43 100644 --- a/Externals/wxWidgets3/include/wx/filedlg.h +++ b/Externals/wxWidgets3/include/wx/filedlg.h @@ -5,7 +5,7 @@ // Modified by: // Created: 8/17/99 // Copyright: (c) Robert Roebling -// RCS-ID: $Id: filedlg.h 62722 2009-11-26 16:17:00Z VZ $ +// RCS-ID: $Id: filedlg.h 70345 2012-01-15 01:05:28Z VZ $ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -232,9 +232,6 @@ wxSaveFileSelector(const wxString& what, #include "wx/cocoa/filedlg.h" #elif defined(__WXPM__) #include "wx/os2/filedlg.h" -#elif defined(__WXPALMOS__) - #define wxHAS_GENERIC_FILEDIALOG - #include "wx/generic/filedlgg.h" #endif #endif // wxUSE_FILEDLG diff --git a/Externals/wxWidgets3/include/wx/filefn.h b/Externals/wxWidgets3/include/wx/filefn.h index 5172917416..ebd0c373c4 100644 --- a/Externals/wxWidgets3/include/wx/filefn.h +++ b/Externals/wxWidgets3/include/wx/filefn.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 29/01/98 -// RCS-ID: $Id: filefn.h 65057 2010-07-23 23:32:46Z VZ $ +// RCS-ID: $Id: filefn.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998 Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,7 +15,6 @@ #include "wx/list.h" #include "wx/arrstr.h" -#ifndef __WXPALMOS5__ #ifdef __WXWINCE__ #include "wx/msw/wince/time.h" #include "wx/msw/private.h" @@ -40,7 +39,6 @@ #include #endif #endif -#endif // !__WXPALMOS5__ #ifdef __OS2__ // need to check for __OS2__ first since currently both @@ -85,11 +83,10 @@ #include #endif -#ifndef __WXPALMOS5__ #ifndef __WXWINCE__ #include // O_RDONLY &c #endif -#endif // !__WXPALMOS5__ + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -115,8 +112,6 @@ typedef long off_t; #elif defined(__MWERKS__) && !defined(__INTEL__) && !defined(__MACH__) typedef long off_t; -#elif defined(__WXPALMOS5__) - typedef long off_t; #endif enum wxSeekMode @@ -205,7 +200,7 @@ enum wxPosixPermissions #define wxCRT_RmDir _wrmdir #define wxCRT_Stat _wstat #define wxStructStat struct _stat -#elif (defined(__WXMSW__) || defined(__OS2__)) && !defined(__WXPALMOS__) && \ +#elif (defined(__WINDOWS__) || defined(__OS2__)) && \ ( \ defined(__VISUALC__) || \ defined(__MINGW64__) || \ @@ -368,7 +363,13 @@ enum wxPosixPermissions #define wxCRT_MkDirA wxPOSIX_IDENT(mkdir) #define wxCRT_RmDirA wxPOSIX_IDENT(rmdir) #ifdef wxHAS_HUGE_FILES - #define wxCRT_StatA wxPOSIX_IDENT(stati64) + // MinGW-64 provides underscore-less versions of all file functions + // except for this one. + #ifdef __MINGW64__ + #define wxCRT_StatA _stati64 + #else + #define wxCRT_StatA wxPOSIX_IDENT(stati64) + #endif #else // Unfortunately Watcom is not consistent #if defined(__OS2__) && defined(__WATCOMC__) @@ -468,43 +469,6 @@ enum wxPosixPermissions // private defines, undefine so that nobody gets tempted to use #undef wxHAS_HUGE_FILES #undef wxHAS_HUGE_STDIO_FILES -#elif defined (__WXPALMOS__) - typedef off_t wxFileOffset; -#ifdef _LARGE_FILES - #define wxFileOffsetFmtSpec wxLongLongFmtSpec - wxCOMPILE_TIME_ASSERT( sizeof(off_t) == sizeof(wxLongLong_t), BadFileSizeType ); - // wxFile is present and supports large files - #ifdef wxUSE_FILE - #define wxHAS_LARGE_FILES - #endif - // wxFFile is present and supports large files - #if SIZEOF_LONG == 8 || defined HAVE_FSEEKO - #define wxHAS_LARGE_FFILES - #endif -#else - #define wxFileOffsetFmtSpec wxT("") -#endif - #define wxClose close - #define wxRead ::read - #define wxWrite ::write - #define wxLseek lseek - #define wxSeek lseek - #define wxFsync fsync - #define wxEof eof - - #define wxCRT_MkDir mkdir - #define wxCRT_RmDir rmdir - - #define wxTell(fd) lseek(fd, 0, SEEK_CUR) - - #define wxStructStat struct stat - - #define wxCRT_Open open - #define wxCRT_Stat svfs_stat - #define wxCRT_Lstat lstat - #define wxCRT_Access access - - #define wxHAS_NATIVE_LSTAT #else // Unix or Windows using unknown compiler, assume POSIX supported typedef off_t wxFileOffset; #ifdef HAVE_LARGEFILE_SUPPORT @@ -764,9 +728,6 @@ WXDLLIMPEXP_BASE bool wxIsExecutable(const wxString &path); // CYGWIN also uses UNIX settings #define wxFILE_SEP_PATH wxFILE_SEP_PATH_UNIX #define wxPATH_SEP wxPATH_SEP_UNIX -#elif defined(__WXPALMOS__) - #define wxFILE_SEP_PATH wxFILE_SEP_PATH_UNIX - #define wxPATH_SEP wxPATH_SEP_UNIX #elif defined(__MAC__) #define wxFILE_SEP_PATH wxFILE_SEP_PATH_MAC #define wxPATH_SEP wxPATH_SEP_MAC diff --git a/Externals/wxWidgets3/include/wx/filehistory.h b/Externals/wxWidgets3/include/wx/filehistory.h index a98668d6bd..83afeaa3ec 100644 --- a/Externals/wxWidgets3/include/wx/filehistory.h +++ b/Externals/wxWidgets3/include/wx/filehistory.h @@ -3,7 +3,7 @@ // Purpose: wxFileHistory class // Author: Julian Smart, Vaclav Slavik // Created: 2010-05-03 -// RCS-ID: $Id: filehistory.h 64240 2010-05-07 06:45:48Z VS $ +// RCS-ID: $Id: filehistory.h 70503 2012-02-03 17:27:13Z VZ $ // Copyright: (c) Julian Smart, Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -23,6 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxMenu; class WXDLLIMPEXP_FWD_BASE wxConfigBase; +class WXDLLIMPEXP_FWD_BASE wxFileName; // ---------------------------------------------------------------------------- // File history management @@ -79,6 +80,10 @@ private: // The ID of the first history menu item (Doesn't have to be wxID_FILE1) wxWindowID m_idBase; + // Normalize a file name to canonical form. We have a special function for + // this to ensure the same normalization is used everywhere. + static wxString NormalizeFileName(const wxFileName& filename); + wxDECLARE_NO_COPY_CLASS(wxFileHistoryBase); }; diff --git a/Externals/wxWidgets3/include/wx/filename.h b/Externals/wxWidgets3/include/wx/filename.h index ca89cf8ff7..e1454406b7 100644 --- a/Externals/wxWidgets3/include/wx/filename.h +++ b/Externals/wxWidgets3/include/wx/filename.h @@ -4,7 +4,7 @@ // Author: Robert Roebling, Vadim Zeitlin // Modified by: // Created: 28.12.00 -// RCS-ID: $Id: filename.h 63886 2010-04-06 22:51:11Z FM $ +// RCS-ID: $Id: filename.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 2000 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -40,7 +40,7 @@ class WXDLLIMPEXP_FWD_BASE wxFFile; // this symbol is defined for the platforms where file systems use volumes in // paths -#if defined(__WXMSW__) || defined(__DOS__) || defined(__OS2__) +#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__) #define wxHAS_FILESYSTEM_VOLUMES #endif @@ -214,14 +214,20 @@ public: !m_ext.empty() || m_hasExt; } - // does the file with this name exists? + // does the file with this name exist? bool FileExists() const; static bool FileExists( const wxString &file ); - // does the directory with this name exists? + // does the directory with this name exist? bool DirExists() const; static bool DirExists( const wxString &dir ); + // does anything at all with this name (i.e. file, directory or some + // other file system object such as a device, socket, ...) exist? + bool Exists() const { return Exists(GetFullPath()); } + static bool Exists(const wxString& path); + + // checks on most common flags for files/directories; // more platform-specific features (like e.g. Unix permissions) are not // available in wxFileName diff --git a/Externals/wxWidgets3/include/wx/filepicker.h b/Externals/wxWidgets3/include/wx/filepicker.h index 949f6c650d..7796ac33b3 100644 --- a/Externals/wxWidgets3/include/wx/filepicker.h +++ b/Externals/wxWidgets3/include/wx/filepicker.h @@ -5,7 +5,7 @@ // Modified by: // Created: 14/4/2006 // Copyright: (c) Francesco Montorsi -// RCS-ID: $Id: filepicker.h 58849 2009-02-12 21:09:20Z RR $ +// RCS-ID: $Id: filepicker.h 70043 2011-12-18 12:34:47Z VZ $ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -87,9 +87,13 @@ public: wxFileDirPickerWidgetBase() { } virtual ~wxFileDirPickerWidgetBase() { } + // Path here is the name of the selected file or directory. wxString GetPath() const { return m_path; } virtual void SetPath(const wxString &str) { m_path=str; } + // Set the directory to open the file browse dialog at initially. + virtual void SetInitialDirectory(const wxString& dir) = 0; + // returns the picker widget cast to wxControl virtual wxControl *AsControl() = 0; @@ -109,12 +113,14 @@ protected: #define wxFLP_OVERWRITE_PROMPT 0x1000 #define wxFLP_FILE_MUST_EXIST 0x2000 #define wxFLP_CHANGE_DIR 0x4000 +#define wxFLP_SMALL wxPB_SMALL // NOTE: wxMULTIPLE is not supported ! #define wxDIRP_DIR_MUST_EXIST 0x0008 #define wxDIRP_CHANGE_DIR 0x0010 +#define wxDIRP_SMALL wxPB_SMALL // map platform-dependent controls which implement the wxFileDirPickerWidgetBase @@ -163,6 +169,12 @@ public: // public API wxString GetPath() const; void SetPath(const wxString &str); + // Set the directory to open the file browse dialog at initially. + void SetInitialDirectory(const wxString& dir) + { + m_pickerIface->SetInitialDirectory(dir); + } + public: // internal functions void UpdatePickerFromTextCtrl(); @@ -253,13 +265,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxFLP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFilePickerCtrlNameStr) - { - return wxFileDirPickerCtrlBase::CreateBase(parent, id, path, - message, wildcard, - pos, size, style, - validator, name); - } + const wxString& name = wxFilePickerCtrlNameStr); void SetFileName(const wxFileName &filename) { SetPath(filename.GetFullPath()); } @@ -306,8 +312,13 @@ protected: // extracts the style for our picker from wxFileDirPickerCtrlBase's style long GetPickerStyle(long style) const { - return (style & (wxFLP_OPEN|wxFLP_SAVE|wxFLP_OVERWRITE_PROMPT| - wxFLP_FILE_MUST_EXIST|wxFLP_CHANGE_DIR|wxFLP_USE_TEXTCTRL)); + return style & (wxFLP_OPEN | + wxFLP_SAVE | + wxFLP_OVERWRITE_PROMPT | + wxFLP_FILE_MUST_EXIST | + wxFLP_CHANGE_DIR | + wxFLP_USE_TEXTCTRL | + wxFLP_SMALL); } private: @@ -358,14 +369,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxDIRP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDirPickerCtrlNameStr) - { - return wxFileDirPickerCtrlBase::CreateBase - ( - parent, id, path, message, wxEmptyString, - pos, size, style, validator, name - ); - } + const wxString& name = wxDirPickerCtrlNameStr); void SetDirName(const wxFileName &dirname) { SetPath(dirname.GetPath()); } @@ -409,7 +413,12 @@ protected: // extracts the style for our picker from wxFileDirPickerCtrlBase's style long GetPickerStyle(long style) const - { return (style & (wxDIRP_DIR_MUST_EXIST|wxDIRP_CHANGE_DIR|wxDIRP_USE_TEXTCTRL)); } + { + return style & (wxDIRP_DIR_MUST_EXIST | + wxDIRP_CHANGE_DIR | + wxDIRP_USE_TEXTCTRL | + wxDIRP_SMALL); + } private: DECLARE_DYNAMIC_CLASS(wxDirPickerCtrl) diff --git a/Externals/wxWidgets3/include/wx/font.h b/Externals/wxWidgets3/include/wx/font.h index 9952472d18..6e3c5237ab 100644 --- a/Externals/wxWidgets3/include/wx/font.h +++ b/Externals/wxWidgets3/include/wx/font.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 20.09.99 -// RCS-ID: $Id: font.h 67052 2011-02-27 12:47:05Z VZ $ +// RCS-ID: $Id: font.h 70446 2012-01-23 11:28:28Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -227,6 +227,7 @@ public: virtual wxFontStyle GetStyle() const = 0; virtual wxFontWeight GetWeight() const = 0; virtual bool GetUnderlined() const = 0; + virtual bool GetStrikethrough() const { return false; } virtual wxString GetFaceName() const = 0; virtual wxFontEncoding GetEncoding() const = 0; virtual const wxNativeFontInfo *GetNativeFontInfo() const = 0; @@ -244,6 +245,7 @@ public: virtual void SetWeight( wxFontWeight weight ) = 0; virtual void SetUnderlined( bool underlined ) = 0; + virtual void SetStrikethrough( bool WXUNUSED(strikethrough) ) {} virtual void SetEncoding(wxFontEncoding encoding) = 0; virtual bool SetFaceName( const wxString& faceName ); void SetNativeFontInfo(const wxNativeFontInfo& info) @@ -277,7 +279,7 @@ public: static void SetDefaultEncoding(wxFontEncoding encoding); // this doesn't do anything and is kept for compatibility only -#ifdef WXWIN_COMPATIBILITY_2_8 +#if WXWIN_COMPATIBILITY_2_8 wxDEPRECATED_INLINE(void SetNoAntiAliasing(bool no = true), wxUnusedVar(no);); wxDEPRECATED_INLINE(bool GetNoAntiAliasing() const, return false;) #endif // WXWIN_COMPATIBILITY_2_8 @@ -290,6 +292,33 @@ protected: // wxFONTFAMILY_UNKNOWN unlike the public method (see comment there). virtual wxFontFamily DoGetFamily() const = 0; + + // Helper functions to recover wxFONTSTYLE/wxFONTWEIGHT and underlined flg + // values from flags containing a combination of wxFONTFLAG_XXX. + static wxFontStyle GetStyleFromFlags(int flags) + { + return flags & wxFONTFLAG_ITALIC + ? wxFONTSTYLE_ITALIC + : flags & wxFONTFLAG_SLANT + ? wxFONTSTYLE_SLANT + : wxFONTSTYLE_NORMAL; + } + + static wxFontWeight GetWeightFromFlags(int flags) + { + return flags & wxFONTFLAG_LIGHT + ? wxFONTWEIGHT_LIGHT + : flags & wxFONTFLAG_BOLD + ? wxFONTWEIGHT_BOLD + : wxFONTWEIGHT_NORMAL; + } + + static bool GetUnderlinedFromFlags(int flags) + { + return (flags & wxFONTFLAG_UNDERLINED) != 0; + } + + private: // the currently default encoding: by default, it's the default system // encoding, but may be changed by the application using @@ -329,6 +358,7 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font); wxFont& MakeBold(); \ wxFont& MakeItalic(); \ wxFont& MakeUnderlined(); \ + wxFont& MakeStrikethrough(); \ wxFont& MakeLarger() { return Scale(1.2f); } \ wxFont& MakeSmaller() { return Scale(1/1.2f); } \ wxFont& Scale(float x); \ @@ -336,14 +366,13 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font); wxFont Bold() const; \ wxFont Italic() const; \ wxFont Underlined() const; \ + wxFont Strikethrough() const; \ wxFont Larger() const { return Scaled(1.2f); } \ wxFont Smaller() const { return Scaled(1/1.2f); } \ wxFont Scaled(float x) const // include the real class declaration -#if defined(__WXPALMOS__) - #include "wx/palmos/font.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #include "wx/msw/font.h" #elif defined(__WXMOTIF__) #include "wx/motif/font.h" @@ -353,8 +382,6 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font); #include "wx/gtk1/font.h" #elif defined(__WXX11__) #include "wx/x11/font.h" -#elif defined(__WXMGL__) - #include "wx/mgl/font.h" #elif defined(__WXDFB__) #include "wx/dfb/font.h" #elif defined(__WXMAC__) diff --git a/Externals/wxWidgets3/include/wx/fontutil.h b/Externals/wxWidgets3/include/wx/fontutil.h index a34bf5ef5e..232ef8a8e3 100644 --- a/Externals/wxWidgets3/include/wx/fontutil.h +++ b/Externals/wxWidgets3/include/wx/fontutil.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 05.11.99 -// RCS-ID: $Id: fontutil.h 63918 2010-04-08 21:39:14Z SC $ +// RCS-ID: $Id: fontutil.h 70446 2012-01-23 11:28:28Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -172,6 +172,7 @@ public: wxFontStyle m_style; wxFontWeight m_weight; bool m_underlined; + bool m_strikethrough; wxString m_faceName; wxFontEncoding m_encoding; public : @@ -187,6 +188,7 @@ public : wxFontStyle style; wxFontWeight weight; bool underlined; + bool strikethrough; wxString faceName; wxFontEncoding encoding; #endif // platforms @@ -224,6 +226,7 @@ public: SetStyle((wxFontStyle)font.GetStyle()); SetWeight((wxFontWeight)font.GetWeight()); SetUnderlined(font.GetUnderlined()); + SetStrikethrough(font.GetStrikethrough()); #if defined(__WXMSW__) if ( font.IsUsingSizeInPixels() ) SetPixelSize(font.GetPixelSize()); @@ -252,6 +255,7 @@ public: wxFontStyle GetStyle() const; wxFontWeight GetWeight() const; bool GetUnderlined() const; + bool GetStrikethrough() const; wxString GetFaceName() const; wxFontFamily GetFamily() const; wxFontEncoding GetEncoding() const; @@ -261,6 +265,7 @@ public: void SetStyle(wxFontStyle style); void SetWeight(wxFontWeight weight); void SetUnderlined(bool underlined); + void SetStrikethrough(bool strikethrough); bool SetFaceName(const wxString& facename); void SetFamily(wxFontFamily family); void SetEncoding(wxFontEncoding encoding); diff --git a/Externals/wxWidgets3/include/wx/frame.h b/Externals/wxWidgets3/include/wx/frame.h index e2f06c5c79..396dd98f5a 100644 --- a/Externals/wxWidgets3/include/wx/frame.h +++ b/Externals/wxWidgets3/include/wx/frame.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 15.11.99 -// RCS-ID: $Id: frame.h 64278 2010-05-10 21:09:50Z VZ $ +// RCS-ID: $Id: frame.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -39,7 +39,6 @@ class WXDLLIMPEXP_FWD_CORE wxToolBar; #define wxFRAME_NO_TASKBAR 0x0002 // No taskbar button (MSW only) #define wxFRAME_TOOL_WINDOW 0x0004 // No taskbar button, no system menu #define wxFRAME_FLOAT_ON_PARENT 0x0008 // Always above its parent -#define wxFRAME_SHAPED 0x0010 // Create a window that is able to be shaped // ---------------------------------------------------------------------------- // wxFrame is a top-level window with optional menubar, statusbar and toolbar @@ -252,9 +251,7 @@ protected: #if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__) #include "wx/univ/frame.h" #else // !__WXUNIVERSAL__ - #if defined(__WXPALMOS__) - #include "wx/palmos/frame.h" - #elif defined(__WXMSW__) + #if defined(__WXMSW__) #include "wx/msw/frame.h" #elif defined(__WXGTK20__) #include "wx/gtk/frame.h" diff --git a/Externals/wxWidgets3/include/wx/fswatcher.h b/Externals/wxWidgets3/include/wx/fswatcher.h index 446ac98245..239a5b4dad 100644 --- a/Externals/wxWidgets3/include/wx/fswatcher.h +++ b/Externals/wxWidgets3/include/wx/fswatcher.h @@ -3,7 +3,7 @@ // Purpose: wxFileSystemWatcherBase // Author: Bartosz Bekier // Created: 2009-05-23 -// RCS-ID: $Id: fswatcher.h 62474 2009-10-22 11:35:43Z VZ $ +// RCS-ID: $Id: fswatcher.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 2009 Bartosz Bekier // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -55,6 +55,16 @@ enum wxFSW_EVENT_WARNING | wxFSW_EVENT_ERROR }; +// Type of the path watched, used only internally for now. +enum wxFSWPathType +{ + wxFSWPath_None, // Invalid value for an initialized watch. + wxFSWPath_File, // Plain file. + wxFSWPath_Dir, // Watch a directory and the files in it. + wxFSWPath_Tree // Watch a directory and all its children recursively. +}; + + /** * Event containing information about file system change. */ @@ -174,24 +184,24 @@ typedef void (wxEvtHandler::*wxFileSystemWatcherEventFunction) #define wxFileSystemWatcherEventHandler(func) \ wxEVENT_HANDLER_CAST(wxFileSystemWatcherEventFunction, func) +#define EVT_FSWATCHER(winid, func) \ + wx__DECLARE_EVT1(wxEVT_FSWATCHER, winid, wxFileSystemWatcherEventHandler(func)) // ---------------------------------------------------------------------------- // wxFileSystemWatcherBase: interface for wxFileSystemWatcher // ---------------------------------------------------------------------------- -/** - * Simple container to store information about one watched file - */ +// Simple container to store information about one watched path. class wxFSWatchInfo { public: wxFSWatchInfo() : - m_path(wxEmptyString), m_events(-1) + m_events(-1), m_type(wxFSWPath_None) { } - wxFSWatchInfo(const wxString& path, int events) : - m_path(path), m_events(events) + wxFSWatchInfo(const wxString& path, int events, wxFSWPathType type) : + m_path(path), m_events(events), m_type(type) { } @@ -205,9 +215,15 @@ public: return m_events; } + wxFSWPathType GetType() const + { + return m_type; + } + protected: wxString m_path; int m_events; + wxFSWPathType m_type; }; WX_DECLARE_STRING_HASH_MAP(wxFSWatchInfo, wxFSWatchInfoMap); @@ -304,6 +320,11 @@ protected: return path_copy.GetFullPath(); } + // Delegates the real work of adding the path to wxFSWatcherImpl::Add() and + // updates m_watches if the new path was successfully added. + bool DoAdd(const wxFileName& path, int events, wxFSWPathType type); + + wxFSWatchInfoMap m_watches; // path=>wxFSWatchInfo map wxFSWatcherImpl* m_service; // file system events service wxEvtHandler* m_owner; // handler for file system events @@ -320,7 +341,7 @@ protected: #elif defined(wxHAS_KQUEUE) #include "wx/unix/fswatcher_kqueue.h" #define wxFileSystemWatcher wxKqueueFileSystemWatcher -#elif defined(__WXMSW__) +#elif defined(__WINDOWS__) #include "wx/msw/fswatcher.h" #define wxFileSystemWatcher wxMSWFileSystemWatcher #else diff --git a/Externals/wxWidgets3/include/wx/gbsizer.h b/Externals/wxWidgets3/include/wx/gbsizer.h index 582f2881bb..51dc057d3d 100644 --- a/Externals/wxWidgets3/include/wx/gbsizer.h +++ b/Externals/wxWidgets3/include/wx/gbsizer.h @@ -6,7 +6,7 @@ // // Author: Robin Dunn // Created: 03-Nov-2003 -// RCS-ID: $Id: gbsizer.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: gbsizer.h 69970 2011-12-10 04:34:06Z RD $ // Copyright: (c) Robin Dunn // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -115,26 +115,26 @@ public: wxGBSizerItem( int width, int height, const wxGBPosition& pos, - const wxGBSpan& span, - int flag, - int border, - wxObject* userData); + const wxGBSpan& span=wxDefaultSpan, + int flag=0, + int border=0, + wxObject* userData=NULL); // window wxGBSizerItem( wxWindow *window, const wxGBPosition& pos, - const wxGBSpan& span, - int flag, - int border, - wxObject* userData ); + const wxGBSpan& span=wxDefaultSpan, + int flag=0, + int border=0, + wxObject* userData=NULL ); // subsizer wxGBSizerItem( wxSizer *sizer, const wxGBPosition& pos, - const wxGBSpan& span, - int flag, - int border, - wxObject* userData ); + const wxGBSpan& span=wxDefaultSpan, + int flag=0, + int border=0, + wxObject* userData=NULL ); // default ctor wxGBSizerItem(); @@ -160,7 +160,7 @@ public: // is successful and after the next Layout the item will be resized. bool SetSpan( const wxGBSpan& span ); - // Returns true if this item and the other item instersect + // Returns true if this item and the other item intersect bool Intersects(const wxGBSizerItem& other); // Returns true if the given pos/span would intersect with this item. diff --git a/Externals/wxWidgets3/include/wx/gdicmn.h b/Externals/wxWidgets3/include/wx/gdicmn.h index 101c9a3907..d69b5f89be 100644 --- a/Externals/wxWidgets3/include/wx/gdicmn.h +++ b/Externals/wxWidgets3/include/wx/gdicmn.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: gdicmn.h 66306 2010-12-03 12:39:43Z VZ $ +// RCS-ID: $Id: gdicmn.h 70789 2012-03-04 00:28:58Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -59,8 +59,10 @@ enum wxBitmapType wxBITMAP_TYPE_XBM_DATA, wxBITMAP_TYPE_XPM, wxBITMAP_TYPE_XPM_DATA, - wxBITMAP_TYPE_TIF, - wxBITMAP_TYPE_TIF_RESOURCE, + wxBITMAP_TYPE_TIFF, + wxBITMAP_TYPE_TIF = wxBITMAP_TYPE_TIFF, + wxBITMAP_TYPE_TIFF_RESOURCE, + wxBITMAP_TYPE_TIF_RESOURCE = wxBITMAP_TYPE_TIFF_RESOURCE, wxBITMAP_TYPE_GIF, wxBITMAP_TYPE_GIF_RESOURCE, wxBITMAP_TYPE_PNG, @@ -158,14 +160,18 @@ enum wxStockCursor // macros // --------------------------------------------------------------------------- +#if defined(__WINDOWS__) || defined(__WXPM__) + #define wxHAS_IMAGES_IN_RESOURCES +#endif + /* Useful macro for creating icons portably, for example: wxIcon *icon = new wxICON(sample); expands into: - wxIcon *icon = new wxIcon("sample"); // On wxMSW - wxIcon *icon = new wxIcon(sample_xpm); // On wxGTK + wxIcon *icon = new wxIcon("sample"); // On Windows + wxIcon *icon = new wxIcon(sample_xpm); // On wxGTK/Linux */ #ifdef __WXMSW__ @@ -174,9 +180,6 @@ enum wxStockCursor #elif defined(__WXPM__) // Load from a resource #define wxICON(X) wxIcon(wxT(#X)) -#elif defined(__WXMGL__) - // Initialize from an included XPM - #define wxICON(X) wxIcon( X##_xpm ) #elif defined(__WXDFB__) // Initialize from an included XPM #define wxICON(X) wxIcon( X##_xpm ) @@ -202,12 +205,11 @@ enum wxStockCursor */ #if defined(__WXMSW__) || defined(__WXPM__) - #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_RESOURCE) + #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_BMP_RESOURCE) #elif defined(__WXGTK__) || \ defined(__WXMOTIF__) || \ defined(__WXX11__) || \ defined(__WXMAC__) || \ - defined(__WXMGL__) || \ defined(__WXDFB__) || \ defined(__WXCOCOA__) // Initialize from an included XPM @@ -900,7 +902,7 @@ class WXDLLIMPEXP_CORE wxResourceCache: public wxList { public: wxResourceCache() { } -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS wxResourceCache(const unsigned int keyType) : wxList(keyType) { } #endif virtual ~wxResourceCache(); diff --git a/Externals/wxWidgets3/include/wx/gdiobj.h b/Externals/wxWidgets3/include/wx/gdiobj.h index fc018231ba..5e07df0d81 100644 --- a/Externals/wxWidgets3/include/wx/gdiobj.h +++ b/Externals/wxWidgets3/include/wx/gdiobj.h @@ -5,7 +5,7 @@ // Modified by: // Created: // Copyright: (c) Julian Smart -// RCS-ID: $Id: gdiobj.h 66374 2010-12-14 18:43:49Z VZ $ +// RCS-ID: $Id: gdiobj.h 70345 2012-01-15 01:05:28Z VZ $ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -57,7 +57,7 @@ public: // because it's still widely used) bool Ok() const { return IsOk(); } -#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXPALMOS__) +#if defined(__WXMSW__) || defined(__WXPM__) // Creates the resource virtual bool RealizeResource() { return false; } diff --git a/Externals/wxWidgets3/include/wx/generic/aboutdlgg.h b/Externals/wxWidgets3/include/wx/generic/aboutdlgg.h index 9311de0abc..f5b1365953 100644 --- a/Externals/wxWidgets3/include/wx/generic/aboutdlgg.h +++ b/Externals/wxWidgets3/include/wx/generic/aboutdlgg.h @@ -3,7 +3,7 @@ // Purpose: generic wxAboutBox() implementation // Author: Vadim Zeitlin // Created: 2006-10-07 -// RCS-ID: $Id: aboutdlgg.h 60389 2009-04-26 13:41:21Z VZ $ +// RCS-ID: $Id: aboutdlgg.h 70413 2012-01-20 22:11:32Z VZ $ // Copyright: (c) 2006 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -21,6 +21,16 @@ class WXDLLIMPEXP_FWD_ADV wxAboutDialogInfo; class WXDLLIMPEXP_FWD_CORE wxSizer; class WXDLLIMPEXP_FWD_CORE wxSizerFlags; +// Under GTK and OS X "About" dialogs are not supposed to be modal, unlike MSW +// and, presumably, all the other platforms. +#ifndef wxUSE_MODAL_ABOUT_DIALOG + #if defined(__WXGTK__) || defined(__WXMAC__) + #define wxUSE_MODAL_ABOUT_DIALOG 0 + #else + #define wxUSE_MODAL_ABOUT_DIALOG 1 + #endif +#endif // wxUSE_MODAL_ABOUT_DIALOG not defined + // ---------------------------------------------------------------------------- // wxGenericAboutDialog: generic "About" dialog implementation // ---------------------------------------------------------------------------- @@ -73,6 +83,12 @@ private: // common part of all ctors void Init() { m_sizerText = NULL; } +#if !wxUSE_MODAL_ABOUT_DIALOG + // An explicit handler for deleting the dialog when it's closed is needed + // when we show it non-modally. + void OnCloseWindow(wxCloseEvent& event); + void OnOK(wxCommandEvent& event); +#endif // !wxUSE_MODAL_ABOUT_DIALOG wxSizer *m_sizerText; }; diff --git a/Externals/wxWidgets3/include/wx/generic/choicdgg.h b/Externals/wxWidgets3/include/wx/generic/choicdgg.h index 0cbf06d201..431c686b59 100644 --- a/Externals/wxWidgets3/include/wx/generic/choicdgg.h +++ b/Externals/wxWidgets3/include/wx/generic/choicdgg.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: 03.11.00: VZ to add wxArrayString and multiple sel functions // Created: 01/02/97 -// RCS-ID: $Id: choicdgg.h 63731 2010-03-21 11:06:31Z VZ $ +// RCS-ID: $Id: choicdgg.h 70642 2012-02-20 21:56:18Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -106,39 +106,112 @@ public: const wxString& caption, int n, const wxString *choices, - char **clientData = (char **)NULL, + void **clientData = NULL, long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition); + const wxPoint& pos = wxDefaultPosition) + { + Create(parent, message, caption, n, choices, clientData, style, pos); + } + wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption, const wxArrayString& choices, - char **clientData = (char **)NULL, + void **clientData = NULL, long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition); + const wxPoint& pos = wxDefaultPosition) + { + Create(parent, message, caption, choices, clientData, style, pos); + } bool Create(wxWindow *parent, const wxString& message, const wxString& caption, int n, const wxString *choices, - char **clientData = (char **)NULL, + void **clientData = NULL, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition); bool Create(wxWindow *parent, const wxString& message, const wxString& caption, const wxArrayString& choices, - char **clientData = (char **)NULL, + void **clientData = NULL, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition); void SetSelection(int sel); int GetSelection() const { return m_selection; } wxString GetStringSelection() const { return m_stringSelection; } + void* GetSelectionData() const { return m_clientData; } - // obsolete function (NB: no need to make it return wxChar, it's untyped) - char *GetSelectionClientData() const { return (char *)m_clientData; } +#if WXWIN_COMPATIBILITY_2_8 + // Deprecated overloads taking "char**" client data. + wxDEPRECATED_CONSTRUCTOR + ( + wxSingleChoiceDialog(wxWindow *parent, + const wxString& message, + const wxString& caption, + int n, + const wxString *choices, + char **clientData, + long style = wxCHOICEDLG_STYLE, + const wxPoint& pos = wxDefaultPosition) + ) + { + Create(parent, message, caption, n, choices, + (void**)clientData, style, pos); + } + + wxDEPRECATED_CONSTRUCTOR + ( + wxSingleChoiceDialog(wxWindow *parent, + const wxString& message, + const wxString& caption, + const wxArrayString& choices, + char **clientData, + long style = wxCHOICEDLG_STYLE, + const wxPoint& pos = wxDefaultPosition) + ) + { + Create(parent, message, caption, choices, + (void**)clientData, style, pos); + } + + wxDEPRECATED_INLINE + ( + bool Create(wxWindow *parent, + const wxString& message, + const wxString& caption, + int n, + const wxString *choices, + char **clientData, + long style = wxCHOICEDLG_STYLE, + const wxPoint& pos = wxDefaultPosition), + return Create(parent, message, caption, n, choices, + (void**)clientData, style, pos); + ) + + wxDEPRECATED_INLINE + ( + bool Create(wxWindow *parent, + const wxString& message, + const wxString& caption, + const wxArrayString& choices, + char **clientData, + long style = wxCHOICEDLG_STYLE, + const wxPoint& pos = wxDefaultPosition), + return Create(parent, message, caption, choices, + (void**)clientData, style, pos); + ) + + // NB: no need to make it return wxChar, it's untyped + wxDEPRECATED_ACCESSOR + ( + char* GetSelectionClientData() const, + (char*)GetSelectionData() + ) +#endif // WXWIN_COMPATIBILITY_2_8 // implementation from now on void OnOK(wxCommandEvent& event); diff --git a/Externals/wxWidgets3/include/wx/generic/collpaneg.h b/Externals/wxWidgets3/include/wx/generic/collpaneg.h index 3a69a686d3..e06b361b18 100644 --- a/Externals/wxWidgets3/include/wx/generic/collpaneg.h +++ b/Externals/wxWidgets3/include/wx/generic/collpaneg.h @@ -4,7 +4,7 @@ // Author: Francesco Montorsi // Modified by: // Created: 8/10/2006 -// RCS-ID: $Id: collpaneg.h 58606 2009-02-01 20:59:03Z FM $ +// RCS-ID: $Id: collpaneg.h 68366 2011-07-24 22:19:33Z VZ $ // Copyright: (c) Francesco Montorsi // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -25,7 +25,8 @@ class WXDLLIMPEXP_FWD_CORE wxDisclosureTriangle; // wxGenericCollapsiblePane // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxGenericCollapsiblePane : public wxCollapsiblePaneBase +class WXDLLIMPEXP_CORE wxGenericCollapsiblePane : + public wxNavigationEnabled { public: wxGenericCollapsiblePane() { Init(); } @@ -103,7 +104,6 @@ private: void OnButton(wxCommandEvent &ev); void OnSize(wxSizeEvent &ev); - WX_DECLARE_CONTROL_CONTAINER(); DECLARE_DYNAMIC_CLASS(wxGenericCollapsiblePane) DECLARE_EVENT_TABLE() }; diff --git a/Externals/wxWidgets3/include/wx/generic/custombgwin.h b/Externals/wxWidgets3/include/wx/generic/custombgwin.h new file mode 100644 index 0000000000..a7ed85d995 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/generic/custombgwin.h @@ -0,0 +1,96 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/generic/custombgwin.h +// Purpose: Generic implementation of wxCustomBackgroundWindow. +// Author: Vadim Zeitlin +// Created: 2011-10-10 +// RCS-ID: $Id: custombgwin.h 69378 2011-10-11 17:07:43Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_GENERIC_CUSTOMBGWIN_H_ +#define _WX_GENERIC_CUSTOMBGWIN_H_ + +#include "wx/bitmap.h" + +// A helper to avoid template bloat: this class contains all type-independent +// code of wxCustomBackgroundWindow<> below. +class wxCustomBackgroundWindowGenericBase : public wxCustomBackgroundWindowBase +{ +public: + wxCustomBackgroundWindowGenericBase() { } + +protected: + void DoEraseBackground(wxEraseEvent& event, wxWindow* win) + { + wxDC& dc = *event.GetDC(); + + const wxSize clientSize = win->GetClientSize(); + const wxSize bitmapSize = m_bitmapBg.GetSize(); + + for ( int x = 0; x < clientSize.x; x += bitmapSize.x ) + { + for ( int y = 0; y < clientSize.y; y += bitmapSize.y ) + { + dc.DrawBitmap(m_bitmapBg, x, y); + } + } + } + + + // The bitmap used for painting the background if valid. + wxBitmap m_bitmapBg; + + + wxDECLARE_NO_COPY_CLASS(wxCustomBackgroundWindowGenericBase); +}; + +// ---------------------------------------------------------------------------- +// wxCustomBackgroundWindow +// ---------------------------------------------------------------------------- + +template +class wxCustomBackgroundWindow : public W, + public wxCustomBackgroundWindowGenericBase +{ +public: + typedef W BaseWindowClass; + + wxCustomBackgroundWindow() { } + +protected: + virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) + { + m_bitmapBg = bmp; + + if ( m_bitmapBg.IsOk() ) + { + BaseWindowClass::Connect + ( + wxEVT_ERASE_BACKGROUND, + wxEraseEventHandler(wxCustomBackgroundWindow::OnEraseBackground) + ); + } + else + { + BaseWindowClass::Disconnect + ( + wxEVT_ERASE_BACKGROUND, + wxEraseEventHandler(wxCustomBackgroundWindow::OnEraseBackground) + ); + } + } + +private: + // Event handler for erasing the background which is only used when we have + // a valid background bitmap. + void OnEraseBackground(wxEraseEvent& event) + { + DoEraseBackground(event, this); + } + + + wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxCustomBackgroundWindow, W); +}; + +#endif // _WX_GENERIC_CUSTOMBGWIN_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/dataview.h b/Externals/wxWidgets3/include/wx/generic/dataview.h index 30c9893749..af16d65218 100644 --- a/Externals/wxWidgets3/include/wx/generic/dataview.h +++ b/Externals/wxWidgets3/include/wx/generic/dataview.h @@ -3,7 +3,7 @@ // Purpose: wxDataViewCtrl generic implementation header // Author: Robert Roebling // Modified By: Bo Yang -// Id: $Id: dataview.h 65948 2010-10-30 15:57:41Z VS $ +// Id: $Id: dataview.h 70717 2012-02-27 18:54:02Z VZ $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -68,10 +68,12 @@ public: virtual void SetFlags(int flags) { m_flags = flags; UpdateDisplay(); } virtual int GetFlags() const { return m_flags; } - virtual void SetAsSortKey(bool sort = true) { m_sort = sort; UpdateDisplay(); } virtual bool IsSortKey() const { return m_sort; } - virtual void SetSortOrder(bool ascending) { m_sortAscending = ascending; UpdateDisplay(); } + virtual void UnsetAsSortKey() { m_sort = false; UpdateDisplay(); } + + virtual void SetSortOrder(bool ascending); + virtual bool IsSortOrderAscending() const { return m_sortAscending; } virtual void SetBitmap( const wxBitmap& bitmap ) { wxDataViewColumnBase::SetBitmap(bitmap); UpdateDisplay(); } @@ -155,7 +157,7 @@ public: virtual wxDataViewColumn *GetSortingColumn() const; - virtual wxDataViewItem GetSelection() const; + virtual int GetSelectedItemsCount() const; virtual int GetSelections( wxDataViewItemArray & sel ) const; virtual void SetSelections( const wxDataViewItemArray & sel ); virtual void Select( const wxDataViewItem & item ); @@ -172,6 +174,8 @@ public: virtual wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn *column = NULL ) const; + virtual bool SetRowHeight( int rowHeight ); + virtual void Expand( const wxDataViewItem & item ); virtual void Collapse( const wxDataViewItem & item ); virtual bool IsExpanded( const wxDataViewItem & item ) const; @@ -185,19 +189,18 @@ public: virtual wxBorder GetDefaultBorder() const; - void StartEditor( const wxDataViewItem & item, unsigned int column ); + virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column); + + // These methods are specific to generic wxDataViewCtrl implementation and + // should not be used in portable code. + wxColour GetAlternateRowColour() const { return m_alternateRowColour; } + void SetAlternateRowColour(const wxColour& colour); protected: - virtual int GetSelections( wxArrayInt & sel ) const; - virtual void SetSelections( const wxArrayInt & sel ); - virtual void Select( int row ); - virtual void Unselect( int row ); - virtual bool IsSelected( int row ) const; - virtual void SelectRange( int from, int to ); - virtual void UnselectRange( int from, int to ); - virtual void EnsureVisible( int row, int column ); + // Notice that row here may be invalid (i.e. >= GetRowCount()), this is not + // an error and this function simply returns an invalid item in this case. virtual wxDataViewItem GetItemByRow( unsigned int row ) const; virtual int GetRowByItem( const wxDataViewItem & item ) const; @@ -226,21 +229,32 @@ public: // utility functions not part of the API // return the column displayed at the given position in the control wxDataViewColumn *GetColumnAt(unsigned int pos) const; + virtual wxDataViewColumn *GetCurrentColumn() const; + + virtual void OnInternalIdle(); + private: virtual wxDataViewItem DoGetCurrentItem() const; virtual void DoSetCurrentItem(const wxDataViewItem& item); void InvalidateColBestWidths(); void InvalidateColBestWidth(int idx); + void UpdateColWidths(); wxDataViewColumnList m_cols; // cached column best widths or 0 if not computed, values are for // respective columns from m_cols and the arrays have same size wxVector m_colsBestWidths; + // m_colsBestWidths partially invalid, needs recomputing + bool m_colsDirty; + wxDataViewModelNotifier *m_notifier; wxDataViewMainWindow *m_clientArea; wxDataViewHeaderWindow *m_headerArea; + // user defined color to draw row lines, may be invalid + wxColour m_alternateRowColour; + // the index of the column currently used for sorting or -1 int m_sortingColumnIdx; diff --git a/Externals/wxWidgets3/include/wx/generic/datectrl.h b/Externals/wxWidgets3/include/wx/generic/datectrl.h index b92e89990b..fe7dd57299 100644 --- a/Externals/wxWidgets3/include/wx/generic/datectrl.h +++ b/Externals/wxWidgets3/include/wx/generic/datectrl.h @@ -4,7 +4,7 @@ // Author: Andreas Pflug // Modified by: // Created: 2005-01-19 -// RCS-ID: $Id: datectrl.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: datectrl.h 70736 2012-02-28 14:41:30Z VZ $ // Copyright: (c) 2005 Andreas Pflug // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -82,6 +82,10 @@ private: void OnSize(wxSizeEvent& event); void OnFocus(wxFocusEvent& event); +#ifdef __WXOSX_COCOA__ + virtual void OSXGenerateEvent(const wxDateTime& WXUNUSED(dt)) { } +#endif + wxComboCtrl* m_combo; wxCalendarComboPopup* m_popup; diff --git a/Externals/wxWidgets3/include/wx/generic/dvrenderer.h b/Externals/wxWidgets3/include/wx/generic/dvrenderer.h index cfa70c9067..8e4eb7761c 100644 --- a/Externals/wxWidgets3/include/wx/generic/dvrenderer.h +++ b/Externals/wxWidgets3/include/wx/generic/dvrenderer.h @@ -3,7 +3,7 @@ // Purpose: wxDataViewRenderer for generic wxDataViewCtrl implementation // Author: Robert Roebling, Vadim Zeitlin // Created: 2009-11-07 (extracted from wx/generic/dataview.h) -// RCS-ID: $Id: dvrenderer.h 67099 2011-03-01 12:16:49Z VS $ +// RCS-ID: $Id: dvrenderer.h 69473 2011-10-19 16:20:17Z VS $ // Copyright: (c) 2006 Robert Roebling // (c) 2009 Vadim Zeitlin // Licence: wxWindows licence @@ -41,23 +41,16 @@ public: // implementation - // These callbacks are used by generic implementation of wxDVC itself. - // They're different from the corresponding Activate/LeftClick() methods - // which should only be overridable for the custom renderers while the - // generic implementation uses these ones for all of them, including the - // standard ones. + // This callback is used by generic implementation of wxDVC itself. It's + // different from the corresponding ActivateCell() method which should only + // be overridable for the custom renderers while the generic implementation + // uses this one for all of them, including the standard ones. - virtual bool WXOnActivate(const wxRect& WXUNUSED(cell), - wxDataViewModel *WXUNUSED(model), - const wxDataViewItem & WXUNUSED(item), - unsigned int WXUNUSED(col)) - { return false; } - - virtual bool WXOnLeftClick(const wxPoint& WXUNUSED(cursor), - const wxRect& WXUNUSED(cell), - wxDataViewModel *WXUNUSED(model), - const wxDataViewItem & WXUNUSED(item), - unsigned int WXUNUSED(col) ) + virtual bool WXActivateCell(const wxRect& WXUNUSED(cell), + wxDataViewModel *WXUNUSED(model), + const wxDataViewItem & WXUNUSED(item), + unsigned int WXUNUSED(col), + const wxMouseEvent* WXUNUSED(mouseEvent)) { return false; } private: diff --git a/Externals/wxWidgets3/include/wx/generic/dvrenderers.h b/Externals/wxWidgets3/include/wx/generic/dvrenderers.h index 14040bdaa5..e5ca2c71ec 100644 --- a/Externals/wxWidgets3/include/wx/generic/dvrenderers.h +++ b/Externals/wxWidgets3/include/wx/generic/dvrenderers.h @@ -3,7 +3,7 @@ // Purpose: All generic wxDataViewCtrl renderer classes // Author: Robert Roebling, Vadim Zeitlin // Created: 2009-11-07 (extracted from wx/generic/dataview.h) -// RCS-ID: $Id: dvrenderers.h 67099 2011-03-01 12:16:49Z VS $ +// RCS-ID: $Id: dvrenderers.h 69473 2011-10-19 16:20:17Z VS $ // Copyright: (c) 2006 Robert Roebling // (c) 2009 Vadim Zeitlin // Licence: wxWindows licence @@ -26,21 +26,13 @@ public: // see the explanation of the following WXOnXXX() methods in wx/generic/dvrenderer.h - virtual bool WXOnActivate(const wxRect& cell, - wxDataViewModel *model, - const wxDataViewItem& item, - unsigned int col) + virtual bool WXActivateCell(const wxRect& cell, + wxDataViewModel *model, + const wxDataViewItem& item, + unsigned int col, + const wxMouseEvent *mouseEvent) { - return Activate(cell, model, item, col); - } - - virtual bool WXOnLeftClick(const wxPoint& cursor, - const wxRect& cell, - wxDataViewModel *model, - const wxDataViewItem &item, - unsigned int col) - { - return LeftClick(cursor, cell, model, item, col); + return ActivateCell(cell, model, item, col, mouseEvent); } private: @@ -67,9 +59,9 @@ public: // in-place editing virtual bool HasEditorCtrl() const; - virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, - const wxVariant &value ); - virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ); + virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, + const wxVariant &value ); + virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); protected: wxString m_text; @@ -121,11 +113,11 @@ public: wxSize GetSize() const; // Implementation only, don't use nor override - virtual bool WXOnLeftClick(const wxPoint& cursor, - const wxRect& cell, - wxDataViewModel *model, - const wxDataViewItem& item, - unsigned int col); + virtual bool WXActivateCell(const wxRect& cell, + wxDataViewModel *model, + const wxDataViewItem& item, + unsigned int col, + const wxMouseEvent *mouseEvent); private: bool m_toggle; @@ -177,9 +169,9 @@ public: virtual wxSize GetSize() const; virtual bool HasEditorCtrl() const { return true; } - virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, - const wxVariant &value ); - virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ); + virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, + const wxVariant &value ); + virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); private: wxDataViewIconText m_value; @@ -188,36 +180,5 @@ protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer) }; -// --------------------------------------------------------- -// wxDataViewDateRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewDateRenderer: public wxDataViewRenderer -{ -public: - wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"), - wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, - int align = wxDVR_DEFAULT_ALIGNMENT ); - - bool SetValue( const wxVariant &value ); - bool GetValue( wxVariant& value ) const; - - virtual bool Render( wxRect cell, wxDC *dc, int state ); - virtual wxSize GetSize() const; - - // Implementation only, don't use nor override - virtual bool WXOnActivate(const wxRect& cell, - wxDataViewModel *model, - const wxDataViewItem& item, - unsigned int col); - -private: - wxDateTime m_date; - -protected: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer) -}; - - #endif // _WX_GENERIC_DVRENDERERS_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/filepickerg.h b/Externals/wxWidgets3/include/wx/generic/filepickerg.h index 34749fb190..f1283915c1 100644 --- a/Externals/wxWidgets3/include/wx/generic/filepickerg.h +++ b/Externals/wxWidgets3/include/wx/generic/filepickerg.h @@ -5,7 +5,7 @@ // Modified by: // Created: 14/4/2006 // Copyright: (c) Francesco Montorsi -// RCS-ID: $Id: filepickerg.h 63690 2010-03-16 00:23:57Z VZ $ +// RCS-ID: $Id: filepickerg.h 70043 2011-12-18 12:34:47Z VZ $ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -49,7 +49,7 @@ public: virtual wxControl *AsControl() { return this; } -public: // overrideable +public: // overridable virtual wxDialog *CreateDialog() = 0; @@ -58,6 +58,8 @@ public: // overrideable virtual wxEventType GetEventType() const = 0; + virtual void SetInitialDirectory(const wxString& dir); + public: bool Create(wxWindow *parent, wxWindowID id, @@ -82,6 +84,9 @@ protected: // just doesn't make sense to use picker styles for wxButton anyhow long m_pickerStyle; + // Initial directory set by SetInitialDirectory() call or empty. + wxString m_initialDir; + private: // common part of all ctors void Init() { m_pickerStyle = -1; } @@ -114,7 +119,7 @@ public: pos, size, style, validator, name); } -public: // overrideable +public: // overridable virtual long GetDialogStyle() const { @@ -140,16 +145,7 @@ public: // overrideable return filedlgstyle; } - virtual wxDialog *CreateDialog() - { - wxFileDialog *p = new wxFileDialog(GetDialogParent(), m_message, - wxEmptyString, wxEmptyString, - m_wildcard, GetDialogStyle()); - - // this sets both the default folder and the default file of the dialog - p->SetPath(m_path); - return p; - } + virtual wxDialog *CreateDialog(); wxEventType GetEventType() const { return wxEVT_COMMAND_FILEPICKER_CHANGED; } @@ -160,6 +156,10 @@ protected: void UpdatePathFromDialog(wxDialog *p) { m_path = wxStaticCast(p, wxFileDialog)->GetPath(); } + // Set the initial directory for the dialog but without overriding the + // directory of the currently selected file, if any. + void DoSetInitialDirectory(wxFileDialog* dialog, const wxString& dir); + private: DECLARE_DYNAMIC_CLASS(wxGenericFileButton) }; @@ -190,7 +190,7 @@ public: pos, size, style, validator, name); } -public: // overrideable +public: // overridable virtual long GetDialogStyle() const { @@ -204,11 +204,7 @@ public: // overrideable return dirdlgstyle; } - virtual wxDialog *CreateDialog() - { - return new wxDirDialog(GetDialogParent(), m_message, m_path, - GetDialogStyle()); - } + virtual wxDialog *CreateDialog(); wxEventType GetEventType() const { return wxEVT_COMMAND_DIRPICKER_CHANGED; } diff --git a/Externals/wxWidgets3/include/wx/generic/grid.h b/Externals/wxWidgets3/include/wx/generic/grid.h index 18e5a267af..21b380023e 100644 --- a/Externals/wxWidgets3/include/wx/generic/grid.h +++ b/Externals/wxWidgets3/include/wx/generic/grid.h @@ -4,7 +4,7 @@ // Author: Michael Bedward (based on code by Julian Smart, Robin Dunn) // Modified by: Santiago Palacios // Created: 1/08/1999 -// RCS-ID: $Id: grid.h 65451 2010-08-30 22:18:52Z VZ $ +// RCS-ID: $Id: grid.h 70825 2012-03-06 10:23:44Z SC $ // Copyright: (c) Michael Bedward // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -432,9 +432,9 @@ public: void SetKind(wxAttrKind kind) { m_attrkind = kind; } // accessors - bool HasTextColour() const { return m_colText.Ok(); } - bool HasBackgroundColour() const { return m_colBack.Ok(); } - bool HasFont() const { return m_font.Ok(); } + bool HasTextColour() const { return m_colText.IsOk(); } + bool HasBackgroundColour() const { return m_colBack.IsOk(); } + bool HasFont() const { return m_font.IsOk(); } bool HasAlignment() const { return m_hAlign != wxALIGN_INVALID || m_vAlign != wxALIGN_INVALID; @@ -1637,7 +1637,7 @@ public: // unset any existing sorting column void UnsetSortingColumn() { SetSortingColumn(wxNOT_FOUND); } -#ifdef WXWIN_COMPATIBILITY_2_8 +#if WXWIN_COMPATIBILITY_2_8 // ------ For compatibility with previous wxGrid only... // // ************************************************ @@ -2160,7 +2160,7 @@ private: // -------------------------------- // process mouse drag event in WXGRID_CURSOR_SELECT_CELL mode - void DoGridCellDrag(wxMouseEvent& event, + bool DoGridCellDrag(wxMouseEvent& event, const wxGridCellCoords& coords, bool isFirstDrag); diff --git a/Externals/wxWidgets3/include/wx/generic/gridctrl.h b/Externals/wxWidgets3/include/wx/generic/gridctrl.h index a14d98111c..2cc9859025 100644 --- a/Externals/wxWidgets3/include/wx/generic/gridctrl.h +++ b/Externals/wxWidgets3/include/wx/generic/gridctrl.h @@ -4,7 +4,7 @@ // Author: Paul Gammans, Roger Gammans // Modified by: // Created: 11/04/2001 -// RCS-ID: $Id: gridctrl.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: gridctrl.h 69856 2011-11-28 13:23:33Z VZ $ // Copyright: (c) The Computer Surgery (paul@compsurg.co.uk) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -81,13 +81,17 @@ protected: class WXDLLIMPEXP_ADV wxGridCellFloatRenderer : public wxGridCellStringRenderer { public: - wxGridCellFloatRenderer(int width = -1, int precision = -1); + wxGridCellFloatRenderer(int width = -1, + int precision = -1, + int format = wxGRID_FLOAT_FORMAT_DEFAULT); // get/change formatting parameters int GetWidth() const { return m_width; } void SetWidth(int width) { m_width = width; m_format.clear(); } int GetPrecision() const { return m_precision; } void SetPrecision(int precision) { m_precision = precision; m_format.clear(); } + int GetFormat() const { return m_style; } + void SetFormat(int format) { m_style = format; m_format.clear(); } // draw the string right aligned with given width/precision virtual void Draw(wxGrid& grid, @@ -102,7 +106,8 @@ public: wxDC& dc, int row, int col); - // parameters string format is "width[,precision]" + // parameters string format is "width[,precision[,format]]" + // with format being one of f|e|g|E|F|G virtual void SetParameters(const wxString& params); virtual wxGridCellRenderer *Clone() const; @@ -115,6 +120,7 @@ private: int m_width, m_precision; + int m_style; wxString m_format; }; diff --git a/Externals/wxWidgets3/include/wx/generic/grideditors.h b/Externals/wxWidgets3/include/wx/generic/grideditors.h index 006b66232d..c3309e0470 100644 --- a/Externals/wxWidgets3/include/wx/generic/grideditors.h +++ b/Externals/wxWidgets3/include/wx/generic/grideditors.h @@ -4,7 +4,7 @@ // Author: Michael Bedward (based on code by Julian Smart, Robin Dunn) // Modified by: Santiago Palacios // Created: 1/08/1999 -// RCS-ID: $Id: grideditors.h 61508 2009-07-23 20:30:22Z VZ $ +// RCS-ID: $Id: grideditors.h 70693 2012-02-25 23:49:55Z VZ $ // Copyright: (c) Michael Bedward // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -154,11 +154,38 @@ private: wxDECLARE_NO_COPY_CLASS(wxGridCellNumberEditor); }; + +enum wxGridCellFloatFormat +{ + // Decimal floating point (%f) + wxGRID_FLOAT_FORMAT_FIXED = 0x0010, + + // Scientific notation (mantise/exponent) using e character (%e) + wxGRID_FLOAT_FORMAT_SCIENTIFIC = 0x0020, + + // Use the shorter of %e or %f (%g) + wxGRID_FLOAT_FORMAT_COMPACT = 0x0040, + + // To use in combination with one of the above formats (%F/%E/%G) + wxGRID_FLOAT_FORMAT_UPPER = 0x0080, + + // Format used by default. + wxGRID_FLOAT_FORMAT_DEFAULT = wxGRID_FLOAT_FORMAT_FIXED, + + // A mask to extract format from the combination of flags. + wxGRID_FLOAT_FORMAT_MASK = wxGRID_FLOAT_FORMAT_FIXED | + wxGRID_FLOAT_FORMAT_SCIENTIFIC | + wxGRID_FLOAT_FORMAT_COMPACT | + wxGRID_FLOAT_FORMAT_UPPER +}; + // the editor for floating point numbers (double) data class WXDLLIMPEXP_ADV wxGridCellFloatEditor : public wxGridCellTextEditor { public: - wxGridCellFloatEditor(int width = -1, int precision = -1); + wxGridCellFloatEditor(int width = -1, + int precision = -1, + int format = wxGRID_FLOAT_FORMAT_DEFAULT); virtual void Create(wxWindow* parent, wxWindowID id, @@ -176,18 +203,22 @@ public: virtual wxGridCellEditor *Clone() const { return new wxGridCellFloatEditor(m_width, m_precision); } - // parameters string format is "width,precision" + // parameters string format is "width[,precision[,format]]" + // format to choose beween f|e|g|E|G (f is used by default) virtual void SetParameters(const wxString& params); protected: // string representation of our value - wxString GetString() const; + wxString GetString(); private: int m_width, m_precision; double m_value; + int m_style; + wxString m_format; + wxDECLARE_NO_COPY_CLASS(wxGridCellFloatEditor); }; @@ -264,6 +295,8 @@ public: wxWindowID id, wxEvtHandler* evtHandler); + virtual void SetSize(const wxRect& rect); + virtual void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr); virtual void BeginEdit(int row, int col, wxGrid* grid); diff --git a/Externals/wxWidgets3/include/wx/generic/hyperlink.h b/Externals/wxWidgets3/include/wx/generic/hyperlink.h index 7a495ef09f..c834a7fd3b 100644 --- a/Externals/wxWidgets3/include/wx/generic/hyperlink.h +++ b/Externals/wxWidgets3/include/wx/generic/hyperlink.h @@ -4,7 +4,7 @@ // Author: David Norris , Otto Wyss // Modified by: Ryan Norton, Francesco Montorsi // Created: 04/02/2005 -// RCS-ID: $Id: hyperlink.h 65334 2010-08-17 16:55:32Z VZ $ +// RCS-ID: $Id: hyperlink.h 67948 2011-06-15 21:56:23Z VZ $ // Copyright: (c) 2005 David Norris // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -75,6 +75,12 @@ protected: // Renders the hyperlink. void OnPaint(wxPaintEvent& event); + // Handle set/kill focus events (invalidate for painting focus rect) + void OnFocus(wxFocusEvent& event); + + // Fire a HyperlinkEvent on space + void OnChar(wxKeyEvent& event); + // Returns the wxRect of the label of this hyperlink. // This is different from the clientsize's rectangle when // clientsize != bestsize and this rectangle is influenced diff --git a/Externals/wxWidgets3/include/wx/generic/listctrl.h b/Externals/wxWidgets3/include/wx/generic/listctrl.h index 069be51688..19622cac39 100644 --- a/Externals/wxWidgets3/include/wx/generic/listctrl.h +++ b/Externals/wxWidgets3/include/wx/generic/listctrl.h @@ -3,7 +3,7 @@ // Purpose: Generic list control // Author: Robert Roebling // Created: 01/02/97 -// RCS-ID: $Id: listctrl.h 64884 2010-07-11 10:44:08Z VZ $ +// RCS-ID: $Id: listctrl.h 70282 2012-01-07 15:09:43Z VZ $ // Copyright: (c) 1998 Robert Roebling and Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -14,8 +14,6 @@ #include "wx/scrolwin.h" #include "wx/textctrl.h" -class WXDLLIMPEXP_FWD_CORE wxImageList; - #if wxUSE_DRAG_AND_DROP class WXDLLIMPEXP_FWD_CORE wxDropTarget; #endif @@ -31,7 +29,7 @@ class WXDLLIMPEXP_FWD_CORE wxListMainWindow; // wxListCtrl //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxGenericListCtrl: public wxControl, +class WXDLLIMPEXP_CORE wxGenericListCtrl: public wxListCtrlBase, public wxScrollHelper { public: @@ -66,7 +64,7 @@ public: const wxString &name = wxListCtrlNameStr); bool GetColumn( int col, wxListItem& item ) const; - bool SetColumn( int col, wxListItem& item ); + bool SetColumn( int col, const wxListItem& item ); int GetColumnWidth( int col ) const; bool SetColumnWidth( int col, int width); int GetCountPerPage() const; // not the same in wxGLC as in Windows, I think @@ -134,18 +132,9 @@ public: long InsertItem( long index, const wxString& label ); long InsertItem( long index, int imageIndex ); long InsertItem( long index, const wxString& label, int imageIndex ); - long InsertColumn( long col, wxListItem& info ); - long InsertColumn( long col, const wxString& heading, - int format = wxLIST_FORMAT_LEFT, int width = -1 ); bool ScrollList( int dx, int dy ); bool SortItems( wxListCtrlCompare fn, wxIntPtr data ); - // are we in report mode? - bool InReportView() const { return HasFlag(wxLC_REPORT); } - - // are we in virtual report mode? - bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); } - // do we have a header window? bool HasHeader() const { return InReportView() && !HasFlag(wxLC_NO_HEADER); } @@ -214,6 +203,10 @@ public: wxListMainWindow *m_mainWin; protected: + // Implement base class pure virtual methods. + long DoInsertColumn(long col, const wxListItem& info); + + virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); // take into account the coordinates difference between the container diff --git a/Externals/wxWidgets3/include/wx/generic/logg.h b/Externals/wxWidgets3/include/wx/generic/logg.h index 2881dba02a..3ef9eacdc3 100644 --- a/Externals/wxWidgets3/include/wx/generic/logg.h +++ b/Externals/wxWidgets3/include/wx/generic/logg.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 29/01/98 -// RCS-ID: $Id: logg.h 61346 2009-07-08 13:47:33Z VZ $ +// RCS-ID: $Id: logg.h 67656 2011-04-30 10:57:04Z DS $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -104,7 +104,7 @@ private: // ---------------------------------------------------------------------------- // (background) log window: this class forwards all log messages to the log // target which was active when it was instantiated, but also collects them -// to the log window. This window has it's own menu which allows the user to +// to the log window. This window has its own menu which allows the user to // close it, clear the log contents or save it to the file. // ---------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/include/wx/generic/msgdlgg.h b/Externals/wxWidgets3/include/wx/generic/msgdlgg.h index aa9a95be13..73fe48b4a7 100644 --- a/Externals/wxWidgets3/include/wx/generic/msgdlgg.h +++ b/Externals/wxWidgets3/include/wx/generic/msgdlgg.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: msgdlgg.h 65449 2010-08-30 21:48:21Z VZ $ +// RCS-ID: $Id: msgdlgg.h 68537 2011-08-04 22:53:42Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -32,6 +32,7 @@ protected: void OnYes(wxCommandEvent& event); void OnNo(wxCommandEvent& event); + void OnHelp(wxCommandEvent& event); void OnCancel(wxCommandEvent& event); // can be overridden to provide more contents to the dialog diff --git a/Externals/wxWidgets3/include/wx/generic/notebook.h b/Externals/wxWidgets3/include/wx/generic/notebook.h index 0a2b3a4531..e2c405e7ab 100644 --- a/Externals/wxWidgets3/include/wx/generic/notebook.h +++ b/Externals/wxWidgets3/include/wx/generic/notebook.h @@ -3,7 +3,7 @@ // Purpose: wxNotebook class (a.k.a. property sheet, tabbed dialog) // Author: Julian Smart // Modified by: -// RCS-ID: $Id: notebook.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: notebook.h 68810 2011-08-21 14:08:49Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -107,7 +107,7 @@ public: wxNotebookPage *pPage, const wxString& strText, bool bSelect = false, - int imageId = -1); + int imageId = NO_IMAGE); // callbacks // --------- diff --git a/Externals/wxWidgets3/include/wx/generic/panelg.h b/Externals/wxWidgets3/include/wx/generic/panelg.h index bd05855a1f..79dfe85c5c 100644 --- a/Externals/wxWidgets3/include/wx/generic/panelg.h +++ b/Externals/wxWidgets3/include/wx/generic/panelg.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: panelg.h 67253 2011-03-20 00:00:49Z VZ $ +// RCS-ID: $Id: panelg.h 70098 2011-12-23 05:59:59Z PC $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -30,7 +30,7 @@ public: Create(parent, winid, pos, size, style, name); } -#ifdef WXWIN_COMPATIBILITY_2_8 +#if WXWIN_COMPATIBILITY_2_8 wxDEPRECATED_CONSTRUCTOR( wxPanel(wxWindow *parent, int x, int y, int width, int height, @@ -42,18 +42,7 @@ public: ) #endif // WXWIN_COMPATIBILITY_2_8 -protected: - virtual void DoSetBackgroundBitmap(const wxBitmap& bmp); - private: - // Event handler for erasing the background which is only used when we have - // a valid background bitmap. - void OnEraseBackground(wxEraseEvent& event); - - - // The bitmap used for painting the background if valid. - wxBitmap m_bitmapBg; - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel); }; diff --git a/Externals/wxWidgets3/include/wx/generic/private/grid.h b/Externals/wxWidgets3/include/wx/generic/private/grid.h index f217481c3f..ab763a9c22 100644 --- a/Externals/wxWidgets3/include/wx/generic/private/grid.h +++ b/Externals/wxWidgets3/include/wx/generic/private/grid.h @@ -4,7 +4,7 @@ // Author: Michael Bedward (based on code by Julian Smart, Robin Dunn) // Modified by: Santiago Palacios // Created: 1/08/1999 -// RCS-ID: $Id: grid.h 66792 2011-01-27 18:35:01Z SC $ +// RCS-ID: $Id: grid.h 69861 2011-11-28 19:15:59Z VZ $ // Copyright: (c) Michael Bedward // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -301,6 +301,8 @@ public: m_owner = owner; } + virtual wxWindow *GetMainWindowOfCompositeControl() { return m_owner; } + virtual bool AcceptsFocus() const { return false; } wxGrid *GetOwner() { return m_owner; } @@ -546,6 +548,11 @@ public: // implemented for the lines virtual int GetLineAt(const wxGrid *grid, int pos) const = 0; + // Return the display position of the line with the given index. + // + // NB: As GetLineAt(), currently this is always identity for rows. + virtual int GetLinePos(const wxGrid *grid, int line) const = 0; + // Return the index of the line just before the given one. virtual int GetLineBefore(const wxGrid* grid, int line) const = 0; @@ -613,7 +620,9 @@ public: virtual void SetDefaultLineSize(wxGrid *grid, int size, bool resizeExisting) const { grid->SetDefaultRowSize(size, resizeExisting); } - virtual int GetLineAt(const wxGrid * WXUNUSED(grid), int line) const + virtual int GetLineAt(const wxGrid * WXUNUSED(grid), int pos) const + { return pos; } // TODO: implement row reordering + virtual int GetLinePos(const wxGrid * WXUNUSED(grid), int line) const { return line; } // TODO: implement row reordering virtual int GetLineBefore(const wxGrid* WXUNUSED(grid), int line) const @@ -677,8 +686,10 @@ public: virtual void SetDefaultLineSize(wxGrid *grid, int size, bool resizeExisting) const { grid->SetDefaultColSize(size, resizeExisting); } - virtual int GetLineAt(const wxGrid *grid, int line) const - { return grid->GetColAt(line); } + virtual int GetLineAt(const wxGrid *grid, int pos) const + { return grid->GetColAt(pos); } + virtual int GetLinePos(const wxGrid *grid, int line) const + { return grid->GetColPos(line); } virtual int GetLineBefore(const wxGrid* grid, int line) const { return grid->GetColAt(wxMax(0, grid->GetColPos(line) - 1)); } @@ -691,7 +702,10 @@ public: // This class abstracts the difference between operations going forward // (down/right) and backward (up/left) and allows to use the same code for -// functions which differ only in the direction of grid traversal +// functions which differ only in the direction of grid traversal. +// +// Notice that all operations in this class work with display positions and not +// internal indices which can be different if the columns were reordered. // // Like wxGridOperations it's an ABC with two concrete subclasses below. Unlike // it, this is a normal object and not just a function dispatch table and has a @@ -720,6 +734,12 @@ public: // Find the line at the given distance, in pixels, away from this one // (this uses clipping, i.e. anything after the last line is counted as the // last one and anything before the first one as 0) + // + // TODO: Implementation of this method currently doesn't support column + // reordering as it mixes up indices and positions. But this doesn't + // really matter as it's only called for rows (Page Up/Down only work + // vertically) and row reordering is not currently supported. We'd + // need to fix it if this ever changes however. virtual int MoveByPixelDistance(int line, int distance) const = 0; // This class is never used polymorphically but give it a virtual dtor @@ -727,6 +747,28 @@ public: virtual ~wxGridDirectionOperations() { } protected: + // Get the position of the row or column from the given coordinates pair. + // + // This is just a shortcut to avoid repeating m_oper and m_grid multiple + // times in the derived classes code. + int GetLinePos(const wxGridCellCoords& coords) const + { + return m_oper.GetLinePos(m_grid, m_oper.Select(coords)); + } + + // Get the index of the row or column from the position. + int GetLineAt(int pos) const + { + return m_oper.GetLineAt(m_grid, pos); + } + + // Check if the given line is visible, i.e. has non 0 size. + bool IsLineVisible(int line) const + { + return m_oper.GetLineSize(m_grid, line) != 0; + } + + wxGrid * const m_grid; const wxGridOperations& m_oper; }; @@ -743,14 +785,38 @@ public: { wxASSERT_MSG( m_oper.Select(coords) >= 0, "invalid row/column" ); - return m_oper.Select(coords) == 0; + int pos = GetLinePos(coords); + while ( pos ) + { + // Check the previous line. + int line = GetLineAt(--pos); + if ( IsLineVisible(line) ) + { + // There is another visible line before this one, hence it's + // not at boundary. + return false; + } + } + + // We reached the boundary without finding any visible lines. + return true; } virtual void Advance(wxGridCellCoords& coords) const { - wxASSERT( !IsAtBoundary(coords) ); + int pos = GetLinePos(coords); + for ( ;; ) + { + // This is not supposed to happen if IsAtBoundary() returned false. + wxCHECK_RET( pos, "can't advance when already at boundary" ); - m_oper.Set(coords, m_oper.Select(coords) - 1); + int line = GetLineAt(--pos); + if ( IsLineVisible(line) ) + { + m_oper.Set(coords, line); + break; + } + } } virtual int MoveByPixelDistance(int line, int distance) const @@ -760,6 +826,8 @@ public: } }; +// Please refer to the comments above when reading this class code, it's +// absolutely symmetrical to wxGridBackwardOperations. class wxGridForwardOperations : public wxGridDirectionOperations { public: @@ -773,14 +841,32 @@ public: { wxASSERT_MSG( m_oper.Select(coords) < m_numLines, "invalid row/column" ); - return m_oper.Select(coords) == m_numLines - 1; + int pos = GetLinePos(coords); + while ( pos < m_numLines - 1 ) + { + int line = GetLineAt(++pos); + if ( IsLineVisible(line) ) + return false; + } + + return true; } virtual void Advance(wxGridCellCoords& coords) const { - wxASSERT( !IsAtBoundary(coords) ); + int pos = GetLinePos(coords); + for ( ;; ) + { + wxCHECK_RET( pos < m_numLines - 1, + "can't advance when already at boundary" ); - m_oper.Set(coords, m_oper.Select(coords) + 1); + int line = GetLineAt(++pos); + if ( IsLineVisible(line) ) + { + m_oper.Set(coords, line); + break; + } + } } virtual int MoveByPixelDistance(int line, int distance) const diff --git a/Externals/wxWidgets3/include/wx/generic/private/listctrl.h b/Externals/wxWidgets3/include/wx/generic/private/listctrl.h index e2a8de78cb..3d7838a883 100644 --- a/Externals/wxWidgets3/include/wx/generic/private/listctrl.h +++ b/Externals/wxWidgets3/include/wx/generic/private/listctrl.h @@ -3,7 +3,7 @@ // Purpose: private definitions of wxListCtrl helpers // Author: Robert Roebling // Vadim Zeitlin (virtual list control support) -// Id: $Id: listctrl.h 67254 2011-03-20 00:14:35Z DS $ +// Id: $Id: listctrl.h 70285 2012-01-07 15:09:54Z VZ $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -402,6 +402,10 @@ public: wxTextCtrl *GetText() const { return m_text; } + // Check if the given key event should stop editing and return true if it + // does or false otherwise. + bool CheckForEndEditKey(const wxKeyEvent& event); + // Different reasons for calling EndEdit(): // // It was called because: @@ -557,6 +561,7 @@ public: // called to switch the selection from the current item to newCurrent, void OnArrowChar( size_t newCurrent, const wxKeyEvent& event ); + void OnCharHook( wxKeyEvent &event ); void OnChar( wxKeyEvent &event ); void OnKeyDown( wxKeyEvent &event ); void OnKeyUp( wxKeyEvent &event ); @@ -570,13 +575,12 @@ public: void DrawImage( int index, wxDC *dc, int x, int y ); void GetImageSize( int index, int &width, int &height ) const; - int GetTextLength( const wxString &s ) const; void SetImageList( wxImageList *imageList, int which ); void SetItemSpacing( int spacing, bool isSmall = false ); int GetItemSpacing( bool isSmall = false ); - void SetColumn( int col, wxListItem &item ); + void SetColumn( int col, const wxListItem &item ); void SetColumnWidth( int col, int width ); void GetColumn( int col, wxListItem &item ) const; int GetColumnWidth( int col ) const; @@ -640,7 +644,7 @@ public: long FindItem( const wxPoint& pt ); long HitTest( int x, int y, int &flags ) const; void InsertItem( wxListItem &item ); - void InsertColumn( long col, wxListItem &item ); + void InsertColumn( long col, const wxListItem &item ); int GetItemWidthWithImage(wxListItem * item); void SortItems( wxListCtrlCompare fn, wxIntPtr data ); @@ -788,6 +792,10 @@ private: // delete all items but don't refresh: called from dtor void DoDeleteAllItems(); + // Compute the minimal width needed to fully display the column header. + int ComputeMinHeaderWidth(const wxListHeaderData* header) const; + + // the height of one line using the current font wxCoord m_lineHeight; diff --git a/Externals/wxWidgets3/include/wx/generic/private/richtooltip.h b/Externals/wxWidgets3/include/wx/generic/private/richtooltip.h new file mode 100644 index 0000000000..0ca479dadb --- /dev/null +++ b/Externals/wxWidgets3/include/wx/generic/private/richtooltip.h @@ -0,0 +1,62 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/generic/private/richtooltip.h +// Purpose: wxRichToolTipGenericImpl declaration. +// Author: Vadim Zeitlin +// Created: 2011-10-18 +// RCS-ID: $Id: richtooltip.h 69488 2011-10-20 16:20:19Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_GENERIC_PRIVATE_RICHTOOLTIP_H_ +#define _GENERIC_PRIVATE_RICHTOOLTIP_H_ + +#include "wx/icon.h" +#include "wx/colour.h" + +// ---------------------------------------------------------------------------- +// wxRichToolTipGenericImpl: defines generic wxRichToolTip implementation. +// ---------------------------------------------------------------------------- + +class wxRichToolTipGenericImpl : public wxRichToolTipImpl +{ +public: + wxRichToolTipGenericImpl(const wxString& title, const wxString& message) : + m_title(title), + m_message(message) + { + m_tipKind = wxTipKind_Auto; + + // This is pretty arbitrary, we could follow MSW and use some multiple + // of double-click time here. + m_timeout = 5000; + } + + virtual void SetBackgroundColour(const wxColour& col, + const wxColour& colEnd); + virtual void SetCustomIcon(const wxIcon& icon); + virtual void SetStandardIcon(int icon); + virtual void SetTimeout(unsigned milliseconds); + virtual void SetTipKind(wxTipKind tipKind); + virtual void SetTitleFont(const wxFont& font); + + virtual void ShowFor(wxWindow* win); + +protected: + wxString m_title, + m_message; + +private: + wxIcon m_icon; + + wxColour m_colStart, + m_colEnd; + + unsigned m_timeout; + + wxTipKind m_tipKind; + + wxFont m_titleFont; +}; + +#endif // _WX_GENERIC_PRIVATE_RICHTOOLTIP_H_ diff --git a/Externals/wxWidgets3/include/wx/generic/prntdlgg.h b/Externals/wxWidgets3/include/wx/generic/prntdlgg.h index 1cd69143b1..e3317e1cc6 100644 --- a/Externals/wxWidgets3/include/wx/generic/prntdlgg.h +++ b/Externals/wxWidgets3/include/wx/generic/prntdlgg.h @@ -5,7 +5,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: prntdlgg.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: prntdlgg.h 70636 2012-02-20 21:55:55Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_CORE wxCheckBox; class WXDLLIMPEXP_FWD_CORE wxComboBox; class WXDLLIMPEXP_FWD_CORE wxStaticText; class WXDLLIMPEXP_FWD_CORE wxRadioBox; -class WXDLLIMPEXP_FWD_CORE wxPageSetupData; +class WXDLLIMPEXP_FWD_CORE wxPageSetupDialogData; // ---------------------------------------------------------------------------- // constants diff --git a/Externals/wxWidgets3/include/wx/generic/progdlgg.h b/Externals/wxWidgets3/include/wx/generic/progdlgg.h index 518f43212b..38b69241db 100644 --- a/Externals/wxWidgets3/include/wx/generic/progdlgg.h +++ b/Externals/wxWidgets3/include/wx/generic/progdlgg.h @@ -4,7 +4,7 @@ // Author: Karsten Ballueder // Modified by: Francesco Montorsi // Created: 09.05.1999 -// RCS-ID: $Id: progdlgg.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: progdlgg.h 70512 2012-02-05 14:18:25Z VZ $ // Copyright: (c) Karsten Ballueder // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -27,6 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindowDisabler; class WXDLLIMPEXP_CORE wxGenericProgressDialog : public wxDialog { public: + wxGenericProgressDialog(); wxGenericProgressDialog(const wxString& title, const wxString& message, int maximum = 100, wxWindow *parent = NULL, @@ -34,6 +35,12 @@ public: virtual ~wxGenericProgressDialog(); + bool Create(const wxString& title, + const wxString& message, + int maximum = 100, + wxWindow *parent = NULL, + int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE); + virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL); virtual bool Pulse(const wxString& newmsg = wxEmptyString, bool *skip = NULL); @@ -67,15 +74,6 @@ public: }; protected: - // This ctor is used by the native MSW implementation only. - wxGenericProgressDialog(wxWindow *parent, int style); - - void Create(const wxString& title, - const wxString& message, - int maximum, - wxWindow *parent, - int style); - // Update just the m_maximum field, this is used by public SetRange() but, // unlike it, doesn't update the controls state. This makes it useful for // both this class and its derived classes that don't use m_gauge to @@ -95,7 +93,7 @@ protected: // Return the progress dialog style. Prefer to use HasPDFlag() if possible. int GetPDStyle() const { return m_pdStyle; } - + void SetPDStyle(int pdStyle) { m_pdStyle = pdStyle; } // Updates estimated times from a given progress bar value and stores the // results in provided arguments. @@ -123,6 +121,10 @@ protected: // the dialog was shown void ReenableOtherWindows(); + // Set the top level parent we store from the parent window provided when + // creating the dialog. + void SetTopParent(wxWindow* parent); + // return the top level parent window of this dialog (may be NULL) wxWindow *GetTopParent() const { return m_parentTop; } @@ -151,7 +153,7 @@ private: static void SetTimeLabel(unsigned long val, wxStaticText *label); // common part of all ctors - void Init(wxWindow *parent, int style); + void Init(); // create the label with given text and another one to show the time nearby // as the next windows in the sizer, returns the created control diff --git a/Externals/wxWidgets3/include/wx/generic/spinctlg.h b/Externals/wxWidgets3/include/wx/generic/spinctlg.h index 6115fce04e..36c777940e 100644 --- a/Externals/wxWidgets3/include/wx/generic/spinctlg.h +++ b/Externals/wxWidgets3/include/wx/generic/spinctlg.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 28.10.99 -// RCS-ID: $Id: spinctlg.h 67199 2011-03-15 11:10:38Z VZ $ +// RCS-ID: $Id: spinctlg.h 70432 2012-01-21 17:03:52Z VZ $ // Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -81,7 +81,6 @@ public: // forward these functions to all subcontrols virtual bool Enable(bool enable = true); virtual bool Show(bool show = true); - virtual bool Reparent(wxWindowBase *newParent); #if wxUSE_TOOLTIPS virtual void DoSetToolTip(wxToolTip *tip); #endif // wxUSE_TOOLTIPS @@ -92,7 +91,7 @@ public: // forwarded events from children windows void OnSpinButton(wxSpinEvent& event); - void OnTextLostFocus(); + void OnTextLostFocus(wxFocusEvent& event); void OnTextChar(wxKeyEvent& event); // this window itself is used only as a container for its sub windows so it @@ -108,6 +107,11 @@ protected: virtual wxSize DoGetBestSize() const; virtual void DoMoveWindow(int x, int y, int width, int height); +#ifdef __WXMSW__ + // and, for MSW, enabling this window itself + virtual void DoEnable(bool enable); +#endif // __WXMSW__ + // generic double valued functions double DoGetValue() const { return m_value; } bool DoSetValue(double val); @@ -148,6 +152,8 @@ protected: private: // common part of all ctors void Init(); + + DECLARE_EVENT_TABLE() }; #else // !wxUSE_SPINBTN diff --git a/Externals/wxWidgets3/include/wx/generic/splash.h b/Externals/wxWidgets3/include/wx/generic/splash.h index a435975544..a98704a639 100644 --- a/Externals/wxWidgets3/include/wx/generic/splash.h +++ b/Externals/wxWidgets3/include/wx/generic/splash.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 28/6/2000 -// RCS-ID: $Id: splash.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: splash.h 69796 2011-11-22 13:18:55Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -13,8 +13,9 @@ #define _WX_SPLASH_H_ #include "wx/bitmap.h" -#include "wx/timer.h" +#include "wx/eventfilter.h" #include "wx/frame.h" +#include "wx/timer.h" /* @@ -33,11 +34,12 @@ class WXDLLIMPEXP_FWD_ADV wxSplashScreenWindow; * wxSplashScreen */ -class WXDLLIMPEXP_ADV wxSplashScreen: public wxFrame +class WXDLLIMPEXP_ADV wxSplashScreen: public wxFrame, + public wxEventFilter { public: // for RTTI macros only - wxSplashScreen() {} + wxSplashScreen() { Init(); } wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -52,7 +54,13 @@ public: wxSplashScreenWindow* GetSplashWindow() const { return m_window; } int GetTimeout() const { return m_milliseconds; } + // Override wxEventFilter method to hide splash screen on any user input. + virtual int FilterEvent(wxEvent& event); + protected: + // Common part of all ctors. + void Init(); + wxSplashScreenWindow* m_window; long m_splashStyle; int m_milliseconds; @@ -74,8 +82,6 @@ public: void OnPaint(wxPaintEvent& event); void OnEraseBackground(wxEraseEvent& event); - void OnMouseEvent(wxMouseEvent& event); - void OnChar(wxKeyEvent& event); void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; } wxBitmap& GetBitmap() { return m_bitmap; } diff --git a/Externals/wxWidgets3/include/wx/generic/splitter.h b/Externals/wxWidgets3/include/wx/generic/splitter.h index 00a6c88583..47bdebceed 100644 --- a/Externals/wxWidgets3/include/wx/generic/splitter.h +++ b/Externals/wxWidgets3/include/wx/generic/splitter.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: splitter.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: splitter.h 70840 2012-03-08 13:23:39Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -49,7 +49,7 @@ enum // to prevent flickering. (WS_CLIPCHILDREN doesn't work in all cases so can't be // standard). -class WXDLLIMPEXP_CORE wxSplitterWindow: public wxWindow +class WXDLLIMPEXP_CORE wxSplitterWindow: public wxNavigationEnabled { public: @@ -136,8 +136,14 @@ public: // Sets the border size void SetBorderSize(int WXUNUSED(width)) { } - // Gets the sash size + // Hide or show the sash and test whether it's currently hidden. + void SetSashInvisible(bool invisible = true); + bool IsSashInvisible() const { return HasFlag(wxSP_NOSASH); } + + // Gets the current sash size which may be 0 if it's hidden and the default + // sash size. int GetSashSize() const; + int GetDefaultSashSize() const; // Gets the border size int GetBorderSize() const; @@ -211,9 +217,6 @@ public: // Resizes subwindows virtual void SizeWindows(); - void SetNeedUpdating(bool needUpdating) { m_needUpdating = needUpdating; } - bool GetNeedUpdating() const { return m_needUpdating ; } - #ifdef __WXMAC__ virtual bool MacClipGrandChildren() const { return true ; } #endif @@ -297,11 +300,8 @@ protected: bool m_needUpdating:1; bool m_permitUnsplitAlways:1; bool m_isHot:1; - bool m_checkRequestedSashPosition:1; private: - WX_DECLARE_CONTROL_CONTAINER(); - DECLARE_DYNAMIC_CLASS(wxSplitterWindow) DECLARE_EVENT_TABLE() wxDECLARE_NO_COPY_CLASS(wxSplitterWindow); diff --git a/Externals/wxWidgets3/include/wx/generic/srchctlg.h b/Externals/wxWidgets3/include/wx/generic/srchctlg.h index 33af7b7631..864efcd142 100644 --- a/Externals/wxWidgets3/include/wx/generic/srchctlg.h +++ b/Externals/wxWidgets3/include/wx/generic/srchctlg.h @@ -3,7 +3,7 @@ // Purpose: generic wxSearchCtrl class // Author: Vince Harron // Created: 2006-02-19 -// RCS-ID: $Id: srchctlg.h 59269 2009-03-02 14:49:55Z VZ $ +// RCS-ID: $Id: srchctlg.h 68911 2011-08-27 12:13:23Z VZ $ // Copyright: Vince Harron // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -191,6 +191,7 @@ public: // wxWindow overrides virtual bool SetFont(const wxFont& font); + virtual bool SetBackgroundColour(const wxColour& colour); // search control generic only void SetSearchBitmap( const wxBitmap& bitmap ); @@ -235,6 +236,9 @@ protected: private: friend class wxSearchButton; + // Implement pure virtual function inherited from wxCompositeWindow. + virtual wxWindowList GetCompositeWindowParts() const; + #if wxUSE_MENUS void PopupSearchMenu(); #endif // wxUSE_MENUS diff --git a/Externals/wxWidgets3/include/wx/generic/statbmpg.h b/Externals/wxWidgets3/include/wx/generic/statbmpg.h index f62acc721c..930e3943b9 100644 --- a/Externals/wxWidgets3/include/wx/generic/statbmpg.h +++ b/Externals/wxWidgets3/include/wx/generic/statbmpg.h @@ -3,7 +3,7 @@ // Purpose: wxGenericStaticBitmap header // Author: Marcin Wojdyr, Stefan Csomor // Created: 2008-06-16 -// RCS-ID: $Id: statbmpg.h 61724 2009-08-21 10:41:26Z VZ $ +// RCS-ID: $Id: statbmpg.h 67681 2011-05-03 16:29:04Z DS $ // Copyright: wxWidgets developers // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -61,7 +61,7 @@ public: private: wxSize GetBitmapSize() { - return m_bitmap.Ok() ? wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight()) + return m_bitmap.IsOk() ? wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight()) : wxSize(16, 16); // this is completely arbitrary } diff --git a/Externals/wxWidgets3/include/wx/generic/statusbr.h b/Externals/wxWidgets3/include/wx/generic/statusbr.h index 0f5511235b..dc2a3f88a4 100644 --- a/Externals/wxWidgets3/include/wx/generic/statusbr.h +++ b/Externals/wxWidgets3/include/wx/generic/statusbr.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: VZ at 05.02.00 to derive from wxStatusBarBase // Created: 01/02/97 -// RCS-ID: $Id: statusbr.h 61624 2009-08-06 00:01:43Z VZ $ +// RCS-ID: $Id: statusbr.h 67384 2011-04-03 20:31:32Z DS $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -81,7 +81,7 @@ protected: virtual void InitColours(); // true if the status bar shows the size grip: for this it must have - // wxSTB_SIZEGRIP style and the window it is attached to must be resizeable + // wxSTB_SIZEGRIP style and the window it is attached to must be resizable // and not maximized bool ShowsSizeGrip() const; diff --git a/Externals/wxWidgets3/include/wx/generic/tabg.h b/Externals/wxWidgets3/include/wx/generic/tabg.h index e7f07fcbf5..ea21a32a6d 100644 --- a/Externals/wxWidgets3/include/wx/generic/tabg.h +++ b/Externals/wxWidgets3/include/wx/generic/tabg.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: tabg.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: tabg.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -130,7 +130,7 @@ public: // Called when a tab is activated virtual void OnTabActivate(int activateId, int deactivateId); // Allows vetoing - virtual bool OnTabPreActivate(int WXUNUSED(activateId), int WXUNUSED(deactivateId) ) { return true; }; + virtual bool OnTabPreActivate(int WXUNUSED(activateId), int WXUNUSED(deactivateId) ) { return true; } // Allows use of application-supplied wxTabControl classes. virtual wxTabControl *OnCreateTabControl(void) { return new wxTabControl(this); } diff --git a/Externals/wxWidgets3/include/wx/generic/timectrl.h b/Externals/wxWidgets3/include/wx/generic/timectrl.h new file mode 100644 index 0000000000..c04ab8f254 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/generic/timectrl.h @@ -0,0 +1,70 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/generic/timectrl.h +// Purpose: Generic implementation of wxTimePickerCtrl. +// Author: Paul Breen, Vadim Zeitlin +// Created: 2011-09-22 +// RCS-ID: $Id: timectrl.h 69489 2011-10-20 16:45:48Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_GENERIC_TIMECTRL_H_ +#define _WX_GENERIC_TIMECTRL_H_ + +#include "wx/containr.h" +#include "wx/compositewin.h" + +class WXDLLIMPEXP_ADV wxTimePickerCtrlGeneric + : public wxCompositeWindow< wxNavigationEnabled > +{ +public: + typedef wxCompositeWindow< wxNavigationEnabled > Base; + + // Creating the control. + wxTimePickerCtrlGeneric() { Init(); } + virtual ~wxTimePickerCtrlGeneric(); + wxTimePickerCtrlGeneric(wxWindow *parent, + wxWindowID id, + const wxDateTime& date = wxDefaultDateTime, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTP_DEFAULT, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxTimePickerCtrlNameStr) + { + Init(); + + (void)Create(parent, id, date, pos, size, style, validator, name); + } + + bool Create(wxWindow *parent, + wxWindowID id, + const wxDateTime& date = wxDefaultDateTime, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTP_DEFAULT, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxTimePickerCtrlNameStr); + + // Implement pure virtual wxTimePickerCtrlBase methods. + virtual void SetValue(const wxDateTime& date); + virtual wxDateTime GetValue() const; + +protected: + virtual wxSize DoGetBestSize() const; + + virtual void DoMoveWindow(int x, int y, int width, int height); + +private: + void Init(); + + // Return the list of the windows composing this one. + virtual wxWindowList GetCompositeWindowParts() const; + + // Implementation data. + class wxTimePickerGenericImpl* m_impl; + + wxDECLARE_NO_COPY_CLASS(wxTimePickerCtrlGeneric); +}; + +#endif // _WX_GENERIC_TIMECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/geometry.h b/Externals/wxWidgets3/include/wx/geometry.h index 5ece43eb50..d8981c5756 100644 --- a/Externals/wxWidgets3/include/wx/geometry.h +++ b/Externals/wxWidgets3/include/wx/geometry.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 08/05/99 -// RCS-ID: $Id: geometry.h 59019 2009-02-19 07:36:27Z PC $ +// RCS-ID: $Id: geometry.h 70493 2012-01-31 19:39:43Z VZ $ // Copyright: (c) 1999 Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -88,12 +88,9 @@ inline wxPoint2DInt operator+(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2) inline wxPoint2DInt operator-(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2); inline wxPoint2DInt operator*(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2); inline wxPoint2DInt operator*(wxInt32 n , const wxPoint2DInt& pt); -inline wxPoint2DInt operator*(wxInt32 n , const wxPoint2DInt& pt); -inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxInt32 n); inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxInt32 n); inline wxPoint2DInt operator/(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2); inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxInt32 n); -inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxInt32 n); inline wxPoint2DInt::wxPoint2DInt() { @@ -534,8 +531,8 @@ public: inline wxSize GetSize() { return wxSize((int) m_width, (int) m_height); } - // for the edge and corner accessors there are two setters conterparts, the Set.. functions keep the other corners at their - // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners apropriately + // for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their + // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately inline wxDouble GetLeft() const { return m_x; } inline void SetLeft( wxDouble n ) { m_width += m_x - n; m_x = n; } @@ -661,8 +658,8 @@ public: inline wxPoint2DInt GetPosition() { return wxPoint2DInt(m_x, m_y); } inline wxSize GetSize() { return wxSize(m_width, m_height); } - // for the edge and corner accessors there are two setters conterparts, the Set.. functions keep the other corners at their - // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners apropriately + // for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their + // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately inline wxInt32 GetLeft() const { return m_x; } inline void SetLeft( wxInt32 n ) { m_width += m_x - n; m_x = n; } diff --git a/Externals/wxWidgets3/include/wx/glcanvas.h b/Externals/wxWidgets3/include/wx/glcanvas.h index b45a96ffd6..c0ae3dbdf9 100644 --- a/Externals/wxWidgets3/include/wx/glcanvas.h +++ b/Externals/wxWidgets3/include/wx/glcanvas.h @@ -5,7 +5,7 @@ // Modified by: // Created: // Copyright: (c) Julian Smart -// RCS-ID: $Id: glcanvas.h 66088 2010-11-10 13:52:04Z VZ $ +// RCS-ID: $Id: glcanvas.h 70165 2011-12-29 14:42:13Z SN $ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -49,7 +49,7 @@ enum WX_GL_MIN_ACCUM_BLUE, // use blue buffer with most bits (> MIN_ACCUM_BLUE bits) WX_GL_MIN_ACCUM_ALPHA, // use alpha buffer with most bits (> MIN_ACCUM_ALPHA bits) WX_GL_SAMPLE_BUFFERS, // 1 for multisampling support (antialiasing) - WX_GL_SAMPLES // 4 for 2x2 antialising supersampling on most graphics cards + WX_GL_SAMPLES // 4 for 2x2 antialiasing supersampling on most graphics cards }; #define wxGLCanvasName wxT("GLCanvas") @@ -143,7 +143,7 @@ public: #ifdef __WXUNIVERSAL__ // resolve the conflict with wxWindowUniv::SetCurrent() - virtual bool SetCurrent(bool doit) { return wxWindow::SetCurrent(doit); }; + virtual bool SetCurrent(bool doit) { return wxWindow::SetCurrent(doit); } #endif protected: diff --git a/Externals/wxWidgets3/include/wx/graphics.h b/Externals/wxWidgets3/include/wx/graphics.h index 64b62bd7d7..0b2420faa8 100644 --- a/Externals/wxWidgets3/include/wx/graphics.h +++ b/Externals/wxWidgets3/include/wx/graphics.h @@ -5,7 +5,7 @@ // Modified by: // Created: // Copyright: (c) Stefan Csomor -// RCS-ID: $Id: graphics.h 66514 2011-01-01 11:10:35Z SC $ +// RCS-ID: $Id: graphics.h 69485 2011-10-20 04:49:12Z RD $ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,12 +19,27 @@ #include "wx/geometry.h" #include "wx/dynarray.h" #include "wx/dc.h" +#include "wx/image.h" #include "wx/vector.h" enum wxAntialiasMode { wxANTIALIAS_NONE, // should be 0 - wxANTIALIAS_DEFAULT, + wxANTIALIAS_DEFAULT +}; + +enum wxInterpolationQuality +{ + // default interpolation + wxINTERPOLATION_DEFAULT, + // no interpolation + wxINTERPOLATION_NONE, + // fast interpolation, suited for interactivity + wxINTERPOLATION_FAST, + // better quality + wxINTERPOLATION_GOOD, + // best quality, not suited for interactivity + wxINTERPOLATION_BEST }; enum wxCompositionMode @@ -35,6 +50,7 @@ enum wxCompositionMode // classic Porter-Duff compositions // http://keithp.com/~keithp/porterduff/p253-porter.pdf + wxCOMPOSITION_INVALID = -1, /* indicates invalid/unsupported mode */ wxCOMPOSITION_CLEAR, /* R = 0 */ wxCOMPOSITION_SOURCE, /* R = S */ wxCOMPOSITION_OVER, /* R = S + D*(1 - Sa) */ @@ -50,7 +66,7 @@ enum wxCompositionMode wxCOMPOSITION_XOR, /* R = S*(1 - Da) + D*(1 - Sa) */ // mathematical compositions - wxCOMPOSITION_ADD, /* R = S + D */ + wxCOMPOSITION_ADD /* R = S + D */ }; class WXDLLIMPEXP_FWD_CORE wxWindowDC; @@ -151,6 +167,14 @@ class WXDLLIMPEXP_CORE wxGraphicsBitmap : public wxGraphicsObject public: wxGraphicsBitmap() {} virtual ~wxGraphicsBitmap() {} + + // Convert bitmap to wxImage: this is more efficient than converting to + // wxBitmap first and then to wxImage and also works without X server + // connection under Unix that wxBitmap requires. +#if wxUSE_IMAGE + wxImage ConvertToImage() const; +#endif // wxUSE_IMAGE + private: DECLARE_DYNAMIC_CLASS(wxGraphicsBitmap) }; @@ -410,6 +434,13 @@ public: static wxGraphicsContext* Create( wxWindow* window ); +#if wxUSE_IMAGE + // Create a context for drawing onto a wxImage. The image life time must be + // greater than that of the context itself as when the context is destroyed + // it will copy its contents to the specified image. + static wxGraphicsContext* Create(wxImage& image); +#endif // wxUSE_IMAGE + // create a context that can be used for measuring texts only, no drawing allowed static wxGraphicsContext * Create(); @@ -459,11 +490,18 @@ public: wxDouble xc, wxDouble yc, wxDouble radius, const wxGraphicsGradientStops& stops) const; - // sets the font + // creates a font virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) const; + virtual wxGraphicsFont CreateFont(double sizeInPixels, + const wxString& facename, + int flags = wxFONTFLAG_DEFAULT, + const wxColour& col = *wxBLACK) const; // create a native bitmap representation virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) const; +#if wxUSE_IMAGE + wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) const; +#endif // wxUSE_IMAGE // create a native bitmap representation virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) const; @@ -496,6 +534,12 @@ public: // sets the antialiasing mode, returns true if it supported virtual bool SetAntialiasMode(wxAntialiasMode antialias) = 0; + // returns the current interpolation quality + virtual wxInterpolationQuality GetInterpolationQuality() const { return m_interpolation; } + + // sets the interpolation quality, returns true if it supported + virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation) = 0; + // returns the current compositing operator virtual wxCompositionMode GetCompositionMode() const { return m_composition; } @@ -503,7 +547,13 @@ public: virtual bool SetCompositionMode(wxCompositionMode op) = 0; // returns the size of the graphics context in device coordinates - virtual void GetSize( wxDouble* width, wxDouble* height); + void GetSize(wxDouble* width, wxDouble* height) + { + if ( width ) + *width = m_width; + if ( height ) + *height = m_height; + } // returns the resolution of the graphics context in device points per inch virtual void GetDPI( wxDouble* dpiX, wxDouble* dpiY); @@ -636,14 +686,26 @@ public: // helper to determine if a 0.5 offset should be applied for the drawing operation virtual bool ShouldOffset() const { return false; } - + + // indicates whether the context should try to offset for pixel boundaries, this only makes sense on + // bitmap devices like screen, by default this is turned off + virtual void EnableOffset(bool enable = true); + + void DisableOffset() { EnableOffset(false); } + bool OffsetEnabled() { return m_enableOffset; } + protected: + // These fields must be initialized in the derived class ctors. + wxDouble m_width, + m_height; wxGraphicsPen m_pen; wxGraphicsBrush m_brush; wxGraphicsFont m_font; wxAntialiasMode m_antialias; wxCompositionMode m_composition; + wxInterpolationQuality m_interpolation; + bool m_enableOffset; protected: // implementations of overloaded public functions: we use different names @@ -733,6 +795,10 @@ public: virtual wxGraphicsContext * CreateContext( wxWindow* window ) = 0; +#if wxUSE_IMAGE + virtual wxGraphicsContext * CreateContextFromImage(wxImage& image) = 0; +#endif // wxUSE_IMAGE + // create a context that can be used for measuring texts only, no drawing allowed virtual wxGraphicsContext * CreateMeasuringContext() = 0; @@ -767,9 +833,17 @@ public: // sets the font virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) = 0; + virtual wxGraphicsFont CreateFont(double sizeInPixels, + const wxString& facename, + int flags = wxFONTFLAG_DEFAULT, + const wxColour& col = *wxBLACK) = 0; // create a native bitmap representation virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) = 0; +#if wxUSE_IMAGE + virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) = 0; + virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp) = 0; +#endif // wxUSE_IMAGE // create a graphics bitmap from a native bitmap virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap ) = 0; @@ -782,6 +856,16 @@ private: DECLARE_ABSTRACT_CLASS(wxGraphicsRenderer) }; -#endif + +#if wxUSE_IMAGE +inline +wxImage wxGraphicsBitmap::ConvertToImage() const +{ + wxGraphicsRenderer* renderer = GetRenderer(); + return renderer ? renderer->CreateImageFromBitmap(*this) : wxNullImage; +} +#endif // wxUSE_IMAGE + +#endif // wxUSE_GRAPHICS_CONTEXT #endif // _WX_GRAPHICS_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/animate.h b/Externals/wxWidgets3/include/wx/gtk/animate.h index 7dc5e96b6c..b48fb3a543 100644 --- a/Externals/wxWidgets3/include/wx/gtk/animate.h +++ b/Externals/wxWidgets3/include/wx/gtk/animate.h @@ -4,7 +4,7 @@ // Author: Julian Smart and Guillermo Rodriguez Garcia // Modified by: Francesco Montorsi // Created: 13/8/99 -// RCS-ID: $Id: animate.h 53629 2008-05-17 22:51:52Z VZ $ +// RCS-ID: $Id: animate.h 70520 2012-02-05 22:53:39Z SN $ // Copyright: (c) Julian Smart and Guillermo Rodriguez Garcia // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/Externals/wxWidgets3/include/wx/gtk/anybutton.h b/Externals/wxWidgets3/include/wx/gtk/anybutton.h new file mode 100644 index 0000000000..7dee3e096d --- /dev/null +++ b/Externals/wxWidgets3/include/wx/gtk/anybutton.h @@ -0,0 +1,81 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/gtk/anybutton.h +// Purpose: wxGTK wxAnyButton class declaration +// Author: Robert Roebling +// Created: 1998-05-20 (extracted from button.h) +// Id: $Id: anybutton.h 67931 2011-06-14 13:00:42Z VZ $ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_GTK_ANYBUTTON_H_ +#define _WX_GTK_ANYBUTTON_H_ + +//----------------------------------------------------------------------------- +// wxAnyButton +//----------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase +{ +public: + wxAnyButton() + { + m_isCurrent = + m_isPressed = false; + } + + virtual bool Enable( bool enable = true ); + + // implementation + // -------------- + + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + // called from GTK callbacks: they update the button state and call + // GTKUpdateBitmap() + void GTKMouseEnters(); + void GTKMouseLeaves(); + void GTKPressed(); + void GTKReleased(); + +protected: + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + + virtual wxBitmap DoGetBitmap(State which) const; + virtual void DoSetBitmap(const wxBitmap& bitmap, State which); + virtual void DoSetBitmapPosition(wxDirection dir); + +private: + typedef wxAnyButtonBase base_type; + + // focus event handler: calls GTKUpdateBitmap() + void GTKOnFocus(wxFocusEvent& event); + + // update the bitmap to correspond to the current button state + void GTKUpdateBitmap(); + + // return the current button state from m_isXXX flags (which means that it + // might not correspond to the real current state as e.g. m_isCurrent will + // never be true if we don't have a valid current bitmap) + State GTKGetCurrentState() const; + + // show the given bitmap (must be valid) + void GTKDoShowBitmap(const wxBitmap& bitmap); + + + // the bitmaps for the different state of the buttons, all of them may be + // invalid and the button only shows a bitmap at all if State_Normal bitmap + // is valid + wxBitmap m_bitmaps[State_Max]; + + // true iff mouse is currently over the button + bool m_isCurrent; + + // true iff the button is in pressed state + bool m_isPressed; + + wxDECLARE_NO_COPY_CLASS(wxAnyButton); +}; + +#endif // _WX_GTK_ANYBUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/app.h b/Externals/wxWidgets3/include/wx/gtk/app.h index c7ed113db6..00028aca9d 100644 --- a/Externals/wxWidgets3/include/wx/gtk/app.h +++ b/Externals/wxWidgets3/include/wx/gtk/app.h @@ -2,7 +2,7 @@ // Name: wx/gtk/app.h // Purpose: wxApp definition for wxGTK // Author: Robert Roebling -// Id: $Id: app.h 63091 2010-01-07 18:30:18Z PC $ +// Id: $Id: app.h 69020 2011-09-07 16:56:50Z PC $ // Copyright: (c) 1998 Robert Roebling, Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -75,7 +75,7 @@ private: #if wxUSE_THREADS wxMutex m_idleMutex; #endif - guint m_idleSourceId; + unsigned m_idleSourceId; #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 HildonProgram *m_hildonProgram; diff --git a/Externals/wxWidgets3/include/wx/gtk/assertdlg_gtk.h b/Externals/wxWidgets3/include/wx/gtk/assertdlg_gtk.h index 35b2b82be3..91197215b6 100644 --- a/Externals/wxWidgets3/include/wx/gtk/assertdlg_gtk.h +++ b/Externals/wxWidgets3/include/wx/gtk/assertdlg_gtk.h @@ -2,19 +2,13 @@ // Name: wx/gtk/assertdlg_gtk.h // Purpose: GtkAssertDialog // Author: Francesco Montorsi -// Id: $Id: assertdlg_gtk.h 67254 2011-03-20 00:14:35Z DS $ +// Id: $Id: assertdlg_gtk.h 67338 2011-03-30 05:35:24Z PC $ // Copyright: (c) 2006 Francesco Montorsi // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////// */ -#ifndef __GTK_ASSERTDLG_H__ -#define __GTK_ASSERTDLG_H__ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include +#ifndef _WX_GTK_ASSERTDLG_H_ +#define _WX_GTK_ASSERTDLG_H_ #define GTK_TYPE_ASSERT_DIALOG (gtk_assert_dialog_get_type ()) #define GTK_ASSERT_DIALOG(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_ASSERT_DIALOG, GtkAssertDialog)) @@ -82,10 +76,4 @@ void gtk_assert_dialog_append_stack_frame(GtkAssertDialog *dlg, const gchar *sourcefile, guint line_number); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __GTK_ASSERTDLG_H__ */ - - +#endif /* _WX_GTK_ASSERTDLG_H_ */ diff --git a/Externals/wxWidgets3/include/wx/gtk/bitmap.h b/Externals/wxWidgets3/include/wx/gtk/bitmap.h index c82ef8a1cb..a6e6634320 100644 --- a/Externals/wxWidgets3/include/wx/gtk/bitmap.h +++ b/Externals/wxWidgets3/include/wx/gtk/bitmap.h @@ -2,7 +2,7 @@ // Name: wx/gtk/bitmap.h // Purpose: // Author: Robert Roebling -// RCS-ID: $Id: bitmap.h 63774 2010-03-28 23:20:49Z VZ $ +// RCS-ID: $Id: bitmap.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -30,8 +30,8 @@ public: virtual ~wxMask(); // implementation - GdkBitmap *m_bitmap; - GdkBitmap *GetBitmap() const; + GdkPixmap* m_bitmap; + GdkPixmap* GetBitmap() const; protected: virtual void FreeData(); @@ -94,7 +94,7 @@ public: #if wxUSE_PALETTE wxPalette *GetPalette() const; void SetPalette(const wxPalette& palette); - wxPalette *GetColourMap() const { return GetPalette(); }; + wxPalette *GetColourMap() const { return GetPalette(); } #endif // wxUSE_PALETTE static void InitStandardHandlers(); diff --git a/Externals/wxWidgets3/include/wx/gtk/button.h b/Externals/wxWidgets3/include/wx/gtk/button.h index 9be049b5ef..6b8988ed7e 100644 --- a/Externals/wxWidgets3/include/wx/gtk/button.h +++ b/Externals/wxWidgets3/include/wx/gtk/button.h @@ -2,7 +2,7 @@ // Name: wx/gtk/button.h // Purpose: wxGTK wxButton class declaration // Author: Robert Roebling -// Id: $Id: button.h 67066 2011-02-27 12:48:30Z VZ $ +// Id: $Id: button.h 67931 2011-06-14 13:00:42Z VZ $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,7 +17,7 @@ class WXDLLIMPEXP_CORE wxButton : public wxButtonBase { public: - wxButton() { Init(); } + wxButton() {} wxButton(wxWindow *parent, wxWindowID id, const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, @@ -25,8 +25,6 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr) { - Init(); - Create(parent, id, label, pos, size, style, validator, name); } @@ -39,7 +37,6 @@ public: virtual wxWindow *SetDefault(); virtual void SetLabel( const wxString &label ); - virtual bool Enable( bool enable = true ); // implementation // -------------- @@ -61,12 +58,6 @@ protected: virtual wxSize DoGetBestSize() const; virtual void DoApplyWidgetStyle(GtkRcStyle *style); - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - - virtual wxBitmap DoGetBitmap(State which) const; - virtual void DoSetBitmap(const wxBitmap& bitmap, State which); - virtual void DoSetBitmapPosition(wxDirection dir); - #if wxUSE_MARKUP virtual bool DoSetLabelMarkup(const wxString& markup); #endif // wxUSE_MARKUP @@ -74,42 +65,9 @@ protected: private: typedef wxButtonBase base_type; - // common part of all ctors - void Init() - { - m_isCurrent = - m_isPressed = false; - } - - // focus event handler: calls GTKUpdateBitmap() - void GTKOnFocus(wxFocusEvent& event); - - // update the bitmap to correspond to the current button state - void GTKUpdateBitmap(); - - // return the current button state from m_isXXX flags (which means that it - // might not correspond to the real current state as e.g. m_isCurrent will - // never be true if we don't have a valid current bitmap) - State GTKGetCurrentState() const; - - // show the given bitmap (must be valid) - void GTKDoShowBitmap(const wxBitmap& bitmap); - // Return the GtkLabel used by this button. GtkLabel *GTKGetLabel() const; - - // the bitmaps for the different state of the buttons, all of them may be - // invalid and the button only shows a bitmap at all if State_Normal bitmap - // is valid - wxBitmap m_bitmaps[State_Max]; - - // true iff mouse is currently over the button - bool m_isCurrent; - - // true iff the button is in pressed state - bool m_isPressed; - DECLARE_DYNAMIC_CLASS(wxButton) }; diff --git a/Externals/wxWidgets3/include/wx/gtk/calctrl.h b/Externals/wxWidgets3/include/wx/gtk/calctrl.h index 9b2a10d1df..a0cab6253f 100644 --- a/Externals/wxWidgets3/include/wx/gtk/calctrl.h +++ b/Externals/wxWidgets3/include/wx/gtk/calctrl.h @@ -2,7 +2,7 @@ // Name: wx/gtk/calctrl.h // Purpose: wxGtkCalendarCtrl control // Author: Marcin Wojdyr -// RCS-ID: $Id: calctrl.h 58757 2009-02-08 11:45:59Z VZ $ +// RCS-ID: $Id: calctrl.h 67987 2011-06-19 22:46:36Z VZ $ // Copyright: (C) 2008 Marcin Wojdyr // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -38,15 +38,31 @@ public: virtual bool SetDate(const wxDateTime& date); virtual wxDateTime GetDate() const; + virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime, + const wxDateTime& upperdate = wxDefaultDateTime); + virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const; + virtual bool EnableMonthChange(bool enable = true); virtual void Mark(size_t day, bool mark); // implementation // -------------- - wxDateTime m_selectedDate; + + void GTKGenerateEvent(wxEventType type); private: + bool IsInValidRange(const wxDateTime& dt) const; + + // Range of the dates that can be selected by user, either or both may be + // invalid to indicate that no corresponding restriction is set. + wxDateTime m_validStart, + m_validEnd; + + // Last known selected date, may be different from the real selection in + // the control while a handler for day-selected is running. + wxDateTime m_selectedDate; + DECLARE_DYNAMIC_CLASS(wxGtkCalendarCtrl) wxDECLARE_NO_COPY_CLASS(wxGtkCalendarCtrl); }; diff --git a/Externals/wxWidgets3/include/wx/gtk/combobox.h b/Externals/wxWidgets3/include/wx/gtk/combobox.h index 4af492976f..87154df510 100644 --- a/Externals/wxWidgets3/include/wx/gtk/combobox.h +++ b/Externals/wxWidgets3/include/wx/gtk/combobox.h @@ -3,7 +3,7 @@ // Purpose: // Author: Robert Roebling // Created: 01/02/97 -// Id: $Id: combobox.h 65324 2010-08-16 17:48:28Z RR $ +// Id: $Id: combobox.h 70880 2012-03-11 23:55:19Z VZ $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -88,6 +88,9 @@ public: { return wxItemContainer::GetStringSelection(); } + + virtual void SetString(unsigned int n, const wxString& string); + virtual void Popup(); virtual void Dismiss(); @@ -97,7 +100,9 @@ public: wxItemContainer::Clear(); } - bool IsEmpty() const { return wxItemContainer::IsEmpty(); } + // See wxComboBoxBase discussion of IsEmpty(). + bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } + bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); } void OnChar( wxKeyEvent &event ); diff --git a/Externals/wxWidgets3/include/wx/gtk/control.h b/Externals/wxWidgets3/include/wx/gtk/control.h index ad55168658..3d00b42278 100644 --- a/Externals/wxWidgets3/include/wx/gtk/control.h +++ b/Externals/wxWidgets3/include/wx/gtk/control.h @@ -2,7 +2,7 @@ // Name: wx/gtk/control.h // Purpose: // Author: Robert Roebling -// Id: $Id: control.h 67254 2011-03-20 00:14:35Z DS $ +// Id: $Id: control.h 70714 2012-02-27 17:49:33Z PC $ // Copyright: (c) 1998 Robert Roebling, Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -20,7 +20,7 @@ typedef struct _GtkFrame GtkFrame; // C-linkage function pointer types for GetDefaultAttributesFromGTKWidget extern "C" { typedef GtkWidget* (*wxGtkWidgetNew_t)(void); - typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const gchar*); + typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const char*); typedef GtkWidget* (*wxGtkWidgetNewFromAdj_t)(GtkAdjustment*); } @@ -75,20 +75,20 @@ protected: static wxVisualAttributes GetDefaultAttributesFromGTKWidget(GtkWidget* widget, bool useBase = false, - int state = -1); + int state = 0); static wxVisualAttributes GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t, bool useBase = false, - int state = -1); + int state = 0); static wxVisualAttributes GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t, bool useBase = false, - int state = -1); + int state = 0); static wxVisualAttributes GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t, bool useBase = false, - int state = -1); + int state = 0); // Widgets that use the style->base colour for the BG colour should // override this and return true. diff --git a/Externals/wxWidgets3/include/wx/gtk/dataview.h b/Externals/wxWidgets3/include/wx/gtk/dataview.h index 5a82a93625..75463bd02d 100644 --- a/Externals/wxWidgets3/include/wx/gtk/dataview.h +++ b/Externals/wxWidgets3/include/wx/gtk/dataview.h @@ -2,7 +2,7 @@ // Name: wx/gtk/dataview.h // Purpose: wxDataViewCtrl GTK+2 implementation header // Author: Robert Roebling -// Id: $Id: dataview.h 65562 2010-09-17 19:07:02Z RR $ +// Id: $Id: dataview.h 70377 2012-01-17 14:05:17Z VS $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -44,9 +44,8 @@ public: virtual void SetSortable( bool sortable ); virtual void SetSortOrder( bool ascending ); - virtual void SetAsSortKey(bool sort = true); - virtual void SetResizeable( bool resizeable ); + virtual void SetResizeable( bool resizable ); virtual void SetHidden( bool hidden ); virtual void SetMinWidth( int minWidth ); @@ -76,8 +75,7 @@ public: virtual int GetFlags() const { return GetFromIndividualFlags(); } // implementation - GtkWidget* GetGtkHandle() { return m_column; } - GtkWidget* GetConstGtkHandle() const { return m_column; } + GtkWidget* GetGtkHandle() const { return m_column; } private: // holds the GTK handle @@ -143,7 +141,7 @@ public: virtual wxDataViewColumn *GetSortingColumn() const; - virtual wxDataViewItem GetSelection() const; + virtual int GetSelectedItemsCount() const; virtual int GetSelections( wxDataViewItemArray & sel ) const; virtual void SetSelections( const wxDataViewItemArray & sel ); virtual void Select( const wxDataViewItem & item ); @@ -160,6 +158,10 @@ public: virtual wxRect GetItemRect( const wxDataViewItem &item, const wxDataViewColumn *column = NULL ) const; + virtual bool SetRowHeight( int rowHeight ); + + virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column); + virtual void Expand( const wxDataViewItem & item ); virtual void Collapse( const wxDataViewItem & item ); virtual bool IsExpanded( const wxDataViewItem & item ) const; @@ -167,6 +169,8 @@ public: virtual bool EnableDragSource( const wxDataFormat &format ); virtual bool EnableDropTarget( const wxDataFormat &format ); + virtual wxDataViewColumn *GetCurrentColumn() const; + static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -181,6 +185,8 @@ public: virtual void OnInternalIdle(); + int GTKGetUniformRowHeight() const { return m_uniformRowHeight; } + protected: virtual void DoSetExpanderColumn(); virtual void DoSetIndent(); @@ -193,6 +199,12 @@ private: virtual wxDataViewItem DoGetCurrentItem() const; virtual void DoSetCurrentItem(const wxDataViewItem& item); + // Return wxDataViewColumn matching the given GtkTreeViewColumn. + // + // If the input argument is NULL, return NULL too. Otherwise we must find + // the matching column and assert if we didn't. + wxDataViewColumn* FromGTKColumn(GtkTreeViewColumn *gtk_col) const; + friend class wxDataViewCtrlDCImpl; friend class wxDataViewColumn; friend class wxDataViewCtrlInternal; @@ -202,6 +214,11 @@ private: wxDataViewColumnList m_cols; wxDataViewItem m_ensureVisibleDefered; + // By default this is set to -1 and the height of the rows is determined by + // GetRect() methods of the renderers but this can be set to a positive + // value to force the height of all rows to the given value. + int m_uniformRowHeight; + virtual void AddChildGTK(wxWindowGTK* child); void GtkEnableSelectionEvents(); void GtkDisableSelectionEvents(); diff --git a/Externals/wxWidgets3/include/wx/gtk/dc.h b/Externals/wxWidgets3/include/wx/gtk/dc.h index 0d00acbd15..3a2cc8afdc 100644 --- a/Externals/wxWidgets3/include/wx/gtk/dc.h +++ b/Externals/wxWidgets3/include/wx/gtk/dc.h @@ -2,7 +2,7 @@ // Name: wx/gtk/dc.h // Purpose: // Author: Robert Roebling -// Id: $Id: dc.h 50547 2007-12-06 16:22:00Z PC $ +// Id: $Id: dc.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -23,7 +23,7 @@ public: virtual ~wxGTKDCImpl(); #if wxUSE_PALETTE - void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }; + void SetColourMap( const wxPalette& palette ) { SetPalette(palette); } #endif // wxUSE_PALETTE // Resolution in pixels per logical inch diff --git a/Externals/wxWidgets3/include/wx/gtk/dirdlg.h b/Externals/wxWidgets3/include/wx/gtk/dirdlg.h index ad969b56e9..78e8c02a96 100644 --- a/Externals/wxWidgets3/include/wx/gtk/dirdlg.h +++ b/Externals/wxWidgets3/include/wx/gtk/dirdlg.h @@ -2,7 +2,7 @@ // Name: wx/gtk/dirdlg.h // Purpose: wxDirDialog // Author: Francesco Montorsi -// Id: $Id: dirdlg.h 67254 2011-03-20 00:14:35Z DS $ +// Id: $Id: dirdlg.h 70898 2012-03-14 12:32:27Z VZ $ // Copyright: (c) 2006 Francesco Montorsi // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -26,7 +26,13 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxString& name = wxDirDialogNameStr); - + bool Create(wxWindow *parent, + const wxString& message = wxDirSelectorPromptStr, + const wxString& defaultPath = wxEmptyString, + long style = wxDD_DEFAULT_STYLE, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + const wxString& name = wxDirDialogNameStr); virtual ~wxDirDialog() { } diff --git a/Externals/wxWidgets3/include/wx/gtk/dnd.h b/Externals/wxWidgets3/include/wx/gtk/dnd.h index 74cdd71bc1..f7725017b5 100644 --- a/Externals/wxWidgets3/include/wx/gtk/dnd.h +++ b/Externals/wxWidgets3/include/wx/gtk/dnd.h @@ -2,7 +2,7 @@ // Name: wx/gtk/dnd.h // Purpose: declaration of the wxDropTarget class // Author: Robert Roebling -// RCS-ID: $Id: dnd.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: dnd.h 69020 2011-09-07 16:56:50Z PC $ // Copyright: (c) 1998 Vadim Zeitlin, Robert Roebling // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -50,13 +50,13 @@ public: GdkDragContext *m_dragContext; GtkWidget *m_dragWidget; GtkSelectionData *m_dragData; - guint m_dragTime; + unsigned m_dragTime; bool m_firstMotion; // gdk has no "gdk_drag_enter" event void GTKSetDragContext( GdkDragContext *dc ) { m_dragContext = dc; } void GTKSetDragWidget( GtkWidget *w ) { m_dragWidget = w; } void GTKSetDragData( GtkSelectionData *sd ) { m_dragData = sd; } - void GTKSetDragTime( guint time ) { m_dragTime = time; } + void GTKSetDragTime(unsigned time) { m_dragTime = time; } }; //------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/include/wx/gtk/dvrenderer.h b/Externals/wxWidgets3/include/wx/gtk/dvrenderer.h index 195360fdf7..a8a75dc4fd 100644 --- a/Externals/wxWidgets3/include/wx/gtk/dvrenderer.h +++ b/Externals/wxWidgets3/include/wx/gtk/dvrenderer.h @@ -3,7 +3,7 @@ // Purpose: wxDataViewRenderer for GTK wxDataViewCtrl implementation // Author: Robert Roebling, Vadim Zeitlin // Created: 2009-11-07 (extracted from wx/gtk/dataview.h) -// RCS-ID: $Id: dvrenderer.h 66404 2010-12-19 19:43:46Z RR $ +// RCS-ID: $Id: dvrenderer.h 69020 2011-09-07 16:56:50Z PC $ // Copyright: (c) 2006 Robert Roebling // (c) 2009 Vadim Zeitlin // Licence: wxWindows licence @@ -48,11 +48,11 @@ public: // // it validates the new value and notifies the model about the change by // calling GtkOnCellChanged() if it was accepted - virtual void GtkOnTextEdited(const gchar *itempath, const wxString& value); + virtual void GtkOnTextEdited(const char *itempath, const wxString& value); GtkCellRenderer* GetGtkHandle() { return m_renderer; } void GtkInitHandlers(); - void GtkUpdateAlignment(); + void GtkUpdateAlignment() { GtkApplyAlignment(m_renderer); } // should be overridden to return true if the renderer supports properties // corresponding to wxDataViewItemAttr field, see wxGtkTreeCellDataFunc() @@ -85,6 +85,9 @@ protected: const wxDataViewItem& item, unsigned col); + // Apply our effective alignment (i.e. m_alignment if specified or the + // associated column alignment by default) to the given renderer. + void GtkApplyAlignment(GtkCellRenderer *renderer); GtkCellRenderer *m_renderer; int m_alignment; diff --git a/Externals/wxWidgets3/include/wx/gtk/dvrenderers.h b/Externals/wxWidgets3/include/wx/gtk/dvrenderers.h index 2199a7e851..95b84d416b 100644 --- a/Externals/wxWidgets3/include/wx/gtk/dvrenderers.h +++ b/Externals/wxWidgets3/include/wx/gtk/dvrenderers.h @@ -3,7 +3,7 @@ // Purpose: All GTK wxDataViewCtrl renderer classes // Author: Robert Roebling, Vadim Zeitlin // Created: 2009-11-07 (extracted from wx/gtk/dataview.h) -// RCS-ID: $Id: dvrenderers.h 67120 2011-03-03 17:51:52Z PC $ +// RCS-ID: $Id: dvrenderers.h 70300 2012-01-09 06:31:07Z PC $ // Copyright: (c) 2006 Robert Roebling // (c) 2009 Vadim Zeitlin // Licence: wxWindows licence @@ -117,18 +117,12 @@ public: wxDC *dc, int state); + struct GTKRenderParams; + // store GTK render call parameters for possible later use - void GTKStashRenderParams(GdkWindow *window, - GtkWidget *widget, - GdkRectangle *background_area, - GdkRectangle *expose_area, - int flags) + void GTKSetRenderParams(GTKRenderParams* renderParams) { - m_renderParams.window = window; - m_renderParams.widget = widget; - m_renderParams.background_area = background_area; - m_renderParams.expose_area = expose_area; - m_renderParams.flags = flags; + m_renderParams = renderParams; } // we may or not support attributes, as we don't know it, return true to @@ -147,20 +141,17 @@ protected: bool Init(wxDataViewCellMode mode, int align); private: + // Called from GtkGetTextRenderer() to really create the renderer if + // necessary. + void GtkInitTextRenderer(); + wxDC *m_dc; GtkCellRendererText *m_text_renderer; // parameters of the original render() call stored so that we could pass // them forward to m_text_renderer if our RenderText() is called - struct GTKRenderParams - { - GdkWindow *window; - GtkWidget *widget; - GdkRectangle *background_area; - GdkRectangle *expose_area; - int flags; - } m_renderParams; + GTKRenderParams* m_renderParams; DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer) }; @@ -185,9 +176,17 @@ public: virtual wxSize GetSize() const; private: + void GTKSetLabel(); + wxString m_label; int m_value; +#if !wxUSE_UNICODE + // Flag used to indicate that we need to set the label because we were + // unable to do it in the ctor (see comments there). + bool m_needsToSetLabel; +#endif // !wxUSE_UNICODE + protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer) }; @@ -223,34 +222,6 @@ private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer) }; -// --------------------------------------------------------- -// wxDataViewDateRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewDateRenderer: public wxDataViewCustomRenderer -{ -public: - wxDataViewDateRenderer( const wxString &varianttype = "datetime", - wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, - int align = wxDVR_DEFAULT_ALIGNMENT ); - - bool SetValue( const wxVariant &value ); - bool GetValue( wxVariant &value ) const; - - virtual bool Render( wxRect cell, wxDC *dc, int state ); - virtual wxSize GetSize() const; - virtual bool Activate( const wxRect& cell, - wxDataViewModel *model, - const wxDataViewItem &item, - unsigned int col ); - -private: - wxDateTime m_date; - -protected: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer) -}; - // ------------------------------------- // wxDataViewChoiceRenderer // ------------------------------------- @@ -291,7 +262,7 @@ public: virtual bool GetValue( wxVariant &value ) const; private: - virtual void GtkOnTextEdited(const gchar *itempath, const wxString& str); + virtual void GtkOnTextEdited(const char *itempath, const wxString& str); }; diff --git a/Externals/wxWidgets3/include/wx/gtk/filectrl.h b/Externals/wxWidgets3/include/wx/gtk/filectrl.h index 43c3a76b97..1551923ec3 100644 --- a/Externals/wxWidgets3/include/wx/gtk/filectrl.h +++ b/Externals/wxWidgets3/include/wx/gtk/filectrl.h @@ -4,7 +4,7 @@ // Author: Diaa M. Sami // Modified by: // Created: Aug-10-2007 -// RCS-ID: $Id: filectrl.h 64429 2010-05-29 10:35:47Z VZ $ +// RCS-ID: $Id: filectrl.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) Diaa M. Sami // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -88,7 +88,7 @@ public: Create( parent, id, defaultDirectory, defaultFilename, wildCard, style, pos, size, name ); } - virtual ~wxGtkFileCtrl() {}; + virtual ~wxGtkFileCtrl() {} void Init(); bool Create( wxWindow *parent, diff --git a/Externals/wxWidgets3/include/wx/gtk/filedlg.h b/Externals/wxWidgets3/include/wx/gtk/filedlg.h index 7afb9b1745..667e94a359 100644 --- a/Externals/wxWidgets3/include/wx/gtk/filedlg.h +++ b/Externals/wxWidgets3/include/wx/gtk/filedlg.h @@ -2,7 +2,7 @@ // Name: wx/gtk/filedlg.h // Purpose: // Author: Robert Roebling -// Id: $Id: filedlg.h 67254 2011-03-20 00:14:35Z DS $ +// Id: $Id: filedlg.h 70898 2012-03-14 12:32:27Z VZ $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -30,6 +30,15 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, const wxString& name = wxFileDialogNameStr); + bool Create(wxWindow *parent, + const wxString& message = wxFileSelectorPromptStr, + const wxString& defaultDir = wxEmptyString, + const wxString& defaultFile = wxEmptyString, + const wxString& wildCard = wxFileSelectorDefaultWildcardStr, + long style = wxFD_DEFAULT_STYLE, + const wxPoint& pos = wxDefaultPosition, + const wxSize& sz = wxDefaultSize, + const wxString& name = wxFileDialogNameStr); virtual ~wxFileDialog(); virtual wxString GetPath() const; diff --git a/Externals/wxWidgets3/include/wx/gtk/filepicker.h b/Externals/wxWidgets3/include/wx/gtk/filepicker.h index 782af3d680..ad6be66083 100644 --- a/Externals/wxWidgets3/include/wx/gtk/filepicker.h +++ b/Externals/wxWidgets3/include/wx/gtk/filepicker.h @@ -5,7 +5,7 @@ // Modified by: // Created: 14/4/2006 // Copyright: (c) Francesco Montorsi -// RCS-ID: $Id: filepicker.h 63690 2010-03-16 00:23:57Z VZ $ +// RCS-ID: $Id: filepicker.h 70043 2011-12-18 12:34:47Z VZ $ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -101,6 +101,7 @@ public: // overrides void OnDialogOK(wxCommandEvent &); virtual void SetPath(const wxString &str); + virtual void SetInitialDirectory(const wxString& dir); // see macro defined above FILEDIRBTN_OVERRIDES @@ -171,6 +172,7 @@ public: // overrides } virtual void SetPath(const wxString &str); + virtual void SetInitialDirectory(const wxString& dir); // see macro defined above FILEDIRBTN_OVERRIDES diff --git a/Externals/wxWidgets3/include/wx/gtk/font.h b/Externals/wxWidgets3/include/wx/gtk/font.h index b14fb7e921..53bc2d6441 100644 --- a/Externals/wxWidgets3/include/wx/gtk/font.h +++ b/Externals/wxWidgets3/include/wx/gtk/font.h @@ -2,7 +2,7 @@ // Name: wx/gtk/font.h // Purpose: // Author: Robert Roebling -// Id: $Id: font.h 67254 2011-03-20 00:14:35Z DS $ +// Id: $Id: font.h 70476 2012-01-29 08:14:34Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -63,6 +63,12 @@ public: SetPixelSize(pixelSize); } + wxFont(int pointSize, + wxFontFamily family, + int flags = wxFONTFLAG_DEFAULT, + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT); + bool Create(int size, wxFontFamily family, wxFontStyle style, @@ -82,6 +88,7 @@ public: virtual wxFontWeight GetWeight() const; virtual wxString GetFaceName() const; virtual bool GetUnderlined() const; + virtual bool GetStrikethrough() const; virtual wxFontEncoding GetEncoding() const; virtual const wxNativeFontInfo *GetNativeFontInfo() const; virtual bool IsFixedWidth() const; @@ -92,10 +99,18 @@ public: virtual void SetWeight(wxFontWeight weight); virtual bool SetFaceName( const wxString& faceName ); virtual void SetUnderlined( bool underlined ); + virtual void SetStrikethrough(bool strikethrough); virtual void SetEncoding(wxFontEncoding encoding); wxDECLARE_COMMON_FONT_METHODS(); + // Set Pango attributes in the specified layout. Currently only + // underlined and strike-through attributes are handled by this function. + // + // If neither of them is specified, returns false, otherwise sets up the + // attributes and returns true. + bool GTKSetPangoAttrs(PangoLayout* layout) const; + // implementation from now on void Unshare(); diff --git a/Externals/wxWidgets3/include/wx/gtk/fontpicker.h b/Externals/wxWidgets3/include/wx/gtk/fontpicker.h index 27be02dfbd..505090e762 100644 --- a/Externals/wxWidgets3/include/wx/gtk/fontpicker.h +++ b/Externals/wxWidgets3/include/wx/gtk/fontpicker.h @@ -5,7 +5,7 @@ // Modified by: // Created: 14/4/2006 // Copyright: (c) Francesco Montorsi -// RCS-ID: $Id: fontpicker.h 49668 2007-11-06 00:32:34Z MR $ +// RCS-ID: $Id: fontpicker.h 69020 2011-09-07 16:56:50Z PC $ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -52,7 +52,7 @@ protected: public: // used by the GTK callback only - void SetNativeFontInfo(const gchar *gtkdescription) + void SetNativeFontInfo(const char *gtkdescription) { m_selectedFont.SetNativeFontInfo(wxString::FromAscii(gtkdescription)); } private: diff --git a/Externals/wxWidgets3/include/wx/gtk/gauge.h b/Externals/wxWidgets3/include/wx/gtk/gauge.h index 1c91c40512..7f065f2657 100644 --- a/Externals/wxWidgets3/include/wx/gtk/gauge.h +++ b/Externals/wxWidgets3/include/wx/gtk/gauge.h @@ -2,7 +2,7 @@ // Name: wx/gtk/gauge.h // Purpose: // Author: Robert Roebling -// Id: $Id: gauge.h 42077 2006-10-17 14:44:52Z ABX $ +// Id: $Id: gauge.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -43,8 +43,8 @@ public: void SetShadowWidth( int WXUNUSED(w) ) { } void SetBezelFace( int WXUNUSED(w) ) { } - int GetShadowWidth() const { return 0; }; - int GetBezelFace() const { return 0; }; + int GetShadowWidth() const { return 0; } + int GetBezelFace() const { return 0; } // determinate mode API void SetRange( int r ); diff --git a/Externals/wxWidgets3/include/wx/gtk/hyperlink.h b/Externals/wxWidgets3/include/wx/gtk/hyperlink.h index a3419bf64c..7fdb40f020 100644 --- a/Externals/wxWidgets3/include/wx/gtk/hyperlink.h +++ b/Externals/wxWidgets3/include/wx/gtk/hyperlink.h @@ -4,13 +4,13 @@ // Author: Francesco Montorsi // Modified by: // Created: 14/2/2007 -// RCS-ID: $Id: hyperlink.h 44647 2007-03-07 22:12:47Z VZ $ +// RCS-ID: $Id: hyperlink.h 67378 2011-04-02 20:43:29Z PC $ // Copyright: (c) 2007 Francesco Montorsi // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKHYPERLINKCTRLH__ -#define __GTKHYPERLINKCTRLH__ +#ifndef _WX_GTKHYPERLINKCTRL_H_ +#define _WX_GTKHYPERLINKCTRL_H_ #include "wx/generic/hyperlink.h" @@ -62,16 +62,12 @@ public: virtual void SetLabel(const wxString &label); protected: - // overridden base class virtuals - - // Returns the best size for the window, which is the size needed - // to display the text label. virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestClientSize() const; virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; -private: DECLARE_DYNAMIC_CLASS(wxHyperlinkCtrl) }; -#endif // __GTKHYPERLINKCTRLH__ +#endif // _WX_GTKHYPERLINKCTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/listbox.h b/Externals/wxWidgets3/include/wx/gtk/listbox.h index 6af95eb831..b2862a935f 100644 --- a/Externals/wxWidgets3/include/wx/gtk/listbox.h +++ b/Externals/wxWidgets3/include/wx/gtk/listbox.h @@ -2,7 +2,7 @@ // Name: wx/gtk/listbox.h // Purpose: wxListBox class declaration // Author: Robert Roebling -// Id: $Id: listbox.h 65936 2010-10-27 23:22:00Z VZ $ +// Id: $Id: listbox.h 67298 2011-03-23 17:36:10Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -82,11 +82,7 @@ public: // implementation from now on - GtkWidget *GetConnectWidget(); - -#if wxUSE_TOOLTIPS - void GTKApplyToolTip( GtkTooltips *tips, const gchar *tip ); -#endif // wxUSE_TOOLTIPS + virtual GtkWidget *GetConnectWidget(); struct _GtkTreeView *m_treeview; struct _GtkListStore *m_liststore; diff --git a/Externals/wxWidgets3/include/wx/gtk/mdi.h b/Externals/wxWidgets3/include/wx/gtk/mdi.h index 43a6a06b7f..6b7b50da20 100644 --- a/Externals/wxWidgets3/include/wx/gtk/mdi.h +++ b/Externals/wxWidgets3/include/wx/gtk/mdi.h @@ -3,7 +3,7 @@ // Purpose: TDI-based MDI implementation for wxGTK // Author: Robert Roebling // Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes -// Id: $Id: mdi.h 59523 2009-03-14 01:24:45Z FM $ +// Id: $Id: mdi.h 69528 2011-10-25 16:56:57Z PC $ // Copyright: (c) 1998 Robert Roebling // (c) 2008 Vadim Zeitlin // Licence: wxWindows licence @@ -118,9 +118,9 @@ public: void OnActivate( wxActivateEvent& event ); void OnMenuHighlight( wxMenuEvent& event ); + virtual void GTKHandleRealized(); wxMenuBar *m_menuBar; - GtkNotebookPage *m_page; bool m_justInserted; private: diff --git a/Externals/wxWidgets3/include/wx/gtk/menu.h b/Externals/wxWidgets3/include/wx/gtk/menu.h index 1c70606a61..25302e3ace 100644 --- a/Externals/wxWidgets3/include/wx/gtk/menu.h +++ b/Externals/wxWidgets3/include/wx/gtk/menu.h @@ -2,7 +2,7 @@ // Name: wx/gtk/menu.h // Purpose: // Author: Robert Roebling -// Id: $Id: menu.h 66180 2010-11-17 05:57:21Z PC $ +// Id: $Id: menu.h 70350 2012-01-15 13:41:17Z VZ $ // Copyright: (c) 1998 Robert Roebling, Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -33,6 +33,7 @@ public: virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const; virtual void EnableTop( size_t pos, bool flag ); + virtual bool IsEnabledTop(size_t pos) const; virtual void SetMenuLabel( size_t pos, const wxString& label ); virtual wxString GetMenuLabel( size_t pos ) const; @@ -51,7 +52,7 @@ public: private: // common part of Append and Insert - bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1); + void GtkAppend(wxMenu* menu, const wxString& title, int pos = -1); void Init(size_t n, wxMenu *menus[], const wxString titles[], long style); @@ -99,9 +100,8 @@ private: void Init(); // common part of Append (if pos == -1) and Insert - bool GtkAppend(wxMenuItem *item, int pos=-1); + void GtkAppend(wxMenuItem* item, int pos = -1); - GtkWidget *m_prevRadio; DECLARE_DYNAMIC_CLASS(wxMenu) }; diff --git a/Externals/wxWidgets3/include/wx/gtk/msgdlg.h b/Externals/wxWidgets3/include/wx/gtk/msgdlg.h index 86489d335b..90cc21da1f 100644 --- a/Externals/wxWidgets3/include/wx/gtk/msgdlg.h +++ b/Externals/wxWidgets3/include/wx/gtk/msgdlg.h @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // Modified by: // Created: 2003/02/28 -// RCS-ID: $Id: msgdlg.h 65348 2010-08-18 22:48:28Z VZ $ +// RCS-ID: $Id: msgdlg.h 68537 2011-08-04 22:53:42Z VZ $ // Copyright: (c) Vaclav Slavik, 2003 // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -40,6 +40,7 @@ private: virtual wxString GetDefaultNoLabel() const; virtual wxString GetDefaultOKLabel() const; virtual wxString GetDefaultCancelLabel() const; + virtual wxString GetDefaultHelpLabel() const; // create the real GTK+ dialog: this is done from ShowModal() to allow // changing the message between constructing the dialog and showing it diff --git a/Externals/wxWidgets3/include/wx/gtk/nonownedwnd.h b/Externals/wxWidgets3/include/wx/gtk/nonownedwnd.h new file mode 100644 index 0000000000..8dcb75a696 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/gtk/nonownedwnd.h @@ -0,0 +1,44 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/gtk/nonownedwnd.h +// Purpose: wxGTK-specific wxNonOwnedWindow declaration. +// Author: Vadim Zeitlin +// Created: 2011-10-12 +// RCS-ID: $Id: nonownedwnd.h 69462 2011-10-18 21:56:52Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_GTK_NONOWNEDWND_H_ +#define _WX_GTK_NONOWNEDWND_H_ + +class wxNonOwnedWindowShapeImpl; + +// ---------------------------------------------------------------------------- +// wxNonOwnedWindow contains code common to wx{Popup,TopLevel}Window in wxGTK. +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase +{ +public: + wxNonOwnedWindow() { m_shapeImpl = NULL; } + virtual ~wxNonOwnedWindow(); + + // Overridden to actually set the shape when the window becomes realized. + virtual void GTKHandleRealized(); + +protected: + virtual bool DoClearShape(); + virtual bool DoSetRegionShape(const wxRegion& region); +#if wxUSE_GRAPHICS_CONTEXT + virtual bool DoSetPathShape(const wxGraphicsPath& path); +#endif // wxUSE_GRAPHICS_CONTEXT + + +private: + // If non-NULL, contains information about custom window shape. + wxNonOwnedWindowShapeImpl* m_shapeImpl; + + wxDECLARE_NO_COPY_CLASS(wxNonOwnedWindow); +}; + +#endif // _WX_GTK_NONOWNEDWND_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/notebook.h b/Externals/wxWidgets3/include/wx/gtk/notebook.h index 266b1b4e1b..50cedf0171 100644 --- a/Externals/wxWidgets3/include/wx/gtk/notebook.h +++ b/Externals/wxWidgets3/include/wx/gtk/notebook.h @@ -3,7 +3,7 @@ // Purpose: wxNotebook class // Author: Robert Roebling // Modified by: -// RCS-ID: $Id: notebook.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: notebook.h 70112 2011-12-24 18:19:26Z VZ $ // Copyright: (c) Julian Smart and Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -68,13 +68,13 @@ public: bool SetPageImage(size_t nPage, int nImage); // control the appearance of the notebook pages - // set the size (the same for all pages) - void SetPageSize(const wxSize& size); // set the padding between tabs (in pixels) void SetPadding(const wxSize& padding); // sets the size of the tabs (assumes all tabs are the same size) void SetTabSize(const wxSize& sz); + // geometry + virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; // operations @@ -89,7 +89,7 @@ public: wxNotebookPage *win, const wxString& strText, bool bSelect = false, - int imageId = -1 ); + int imageId = NO_IMAGE ); // handler for tab navigation // -------------------------- diff --git a/Externals/wxWidgets3/include/wx/gtk/pen.h b/Externals/wxWidgets3/include/wx/gtk/pen.h index 0f32910275..137066611c 100644 --- a/Externals/wxWidgets3/include/wx/gtk/pen.h +++ b/Externals/wxWidgets3/include/wx/gtk/pen.h @@ -2,7 +2,7 @@ // Name: wx/gtk/pen.h // Purpose: // Author: Robert Roebling -// Id: $Id: pen.h 54273 2008-06-17 17:28:26Z VZ $ +// Id: $Id: pen.h 69020 2011-09-07 16:56:50Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -10,7 +10,7 @@ #ifndef _WX_GTK_PEN_H_ #define _WX_GTK_PEN_H_ -typedef gint8 wxGTKDash; +typedef signed char wxGTKDash; //----------------------------------------------------------------------------- // wxPen diff --git a/Externals/wxWidgets3/include/wx/gtk/popupwin.h b/Externals/wxWidgets3/include/wx/gtk/popupwin.h index d71c539128..616ae41618 100644 --- a/Externals/wxWidgets3/include/wx/gtk/popupwin.h +++ b/Externals/wxWidgets3/include/wx/gtk/popupwin.h @@ -3,7 +3,7 @@ // Purpose: // Author: Robert Roebling // Created: -// Id: $Id: popupwin.h 67254 2011-03-20 00:14:35Z DS $ +// Id: $Id: popupwin.h 70739 2012-02-28 17:25:59Z PC $ // Copyright: (c) 2001 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -42,9 +42,6 @@ protected: virtual void DoMoveWindow(int x, int y, int width, int height); -private: - virtual void AddChildGTK(wxWindowGTK* child); - #ifdef __WXUNIVERSAL__ DECLARE_EVENT_TABLE() #endif diff --git a/Externals/wxWidgets3/include/wx/gtk/private.h b/Externals/wxWidgets3/include/wx/gtk/private.h index 86168ca47b..321ba28f3c 100644 --- a/Externals/wxWidgets3/include/wx/gtk/private.h +++ b/Externals/wxWidgets3/include/wx/gtk/private.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 12.03.02 -// RCS-ID: $Id: private.h 63805 2010-03-30 16:14:11Z PC $ +// RCS-ID: $Id: private.h 70475 2012-01-29 08:00:15Z PC $ // Copyright: (c) 2002 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -15,6 +15,7 @@ #include #include "wx/gtk/private/string.h" +#include "wx/gtk/private/gtk2-compat.h" // pango_version_check symbol is quite recent ATM (4/2007)... so we // use our own wrapper which implements a smart trick. @@ -51,13 +52,13 @@ extern const gchar *wx_pango_version_check(int major, int minor, int micro); // helper: use the encoding of the given font if it's valid inline wxCharBuffer wxConvertToGTK(const wxString& s, const wxFont& font) { - return wxConvertToGTK(s, font.Ok() ? font.GetEncoding() + return wxConvertToGTK(s, font.IsOk() ? font.GetEncoding() : wxFONTENCODING_SYSTEM); } inline wxCharBuffer wxConvertFromGTK(const wxString& s, const wxFont& font) { - return wxConvertFromGTK(s, font.Ok() ? font.GetEncoding() + return wxConvertFromGTK(s, font.IsOk() ? font.GetEncoding() : wxFONTENCODING_SYSTEM); } @@ -113,4 +114,3 @@ GtkWidget *GetTreeWidget(); } // wxGTKPrivate #endif // _WX_GTK_PRIVATE_H_ - diff --git a/Externals/wxWidgets3/include/wx/gtk/private/event.h b/Externals/wxWidgets3/include/wx/gtk/private/event.h new file mode 100644 index 0000000000..7c1254fea8 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/gtk/private/event.h @@ -0,0 +1,80 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/gtk/private/event.h +// Purpose: Helper functions for working with GDK and wx events +// Author: Vaclav Slavik +// Created: 2011-10-14 +// RCS-ID: $Id$ +// Copyright: (c) 2011 Vaclav Slavik +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _GTK_PRIVATE_EVENT_H_ +#define _GTK_PRIVATE_EVENT_H_ + +#if !GTK_CHECK_VERSION(2,10,0) + // GTK+ can reliably detect Meta key state only since 2.10 when + // GDK_META_MASK was introduced -- there wasn't any way to detect it + // in older versions. wxGTK used GDK_MOD2_MASK for this purpose, but + // GDK_MOD2_MASK is documented as: + // + // the fifth modifier key (it depends on the modifier mapping of the X + // server which key is interpreted as this modifier) + // + // In other words, it isn't guaranteed to map to Meta. This is a real + // problem: it is common to map NumLock to it (in fact, it's an exception + // if the X server _doesn't_ use it for NumLock). So the old code caused + // wxKeyEvent::MetaDown() to always return true as long as NumLock was on + // on many systems, which broke all applications using + // wxKeyEvent::GetModifiers() to check modifiers state (see e.g. here: + // http://tinyurl.com/56lsk2). + // + // Because of this, it's better to not detect Meta key state at all than + // to detect it incorrectly. Hence the following #define, which causes + // m_metaDown to be always set to false. + #define GDK_META_MASK 0 +#endif + +namespace wxGTKImpl +{ + +// init wxMouseEvent with the info from GdkEventXXX struct +template void InitMouseEvent(wxWindowGTK *win, + wxMouseEvent& event, + T *gdk_event) +{ + event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK) != 0; + event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK) != 0; + event.m_altDown = (gdk_event->state & GDK_MOD1_MASK) != 0; + event.m_metaDown = (gdk_event->state & GDK_META_MASK) != 0; + event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK) != 0; + event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK) != 0; + event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK) != 0; + + // In gdk/win32 VK_XBUTTON1 is translated to GDK_BUTTON4_MASK + // and VK_XBUTTON2 to GDK_BUTTON5_MASK. In x11/gdk buttons 4/5 + // are wheel rotation and buttons 8/9 don't change the state. + event.m_aux1Down = (gdk_event->state & GDK_BUTTON4_MASK) != 0; + event.m_aux2Down = (gdk_event->state & GDK_BUTTON5_MASK) != 0; + + wxPoint pt = win->GetClientAreaOrigin(); + event.m_x = (wxCoord)gdk_event->x - pt.x; + event.m_y = (wxCoord)gdk_event->y - pt.y; + + if ((win->m_wxwindow) && (win->GetLayoutDirection() == wxLayout_RightToLeft)) + { + // origin in the upper right corner + GtkAllocation a; + gtk_widget_get_allocation(win->m_wxwindow, &a); + int window_width = a.width; + event.m_x = window_width - event.m_x; + } + + event.SetEventObject( win ); + event.SetId( win->GetId() ); + event.SetTimestamp( gdk_event->time ); +} + +} // namespace wxGTKImpl + +#endif // _GTK_PRIVATE_EVENT_H_ + diff --git a/Externals/wxWidgets3/include/wx/gtk/private/gtk2-compat.h b/Externals/wxWidgets3/include/wx/gtk/private/gtk2-compat.h new file mode 100644 index 0000000000..fddeaafca9 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/gtk/private/gtk2-compat.h @@ -0,0 +1,376 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/gtk/private/compat.h +// Purpose: Compatibility code for older GTK+ versions +// Author: Vaclav Slavik +// Created: 2011-03-25 +// RCS-ID: $Id$ +// Copyright: (c) 2011 Vaclav Slavik +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_GTK_PRIVATE_COMPAT_H_ +#define _WX_GTK_PRIVATE_COMPAT_H_ + +// ---------------------------------------------------------------------------- +// Implementations of new accessors for older GTK+ versions +// ---------------------------------------------------------------------------- + +// GTK+ deprecated direct access to struct members and some other stuff, +// replacing them with simple accessor functions. These aren't available in +// older versions, though, so we have to provide them for compatibility. +// +// Note: wx_ prefix is used to avoid symbol conflicts at runtime +// +// Note 2: We support building against newer GTK+ version and using an older +// one at runtime, so we must provide our implementations of these +// functions even if GTK_CHECK_VERSION would indicate the function is +// already available in GTK+. + +#if !GTK_CHECK_VERSION(3,0,0) && !(defined(GTK_DISABLE_DEPRECATED) || defined(GSEAL_ENABLE)) + +// ---------------------------------------------------------------------------- +// the following were introduced in GTK+ 2.8 + +static inline GtkWidget* wx_gtk_scrolled_window_get_hscrollbar(GtkScrolledWindow* scrolled_window) +{ + return scrolled_window->hscrollbar; +} +#define gtk_scrolled_window_get_hscrollbar wx_gtk_scrolled_window_get_hscrollbar + +static inline GtkWidget* wx_gtk_scrolled_window_get_vscrollbar(GtkScrolledWindow* scrolled_window) +{ + return scrolled_window->vscrollbar; +} +#define gtk_scrolled_window_get_vscrollbar wx_gtk_scrolled_window_get_vscrollbar + +// ---------------------------------------------------------------------------- +// the following were introduced in GLib 2.10 + +static inline gpointer wx_g_object_ref_sink(gpointer object) +{ + g_object_ref(object); + gtk_object_sink(GTK_OBJECT(object)); + return object; +} +#define g_object_ref_sink wx_g_object_ref_sink + +// ---------------------------------------------------------------------------- +// the following were introduced in GTK+ 2.12 and GtkAboutDialog itself is not +// in 2.4 so skip this if we don't have it. +#if GTK_CHECK_VERSION(2,6,0) + +static inline void wx_gtk_about_dialog_set_program_name(GtkAboutDialog* about, const gchar* name) +{ + gtk_about_dialog_set_name(about, name); +} +#define gtk_about_dialog_set_program_name wx_gtk_about_dialog_set_program_name +#endif // 2.6.0 + +// ---------------------------------------------------------------------------- +// the following were introduced in GTK+ 2.14 + +static inline gdouble wx_gtk_adjustment_get_lower(GtkAdjustment* adjustment) +{ + return adjustment->lower; +} +#define gtk_adjustment_get_lower wx_gtk_adjustment_get_lower + +static inline gdouble wx_gtk_adjustment_get_page_increment(GtkAdjustment* adjustment) +{ + return adjustment->page_increment; +} +#define gtk_adjustment_get_page_increment wx_gtk_adjustment_get_page_increment + +static inline gdouble wx_gtk_adjustment_get_page_size(GtkAdjustment* adjustment) +{ + return adjustment->page_size; +} +#define gtk_adjustment_get_page_size wx_gtk_adjustment_get_page_size + +static inline gdouble wx_gtk_adjustment_get_step_increment(GtkAdjustment* adjustment) +{ + return adjustment->step_increment; +} +#define gtk_adjustment_get_step_increment wx_gtk_adjustment_get_step_increment + +static inline gdouble wx_gtk_adjustment_get_upper(GtkAdjustment* adjustment) +{ + return adjustment->upper; +} +#define gtk_adjustment_get_upper wx_gtk_adjustment_get_upper + +static inline void wx_gtk_adjustment_set_page_size(GtkAdjustment* adjustment, gdouble page_size) +{ + adjustment->page_size = page_size; +} +#define gtk_adjustment_set_page_size wx_gtk_adjustment_set_page_size + +static inline GtkWidget* wx_gtk_color_selection_dialog_get_color_selection(GtkColorSelectionDialog* csd) +{ + return csd->colorsel; +} +#define gtk_color_selection_dialog_get_color_selection wx_gtk_color_selection_dialog_get_color_selection + +static inline GtkWidget* wx_gtk_dialog_get_content_area(GtkDialog* dialog) +{ + return dialog->vbox; +} +#define gtk_dialog_get_content_area wx_gtk_dialog_get_content_area + +static inline GtkWidget* wx_gtk_dialog_get_action_area(GtkDialog* dialog) +{ + return dialog->action_area; +} +#define gtk_dialog_get_action_area wx_gtk_dialog_get_action_area + +static inline guint16 wx_gtk_entry_get_text_length(GtkEntry* entry) +{ + return entry->text_length; +} +#define gtk_entry_get_text_length wx_gtk_entry_get_text_length + +static inline GtkWidget* wx_gtk_font_selection_dialog_get_cancel_button(GtkFontSelectionDialog* fsd) +{ + return fsd->cancel_button; +} +#define gtk_font_selection_dialog_get_cancel_button wx_gtk_font_selection_dialog_get_cancel_button + +static inline GtkWidget* wx_gtk_font_selection_dialog_get_ok_button(GtkFontSelectionDialog* fsd) +{ + return fsd->ok_button; +} +#define gtk_font_selection_dialog_get_ok_button wx_gtk_font_selection_dialog_get_ok_button + +static inline const guchar* wx_gtk_selection_data_get_data(GtkSelectionData* selection_data) +{ + return selection_data->data; +} +#define gtk_selection_data_get_data wx_gtk_selection_data_get_data + +static inline GdkAtom wx_gtk_selection_data_get_data_type(GtkSelectionData* selection_data) +{ + return selection_data->type; +} +#define gtk_selection_data_get_data_type wx_gtk_selection_data_get_data_type + +static inline gint wx_gtk_selection_data_get_format(GtkSelectionData* selection_data) +{ + return selection_data->format; +} +#define gtk_selection_data_get_format wx_gtk_selection_data_get_format + +static inline gint wx_gtk_selection_data_get_length(GtkSelectionData* selection_data) +{ + return selection_data->length; +} +#define gtk_selection_data_get_length wx_gtk_selection_data_get_length + +static inline GdkAtom wx_gtk_selection_data_get_target(GtkSelectionData* selection_data) +{ + return selection_data->target; +} +#define gtk_selection_data_get_target wx_gtk_selection_data_get_target + +static inline GdkWindow* wx_gtk_widget_get_window(GtkWidget* widget) +{ + return widget->window; +} +#define gtk_widget_get_window wx_gtk_widget_get_window + +static inline GtkWidget* wx_gtk_window_get_default_widget(GtkWindow* window) +{ + return window->default_widget; +} +#define gtk_window_get_default_widget wx_gtk_window_get_default_widget + +// ---------------------------------------------------------------------------- +// the following were introduced in GTK+ 2.16 + +static inline GdkAtom wx_gtk_selection_data_get_selection(GtkSelectionData* selection_data) +{ + return selection_data->selection; +} +#define gtk_selection_data_get_selection wx_gtk_selection_data_get_selection + +// ---------------------------------------------------------------------------- +// the following were introduced in GTK+ 2.18 + +static inline void wx_gtk_cell_renderer_get_alignment(GtkCellRenderer* cell, gfloat* xalign, gfloat* yalign) +{ + *xalign = cell->xalign; + *yalign = cell->yalign; +} +#define gtk_cell_renderer_get_alignment wx_gtk_cell_renderer_get_alignment + +static inline void wx_gtk_cell_renderer_get_padding(GtkCellRenderer* cell, gint* xpad, gint* ypad) +{ + *xpad = cell->xpad; + *ypad = cell->ypad; +} +#define gtk_cell_renderer_get_padding wx_gtk_cell_renderer_get_padding + +static inline void wx_gtk_widget_get_allocation(GtkWidget* widget, GtkAllocation* allocation) +{ + *allocation = widget->allocation; +} +#define gtk_widget_get_allocation wx_gtk_widget_get_allocation + +inline gboolean wx_gtk_widget_get_has_window(GtkWidget *widget) +{ + return !GTK_WIDGET_NO_WINDOW(widget); +} +#define gtk_widget_get_has_window wx_gtk_widget_get_has_window + + +inline gboolean wx_gtk_widget_get_has_grab(GtkWidget *widget) +{ + return GTK_WIDGET_HAS_GRAB(widget); +} +#define gtk_widget_get_has_grab wx_gtk_widget_get_has_grab + + +inline gboolean wx_gtk_widget_get_visible(GtkWidget *widget) +{ + return GTK_WIDGET_VISIBLE(widget); +} +#define gtk_widget_get_visible wx_gtk_widget_get_visible + + +inline gboolean wx_gtk_widget_get_sensitive(GtkWidget *widget) +{ + return GTK_WIDGET_SENSITIVE(widget); +} +#define gtk_widget_get_sensitive wx_gtk_widget_get_sensitive + + +inline gboolean wx_gtk_widget_is_drawable(GtkWidget *widget) +{ + return GTK_WIDGET_DRAWABLE(widget); +} +#define gtk_widget_is_drawable wx_gtk_widget_is_drawable + + +inline gboolean wx_gtk_widget_get_can_focus(GtkWidget *widget) +{ + return GTK_WIDGET_CAN_FOCUS(widget); +} +#define gtk_widget_get_can_focus wx_gtk_widget_get_can_focus + +inline void wx_gtk_widget_set_can_focus(GtkWidget *widget, gboolean can) +{ + if ( can ) + GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_FOCUS); + else + GTK_WIDGET_UNSET_FLAGS(widget, GTK_CAN_FOCUS); +} +#define gtk_widget_set_can_focus wx_gtk_widget_set_can_focus + + +inline gboolean wx_gtk_widget_get_can_default(GtkWidget *widget) +{ + return GTK_WIDGET_CAN_DEFAULT(widget); +} +#define gtk_widget_get_can_default wx_gtk_widget_get_can_default + +inline void wx_gtk_widget_set_can_default(GtkWidget *widget, gboolean can) +{ + if ( can ) + GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_DEFAULT); + else + GTK_WIDGET_UNSET_FLAGS(widget, GTK_CAN_DEFAULT); +} +#define gtk_widget_set_can_default wx_gtk_widget_set_can_default + + +inline gboolean wx_gtk_widget_has_default(GtkWidget *widget) +{ + return GTK_WIDGET_HAS_DEFAULT(widget); +} +#define gtk_widget_has_default wx_gtk_widget_has_default + + +inline GtkStateType wx_gtk_widget_get_state(GtkWidget *widget) +{ + return (GtkStateType)GTK_WIDGET_STATE(widget); +} +#define gtk_widget_get_state wx_gtk_widget_get_state + + +inline gboolean wx_gtk_widget_get_double_buffered(GtkWidget *widget) +{ + return GTK_WIDGET_DOUBLE_BUFFERED(widget); +} +#define gtk_widget_get_double_buffered wx_gtk_widget_get_double_buffered + +static inline gboolean wx_gtk_widget_has_grab(GtkWidget* widget) +{ + return GTK_WIDGET_HAS_GRAB(widget); +} +#define gtk_widget_has_grab wx_gtk_widget_has_grab + +static inline void wx_gtk_widget_set_allocation(GtkWidget* widget, const GtkAllocation* allocation) +{ + widget->allocation = *allocation; +} +#define gtk_widget_set_allocation wx_gtk_widget_set_allocation + +// ---------------------------------------------------------------------------- +// the following were introduced in GTK+ 2.20 + +inline gboolean wx_gtk_widget_get_realized(GtkWidget *widget) +{ + return GTK_WIDGET_REALIZED(widget); +} +#define gtk_widget_get_realized wx_gtk_widget_get_realized + + +inline gboolean wx_gtk_widget_get_mapped(GtkWidget *widget) +{ + return GTK_WIDGET_MAPPED(widget); +} +#define gtk_widget_get_mapped wx_gtk_widget_get_mapped + +static inline void wx_gtk_widget_get_requisition(GtkWidget* widget, GtkRequisition* requisition) +{ + *requisition = widget->requisition; +} +#define gtk_widget_get_requisition wx_gtk_widget_get_requisition + +static inline GdkWindow* wx_gtk_entry_get_text_window(GtkEntry* entry) +{ + return entry->text_area; +} +#define gtk_entry_get_text_window wx_gtk_entry_get_text_window + +// ---------------------------------------------------------------------------- +// the following were introduced in GTK+ 2.24 + +static inline gint wx_gdk_window_get_height(GdkWindow* window) +{ + int h; + gdk_drawable_get_size(window, NULL, &h); + return h; +} +#define gdk_window_get_height wx_gdk_window_get_height + +static inline gint wx_gdk_window_get_width(GdkWindow* window) +{ + int w; + gdk_drawable_get_size(window, &w, NULL); + return w; +} +#define gdk_window_get_width wx_gdk_window_get_width + +#if GTK_CHECK_VERSION(2,10,0) +static inline void wx_gdk_cairo_set_source_window(cairo_t* cr, GdkWindow* window, gdouble x, gdouble y) +{ + gdk_cairo_set_source_pixmap(cr, window, x, y); +} +#define gdk_cairo_set_source_window wx_gdk_cairo_set_source_window +#endif + +#endif // !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED) + + +#endif // _WX_GTK_PRIVATE_COMPAT_H_ + diff --git a/Externals/wxWidgets3/include/wx/gtk/private/list.h b/Externals/wxWidgets3/include/wx/gtk/private/list.h new file mode 100644 index 0000000000..0ec669317d --- /dev/null +++ b/Externals/wxWidgets3/include/wx/gtk/private/list.h @@ -0,0 +1,33 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/gtk/private/list.h +// Purpose: wxGtkList class. +// Author: Vadim Zeitlin +// Created: 2011-08-21 +// RCS-ID: $Id: list.h 68842 2011-08-22 12:41:00Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_GTK_PRIVATE_LIST_H_ +#define _WX_GTK_PRIVATE_LIST_H_ + +// ---------------------------------------------------------------------------- +// Convenience class for calling g_list_free() automatically +// ---------------------------------------------------------------------------- + +class wxGtkList +{ +public: + explicit wxGtkList(GList* list) : m_list(list) { } + ~wxGtkList() { g_list_free(m_list); } + + operator GList *() const { return m_list; } + GList * operator->() const { return m_list; } + +protected: + GList* const m_list; + + wxDECLARE_NO_COPY_CLASS(wxGtkList); +}; + +#endif // _WX_GTK_PRIVATE_LIST_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/private/timer.h b/Externals/wxWidgets3/include/wx/gtk/private/timer.h index 1d845fd873..509303cda6 100644 --- a/Externals/wxWidgets3/include/wx/gtk/private/timer.h +++ b/Externals/wxWidgets3/include/wx/gtk/private/timer.h @@ -2,7 +2,7 @@ // Name: wx/gtk/private/timer.h // Purpose: wxTimerImpl for wxGTK // Author: Robert Roebling -// Id: $Id: timer.h 67254 2011-03-20 00:14:35Z DS $ +// Id: $Id: timer.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -21,7 +21,7 @@ class WXDLLIMPEXP_CORE wxGTKTimerImpl : public wxTimerImpl { public: - wxGTKTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { m_sourceId = 0; }; + wxGTKTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { m_sourceId = 0; } virtual bool Start( int millisecs = -1, bool oneShot = false ); virtual void Stop(); diff --git a/Externals/wxWidgets3/include/wx/gtk/radiobox.h b/Externals/wxWidgets3/include/wx/gtk/radiobox.h index cf875dd5ac..ced13bc390 100644 --- a/Externals/wxWidgets3/include/wx/gtk/radiobox.h +++ b/Externals/wxWidgets3/include/wx/gtk/radiobox.h @@ -2,7 +2,7 @@ // Name: wx/gtk/radiobox.h // Purpose: // Author: Robert Roebling -// Id: $Id: radiobox.h 60885 2009-06-03 22:33:32Z VZ $ +// Id: $Id: radiobox.h 67298 2011-03-23 17:36:10Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -131,7 +131,7 @@ public: void GtkDisableEvents(); void GtkEnableEvents(); #if wxUSE_TOOLTIPS - void GTKApplyToolTip( GtkTooltips *tips, const gchar *tip ); + virtual void GTKApplyToolTip(const char* tip); #endif // wxUSE_TOOLTIPS wxRadioBoxButtonsInfoList m_buttonsInfo; diff --git a/Externals/wxWidgets3/include/wx/gtk/region.h b/Externals/wxWidgets3/include/wx/gtk/region.h index cba99cf1cd..18b2f26169 100644 --- a/Externals/wxWidgets3/include/wx/gtk/region.h +++ b/Externals/wxWidgets3/include/wx/gtk/region.h @@ -2,7 +2,7 @@ // Name: wx/gtk/region.h // Purpose: // Author: Robert Roebling -// Id: $Id: region.h 61724 2009-08-21 10:41:26Z VZ $ +// Id: $Id: region.h 69815 2011-11-25 00:52:24Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -122,13 +122,11 @@ private: void Init(); void CreateRects( const wxRegion& r ); - size_t m_current; wxRegion m_region; - wxRect *m_rects; - size_t m_numRects; + int m_numRects; + int m_current; -private: DECLARE_DYNAMIC_CLASS(wxRegionIterator) }; diff --git a/Externals/wxWidgets3/include/wx/gtk/scrolbar.h b/Externals/wxWidgets3/include/wx/gtk/scrolbar.h index 980504935d..2ab5353ed8 100644 --- a/Externals/wxWidgets3/include/wx/gtk/scrolbar.h +++ b/Externals/wxWidgets3/include/wx/gtk/scrolbar.h @@ -2,7 +2,7 @@ // Name: wx/gtk/scrolbar.h // Purpose: // Author: Robert Roebling -// Id: $Id: scrolbar.h 67254 2011-03-20 00:14:35Z DS $ +// Id: $Id: scrolbar.h 67326 2011-03-28 06:27:49Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -10,14 +10,6 @@ #ifndef _WX_GTK_SCROLLBAR_H_ #define _WX_GTK_SCROLLBAR_H_ -#include "wx/defs.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxScrollBar; - //----------------------------------------------------------------------------- // wxScrollBar //----------------------------------------------------------------------------- @@ -57,10 +49,6 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); -protected: - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - -private: DECLARE_DYNAMIC_CLASS(wxScrollBar) }; diff --git a/Externals/wxWidgets3/include/wx/gtk/statbox.h b/Externals/wxWidgets3/include/wx/gtk/statbox.h index 7860451813..0d9ab6f624 100644 --- a/Externals/wxWidgets3/include/wx/gtk/statbox.h +++ b/Externals/wxWidgets3/include/wx/gtk/statbox.h @@ -2,7 +2,7 @@ // Name: wx/gtk/statbox.h // Purpose: // Author: Robert Roebling -// Id: $Id: statbox.h 67254 2011-03-20 00:14:35Z DS $ +// Id: $Id: statbox.h 70738 2012-02-28 17:06:56Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -40,7 +40,7 @@ public: // implementation - virtual bool IsTransparentForMouse() const { return true; } + virtual bool GTKIsTransparentForMouse() const { return true; } virtual void GetBordersForSizer(int *borderTop, int *borderOther) const; diff --git a/Externals/wxWidgets3/include/wx/gtk/textctrl.h b/Externals/wxWidgets3/include/wx/gtk/textctrl.h index 0582485fa1..fb214dc5f9 100644 --- a/Externals/wxWidgets3/include/wx/gtk/textctrl.h +++ b/Externals/wxWidgets3/include/wx/gtk/textctrl.h @@ -3,7 +3,7 @@ // Purpose: // Author: Robert Roebling // Created: 01/02/97 -// Id: $Id: textctrl.h 64404 2010-05-26 17:37:55Z RR $ +// Id: $Id: textctrl.h 68450 2011-07-29 15:11:54Z VZ $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -167,6 +167,8 @@ protected: virtual void DoSetValue(const wxString &value, int flags = 0); + virtual wxPoint DoPositionToCoords(long pos) const; + // wrappers hiding the differences between functions doing the same thing // for GtkTextView and GtkEntry (all of them use current window style to // set the given characteristic) @@ -214,6 +216,7 @@ private: GtkTextBuffer *m_buffer; GtkTextMark* m_showPositionOnThaw; + GSList* m_anonymousMarkList; // For wxTE_AUTO_URL void OnUrlMouseEvent(wxMouseEvent&); diff --git a/Externals/wxWidgets3/include/wx/gtk/textentry.h b/Externals/wxWidgets3/include/wx/gtk/textentry.h index e9fb99c444..c9084a53f4 100644 --- a/Externals/wxWidgets3/include/wx/gtk/textentry.h +++ b/Externals/wxWidgets3/include/wx/gtk/textentry.h @@ -3,7 +3,7 @@ // Purpose: wxGTK-specific wxTextEntry implementation // Author: Vadim Zeitlin // Created: 2007-09-24 -// RCS-ID: $Id: textentry.h 61834 2009-09-05 12:39:12Z JMS $ +// RCS-ID: $Id: textentry.h 67509 2011-04-16 17:27:04Z VZ $ // Copyright: (c) 2007 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -43,8 +43,6 @@ public: virtual void SetSelection(long from, long to); virtual void GetSelection(long *from, long *to) const; - virtual bool AutoComplete(const wxArrayString& choices); - virtual bool IsEditable() const; virtual void SetEditable(bool editable); @@ -60,6 +58,8 @@ protected: virtual bool DoSetMargins(const wxPoint& pt); virtual wxPoint DoGetMargins() const; + virtual bool DoAutoCompleteStrings(const wxArrayString& choices); + private: // implement this to return the associated GtkEntry or another widget // implementing GtkEditable diff --git a/Externals/wxWidgets3/include/wx/gtk/tglbtn.h b/Externals/wxWidgets3/include/wx/gtk/tglbtn.h index 1bdbeb3673..514f5e4e7e 100644 --- a/Externals/wxWidgets3/include/wx/gtk/tglbtn.h +++ b/Externals/wxWidgets3/include/wx/gtk/tglbtn.h @@ -5,7 +5,7 @@ // Author: John Norris, minor changes by Axel Schlueter // Modified by: // Created: 08.02.01 -// RCS-ID: $Id: tglbtn.h 66992 2011-02-22 13:25:30Z VZ $ +// RCS-ID: $Id: tglbtn.h 67931 2011-06-14 13:00:42Z VZ $ // Copyright: (c) 2000 Johnny C. Norris II // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -22,67 +22,6 @@ class WXDLLIMPEXP_FWD_CORE wxToggleButton; class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton; -//----------------------------------------------------------------------------- -// wxBitmapToggleButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButtonBase -{ -public: - // construction/destruction - wxBitmapToggleButton() {} - wxBitmapToggleButton(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - // Create the control - bool Create(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - - // Get/set the value - void SetValue(bool state); - bool GetValue() const; - - // Set the label - virtual void SetLabel(const wxString& label) { wxControl::SetLabel(label); } - virtual void SetLabel(const wxBitmap& label); - bool Enable(bool enable = true); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - wxBitmap m_bitmap; - - void OnSetBitmap(); - -protected: - void GTKDisableEvents(); - void GTKEnableEvents(); - - virtual wxSize DoGetBestSize() const; - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - -private: - typedef wxToggleButtonBase base_type; - - DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton) -}; - //----------------------------------------------------------------------------- // wxToggleButton //----------------------------------------------------------------------------- @@ -119,7 +58,6 @@ public: // Set the label void SetLabel(const wxString& label); - bool Enable(bool enable = true); static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -130,13 +68,61 @@ protected: virtual wxSize DoGetBestSize() const; virtual void DoApplyWidgetStyle(GtkRcStyle *style); - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + +#if wxUSE_MARKUP + virtual bool DoSetLabelMarkup(const wxString& markup); +#endif // wxUSE_MARKUP private: typedef wxToggleButtonBase base_type; + // Return the GtkLabel used by this toggle button. + GtkLabel *GTKGetLabel() const; + DECLARE_DYNAMIC_CLASS(wxToggleButton) }; +//----------------------------------------------------------------------------- +// wxBitmapToggleButton +//----------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButton +{ +public: + // construction/destruction + wxBitmapToggleButton() {} + wxBitmapToggleButton(wxWindow *parent, + wxWindowID id, + const wxBitmap& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxCheckBoxNameStr) + { + Create(parent, id, label, pos, size, style, validator, name); + } + + // Create the control + bool Create(wxWindow *parent, + wxWindowID id, + const wxBitmap& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxCheckBoxNameStr); + + // deprecated synonym for SetBitmapLabel() + wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap), + SetBitmapLabel(bitmap); ) + // prevent virtual function hiding + virtual void SetLabel(const wxString& label) { wxToggleButton::SetLabel(label); } + +private: + typedef wxToggleButtonBase base_type; + + DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton) +}; + #endif // _WX_GTK_TOGGLEBUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/toolbar.h b/Externals/wxWidgets3/include/wx/gtk/toolbar.h index f97fe264e8..ea71a5c91b 100644 --- a/Externals/wxWidgets3/include/wx/gtk/toolbar.h +++ b/Externals/wxWidgets3/include/wx/gtk/toolbar.h @@ -2,7 +2,7 @@ // Name: wx/gtk/toolbar.h // Purpose: GTK toolbar // Author: Robert Roebling -// RCS-ID: $Id: toolbar.h 66633 2011-01-07 18:15:21Z PC $ +// RCS-ID: $Id: toolbar.h 70854 2012-03-10 00:01:09Z RD $ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,6 +12,8 @@ #if wxUSE_TOOLBAR +typedef struct _GtkTooltips GtkTooltips; + // ---------------------------------------------------------------------------- // wxToolBar // ---------------------------------------------------------------------------- @@ -56,6 +58,17 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + virtual wxToolBarToolBase *CreateTool(int id, + const wxString& label, + const wxBitmap& bitmap1, + const wxBitmap& bitmap2 = wxNullBitmap, + wxItemKind kind = wxITEM_NORMAL, + wxObject *clientData = NULL, + const wxString& shortHelpString = wxEmptyString, + const wxString& longHelpString = wxEmptyString); + virtual wxToolBarToolBase *CreateTool(wxControl *control, + const wxString& label); + // implementation from now on // -------------------------- @@ -71,17 +84,6 @@ protected: virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); - virtual wxToolBarToolBase *CreateTool(int id, - const wxString& label, - const wxBitmap& bitmap1, - const wxBitmap& bitmap2, - wxItemKind kind, - wxObject *clientData, - const wxString& shortHelpString, - const wxString& longHelpString); - virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label); - private: void Init(); void GtkSetStyle(); diff --git a/Externals/wxWidgets3/include/wx/gtk/tooltip.h b/Externals/wxWidgets3/include/wx/gtk/tooltip.h index 3e4589140c..e82880d638 100644 --- a/Externals/wxWidgets3/include/wx/gtk/tooltip.h +++ b/Externals/wxWidgets3/include/wx/gtk/tooltip.h @@ -2,15 +2,14 @@ // Name: wx/gtk/tooltip.h // Purpose: wxToolTip class // Author: Robert Roebling -// Id: $Id: tooltip.h 67254 2011-03-20 00:14:35Z DS $ +// Id: $Id: tooltip.h 67298 2011-03-23 17:36:10Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKTOOLTIPH__ -#define __GTKTOOLTIPH__ +#ifndef _WX_GTKTOOLTIP_H_ +#define _WX_GTKTOOLTIP_H_ -#include "wx/defs.h" #include "wx/string.h" #include "wx/object.h" @@ -18,7 +17,6 @@ // forward declarations //----------------------------------------------------------------------------- -class WXDLLIMPEXP_FWD_CORE wxToolTip; class WXDLLIMPEXP_FWD_CORE wxWindow; //----------------------------------------------------------------------------- @@ -43,15 +41,10 @@ public: wxString GetTip() const { return m_text; } wxWindow *GetWindow() const { return m_window; } - bool IsOk() const { return m_window != NULL; } - - // this forwards back to wxWindow::GTKApplyToolTip() - void GTKApply( wxWindow *win ); - - // this just sets the given tooltip for the specified widget - // tip must be UTF-8 encoded - static void GTKApply(GtkWidget *w, const gchar *tip); + // Implementation + void GTKSetWindow(wxWindow* win); + static void GTKApply(GtkWidget* widget, const char* tip); private: wxString m_text; @@ -60,4 +53,4 @@ private: DECLARE_ABSTRACT_CLASS(wxToolTip) }; -#endif // __GTKTOOLTIPH__ +#endif // _WX_GTKTOOLTIP_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/toplevel.h b/Externals/wxWidgets3/include/wx/gtk/toplevel.h index cbfa47d34c..c17f62ed77 100644 --- a/Externals/wxWidgets3/include/wx/gtk/toplevel.h +++ b/Externals/wxWidgets3/include/wx/gtk/toplevel.h @@ -2,7 +2,7 @@ // Name: wx/gtk/toplevel.h // Purpose: // Author: Robert Roebling -// Id: $Id: toplevel.h 65373 2010-08-21 09:53:25Z RR $ +// Id: $Id: toplevel.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) 1998 Robert Roebling, Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -55,9 +55,7 @@ public: virtual void ShowWithoutActivating(); virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - virtual bool IsFullScreen() const { return m_fsIsShowing; }; - - virtual bool SetShape(const wxRegion& region); + virtual bool IsFullScreen() const { return m_fsIsShowing; } virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); @@ -95,6 +93,8 @@ public: // GTK callbacks virtual void OnInternalIdle(); + virtual void GTKHandleRealized(); + // do *not* call this to iconize the frame, this is a private function! void SetIconizeState(bool iconic); @@ -111,12 +111,11 @@ public: // size of WM decorations wxSize m_decorSize; - // shape of the frame - wxRegion m_shape; - // private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle. int m_urgency_hint; + // timer for detecting WM with broken _NET_REQUEST_FRAME_EXTENTS handling + unsigned m_netFrameExtentsTimerId; // return the size of the window without WM decorations void GTKDoGetSize(int *width, int *height) const; diff --git a/Externals/wxWidgets3/include/wx/gtk/treeentry_gtk.h b/Externals/wxWidgets3/include/wx/gtk/treeentry_gtk.h index f5c5f84363..5a2c926151 100644 --- a/Externals/wxWidgets3/include/wx/gtk/treeentry_gtk.h +++ b/Externals/wxWidgets3/include/wx/gtk/treeentry_gtk.h @@ -2,7 +2,7 @@ // Name: wx/gtk/treeentry_gtk.h // Purpose: GtkTreeEntry - a string/userdata combo for use with treeview // Author: Ryan Norton -// Id: $Id: treeentry_gtk.h 67254 2011-03-20 00:14:35Z DS $ +// Id: $Id: treeentry_gtk.h 67326 2011-03-28 06:27:49Z PC $ // Copyright: (c) 2006 Ryan Norton // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////// */ @@ -19,9 +19,9 @@ extern "C" { #include "wx/dlimpexp.h" #define GTK_TYPE_TREE_ENTRY (gtk_tree_entry_get_type()) -#define GTK_TREE_ENTRY(obj) (GTK_CHECK_CAST (obj, gtk_tree_entry_get_type (), GtkTreeEntry)) -#define GTK_TREE_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, gtk_tree_entry_get_type (), GtkTreeEntryClass)) -#define GTK_IS_TREE_ENTRY(obj) (GTK_CHECK_TYPE (obj, gtk_tree_entry_get_type ())) +#define GTK_TREE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, gtk_tree_entry_get_type (), GtkTreeEntry)) +#define GTK_TREE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, gtk_tree_entry_get_type (), GtkTreeEntryClass)) +#define GTK_IS_TREE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_tree_entry_get_type ())) typedef struct _GtkTreeEntry GtkTreeEntry; typedef struct _GtkTreeEntryClass GtkTreeEntryClass; @@ -47,7 +47,7 @@ WXDLLIMPEXP_CORE GtkTreeEntry* gtk_tree_entry_new (void); WXDLLIMPEXP_CORE -GtkType gtk_tree_entry_get_type (void); +GType gtk_tree_entry_get_type (void); WXDLLIMPEXP_CORE gchar* gtk_tree_entry_get_collate_key (GtkTreeEntry* entry); diff --git a/Externals/wxWidgets3/include/wx/gtk/webview_webkit.h b/Externals/wxWidgets3/include/wx/gtk/webview_webkit.h new file mode 100644 index 0000000000..cfb7e08aaa --- /dev/null +++ b/Externals/wxWidgets3/include/wx/gtk/webview_webkit.h @@ -0,0 +1,156 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: include/gtk/wx/webview.h +// Purpose: GTK webkit backend for web view component +// Author: Robert Roebling, Marianne Gagnon +// Id: $Id: webview_webkit.h 70768 2012-03-01 16:44:31Z PC $ +// Copyright: (c) 2010 Marianne Gagnon, 1998 Robert Roebling +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_GTK_WEBKITCTRL_H_ +#define _WX_GTK_WEBKITCTRL_H_ + +#include "wx/setup.h" + +#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__) + +#include "wx/sharedptr.h" +#include "wx/webview.h" + +typedef struct _WebKitWebView WebKitWebView; + +//----------------------------------------------------------------------------- +// wxWebViewWebKit +//----------------------------------------------------------------------------- + +class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView +{ +public: + wxWebViewWebKit() { Init(); } + + wxWebViewWebKit(wxWindow *parent, + wxWindowID id = wxID_ANY, + const wxString& url = wxWebViewDefaultURLStr, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = 0, + const wxString& name = wxWebViewNameStr) + { + Init(); + + Create(parent, id, url, pos, size, style, name); + } + + virtual bool Create(wxWindow *parent, + wxWindowID id = wxID_ANY, + const wxString& url = wxWebViewDefaultURLStr, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = 0, + const wxString& name = wxWebViewNameStr); + + virtual bool Enable( bool enable = true ); + + // implementation + // -------------- + + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + virtual void Stop(); + virtual void LoadURL(const wxString& url); + virtual void GoBack(); + virtual void GoForward(); + virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT); + virtual bool CanGoBack() const; + virtual bool CanGoForward() const; + virtual void ClearHistory(); + virtual void EnableHistory(bool enable = true); + virtual wxVector > GetBackwardHistory(); + virtual wxVector > GetForwardHistory(); + virtual void LoadHistoryItem(wxSharedPtr item); + virtual wxString GetCurrentURL() const; + virtual wxString GetCurrentTitle() const; + virtual wxString GetPageSource() const; + virtual wxString GetPageText() const; + //We do not want to hide the other overloads + using wxWebView::SetPage; + virtual void SetPage(const wxString& html, const wxString& baseUrl); + virtual void Print(); + virtual bool IsBusy() const; + + void SetZoomType(wxWebViewZoomType); + wxWebViewZoomType GetZoomType() const; + bool CanSetZoomType(wxWebViewZoomType) const; + virtual wxWebViewZoom GetZoom() const; + virtual void SetZoom(wxWebViewZoom); + + //Clipboard functions + virtual bool CanCut() const; + virtual bool CanCopy() const; + virtual bool CanPaste() const; + virtual void Cut(); + virtual void Copy(); + virtual void Paste(); + + //Undo / redo functionality + virtual bool CanUndo() const; + virtual bool CanRedo() const; + virtual void Undo(); + virtual void Redo(); + + //Editing functions + virtual void SetEditable(bool enable = true); + virtual bool IsEditable() const; + + //Selection + virtual void DeleteSelection(); + virtual bool HasSelection() const; + virtual void SelectAll(); + virtual wxString GetSelectedText() const; + virtual wxString GetSelectedSource() const; + virtual void ClearSelection(); + + virtual void RunScript(const wxString& javascript); + + //Virtual Filesystem Support + virtual void RegisterHandler(wxSharedPtr handler); + virtual wxVector > GetHandlers() { return m_handlerList; } + + /** TODO: check if this can be made private + * The native control has a getter to check for busy state, but except in + * very recent versions of webkit this getter doesn't say everything we need + * (namely it seems to stay indefinitely busy when loading is cancelled by + * user) + */ + bool m_busy; + + wxString m_vfsurl; + + //We use this flag to stop recursion when we load a page from the navigation + //callback, mainly when loading a VFS page + bool m_guard; + +protected: + + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + +private: + + void ZoomIn(); + void ZoomOut(); + void SetWebkitZoom(float level); + float GetWebkitZoom() const; + + // focus event handler: calls GTKUpdateBitmap() + void GTKOnFocus(wxFocusEvent& event); + + WebKitWebView *m_web_view; + int m_historyLimit; + + wxVector > m_handlerList; + + wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit); +}; + +#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__) + +#endif diff --git a/Externals/wxWidgets3/include/wx/gtk/webviewhistoryitem_webkit.h b/Externals/wxWidgets3/include/wx/gtk/webviewhistoryitem_webkit.h new file mode 100644 index 0000000000..cbadf4ef5f --- /dev/null +++ b/Externals/wxWidgets3/include/wx/gtk/webviewhistoryitem_webkit.h @@ -0,0 +1,34 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: include/wx/gtk/webviewhistoryitem.h +// Purpose: wxWebViewHistoryItem header for GTK +// Author: Steven Lamerton +// Id: $Id: webviewhistoryitem_webkit.h 69770 2011-11-17 01:23:03Z RD $ +// Copyright: (c) 2011 Steven Lamerton +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_GTK_WEBVIEWHISTORYITEM_H_ +#define _WX_GTK_WEBVIEWHISTORYITEM_H_ + +#include "wx/setup.h" + +#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__) + +class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem +{ +public: + wxWebViewHistoryItem(const wxString& url, const wxString& title) : + m_url(url), m_title(title) {} + wxString GetUrl() { return m_url; } + wxString GetTitle() { return m_title; } + + friend class wxWebViewWebKit; + +private: + wxString m_url, m_title; + void* m_histItem; +}; + +#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__) + +#endif // _WX_GTK_WEBVIEWHISTORYITEM_H_ diff --git a/Externals/wxWidgets3/include/wx/gtk/window.h b/Externals/wxWidgets3/include/wx/gtk/window.h index 7d2e6ed4fb..7238d6149b 100644 --- a/Externals/wxWidgets3/include/wx/gtk/window.h +++ b/Externals/wxWidgets3/include/wx/gtk/window.h @@ -2,7 +2,7 @@ // Name: wx/gtk/window.h // Purpose: // Author: Robert Roebling -// Id: $Id: window.h 65680 2010-09-30 11:44:45Z VZ $ +// Id: $Id: window.h 70569 2012-02-11 16:26:52Z VZ $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -18,6 +18,13 @@ struct wxGtkIMData; WX_DEFINE_EXPORTED_ARRAY_PTR(GdkWindow *, wxArrayGdkWindows); +extern "C" +{ + +typedef void (*wxGTKCallback)(); + +} + //----------------------------------------------------------------------------- // wxWindowGTK //----------------------------------------------------------------------------- @@ -52,8 +59,6 @@ public: virtual bool Show( bool show = true ); - virtual void SetWindowStyleFlag( long style ); - virtual bool IsRetained() const; virtual void SetFocus(); @@ -76,6 +81,7 @@ public: virtual bool SetFont( const wxFont &font ); virtual bool SetBackgroundStyle(wxBackgroundStyle style) ; + virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const; virtual int GetCharHeight() const; virtual int GetCharWidth() const; @@ -187,6 +193,10 @@ public: void GTKHandleFocusOutNoDeferring(); static void GTKHandleDeferredFocusOut(); + // Called when m_widget becomes realized. Derived classes must call the + // base class method if they override it. + virtual void GTKHandleRealized(); + protected: // for controls composed of multiple GTK widgets, return true to eliminate // spurious focus events if the focus changes between GTK+ children within @@ -218,7 +228,7 @@ public: #if wxUSE_TOOLTIPS // applies tooltip to the widget (tip must be UTF-8 encoded) - virtual void GTKApplyToolTip( GtkTooltips *tips, const gchar *tip ); + virtual void GTKApplyToolTip(const char* tip); #endif // wxUSE_TOOLTIPS // Called when a window should delay showing itself @@ -370,7 +380,7 @@ protected: // // This is just a wrapper for g_signal_connect() and returns the handler id // just as it does. - gulong GTKConnectWidget(const char *signal, void (*callback)()); + unsigned long GTKConnectWidget(const char *signal, wxGTKCallback callback); // Return true from here if PostCreation() should connect to size_request // signal: this is done by default but doesn't work for some native @@ -390,7 +400,6 @@ private: bool DoScrollByUnits(ScrollDir dir, ScrollUnit unit, int units); virtual void AddChildGTK(wxWindowGTK* child); - DECLARE_DYNAMIC_CLASS(wxWindowGTK) wxDECLARE_NO_COPY_CLASS(wxWindowGTK); }; diff --git a/Externals/wxWidgets3/include/wx/hash.h b/Externals/wxWidgets3/include/wx/hash.h index d20c83c668..c30644fcfb 100644 --- a/Externals/wxWidgets3/include/wx/hash.h +++ b/Externals/wxWidgets3/include/wx/hash.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH() // Created: 01/02/97 -// RCS-ID: $Id: hash.h 58757 2009-02-08 11:45:59Z VZ $ +// RCS-ID: $Id: hash.h 67343 2011-03-30 14:16:04Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,7 +15,7 @@ #include "wx/defs.h" #include "wx/string.h" -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS #include "wx/object.h" #else class WXDLLIMPEXP_FWD_BASE wxObject; @@ -80,7 +80,7 @@ protected: }; class WXDLLIMPEXP_BASE wxHashTableBase -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS : public wxObject #endif { diff --git a/Externals/wxWidgets3/include/wx/hashmap.h b/Externals/wxWidgets3/include/wx/hashmap.h index 058c5c9e38..f7288a6df0 100644 --- a/Externals/wxWidgets3/include/wx/hashmap.h +++ b/Externals/wxWidgets3/include/wx/hashmap.h @@ -4,7 +4,7 @@ // Author: Mattia Barbon // Modified by: // Created: 29/01/2002 -// RCS-ID: $Id: hashmap.h 66711 2011-01-19 10:47:49Z VZ $ +// RCS-ID: $Id: hashmap.h 69568 2011-10-27 22:26:10Z VZ $ // Copyright: (c) Mattia Barbon // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,9 +15,9 @@ #include "wx/string.h" #include "wx/wxcrt.h" -// In wxUSE_STL build we prefer to use the standard hash map class but it can -// be either in non-standard hash_map header (old g++ and some other STL -// implementations) or in C++0x standard unordered_map which can in turn be +// In wxUSE_STD_CONTAINERS build we prefer to use the standard hash map class +// but it can be either in non-standard hash_map header (old g++ and some other +// STL implementations) or in C++0x standard unordered_map which can in turn be // available either in std::tr1 or std namespace itself // // To summarize: if std::unordered_map is available use it, otherwise use tr1 @@ -28,7 +28,7 @@ #define HAVE_STL_HASH_MAP #endif -#if wxUSE_STL && \ +#if wxUSE_STD_CONTAINERS && \ (defined(HAVE_STD_UNORDERED_MAP) || defined(HAVE_TR1_UNORDERED_MAP)) #if defined(HAVE_STD_UNORDERED_MAP) @@ -42,7 +42,7 @@ #define _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP ) \ typedef WX_HASH_MAP_NAMESPACE::unordered_map< KEY_T, VALUE_T, HASH_T, KEY_EQ_T > CLASSNAME -#elif wxUSE_STL && defined(HAVE_STL_HASH_MAP) +#elif wxUSE_STD_CONTAINERS && defined(HAVE_STL_HASH_MAP) #if defined(HAVE_EXT_HASH_MAP) #include @@ -59,7 +59,7 @@ #define _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP ) \ typedef WX_HASH_MAP_NAMESPACE::hash_map< KEY_T, VALUE_T, HASH_T, KEY_EQ_T > CLASSNAME -#else // !wxUSE_STL || no std::{hash,unordered}_map class available +#else // !wxUSE_STD_CONTAINERS || no std::{hash,unordered}_map class available #define wxNEEDS_WX_HASH_MAP @@ -127,7 +127,9 @@ protected: } }; -#define _WX_DECLARE_HASHTABLE( VALUE_T, KEY_T, HASH_T, KEY_EX_T, KEY_EQ_T, CLASSNAME, CLASSEXP, SHOULD_GROW, SHOULD_SHRINK ) \ +#define _WX_DECLARE_HASHTABLE( VALUE_T, KEY_T, HASH_T, KEY_EX_T, KEY_EQ_T,\ + PTROPERATOR, CLASSNAME, CLASSEXP, \ + SHOULD_GROW, SHOULD_SHRINK ) \ CLASSEXP CLASSNAME : protected _wxHashTableBase2 \ { \ public: \ @@ -217,7 +219,7 @@ public: \ iterator& operator++() { PlusPlus(); return *this; } \ iterator operator++(int) { iterator it=*this;PlusPlus();return it; } \ reference operator *() const { return m_node->m_value; } \ - pointer operator ->() const { return &(m_node->m_value); } \ + PTROPERATOR(pointer) \ }; \ \ CLASSEXP const_iterator : public Iterator \ @@ -230,7 +232,7 @@ public: \ const_iterator& operator++() { PlusPlus();return *this; } \ const_iterator operator++(int) { const_iterator it=*this;PlusPlus();return it; } \ const_reference operator *() const { return m_node->m_value; } \ - const_pointer operator ->() const { return &(m_node->m_value); } \ + PTROPERATOR(const_pointer) \ }; \ \ CLASSNAME( size_type sz = 10, const hasher& hfun = hasher(), \ @@ -632,10 +634,16 @@ public: #ifdef wxNEEDS_WX_HASH_MAP +#define wxPTROP_NORMAL(pointer) \ + pointer operator ->() const { return &(m_node->m_value); } +#define wxPTROP_NOP(pointer) + #define _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP ) \ _WX_DECLARE_PAIR( KEY_T, VALUE_T, CLASSNAME##_wxImplementation_Pair, CLASSEXP ) \ _WX_DECLARE_HASH_MAP_KEY_EX( KEY_T, CLASSNAME##_wxImplementation_Pair, CLASSNAME##_wxImplementation_KeyEx, CLASSEXP ) \ -_WX_DECLARE_HASHTABLE( CLASSNAME##_wxImplementation_Pair, KEY_T, HASH_T, CLASSNAME##_wxImplementation_KeyEx, KEY_EQ_T, CLASSNAME##_wxImplementation_HashTable, CLASSEXP, grow_lf70, never_shrink ) \ +_WX_DECLARE_HASHTABLE( CLASSNAME##_wxImplementation_Pair, KEY_T, HASH_T, \ + CLASSNAME##_wxImplementation_KeyEx, KEY_EQ_T, wxPTROP_NORMAL, \ + CLASSNAME##_wxImplementation_HashTable, CLASSEXP, grow_lf70, never_shrink ) \ CLASSEXP CLASSNAME:public CLASSNAME##_wxImplementation_HashTable \ { \ public: \ @@ -676,7 +684,7 @@ public: \ \ size_type erase( const key_type& k ) \ { return CLASSNAME##_wxImplementation_HashTable::erase( k ); } \ - void erase( const iterator& it ) { erase( it->first ); } \ + void erase( const iterator& it ) { erase( (*it).first ); } \ \ /* count() == 0 | 1 */ \ size_type count( const const_key_type& key ) \ diff --git a/Externals/wxWidgets3/include/wx/hashset.h b/Externals/wxWidgets3/include/wx/hashset.h index 54a7779c4a..e5f4d10eca 100644 --- a/Externals/wxWidgets3/include/wx/hashset.h +++ b/Externals/wxWidgets3/include/wx/hashset.h @@ -4,7 +4,7 @@ // Author: Mattia Barbon // Modified by: // Created: 11/08/2003 -// RCS-ID: $Id: hashset.h 60410 2009-04-27 13:26:19Z VZ $ +// RCS-ID: $Id: hashset.h 69568 2011-10-27 22:26:10Z VZ $ // Copyright: (c) Mattia Barbon // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,7 +17,7 @@ // see comment in wx/hashmap.h which also applies to different standard hash // set classes -#if wxUSE_STL && \ +#if wxUSE_STD_CONTAINERS && \ (defined(HAVE_STD_UNORDERED_SET) || defined(HAVE_TR1_UNORDERED_SET)) #if defined(HAVE_STD_UNORDERED_SET) @@ -30,7 +30,7 @@ #error Update this code: unordered_set is available, but I do not know where. #endif -#elif wxUSE_STL && defined(HAVE_STL_HASH_MAP) +#elif wxUSE_STD_CONTAINERS && defined(HAVE_STL_HASH_MAP) #if defined(HAVE_EXT_HASH_MAP) #include @@ -46,7 +46,7 @@ // we need to define the class declared by _WX_DECLARE_HASH_SET as a class and // not a typedef to allow forward declaring it -#define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP ) \ +#define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, PTROP, CLASSNAME, CLASSEXP ) \ CLASSEXP CLASSNAME \ : public WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T > \ { \ @@ -89,9 +89,11 @@ public: \ CLASSNAME& operator=(const CLASSNAME&) { return *this; } \ }; -#define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP )\ +#define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, PTROP, CLASSNAME, CLASSEXP )\ _WX_DECLARE_HASH_SET_KEY_EX( KEY_T, CLASSNAME##_wxImplementation_KeyEx, CLASSEXP ) \ -_WX_DECLARE_HASHTABLE( KEY_T, KEY_T, HASH_T, CLASSNAME##_wxImplementation_KeyEx, KEY_EQ_T, CLASSNAME##_wxImplementation_HashTable, CLASSEXP, grow_lf70, never_shrink ) \ +_WX_DECLARE_HASHTABLE( KEY_T, KEY_T, HASH_T, \ + CLASSNAME##_wxImplementation_KeyEx, KEY_EQ_T, PTROP, \ + CLASSNAME##_wxImplementation_HashTable, CLASSEXP, grow_lf70, never_shrink ) \ CLASSEXP CLASSNAME:public CLASSNAME##_wxImplementation_HashTable \ { \ public: \ @@ -134,17 +136,27 @@ public: \ // these macros are to be used in the user code #define WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME) \ - _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, class ) + _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, wxPTROP_NORMAL, CLASSNAME, class ) // and these do exactly the same thing but should be used inside the // library #define WX_DECLARE_HASH_SET_WITH_DECL( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, DECL) \ - _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, DECL ) + _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, wxPTROP_NORMAL, CLASSNAME, DECL ) #define WX_DECLARE_EXPORTED_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME) \ WX_DECLARE_HASH_SET_WITH_DECL( KEY_T, HASH_T, KEY_EQ_T, \ CLASSNAME, class WXDLLIMPEXP_CORE ) +// Finally these versions allow to define hash sets of non-objects (including +// pointers, hence the confusing but wxArray-compatible name) without +// operator->() which can't be used for them. This is mostly used inside the +// library itself to avoid warnings when using such hash sets with some less +// common compilers (notably Sun CC). +#define WX_DECLARE_HASH_SET_PTR( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME) \ + _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, wxPTROP_NOP, CLASSNAME, class ) +#define WX_DECLARE_HASH_SET_WITH_DECL_PTR( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, DECL) \ + _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, wxPTROP_NOP, CLASSNAME, DECL ) + // delete all hash elements // // NB: the class declaration of the hash elements must be visible from the diff --git a/Externals/wxWidgets3/include/wx/headercol.h b/Externals/wxWidgets3/include/wx/headercol.h index d3a47d3054..34231fe83e 100644 --- a/Externals/wxWidgets3/include/wx/headercol.h +++ b/Externals/wxWidgets3/include/wx/headercol.h @@ -3,7 +3,7 @@ // Purpose: declaration of wxHeaderColumn class // Author: Vadim Zeitlin // Created: 2008-12-02 -// RCS-ID: $Id: headercol.h 65948 2010-10-30 15:57:41Z VS $ +// RCS-ID: $Id: headercol.h 69174 2011-09-21 15:07:46Z VZ $ // Copyright: (c) 2008 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -97,7 +97,7 @@ public: // unspecified/default virtual int GetWidth() const = 0; - // minimal width can be set for resizeable columns to forbid resizing them + // minimal width can be set for resizable columns to forbid resizing them // below the specified size (set to 0 to remove) virtual int GetMinWidth() const = 0; @@ -177,8 +177,8 @@ public: void ClearFlag(int flag); void ToggleFlag(int flag); - virtual void SetResizeable(bool resizeable) - { ChangeFlag(wxCOL_RESIZABLE, resizeable); } + virtual void SetResizeable(bool resizable) + { ChangeFlag(wxCOL_RESIZABLE, resizable); } virtual void SetSortable(bool sortable) { ChangeFlag(wxCOL_SORTABLE, sortable); } virtual void SetReorderable(bool reorderable) @@ -186,8 +186,12 @@ public: virtual void SetHidden(bool hidden) { ChangeFlag(wxCOL_HIDDEN, hidden); } - virtual void SetAsSortKey(bool sort = true) = 0; - void UnsetAsSortKey() { SetAsSortKey(false); } + // This function can be called to indicate that this column is not used for + // sorting any more. Under some platforms it's not necessary to do anything + // in this case as just setting another column as a sort key takes care of + // everything but under MSW we currently need to call this explicitly to + // reset the sort indicator displayed on the column. + virtual void UnsetAsSortKey() { } virtual void SetSortOrder(bool ascending) = 0; void ToggleSortOrder() { SetSortOrder(!IsSortOrderAscending()); } @@ -249,10 +253,15 @@ public: virtual void SetFlags(int flags) { m_flags = flags; } virtual int GetFlags() const { return m_flags; } - virtual void SetAsSortKey(bool sort = true) { m_sort = sort; } virtual bool IsSortKey() const { return m_sort; } + virtual void UnsetAsSortKey() { m_sort = false; } + + virtual void SetSortOrder(bool ascending) + { + m_sort = true; + m_sortAscending = ascending; + } - virtual void SetSortOrder(bool ascending) { m_sortAscending = ascending; } virtual bool IsSortOrderAscending() const { return m_sortAscending; } private: diff --git a/Externals/wxWidgets3/include/wx/headerctrl.h b/Externals/wxWidgets3/include/wx/headerctrl.h index 600778b5fc..5477ea568d 100644 --- a/Externals/wxWidgets3/include/wx/headerctrl.h +++ b/Externals/wxWidgets3/include/wx/headerctrl.h @@ -3,7 +3,7 @@ // Purpose: wxHeaderCtrlBase class: interface of wxHeaderCtrl // Author: Vadim Zeitlin // Created: 2008-12-01 -// RCS-ID: $Id: headerctrl.h 58757 2009-02-08 11:45:59Z VZ $ +// RCS-ID: $Id: headerctrl.h 70338 2012-01-14 16:51:57Z VS $ // Copyright: (c) 2008 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -154,6 +154,8 @@ public: // specified) and if the control has wxHD_ALLOW_REORDER style as well bool ShowCustomizeDialog(); + // compute column title width + int GetColumnTitleWidth(const wxHeaderColumn& col); // implementation only from now on // ------------------------------- diff --git a/Externals/wxWidgets3/include/wx/help.h b/Externals/wxWidgets3/include/wx/help.h index 0dae79dfae..e76d713189 100644 --- a/Externals/wxWidgets3/include/wx/help.h +++ b/Externals/wxWidgets3/include/wx/help.h @@ -5,7 +5,7 @@ // Modified by: // Created: // Copyright: (c) Julian Smart -// RCS-ID: $Id: help.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: help.h 70345 2012-01-15 01:05:28Z VZ $ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -22,10 +22,6 @@ #include "wx/msw/wince/helpwce.h" #define wxHelpController wxWinceHelpController -#elif defined(__WXPALMOS__) - #include "wx/palmos/help.h" - - #define wxHelpController wxPalmHelpController #elif defined(__WXMSW__) #include "wx/msw/helpchm.h" diff --git a/Externals/wxWidgets3/include/wx/htmllbox.h b/Externals/wxWidgets3/include/wx/htmllbox.h index 46a15de7bc..8e051b371f 100644 --- a/Externals/wxWidgets3/include/wx/htmllbox.h +++ b/Externals/wxWidgets3/include/wx/htmllbox.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 31.05.03 -// RCS-ID: $Id: htmllbox.h 66751 2011-01-25 05:03:17Z RD $ +// RCS-ID: $Id: htmllbox.h 68460 2011-07-30 11:30:08Z VZ $ // Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -196,8 +196,8 @@ private: #define wxHLB_DEFAULT_STYLE wxBORDER_SUNKEN #define wxHLB_MULTIPLE wxLB_MULTIPLE -class WXDLLIMPEXP_HTML wxSimpleHtmlListBox : public wxHtmlListBox, - public wxItemContainer +class WXDLLIMPEXP_HTML wxSimpleHtmlListBox : + public wxWindowWithItems { DECLARE_ABSTRACT_CLASS(wxSimpleHtmlListBox) public: @@ -254,9 +254,6 @@ public: int GetSelection() const { return wxVListBox::GetSelection(); } - // see ctrlsub.h for more info about this: - wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST - // accessing strings // ----------------- diff --git a/Externals/wxWidgets3/include/wx/icon.h b/Externals/wxWidgets3/include/wx/icon.h index 7e5265389b..421f7c5ba6 100644 --- a/Externals/wxWidgets3/include/wx/icon.h +++ b/Externals/wxWidgets3/include/wx/icon.h @@ -5,7 +5,7 @@ // Modified by: // Created: // Copyright: (c) Julian Smart -// RCS-ID: $Id: icon.h 66772 2011-01-26 15:53:31Z SC $ +// RCS-ID: $Id: icon.h 70353 2012-01-15 14:46:41Z VZ $ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -23,10 +23,7 @@ // constant defines the default argument value for wxIcon ctor and wxIcon::LoadFile() // functions. -#if defined(__WXPALMOS__) - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM - #include "wx/generic/icon.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE #include "wx/msw/icon.h" #elif defined(__WXMOTIF__) @@ -41,9 +38,6 @@ #elif defined(__WXX11__) #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM #include "wx/generic/icon.h" -#elif defined(__WXMGL__) - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE - #include "wx/generic/icon.h" #elif defined(__WXDFB__) #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM #include "wx/generic/icon.h" diff --git a/Externals/wxWidgets3/include/wx/iconbndl.h b/Externals/wxWidgets3/include/wx/iconbndl.h index 32c62fd475..f0bbb403d9 100644 --- a/Externals/wxWidgets3/include/wx/iconbndl.h +++ b/Externals/wxWidgets3/include/wx/iconbndl.h @@ -4,7 +4,7 @@ // Author: Mattia barbon // Modified by: // Created: 23.03.02 -// RCS-ID: $Id: iconbndl.h 63942 2010-04-12 00:36:31Z VZ $ +// RCS-ID: $Id: iconbndl.h 70455 2012-01-24 22:17:47Z VZ $ // Copyright: (c) Mattia Barbon // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -28,6 +28,23 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray); class WXDLLIMPEXP_CORE wxIconBundle : public wxGDIObject { public: + // Flags that determine what happens if GetIcon() doesn't find the icon of + // exactly the requested size. + enum + { + // Return invalid icon if exact size is not found. + FALLBACK_NONE = 0, + + // Return the icon of the system icon size if exact size is not found. + // May be combined with other non-NONE enum elements to determine what + // happens if the system icon size is not found neither. + FALLBACK_SYSTEM = 1, + + // Return the icon of closest larger size or, if there is no icon of + // larger size in the bundle, the closest icon of smaller size. + FALLBACK_NEAREST_LARGER = 2 + }; + // default constructor wxIconBundle(); @@ -60,13 +77,13 @@ public: void AddIcon(const wxIcon& icon); // returns the icon with the given size; if no such icon exists, - // returns the icon with size wxSYS_ICON_[XY]; if no such icon exists, - // returns the first icon in the bundle - wxIcon GetIcon(const wxSize& size) const; + // behavior is specified by the flags. + wxIcon GetIcon(const wxSize& size, int flags = FALLBACK_SYSTEM) const; // equivalent to GetIcon(wxSize(size, size)) - wxIcon GetIcon(wxCoord size = wxDefaultCoord) const - { return GetIcon(wxSize(size, size)); } + wxIcon GetIcon(wxCoord size = wxDefaultCoord, + int flags = FALLBACK_SYSTEM) const + { return GetIcon(wxSize(size, size), flags); } // returns the icon exactly of the specified size or wxNullIcon if no icon // of exactly given size are available diff --git a/Externals/wxWidgets3/include/wx/iconloc.h b/Externals/wxWidgets3/include/wx/iconloc.h index 41abc8fa7a..c2c6ef5485 100644 --- a/Externals/wxWidgets3/include/wx/iconloc.h +++ b/Externals/wxWidgets3/include/wx/iconloc.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 21.06.2003 -// RCS-ID: $Id: iconloc.h 27408 2004-05-23 20:53:33Z JS $ +// RCS-ID: $Id: iconloc.h 70808 2012-03-04 20:31:42Z VZ $ // Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -39,9 +39,9 @@ private: wxString m_filename; }; -// under MSW the same file may contain several icons so we also store the +// under Windows the same file may contain several icons so we also store the // index of the icon -#if defined(__WXMSW__) +#if defined(__WINDOWS__) class WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase { @@ -65,7 +65,7 @@ wxIconLocation::wxIconLocation(const wxString& file, int num) SetIndex(num); } -#else // !MSW +#else // !__WINDOWS__ // must be a class because we forward declare it as class class WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase diff --git a/Externals/wxWidgets3/include/wx/image.h b/Externals/wxWidgets3/include/wx/image.h index 393c0a6f69..70167b104c 100644 --- a/Externals/wxWidgets3/include/wx/image.h +++ b/Externals/wxWidgets3/include/wx/image.h @@ -2,7 +2,7 @@ // Name: wx/image.h // Purpose: wxImage class // Author: Robert Roebling -// RCS-ID: $Id: image.h 67203 2011-03-15 16:42:34Z DS $ +// RCS-ID: $Id: image.h 69760 2011-11-14 13:35:52Z VZ $ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -28,17 +28,20 @@ // which breaks the compilation below #undef index -#define wxIMAGE_OPTION_QUALITY wxString(wxT("quality")) -#define wxIMAGE_OPTION_FILENAME wxString(wxT("FileName")) +#define wxIMAGE_OPTION_QUALITY wxString(wxS("quality")) +#define wxIMAGE_OPTION_FILENAME wxString(wxS("FileName")) -#define wxIMAGE_OPTION_RESOLUTION wxString(wxT("Resolution")) -#define wxIMAGE_OPTION_RESOLUTIONX wxString(wxT("ResolutionX")) -#define wxIMAGE_OPTION_RESOLUTIONY wxString(wxT("ResolutionY")) +#define wxIMAGE_OPTION_RESOLUTION wxString(wxS("Resolution")) +#define wxIMAGE_OPTION_RESOLUTIONX wxString(wxS("ResolutionX")) +#define wxIMAGE_OPTION_RESOLUTIONY wxString(wxS("ResolutionY")) -#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(wxT("ResolutionUnit")) +#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(wxS("ResolutionUnit")) -#define wxIMAGE_OPTION_MAX_WIDTH wxString(wxT("MaxWidth")) -#define wxIMAGE_OPTION_MAX_HEIGHT wxString(wxT("MaxHeight")) +#define wxIMAGE_OPTION_MAX_WIDTH wxString(wxS("MaxWidth")) +#define wxIMAGE_OPTION_MAX_HEIGHT wxString(wxS("MaxHeight")) + +#define wxIMAGE_OPTION_ORIGINAL_WIDTH wxString(wxS("OriginalWidth")) +#define wxIMAGE_OPTION_ORIGINAL_HEIGHT wxString(wxS("OriginalHeight")) // constants used with wxIMAGE_OPTION_RESOLUTIONUNIT // diff --git a/Externals/wxWidgets3/include/wx/imaglist.h b/Externals/wxWidgets3/include/wx/imaglist.h index 2d501d93a4..9e5719a145 100644 --- a/Externals/wxWidgets3/include/wx/imaglist.h +++ b/Externals/wxWidgets3/include/wx/imaglist.h @@ -5,7 +5,7 @@ // Modified by: // Created: // Copyright: (c) Julian Smart -// RCS-ID: $Id: imaglist.h 63553 2010-02-25 00:03:53Z VZ $ +// RCS-ID: $Id: imaglist.h 70345 2012-01-15 01:05:28Z VZ $ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -42,7 +42,7 @@ enum #define wxIMAGELIST_DRAW_SELECTED 0x0004 #define wxIMAGELIST_DRAW_FOCUSED 0x0008 -#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPALMOS__) +#if defined(__WXMSW__) || defined(__WXMAC__) #define wxHAS_NATIVE_IMAGELIST #endif @@ -52,8 +52,6 @@ enum #include "wx/msw/imaglist.h" #elif defined(__WXMAC__) #include "wx/osx/imaglist.h" -#elif defined(__WXPALMOS__) - #include "wx/palmos/imaglist.h" #endif #endif // _WX_IMAGLIST_H_BASE_ diff --git a/Externals/wxWidgets3/include/wx/imagtiff.h b/Externals/wxWidgets3/include/wx/imagtiff.h index ad91d3d5d3..e9b00aa989 100644 --- a/Externals/wxWidgets3/include/wx/imagtiff.h +++ b/Externals/wxWidgets3/include/wx/imagtiff.h @@ -2,7 +2,7 @@ // Name: wx/imagtiff.h // Purpose: wxImage TIFF handler // Author: Robert Roebling -// RCS-ID: $Id: imagtiff.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: imagtiff.h 68785 2011-08-19 03:47:40Z DS $ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -22,10 +22,17 @@ #include "wx/versioninfo.h" // defines for wxImage::SetOption -#define wxIMAGE_OPTION_BITSPERSAMPLE wxString(wxT("BitsPerSample")) -#define wxIMAGE_OPTION_SAMPLESPERPIXEL wxString(wxT("SamplesPerPixel")) -#define wxIMAGE_OPTION_COMPRESSION wxString(wxT("Compression")) -#define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxString(wxT("ImageDescriptor")) +#define wxIMAGE_OPTION_TIFF_BITSPERSAMPLE wxString(wxT("BitsPerSample")) +#define wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL wxString(wxT("SamplesPerPixel")) +#define wxIMAGE_OPTION_TIFF_COMPRESSION wxString(wxT("Compression")) +#define wxIMAGE_OPTION_TIFF_PHOTOMETRIC wxString(wxT("Photometric")) +#define wxIMAGE_OPTION_TIFF_IMAGEDESCRIPTOR wxString(wxT("ImageDescriptor")) + +// for backwards compatibility +#define wxIMAGE_OPTION_BITSPERSAMPLE wxIMAGE_OPTION_TIFF_BITSPERSAMPLE +#define wxIMAGE_OPTION_SAMPLESPERPIXEL wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL +#define wxIMAGE_OPTION_COMPRESSION wxIMAGE_OPTION_TIFF_COMPRESSION +#define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxIMAGE_OPTION_TIFF_IMAGEDESCRIPTOR class WXDLLIMPEXP_CORE wxTIFFHandler: public wxImageHandler { diff --git a/Externals/wxWidgets3/include/wx/intl.h b/Externals/wxWidgets3/include/wx/intl.h index be563dd495..a2785fd97f 100644 --- a/Externals/wxWidgets3/include/wx/intl.h +++ b/Externals/wxWidgets3/include/wx/intl.h @@ -5,7 +5,7 @@ // Modified by: Michael N. Filippov // (2003/09/30 - plural forms support) // Created: 29/01/98 -// RCS-ID: $Id: intl.h 64215 2010-05-05 12:27:07Z VS $ +// RCS-ID: $Id: intl.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -60,17 +60,17 @@ struct WXDLLIMPEXP_BASE wxLanguageInfo { int Language; // wxLanguage id wxString CanonicalName; // Canonical name, e.g. fr_FR -#ifdef __WXMSW__ +#ifdef __WINDOWS__ wxUint32 WinLang, // Win32 language identifiers WinSublang; -#endif // __WXMSW__ +#endif // __WINDOWS__ wxString Description; // human-readable name of the language wxLayoutDirection LayoutDirection; -#ifdef __WXMSW__ +#ifdef __WINDOWS__ // return the LCID corresponding to this language wxUint32 GetLCID() const; -#endif // __WXMSW__ +#endif // __WINDOWS__ // return the locale name corresponding to this language usable with // setlocale() on the current system @@ -79,9 +79,9 @@ struct WXDLLIMPEXP_BASE wxLanguageInfo // for Unix systems GetLocaleName() is trivial so implement it inline here, for // MSW it's implemented in intl.cpp -#ifndef __WXMSW__ +#ifndef __WINDOWS__ inline wxString wxLanguageInfo::GetLocaleName() const { return CanonicalName; } -#endif // !__WXMSW__ +#endif // !__WINDOWS__ // ---------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/include/wx/iosfwrap.h b/Externals/wxWidgets3/include/wx/iosfwrap.h index a4df4bfb9b..020d45882d 100644 --- a/Externals/wxWidgets3/include/wx/iosfwrap.h +++ b/Externals/wxWidgets3/include/wx/iosfwrap.h @@ -4,7 +4,7 @@ // Author: Jan van Dijk // Modified by: // Created: 18.12.2002 -// RCS-ID: $Id: iosfwrap.h 33555 2005-04-12 21:06:03Z ABX $ +// RCS-ID: $Id: iosfwrap.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -18,7 +18,7 @@ # include #endif -#ifdef __WXMSW__ +#ifdef __WINDOWS__ # include "wx/msw/winundef.h" #endif diff --git a/Externals/wxWidgets3/include/wx/ioswrap.h b/Externals/wxWidgets3/include/wx/ioswrap.h index 25932450fd..50ba04a1dc 100644 --- a/Externals/wxWidgets3/include/wx/ioswrap.h +++ b/Externals/wxWidgets3/include/wx/ioswrap.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 03.02.99 -// RCS-ID: $Id: ioswrap.h 47644 2007-07-22 09:20:42Z VS $ +// RCS-ID: $Id: ioswrap.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -21,7 +21,7 @@ #include "wx/afterstd.h" -#ifdef __WXMSW__ +#ifdef __WINDOWS__ # include "wx/msw/winundef.h" #endif diff --git a/Externals/wxWidgets3/include/wx/ipc.h b/Externals/wxWidgets3/include/wx/ipc.h index 34d056dde4..14650aea1d 100644 --- a/Externals/wxWidgets3/include/wx/ipc.h +++ b/Externals/wxWidgets3/include/wx/ipc.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 15.04.02 -// RCS-ID: $Id: ipc.h 35698 2005-09-25 20:49:40Z MW $ +// RCS-ID: $Id: ipc.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 2002 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -16,7 +16,7 @@ // 0, or if the platform is not Windows, use TCP/IP for IPC implementation #if !defined(wxUSE_DDE_FOR_IPC) - #ifdef __WXMSW__ + #ifdef __WINDOWS__ #define wxUSE_DDE_FOR_IPC 1 #else #define wxUSE_DDE_FOR_IPC 0 diff --git a/Externals/wxWidgets3/include/wx/itemid.h b/Externals/wxWidgets3/include/wx/itemid.h new file mode 100644 index 0000000000..ff867ef3ec --- /dev/null +++ b/Externals/wxWidgets3/include/wx/itemid.h @@ -0,0 +1,62 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/itemid.h +// Purpose: wxItemId class declaration. +// Author: Vadim Zeitlin +// Created: 2011-08-17 +// RCS-ID: $Id: itemid.h 68916 2011-08-27 14:11:03Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_ITEMID_H_ +#define _WX_ITEMID_H_ + +// ---------------------------------------------------------------------------- +// wxItemId: an opaque item identifier used with wx{Tree,TreeList,DataView}Ctrl. +// ---------------------------------------------------------------------------- + +// The template argument T is typically a pointer to some opaque type. While +// wxTreeItemId and wxDataViewItem use a pointer to void, this is dangerous and +// not recommended for the new item id classes. +template +class wxItemId +{ +public: + typedef T Type; + + // This ctor is implicit which is fine for non-void* types, but if you use + // this class with void* you're strongly advised to make the derived class + // ctor explicit as implicitly converting from any pointer is simply too + // dangerous. + wxItemId(Type item = NULL) : m_pItem(item) { } + + // Default copy ctor, assignment operator and dtor are ok. + + bool IsOk() const { return m_pItem != NULL; } + Type GetID() const { return m_pItem; } + operator const Type() const { return m_pItem; } + + // This is used for implementation purposes only. + Type operator->() const { return m_pItem; } + + void Unset() { m_pItem = NULL; } + + // This field is public *only* for compatibility with the old wxTreeItemId + // implementation and must not be used in any new code. +//private: + Type m_pItem; +}; + +template +bool operator==(const wxItemId& left, const wxItemId& right) +{ + return left.GetID() == right.GetID(); +} + +template +bool operator!=(const wxItemId& left, const wxItemId& right) +{ + return !(left == right); +} + +#endif // _WX_ITEMID_H_ diff --git a/Externals/wxWidgets3/include/wx/joystick.h b/Externals/wxWidgets3/include/wx/joystick.h index 5a42af2a0f..ba36f5e956 100644 --- a/Externals/wxWidgets3/include/wx/joystick.h +++ b/Externals/wxWidgets3/include/wx/joystick.h @@ -5,7 +5,7 @@ // Modified by: // Created: // Copyright: (c) wxWidgets Team -// RCS-ID: $Id: joystick.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: joystick.h 70808 2012-03-04 20:31:42Z VZ $ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -16,7 +16,7 @@ #if wxUSE_JOYSTICK -#if defined(__WXMSW__) +#if defined(__WINDOWS__) #include "wx/msw/joystick.h" #elif defined(__WXMOTIF__) #include "wx/unix/joystick.h" diff --git a/Externals/wxWidgets3/include/wx/kbdstate.h b/Externals/wxWidgets3/include/wx/kbdstate.h index 851ec3c013..d3f927f77a 100644 --- a/Externals/wxWidgets3/include/wx/kbdstate.h +++ b/Externals/wxWidgets3/include/wx/kbdstate.h @@ -3,7 +3,7 @@ // Purpose: Declaration of wxKeyboardState class // Author: Vadim Zeitlin // Created: 2008-09-19 -// RCS-ID: $Id: kbdstate.h 55747 2008-09-19 23:59:39Z VZ $ +// RCS-ID: $Id: kbdstate.h 70579 2012-02-13 15:23:33Z SC $ // Copyright: (c) 2008 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -28,6 +28,9 @@ public: m_shiftDown(shiftDown), m_altDown(altDown), m_metaDown(metaDown) +#ifdef __WXOSX__ + ,m_rawControlDown(false) +#endif { } @@ -45,6 +48,9 @@ public: return (m_controlDown ? wxMOD_CONTROL : 0) | (m_shiftDown ? wxMOD_SHIFT : 0) | (m_metaDown ? wxMOD_META : 0) | +#ifdef __WXOSX__ + (m_rawControlDown ? wxMOD_RAW_CONTROL : 0) | +#endif (m_altDown ? wxMOD_ALT : 0); } @@ -53,6 +59,14 @@ public: // accessors for individual modifier keys bool ControlDown() const { return m_controlDown; } + bool RawControlDown() const + { +#ifdef __WXOSX__ + return m_rawControlDown; +#else + return m_controlDown; +#endif + } bool ShiftDown() const { return m_shiftDown; } bool MetaDown() const { return m_metaDown; } bool AltDown() const { return m_altDown; } @@ -64,17 +78,21 @@ public: // purpose under Mac) bool CmdDown() const { -#if defined(__WXMAC__) || defined(__WXCOCOA__) - return MetaDown(); -#else return ControlDown(); -#endif } // these functions are mostly used by wxWidgets itself // --------------------------------------------------- void SetControlDown(bool down) { m_controlDown = down; } + void SetRawControlDown(bool down) + { +#ifdef __WXOSX__ + m_rawControlDown = down; +#else + m_controlDown = down; +#endif + } void SetShiftDown(bool down) { m_shiftDown = down; } void SetAltDown(bool down) { m_altDown = down; } void SetMetaDown(bool down) { m_metaDown = down; } @@ -84,10 +102,13 @@ public: // members of wxKeyEvent directly, these variables are public, however you // should not use them in any new code, please use the accessors instead public: - bool m_controlDown : 1; - bool m_shiftDown : 1; - bool m_altDown : 1; - bool m_metaDown : 1; + bool m_controlDown : 1; + bool m_shiftDown : 1; + bool m_altDown : 1; + bool m_metaDown : 1; +#ifdef __WXOSX__ + bool m_rawControlDown : 1; +#endif }; #endif // _WX_KBDSTATE_H_ diff --git a/Externals/wxWidgets3/include/wx/list.h b/Externals/wxWidgets3/include/wx/list.h index cceaa09d23..a74a8fc7b8 100644 --- a/Externals/wxWidgets3/include/wx/list.h +++ b/Externals/wxWidgets3/include/wx/list.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added // Created: 29/01/98 -// RCS-ID: $Id: list.h 66829 2011-02-02 13:49:44Z SC $ +// RCS-ID: $Id: list.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) 1998 Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -33,7 +33,7 @@ #include "wx/object.h" #include "wx/string.h" -#if wxUSE_STL +#if wxUSE_STD_CONTAINERS #include "wx/beforestd.h" #include #include @@ -48,7 +48,7 @@ class WXDLLIMPEXP_FWD_BASE wxObjectListNode; typedef wxObjectListNode wxNode; -#if wxUSE_STL +#if wxUSE_STD_CONTAINERS #define wxLIST_COMPATIBILITY @@ -346,7 +346,7 @@ inline const void *wxListCastElementToVoidPtr(const wxString& str) #define WX_DEFINE_EXPORTED_LIST(name) WX_DEFINE_LIST(name) #define WX_DEFINE_USER_EXPORTED_LIST(name) WX_DEFINE_LIST(name) -#else // if !wxUSE_STL +#else // if !wxUSE_STD_CONTAINERS // undef it to get rid of old, deprecated functions @@ -1148,7 +1148,7 @@ private: #define WX_DEFINE_EXPORTED_LIST(name) WX_DEFINE_LIST(name) #define WX_DEFINE_USER_EXPORTED_LIST(name) WX_DEFINE_LIST(name) -#endif // !wxUSE_STL +#endif // !wxUSE_STD_CONTAINERS // ============================================================================ // now we can define classes 100% compatible with the old ones @@ -1162,7 +1162,7 @@ private: // inline compatibility functions -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS // ---------------------------------------------------------------------------- // wxNodeBase deprecated methods @@ -1197,26 +1197,26 @@ WX_DECLARE_LIST_2(wxObject, wxObjectList, wxObjectListNode, class WXDLLIMPEXP_BASE wxList : public wxObjectList { public: -#if defined(wxWARN_COMPAT_LIST_USE) && !wxUSE_STL - wxList() { }; +#if defined(wxWARN_COMPAT_LIST_USE) && !wxUSE_STD_CONTAINERS + wxList() { } wxDEPRECATED( wxList(int key_type) ); -#elif !wxUSE_STL +#elif !wxUSE_STD_CONTAINERS wxList(int key_type = wxKEY_NONE); #endif // this destructor is required for Darwin ~wxList() { } -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS wxList& operator=(const wxList& list) { if (&list != this) Assign(list); return *this; } // compatibility methods void Sort(wxSortCompareFunction compfunc) { wxListBase::Sort(compfunc); } -#endif // !wxUSE_STL +#endif // !wxUSE_STD_CONTAINERS }; -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS // ----------------------------------------------------------------------------- // wxStringList class for compatibility with the old code @@ -1268,7 +1268,7 @@ private: void DoCopy(const wxStringList&); // common part of copy ctor and operator= }; -#else // if wxUSE_STL +#else // if wxUSE_STD_CONTAINERS WX_DECLARE_LIST_XO(wxString, wxStringListBase, class WXDLLIMPEXP_BASE); @@ -1291,7 +1291,7 @@ public: { push_front(s); return GetFirst(); } }; -#endif // wxUSE_STL +#endif // wxUSE_STD_CONTAINERS #endif // wxLIST_COMPATIBILITY diff --git a/Externals/wxWidgets3/include/wx/listbase.h b/Externals/wxWidgets3/include/wx/listbase.h index 618c5dea7e..b28b9f64a3 100644 --- a/Externals/wxWidgets3/include/wx/listbase.h +++ b/Externals/wxWidgets3/include/wx/listbase.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 04.12.99 -// RCS-ID: $Id: listbase.h 60732 2009-05-24 18:04:37Z VZ $ +// RCS-ID: $Id: listbase.h 70286 2012-01-07 16:11:10Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -16,6 +16,9 @@ #include "wx/font.h" #include "wx/gdicmn.h" #include "wx/event.h" +#include "wx/control.h" + +class WXDLLIMPEXP_FWD_CORE wxImageList; // ---------------------------------------------------------------------------- // types @@ -23,7 +26,7 @@ // type of compare function for wxListCtrl sort operation typedef -int (wxCALLBACK *wxListCtrlCompare)(long item1, long item2, wxIntPtr sortData); +int (wxCALLBACK *wxListCtrlCompare)(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData); // ---------------------------------------------------------------------------- // wxListCtrl constants @@ -183,9 +186,9 @@ public: void SetFont(const wxFont& font) { m_font = font; } // accessors - bool HasTextColour() const { return m_colText.Ok(); } - bool HasBackgroundColour() const { return m_colBack.Ok(); } - bool HasFont() const { return m_font.Ok(); } + bool HasTextColour() const { return m_colText.IsOk(); } + bool HasBackgroundColour() const { return m_colBack.IsOk(); } + bool HasFont() const { return m_font.IsOk(); } const wxColour& GetTextColour() const { return m_colText; } const wxColour& GetBackgroundColour() const { return m_colBack; } @@ -354,7 +357,7 @@ protected: void Init() { m_mask = 0; - m_itemId = 0; + m_itemId = -1; m_col = 0; m_state = 0; m_stateMask = 0; @@ -371,6 +374,94 @@ private: DECLARE_DYNAMIC_CLASS(wxListItem) }; +// ---------------------------------------------------------------------------- +// wxListCtrlBase: the base class for the main control itself. +// ---------------------------------------------------------------------------- + +// Unlike other base classes, this class doesn't currently define the API of +// the real control class but is just used for implementation convenience. We +// should define the public class functions as pure virtual here in the future +// however. +class WXDLLIMPEXP_CORE wxListCtrlBase : public wxControl +{ +public: + wxListCtrlBase() { } + + // Image list methods. + // ------------------- + + // Associate the given (possibly NULL to indicate that no images will be + // used) image list with the control. The ownership of the image list + // passes to the control, i.e. it will be deleted when the control itself + // is destroyed. + // + // The value of "which" must be one of wxIMAGE_LIST_{NORMAL,SMALL,STATE}. + virtual void AssignImageList(wxImageList* imageList, int which) = 0; + + // Same as AssignImageList() but the control does not delete the image list + // so it can be shared among several controls. + virtual void SetImageList(wxImageList* imageList, int which) = 0; + + // Return the currently used image list, may be NULL. + virtual wxImageList* GetImageList(int which) const = 0; + + + // Column-related methods. + // ----------------------- + + // All these methods can only be used in report view mode. + + // Appends a new column. + // + // Returns the index of the newly inserted column or -1 on error. + long AppendColumn(const wxString& heading, + int format = wxLIST_FORMAT_LEFT, + int width = -1); + + // Add a new column to the control at the position "col". + // + // Returns the index of the newly inserted column or -1 on error. + long InsertColumn(long col, const wxListItem& info); + long InsertColumn(long col, + const wxString& heading, + int format = wxLIST_FORMAT_LEFT, + int width = wxLIST_AUTOSIZE); + + // Delete the given or all columns. + virtual bool DeleteColumn(int col) = 0; + virtual bool DeleteAllColumns() = 0; + + // Return the current number of columns. + virtual int GetColumnCount() const = 0; + + // Get or update information about the given column. Set item mask to + // indicate the fields to retrieve or change. + // + // Returns false on error, e.g. if the column index is invalid. + virtual bool GetColumn(int col, wxListItem& item) const = 0; + virtual bool SetColumn(int col, const wxListItem& item) = 0; + + // Convenient wrappers for the above methods which get or update just the + // column width. + virtual int GetColumnWidth(int col) const = 0; + virtual bool SetColumnWidth(int col, int width) = 0; + + + // Other miscellaneous accessors. + // ------------------------------ + + // Convenient functions for testing the list control mode: + bool InReportView() const { return HasFlag(wxLC_REPORT); } + bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); } + +protected: + // Real implementations methods to which our public forwards. + virtual long DoInsertColumn(long col, const wxListItem& info) = 0; + + // Overridden methods of the base class. + virtual wxSize DoGetBestClientSize() const; +}; + // ---------------------------------------------------------------------------- // wxListEvent - the event class for the wxListCtrl notifications // ---------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/include/wx/listbook.h b/Externals/wxWidgets3/include/wx/listbook.h index 02f4cd4634..f7e4bfc389 100644 --- a/Externals/wxWidgets3/include/wx/listbook.h +++ b/Externals/wxWidgets3/include/wx/listbook.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 19.08.03 -// RCS-ID: $Id: listbook.h 65931 2010-10-27 16:54:36Z VZ $ +// RCS-ID: $Id: listbook.h 68810 2011-08-21 14:08:49Z VZ $ // Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -69,7 +69,7 @@ public: wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = -1); + int imageId = NO_IMAGE); virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); } virtual int ChangeSelection(size_t n) { return DoSetSelection(n); } virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; diff --git a/Externals/wxWidgets3/include/wx/listctrl.h b/Externals/wxWidgets3/include/wx/listctrl.h index 704b4ef81f..5f17cfde7d 100644 --- a/Externals/wxWidgets3/include/wx/listctrl.h +++ b/Externals/wxWidgets3/include/wx/listctrl.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 04.12.99 -// RCS-ID: $Id: listctrl.h 58182 2009-01-17 13:38:04Z SC $ +// RCS-ID: $Id: listctrl.h 70808 2012-03-04 20:31:42Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -28,7 +28,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[]; // include the wxListCtrl class declaration // ---------------------------------------------------------------------------- -#if defined(__WIN32__) && !defined(__WXUNIVERSAL__) +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) #include "wx/msw/listctrl.h" #elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON #include "wx/osx/listctrl.h" diff --git a/Externals/wxWidgets3/include/wx/listimpl.cpp b/Externals/wxWidgets3/include/wx/listimpl.cpp index e9ebeae038..771b41dcc2 100644 --- a/Externals/wxWidgets3/include/wx/listimpl.cpp +++ b/Externals/wxWidgets3/include/wx/listimpl.cpp @@ -4,12 +4,12 @@ // Author: Vadim Zeitlin // Modified by: // Created: 16/11/98 -// RCS-ID: $Id: listimpl.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: listimpl.cpp 67343 2011-03-30 14:16:04Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if wxUSE_STL +#if wxUSE_STD_CONTAINERS #undef WX_DEFINE_LIST #define WX_DEFINE_LIST(name) \ @@ -19,7 +19,7 @@ } \ name::BaseListType name::EmptyList; -#else // !wxUSE_STL +#else // !wxUSE_STD_CONTAINERS #undef WX_DEFINE_LIST_2 #define WX_DEFINE_LIST_2(T, name) \ void wx##name##Node::DeleteData() \ @@ -32,5 +32,5 @@ #undef WX_DEFINE_LIST #define WX_DEFINE_LIST(name) WX_DEFINE_LIST_2(_WX_LIST_ITEM_TYPE_##name, name) -#endif // wxUSE_STL/!wxUSE_STL +#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS diff --git a/Externals/wxWidgets3/include/wx/log.h b/Externals/wxWidgets3/include/wx/log.h index 1b1ac53c5e..8f0679b243 100644 --- a/Externals/wxWidgets3/include/wx/log.h +++ b/Externals/wxWidgets3/include/wx/log.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 29/01/98 -// RCS-ID: $Id: log.h 66966 2011-02-19 12:32:59Z VZ $ +// RCS-ID: $Id: log.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -29,7 +29,7 @@ typedef unsigned long wxLogLevel; #define wxTraceResAlloc 0x0004 // trace GDI resource allocation #define wxTraceRefCount 0x0008 // trace various ref counting operations - #ifdef __WXMSW__ + #ifdef __WINDOWS__ #define wxTraceOleCalls 0x0100 // OLE interface calls #endif @@ -57,11 +57,9 @@ class WXDLLIMPEXP_FWD_BASE wxObject; #include "wx/arrstr.h" -#ifndef __WXPALMOS5__ #ifndef __WXWINCE__ #include // for time_t #endif -#endif // ! __WXPALMOS5__ #include "wx/dynarray.h" #include "wx/hashmap.h" @@ -130,7 +128,7 @@ enum wxLogLevelValues #define wxTRACE_ResAlloc wxT("resalloc") // trace GDI resource allocation #define wxTRACE_RefCount wxT("refcount") // trace various ref counting operations -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #define wxTRACE_OleCalls wxT("ole") // OLE interface calls #endif @@ -309,6 +307,34 @@ struct wxLogRecord wxLogRecordInfo info; }; +// ---------------------------------------------------------------------------- +// Derive from this class to customize format of log messages. +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_BASE wxLogFormatter +{ +public: + // Default constructor. + wxLogFormatter() { } + + // Trivial but virtual destructor for the base class. + virtual ~wxLogFormatter() { } + + + // Override this method to implement custom formatting of the given log + // record. The default implementation simply prepends a level-dependent + // prefix to the message and optionally adds a time stamp. + virtual wxString Format(wxLogLevel level, + const wxString& msg, + const wxLogRecordInfo& info) const; + +protected: + // Override this method to change just the time stamp formatting. It is + // called by default Format() implementation. + virtual wxString FormatTime(time_t t) const; +}; + + // ---------------------------------------------------------------------------- // derive from this class to redirect (or suppress, or ...) log messages // normally, only a single instance of this class exists but it's not enforced @@ -318,7 +344,7 @@ class WXDLLIMPEXP_BASE wxLog { public: // ctor - wxLog() { } + wxLog() : m_formatter(new wxLogFormatter) { } // make dtor virtual for all derived classes virtual ~wxLog(); @@ -455,6 +481,26 @@ public: // call AddTraceMask() concurrently static const wxArrayString& GetTraceMasks(); + // is this trace mask in the list? + static bool IsAllowedTraceMask(const wxString& mask); + + + // log formatting + // ----------------- + + // Change wxLogFormatter object used by wxLog to format the log messages. + // + // wxLog takes ownership of the pointer passed in but the caller is + // responsible for deleting the returned pointer. + wxLogFormatter* SetFormatter(wxLogFormatter* formatter); + + + // All the time stamp related functions below only work when the default + // wxLogFormatter is being used. Defining a custom formatter overrides them + // as it could use its own time stamp format or format messages without + // using time stamp at all. + + // sets the time stamp string format: this is used as strftime() format // string for the log targets which add time stamps to the messages; set // it to empty string to disable time stamping completely. @@ -464,9 +510,6 @@ public: static void DisableTimestamp() { SetTimestamp(wxEmptyString); } - // is this trace mask in the list? - static bool IsAllowedTraceMask(const wxString& mask); - // get the current timestamp format string (maybe empty) static const wxString& GetTimestamp() { return ms_timestamp; } @@ -475,9 +518,10 @@ public: // helpers: all functions in this section are mostly for internal use only, // don't call them from your code even if they are not formally deprecated - // put the time stamp into the string if ms_timestamp != NULL (don't - // change it otherwise) + // put the time stamp into the string if ms_timestamp is not empty (don't + // change it otherwise); the first overload uses the current time. static void TimeStamp(wxString *str); + static void TimeStamp(wxString *str, time_t t); // these methods should only be called from derived classes DoLogRecord(), // DoLogTextAtLevel() and DoLogText() implementations respectively and @@ -621,6 +665,12 @@ private: const wxLogRecordInfo& info); + // variables + // ---------------- + + wxLogFormatter *m_formatter; // We own this pointer. + + // static variables // ---------------- diff --git a/Externals/wxWidgets3/include/wx/longlong.h b/Externals/wxWidgets3/include/wx/longlong.h index bcc4575f4e..e190ec804b 100644 --- a/Externals/wxWidgets3/include/wx/longlong.h +++ b/Externals/wxWidgets3/include/wx/longlong.h @@ -5,7 +5,7 @@ // Author: Jeffrey C. Ollie , Vadim Zeitlin // Modified by: // Created: 10.02.99 -// RCS-ID: $Id: longlong.h 61508 2009-07-23 20:30:22Z VZ $ +// RCS-ID: $Id: longlong.h 68472 2011-07-31 13:25:33Z VS $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -404,15 +404,20 @@ public: // convert to ulong with range checking in debug mode (only!) unsigned long ToULong() const { - wxASSERT_MSG( m_ll <= LONG_MAX, + wxASSERT_MSG( m_ll <= ULONG_MAX, wxT("wxULongLong to long conversion loss of precision") ); return wx_truncate_cast(unsigned long, m_ll); } // convert to double -#ifdef _MSC_VER - double ToDouble() const { return wx_truncate_cast(double, (__int64) m_ll); } + // + // For some completely obscure reasons compiling the cast below with + // VC6 in DLL builds only (!) results in "error C2520: conversion from + // unsigned __int64 to double not implemented, use signed __int64" so + // we must use a different version for that compiler. +#ifdef __VISUALC6__ + double ToDouble() const; #else double ToDouble() const { return wx_truncate_cast(double, m_ll); } #endif @@ -1075,6 +1080,66 @@ WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &st #endif +// ---------------------------------------------------------------------------- +// Specialize numeric_limits<> for our long long wrapper classes. +// ---------------------------------------------------------------------------- + +#if wxUSE_LONGLONG_NATIVE + +// VC6 is known to not have __int64 specializations of numeric_limits<> in its +// anyhow so don't bother including it, especially as it results in +// tons of warnings because the standard header itself uses obsolete template +// specialization syntax. +#ifndef __VISUALC6__ + +#include + +namespace std +{ + +#ifdef __clang__ + // libstdc++ (used by Clang) uses struct for numeric_limits; unlike gcc, clang + // warns about this + template<> struct numeric_limits : public numeric_limits {}; + template<> struct numeric_limits : public numeric_limits {}; +#else + template<> class numeric_limits : public numeric_limits {}; + template<> class numeric_limits : public numeric_limits {}; +#endif + +} // namespace std + +#endif // !VC6 + +#endif // wxUSE_LONGLONG_NATIVE + +// ---------------------------------------------------------------------------- +// Specialize wxArgNormalizer to allow using wxLongLong directly with wx pseudo +// vararg functions. +// ---------------------------------------------------------------------------- + +// Notice that this must be done here and not in wx/strvararg.h itself because +// we can't include wx/longlong.h from there as this header itself includes +// wx/string.h which includes wx/strvararg.h too, so to avoid the circular +// dependencies we can only do it here (or add another header just for this but +// it doesn't seem necessary). +#include "wx/strvararg.h" + +template<> +struct WXDLLIMPEXP_BASE wxArgNormalizer +{ + wxArgNormalizer(wxLongLong value, + const wxFormatString *fmt, unsigned index) + : m_value(value) + { + wxASSERT_ARG_TYPE( fmt, index, wxFormatString::Arg_LongLongInt ); + } + + wxLongLong_t get() const { return m_value.GetValue(); } + + wxLongLong m_value; +}; + #endif // wxUSE_LONGLONG #endif // _WX_LONGLONG_H diff --git a/Externals/wxWidgets3/include/wx/math.h b/Externals/wxWidgets3/include/wx/math.h index a71078a54f..0978a84dcc 100644 --- a/Externals/wxWidgets3/include/wx/math.h +++ b/Externals/wxWidgets3/include/wx/math.h @@ -4,7 +4,7 @@ * Author: John Labenski and others * Modified by: * Created: 02/02/03 -* RCS-ID: $Id: math.h 63194 2010-01-19 22:02:59Z VS $ +* RCS-ID: $Id: math.h 70796 2012-03-04 00:29:31Z VZ $ * Copyright: (c) John Labenski * Licence: wxWindows licence */ @@ -58,8 +58,10 @@ #include #define wxFinite(x) _finite(x) #elif defined(__MINGW64__) - // add more compilers with C99 support here: using C99 isfinite() is - // preferable to using BSD-ish finite() + /* + add more compilers with C99 support here: using C99 isfinite() is + preferable to using BSD-ish finite() + */ #define wxFinite(x) isfinite(x) #elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \ defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \ @@ -126,7 +128,7 @@ #endif /* __cplusplus */ -#if defined(__WXMSW__) && !defined(__WXWINCE__) +#if defined(__WINDOWS__) && !defined(__WXWINCE__) #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c ) #else #define wxMulDivInt32( a , b , c ) (wxRound((a)*(((wxDouble)b)/((wxDouble)c)))) @@ -144,7 +146,7 @@ #if WXWIN_COMPATIBILITY_2_8 wxDEPRECATED( WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes) ); wxDEPRECATED( WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes) ); -#endif // WXWIN_COMPATIBILITY_2_8 +#endif #ifdef __cplusplus } diff --git a/Externals/wxWidgets3/include/wx/mdi.h b/Externals/wxWidgets3/include/wx/mdi.h index 35820a90f9..df6283eb2a 100644 --- a/Externals/wxWidgets3/include/wx/mdi.h +++ b/Externals/wxWidgets3/include/wx/mdi.h @@ -5,7 +5,7 @@ // Vadim Zeitlin (base MDI classes refactoring) // Copyright: (c) 1998 Julian Smart // (c) 2008 Vadim Zeitlin -// RCS-ID: $Id: mdi.h 58457 2009-01-27 14:48:20Z VZ $ +// RCS-ID: $Id: mdi.h 70790 2012-03-04 00:29:03Z VZ $ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -81,7 +81,7 @@ public: #if wxUSE_MENUS // return the pointer to the current window menu or NULL if we don't have // because of wxFRAME_NO_WINDOW_MENU style - wxMenu* GetWindowMenu() const { return m_windowMenu; }; + wxMenu* GetWindowMenu() const { return m_windowMenu; } // use the given menu instead of the default window menu // @@ -176,6 +176,16 @@ public: // level windows too virtual bool IsTopLevel() const { return false; } + // In all ports keyboard navigation must stop at MDI child frame level and + // can't cross its boundary. Indicate this by overriding this function to + // return true. + virtual bool IsTopNavigationDomain() const { return true; } + + // Raising any frame is supposed to show it but wxFrame Raise() + // implementation doesn't work for MDI child frames in most forms so + // forward this to Activate() which serves the same purpose by default. + virtual void Raise() { Activate(); } + protected: wxMDIParentFrame *m_mdiParent; }; diff --git a/Externals/wxWidgets3/include/wx/memory.h b/Externals/wxWidgets3/include/wx/memory.h index 480411d38a..17f1149b7b 100644 --- a/Externals/wxWidgets3/include/wx/memory.h +++ b/Externals/wxWidgets3/include/wx/memory.h @@ -4,7 +4,7 @@ // Author: Arthur Seaton, Julian Smart // Modified by: // Created: 29/01/98 -// RCS-ID: $Id: memory.h 59711 2009-03-21 23:36:37Z VZ $ +// RCS-ID: $Id: memory.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998 Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -60,7 +60,7 @@ WXDLLIMPEXP_BASE void wxDebugFree(void * buf, bool isVect = false); // devik 2000-8-29: All new/delete ops are now inline because they can't // be marked as dllexport/dllimport. It then leads to weird bugs when // used on MSW as DLL -#if defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)) +#if defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)) inline void * operator new (size_t size, wxChar * fileName, int lineNum) { return wxDebugAlloc(size, fileName, lineNum, false, false); @@ -108,7 +108,7 @@ void * operator new[] (size_t size, wxChar * fileName, int lineNum); void operator delete[] (void * buf); #endif // wxUSE_ARRAY_MEMORY_OPERATORS -#endif // defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)) +#endif // defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)) // VC++ 6.0 and MWERKS #if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) ) || defined(__MWERKS__) diff --git a/Externals/wxWidgets3/include/wx/menu.h b/Externals/wxWidgets3/include/wx/menu.h index f3ee7c9060..552ca8b286 100644 --- a/Externals/wxWidgets3/include/wx/menu.h +++ b/Externals/wxWidgets3/include/wx/menu.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 26.10.99 -// RCS-ID: $Id: menu.h 66640 2011-01-07 21:51:19Z SC $ +// RCS-ID: $Id: menu.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -580,8 +580,6 @@ protected: #else // !wxUSE_BASE_CLASSES_ONLY #if defined(__WXUNIVERSAL__) #include "wx/univ/menu.h" -#elif defined(__WXPALMOS__) - #include "wx/palmos/menu.h" #elif defined(__WXMSW__) #include "wx/msw/menu.h" #elif defined(__WXMOTIF__) diff --git a/Externals/wxWidgets3/include/wx/menuitem.h b/Externals/wxWidgets3/include/wx/menuitem.h index 0e4a99efd9..3c0fdfc41b 100644 --- a/Externals/wxWidgets3/include/wx/menuitem.h +++ b/Externals/wxWidgets3/include/wx/menuitem.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 25.10.99 -// RCS-ID: $Id: menuitem.h 66966 2011-02-19 12:32:59Z VZ $ +// RCS-ID: $Id: menuitem.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) 1999 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -189,8 +189,6 @@ inline void wxMenuItemBase::SetText(const wxString& text) { SetItemLabel(text); #else // !wxUSE_BASE_CLASSES_ONLY #if defined(__WXUNIVERSAL__) #include "wx/univ/menuitem.h" -#elif defined(__WXPALMOS__) - #include "wx/palmos/menuitem.h" #elif defined(__WXMSW__) #include "wx/msw/menuitem.h" #elif defined(__WXMOTIF__) diff --git a/Externals/wxWidgets3/include/wx/meta/movable.h b/Externals/wxWidgets3/include/wx/meta/movable.h index 55877b129d..0217a121c7 100644 --- a/Externals/wxWidgets3/include/wx/meta/movable.h +++ b/Externals/wxWidgets3/include/wx/meta/movable.h @@ -3,7 +3,7 @@ // Purpose: Test if a type is movable using memmove() etc. // Author: Vaclav Slavik // Created: 2008-01-21 -// RCS-ID: $Id: movable.h 64589 2010-06-14 15:12:37Z JMS $ +// RCS-ID: $Id: movable.h 67343 2011-03-30 14:16:04Z VZ $ // Copyright: (c) 2008 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -38,7 +38,7 @@ struct wxIsMovable // (NB: we don't put this into string.h and choose to include wx/string.h from // here instead so that rarely-used wxIsMovable code isn't included by // everything) -#if !wxUSE_STL && !wxUSE_STRING_POS_CACHE +#if !wxUSE_STD_STRING && !wxUSE_STRING_POS_CACHE WX_DECLARE_TYPE_MOVABLE(wxString) #endif diff --git a/Externals/wxWidgets3/include/wx/metafile.h b/Externals/wxWidgets3/include/wx/metafile.h index 4a501965d2..feaac82e7f 100644 --- a/Externals/wxWidgets3/include/wx/metafile.h +++ b/Externals/wxWidgets3/include/wx/metafile.h @@ -4,7 +4,7 @@ // Author: wxWidgets team // Modified by: // Created: 13.01.00 -// RCS-ID: $Id: metafile.h 54125 2008-06-11 19:17:41Z SC $ +// RCS-ID: $Id: metafile.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -25,11 +25,7 @@ #if defined(__WXMSW__) #if wxUSE_ENH_METAFILE - #if defined(__WXPALMOS__) - #include "wx/palmos/enhmeta.h" - #else - #include "wx/msw/enhmeta.h" - #endif + #include "wx/msw/enhmeta.h" #if wxUSE_WIN_METAFILES_ALWAYS // use normal metafiles as well @@ -45,11 +41,7 @@ #define wxMETAFILE_IS_ENH #endif // wxUSE_WIN_METAFILES_ALWAYS #else // !wxUSE_ENH_METAFILE - #if defined(__WXPALMOS__) - #include "wx/palmos/metafile.h" - #else - #include "wx/msw/metafile.h" - #endif + #include "wx/msw/metafile.h" #endif #elif defined(__WXPM__) #include "wx/os2/metafile.h" diff --git a/Externals/wxWidgets3/include/wx/mimetype.h b/Externals/wxWidgets3/include/wx/mimetype.h index 45eb578d61..a7933cd989 100644 --- a/Externals/wxWidgets3/include/wx/mimetype.h +++ b/Externals/wxWidgets3/include/wx/mimetype.h @@ -5,7 +5,7 @@ // Modified by: // Chris Elliott (biol75@york.ac.uk) 5 Dec 00: write support for Win32 // Created: 23.09.98 -// RCS-ID: $Id: mimetype.h 65707 2010-10-01 13:05:42Z VZ $ +// RCS-ID: $Id: mimetype.h 67384 2011-04-03 20:31:32Z DS $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence (part of wxExtra library) ///////////////////////////////////////////////////////////////////////////// @@ -389,7 +389,7 @@ public: // operations // expand a string in the format of GetOpenCommand (which may contain - // '%s' and '%t' format specificators for the file name and mime type + // '%s' and '%t' format specifiers for the file name and mime type // and %{param} constructions). static wxString ExpandCommand(const wxString& command, const MessageParameters& params); diff --git a/Externals/wxWidgets3/include/wx/minifram.h b/Externals/wxWidgets3/include/wx/minifram.h index d7d66ce25f..8907b69ba4 100644 --- a/Externals/wxWidgets3/include/wx/minifram.h +++ b/Externals/wxWidgets3/include/wx/minifram.h @@ -5,7 +5,7 @@ // Modified by: // Created: // Copyright: (c) Julian Smart -// RCS-ID: $Id: minifram.h 54125 2008-06-11 19:17:41Z SC $ +// RCS-ID: $Id: minifram.h 70345 2012-01-15 01:05:28Z VZ $ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -16,9 +16,7 @@ #if wxUSE_MINIFRAME -#if defined(__WXPALMOS__) -#include "wx/palmos/minifram.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #include "wx/msw/minifram.h" #elif defined(__WXMOTIF__) #include "wx/motif/minifram.h" diff --git a/Externals/wxWidgets3/include/wx/mousestate.h b/Externals/wxWidgets3/include/wx/mousestate.h index 719052951c..334b13fb15 100644 --- a/Externals/wxWidgets3/include/wx/mousestate.h +++ b/Externals/wxWidgets3/include/wx/mousestate.h @@ -3,7 +3,7 @@ // Purpose: Declaration of wxMouseState class // Author: Vadim Zeitlin // Created: 2008-09-19 (extracted from wx/utils.h) -// RCS-ID: $Id: mousestate.h 65379 2010-08-22 22:15:07Z VZ $ +// RCS-ID: $Id: mousestate.h 70098 2011-12-23 05:59:59Z PC $ // Copyright: (c) 2008 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -79,10 +79,6 @@ public: { switch ( but ) { - default: - wxFAIL_MSG(wxT("invalid parameter in wxMouseState::ButtonIsDown")); - // fall through - case wxMOUSE_BTN_ANY: return LeftIsDown() || MiddleIsDown() || RightIsDown() || Aux1IsDown() || Aux2IsDown(); @@ -101,6 +97,15 @@ public: case wxMOUSE_BTN_AUX2: return Aux2IsDown(); + + case wxMOUSE_BTN_NONE: + case wxMOUSE_BTN_MAX: + wxFAIL_MSG(wxS("invalid parameter")); + return false; + + default: + wxFAIL_MSG(wxS("unknown parameter")); + return false; } } @@ -123,7 +128,7 @@ public: // version of wxMouseState but their names are confusing as wxMouseEvent // has methods with the same names which do something quite different so // don't use them any more -#ifdef WXWIN_COMPATIBILITY_2_8 +#if WXWIN_COMPATIBILITY_2_8 wxDEPRECATED_INLINE(bool LeftDown() const, return LeftIsDown(); ) wxDEPRECATED_INLINE(bool MiddleDown() const, return MiddleIsDown(); ) wxDEPRECATED_INLINE(bool RightDown() const, return RightIsDown(); ) diff --git a/Externals/wxWidgets3/include/wx/msgdlg.h b/Externals/wxWidgets3/include/wx/msgdlg.h index be95fbc5e9..6da9e0cd7f 100644 --- a/Externals/wxWidgets3/include/wx/msgdlg.h +++ b/Externals/wxWidgets3/include/wx/msgdlg.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: -// RCS-ID: $Id: msgdlg.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: msgdlg.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -177,10 +177,16 @@ public: return true; } + virtual bool SetHelpLabel(const ButtonLabel& help) + { + DoSetCustomLabel(m_help, help); + return true; + } + // test if any custom labels were set bool HasCustomLabels() const { - return !(m_ok.empty() && m_cancel.empty() && + return !(m_ok.empty() && m_cancel.empty() && m_help.empty() && m_yes.empty() && m_no.empty()); } @@ -195,6 +201,8 @@ public: { return m_ok.empty() ? GetDefaultOKLabel() : m_ok; } wxString GetCancelLabel() const { return m_cancel.empty() ? GetDefaultCancelLabel() : m_cancel; } + wxString GetHelpLabel() const + { return m_help.empty() ? GetDefaultHelpLabel() : m_help; } // based on message dialog style, returns exactly one of: wxICON_NONE, // wxICON_ERROR, wxICON_WARNING, wxICON_QUESTION, wxICON_INFORMATION @@ -250,6 +258,7 @@ protected: const wxString& GetCustomYesLabel() const { return m_yes; } const wxString& GetCustomNoLabel() const { return m_no; } const wxString& GetCustomOKLabel() const { return m_ok; } + const wxString& GetCustomHelpLabel() const { return m_help; } const wxString& GetCustomCancelLabel() const { return m_cancel; } private: @@ -259,13 +268,15 @@ private: virtual wxString GetDefaultNoLabel() const { return wxGetTranslation("No"); } virtual wxString GetDefaultOKLabel() const { return wxGetTranslation("OK"); } virtual wxString GetDefaultCancelLabel() const { return wxGetTranslation("Cancel"); } + virtual wxString GetDefaultHelpLabel() const { return wxGetTranslation("Help"); } // labels for the buttons, initially empty meaning that the defaults should // be used, use GetYes/No/OK/CancelLabel() to access them wxString m_yes, m_no, m_ok, - m_cancel; + m_cancel, + m_help; wxDECLARE_NO_COPY_CLASS(wxMessageDialogBase); }; @@ -279,8 +290,6 @@ private: #define wxMessageDialog wxGenericMessageDialog #elif defined(__WXCOCOA__) #include "wx/cocoa/msgdlg.h" -#elif defined(__WXPALMOS__) - #include "wx/palmos/msgdlg.h" #elif defined(__WXMSW__) #include "wx/msw/msgdlg.h" #elif defined(__WXMOTIF__) diff --git a/Externals/wxWidgets3/include/wx/msw/anybutton.h b/Externals/wxWidgets3/include/wx/msw/anybutton.h new file mode 100644 index 0000000000..cda386e798 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/msw/anybutton.h @@ -0,0 +1,81 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/msw/anybutton.h +// Purpose: wxAnyButton class +// Author: Julian Smart +// Created: 1997-02-01 (extracted from button.h) +// RCS-ID: $Id: anybutton.h 67931 2011-06-14 13:00:42Z VZ $ +// Copyright: (c) Julian Smart +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_MSW_ANYBUTTON_H_ +#define _WX_MSW_ANYBUTTON_H_ + +// ---------------------------------------------------------------------------- +// Common button functionality +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase +{ +public: + wxAnyButton() + { + m_imageData = NULL; +#if wxUSE_MARKUP + m_markupText = NULL; +#endif // wxUSE_MARKUP + } + + virtual ~wxAnyButton(); + + // overridden base class methods + virtual void SetLabel(const wxString& label); + virtual bool SetBackgroundColour(const wxColour &colour); + virtual bool SetForegroundColour(const wxColour &colour); + + // implementation from now on + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + + virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item); + virtual State GetNormalState() const { return State_Normal; } + + // returns true if the platform should explicitly apply a theme border + virtual bool CanApplyThemeBorder() const { return false; } + +protected: + // usually overridden base class virtuals + virtual wxSize DoGetBestSize() const; + + virtual wxBitmap DoGetBitmap(State which) const; + virtual void DoSetBitmap(const wxBitmap& bitmap, State which); + virtual wxSize DoGetBitmapMargins() const; + virtual void DoSetBitmapMargins(wxCoord x, wxCoord y); + virtual void DoSetBitmapPosition(wxDirection dir); + +#if wxUSE_MARKUP + virtual bool DoSetLabelMarkup(const wxString& markup); +#endif // wxUSE_MARKUP + + // Increases the passed in size to account for the button image. + // + // Should only be called if we do have a button, i.e. if m_imageData is + // non-NULL. + void AdjustForBitmapSize(wxSize& size) const; + + class wxButtonImageData *m_imageData; + +#if wxUSE_MARKUP + class wxMarkupText *m_markupText; +#endif // wxUSE_MARKUP + + // Switches button into owner-drawn mode: this is used if we need to draw + // something not supported by the native control, such as using non default + // colours or a bitmap on pre-XP systems. + void MakeOwnerDrawn(); + bool IsOwnerDrawn() const; + +private: + wxDECLARE_NO_COPY_CLASS(wxAnyButton); +}; + +#endif // _WX_MSW_ANYBUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/bmpbuttn.h b/Externals/wxWidgets3/include/wx/msw/bmpbuttn.h index d753a82701..894260f4a0 100644 --- a/Externals/wxWidgets3/include/wx/msw/bmpbuttn.h +++ b/Externals/wxWidgets3/include/wx/msw/bmpbuttn.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: bmpbuttn.h 61071 2009-06-15 23:10:16Z VZ $ +// RCS-ID: $Id: bmpbuttn.h 67931 2011-06-14 13:00:42Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,7 +19,7 @@ class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase { public: - wxBitmapButton() { Init(); } + wxBitmapButton() {} wxBitmapButton(wxWindow *parent, wxWindowID id, @@ -30,8 +30,6 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr) { - Init(); - Create(parent, id, bitmap, pos, size, style, validator, name); } @@ -45,25 +43,6 @@ public: const wxString& name = wxButtonNameStr); protected: - // common part of all ctors - void Init() - { - m_disabledSetByUser = - m_hoverSetByUser = false; - } - - // reimplement some base class virtuals - virtual void DoSetBitmap(const wxBitmap& bitmap, State which); - - // true if disabled bitmap was set by user, false if we created it - // ourselves from the normal one - bool m_disabledSetByUser; - - // true if hover bitmap was set by user, false if it was set from focused - // one - bool m_hoverSetByUser; - - DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton) }; diff --git a/Externals/wxWidgets3/include/wx/msw/button.h b/Externals/wxWidgets3/include/wx/msw/button.h index 898aeaac99..ac3545b6eb 100644 --- a/Externals/wxWidgets3/include/wx/msw/button.h +++ b/Externals/wxWidgets3/include/wx/msw/button.h @@ -4,13 +4,13 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: button.h 67065 2011-02-27 12:48:26Z VZ $ +// RCS-ID: $Id: button.h 69984 2011-12-11 17:03:56Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_BUTTON_H_ -#define _WX_BUTTON_H_ +#ifndef _WX_MSW_BUTTON_H_ +#define _WX_MSW_BUTTON_H_ // ---------------------------------------------------------------------------- // Pushbutton @@ -47,22 +47,13 @@ public: virtual wxWindow *SetDefault(); - // overridden base class methods - virtual void SetLabel(const wxString& label); - virtual bool SetBackgroundColour(const wxColour &colour); - virtual bool SetForegroundColour(const wxColour &colour); - // implementation from now on virtual void Command(wxCommandEvent& event); virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual bool MSWCommand(WXUINT param, WXWORD id); - virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item); virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } - protected: // send a notification event, return true if processed bool SendClickEvent(); @@ -74,32 +65,8 @@ protected: // set or unset BS_DEFPUSHBUTTON style static void SetDefaultStyle(wxButton *btn, bool on); - // usually overridden base class virtuals - virtual wxSize DoGetBestSize() const; - virtual bool DoGetAuthNeeded() const; virtual void DoSetAuthNeeded(bool show); - virtual wxBitmap DoGetBitmap(State which) const; - virtual void DoSetBitmap(const wxBitmap& bitmap, State which); - virtual wxSize DoGetBitmapMargins() const; - virtual void DoSetBitmapMargins(wxCoord x, wxCoord y); - virtual void DoSetBitmapPosition(wxDirection dir); - -#if wxUSE_MARKUP - virtual bool DoSetLabelMarkup(const wxString& markup); -#endif // wxUSE_MARKUP - - // Increases the passed in size to account for the button image. - // - // Should only be called if we do have a button, i.e. if m_imageData is - // non-NULL. - void AdjustForBitmapSize(wxSize& size) const; - - class wxButtonImageData *m_imageData; - -#if wxUSE_MARKUP - class wxMarkupText *m_markupText; -#endif // wxUSE_MARKUP // true if the UAC symbol is shown bool m_authNeeded; @@ -107,19 +74,13 @@ protected: private: void Init() { - m_imageData = NULL; -#if wxUSE_MARKUP - m_markupText = NULL; -#endif // wxUSE_MARKUP m_authNeeded = false; } - // Switches button into owner-drawn mode: this is used if we need to draw - // something not supported by the native control, such as using non default - // colours or a bitmap on pre-XP systems. - void MakeOwnerDrawn(); + void OnCharHook(wxKeyEvent& event); + wxDECLARE_EVENT_TABLE(); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton); }; -#endif // _WX_BUTTON_H_ +#endif // _WX_MSW_BUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/chkconf.h b/Externals/wxWidgets3/include/wx/msw/chkconf.h index 7e547f91b0..637155d5f8 100644 --- a/Externals/wxWidgets3/include/wx/msw/chkconf.h +++ b/Externals/wxWidgets3/include/wx/msw/chkconf.h @@ -4,7 +4,7 @@ * Author: Julian Smart * Modified by: * Created: 01/02/97 - * RCS-ID: $Id: chkconf.h 63832 2010-04-02 19:30:41Z VZ $ + * RCS-ID: $Id: chkconf.h 69845 2011-11-27 19:52:13Z VZ $ * Copyright: (c) Julian Smart * Licence: wxWindows licence */ @@ -224,11 +224,6 @@ */ #ifdef __WIN64__ # if wxUSE_STACKWALKER - /* this is not currently supported under Win64, volunteers needed to - make it work */ -# undef wxUSE_STACKWALKER -# define wxUSE_STACKWALKER 0 - # undef wxUSE_CRASHREPORT # define wxUSE_CRASHREPORT 0 # endif @@ -239,7 +234,7 @@ Compiler-specific checks. */ -// Borland +/* Borland */ #ifdef __BORLANDC__ #if __BORLANDC__ < 0x500 @@ -336,6 +331,14 @@ #endif /* !wxUSE_DYNAMIC_LOADER */ #if !wxUSE_DYNLIB_CLASS +# if wxUSE_DC_TRANSFORM_MATRIX +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_DC_TRANSFORM_MATRIX requires wxUSE_DYNLIB_CLASS" +# else +# undef wxUSE_DC_TRANSFORM_MATRIX +# define wxUSE_DC_TRANSFORM_MATRIX 0 +# endif +# endif # if wxUSE_UXTHEME # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_UXTHEME requires wxUSE_DYNLIB_CLASS" @@ -400,6 +403,14 @@ # define wxUSE_MEDIACTRL 0 # endif # endif +# if wxUSE_WEB +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxWebView requires wxActiveXContainer under MSW" +# else +# undef wxUSE_WEB +# define wxUSE_WEB 0 +# endif +# endif #endif /* !wxUSE_ACTIVEX */ #if !wxUSE_THREADS @@ -413,6 +424,18 @@ # endif #endif /* !wxUSE_THREADS */ + +#if !wxUSE_OLE_AUTOMATION +# if wxUSE_WEB +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxWebView requires wxUSE_OLE_AUTOMATION under MSW" +# else +# undef wxUSE_WEB +# define wxUSE_WEB 0 +# endif +# endif +#endif /* !wxUSE_OLE_AUTOMATION */ + #if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT # undef wxUSE_POSTSCRIPT # define wxUSE_POSTSCRIPT 1 diff --git a/Externals/wxWidgets3/include/wx/msw/combobox.h b/Externals/wxWidgets3/include/wx/msw/combobox.h index d0b6ee8234..5b7c63d67a 100644 --- a/Externals/wxWidgets3/include/wx/msw/combobox.h +++ b/Externals/wxWidgets3/include/wx/msw/combobox.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: combobox.h 63242 2010-01-24 01:00:45Z VZ $ +// RCS-ID: $Id: combobox.h 68808 2011-08-21 12:06:16Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -75,6 +75,10 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr); + // See wxComboBoxBase discussion of IsEmpty(). + bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } + bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); } + // resolve ambiguities among virtual functions inherited from both base // classes virtual void Clear(); diff --git a/Externals/wxWidgets3/include/wx/msw/custombgwin.h b/Externals/wxWidgets3/include/wx/msw/custombgwin.h new file mode 100644 index 0000000000..fe5481f710 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/msw/custombgwin.h @@ -0,0 +1,58 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/msw/custombgwin.h +// Purpose: wxMSW implementation of wxCustomBackgroundWindow +// Author: Vadim Zeitlin +// Created: 2011-10-10 +// RCS-ID: $Id: custombgwin.h 69378 2011-10-11 17:07:43Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_MSW_CUSTOMBGWIN_H_ +#define _WX_MSW_CUSTOMBGWIN_H_ + +#include "wx/bitmap.h" +#include "wx/brush.h" + +// ---------------------------------------------------------------------------- +// wxCustomBackgroundWindow +// ---------------------------------------------------------------------------- + +template +class wxCustomBackgroundWindow : public W, + public wxCustomBackgroundWindowBase +{ +public: + typedef W BaseWindowClass; + + wxCustomBackgroundWindow() { m_backgroundBrush = NULL; } + + virtual ~wxCustomBackgroundWindow() { delete m_backgroundBrush; } + +protected: + virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) + { + delete m_backgroundBrush; + m_backgroundBrush = bmp.IsOk() ? new wxBrush(bmp) : NULL; + + // Our transparent children should use our background if we have it, + // otherwise try to restore m_inheritBgCol to some reasonable value: true + // if we also have non-default background colour or false otherwise. + BaseWindowClass::m_inheritBgCol = bmp.IsOk() + || BaseWindowClass::UseBgCol(); + } + + virtual WXHBRUSH MSWGetCustomBgBrush() + { + if ( m_backgroundBrush ) + return (WXHBRUSH)m_backgroundBrush->GetResourceHandle(); + + return BaseWindowClass::MSWGetCustomBgBrush(); + } + + wxBrush *m_backgroundBrush; + + wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxCustomBackgroundWindow, W); +}; + +#endif // _WX_MSW_CUSTOMBGWIN_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/datectrl.h b/Externals/wxWidgets3/include/wx/msw/datectrl.h index 8a0cabdf9a..7015019f53 100644 --- a/Externals/wxWidgets3/include/wx/msw/datectrl.h +++ b/Externals/wxWidgets3/include/wx/msw/datectrl.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 2005-01-09 -// RCS-ID: $Id: datectrl.h 49893 2007-11-13 12:10:34Z JS $ +// RCS-ID: $Id: datectrl.h 69222 2011-09-29 13:43:02Z VZ $ // Copyright: (c) 2005 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -43,30 +43,21 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxDatePickerCtrlNameStr); - // set/get the date + // Override this one to add date-specific (and time-ignoring) checks. virtual void SetValue(const wxDateTime& dt); virtual wxDateTime GetValue() const; - // set/get the allowed valid range for the dates, if either/both of them - // are invalid, there is no corresponding limit and if neither is set - // GetRange() returns false + // Implement the base class pure virtuals. virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2); virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const; + // Override MSW-specific functions used during control creation. virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - - // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } - protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - virtual wxSize DoGetBestSize() const; - - // the date currently shown by the control, may be invalid - wxDateTime m_date; - + virtual wxLocaleInfo MSWGetFormat() const; + virtual bool MSWAllowsNone() const { return HasFlag(wxDP_ALLOWNONE); } + virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch); DECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl) }; diff --git a/Externals/wxWidgets3/include/wx/msw/datetimectrl.h b/Externals/wxWidgets3/include/wx/msw/datetimectrl.h new file mode 100644 index 0000000000..0c783511c2 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/msw/datetimectrl.h @@ -0,0 +1,87 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/msw/datetimectrl.h +// Purpose: wxDateTimePickerCtrl for Windows. +// Author: Vadim Zeitlin +// Created: 2011-09-22 (extracted from wx/msw/datectrl.h). +// RCS-ID: $Id: datetimectrl.h 69489 2011-10-20 16:45:48Z VZ $ +// Copyright: (c) 2005-2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_MSW_DATETIMECTRL_H_ +#define _WX_MSW_DATETIMECTRL_H_ + +#include "wx/intl.h" + +// Forward declare a struct from Platform SDK. +struct tagNMDATETIMECHANGE; + +// ---------------------------------------------------------------------------- +// wxDateTimePickerCtrl +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_ADV wxDateTimePickerCtrl : public wxDateTimePickerCtrlBase +{ +public: + // set/get the date + virtual void SetValue(const wxDateTime& dt); + virtual wxDateTime GetValue() const; + + // returns true if the platform should explicitly apply a theme border + virtual bool CanApplyThemeBorder() const { return false; } + + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); + +protected: + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxSize DoGetBestSize() const; + + // Helper for the derived classes Create(): creates a native control with + // the specified attributes. + bool MSWCreateDateTimePicker(wxWindow *parent, + wxWindowID id, + const wxDateTime& dt, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name); + + // Notice that the methods below must be overridden in all native MSW + // classes inheriting from this one but they can't be pure virtual because + // the generic implementations, not needing nor able to implement them, is + // also derived from this class currently. The real problem is, of course, + // this wrong class structure because the generic classes also inherit the + // wrong implementations of Set/GetValue() and DoGetBestSize() but as they + // override these methods anyhow, it does work -- but is definitely ugly + // and need to be changed (but how?) in the future. + + // Override to return the date/time format used by this control. + virtual wxLocaleInfo MSWGetFormat() const /* = 0 */ + { + wxFAIL_MSG( "Unreachable" ); + return wxLOCALE_TIME_FMT; + } + + // Override to indicate whether we can have no date at all. + virtual bool MSWAllowsNone() const /* = 0 */ + { + wxFAIL_MSG( "Unreachable" ); + return false; + } + + // Override to update m_date and send the event when the control contents + // changes, return true if the event was handled. + virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch) /* = 0 */ + { + wxUnusedVar(dtch); + wxFAIL_MSG( "Unreachable" ); + return false; + } + + + // the date currently shown by the control, may be invalid + wxDateTime m_date; +}; + +#endif // _WX_MSW_DATETIMECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/dc.h b/Externals/wxWidgets3/include/wx/msw/dc.h index e55eb54715..48fa925c24 100644 --- a/Externals/wxWidgets3/include/wx/msw/dc.h +++ b/Externals/wxWidgets3/include/wx/msw/dc.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: dc.h 67063 2011-02-27 12:48:13Z VZ $ +// RCS-ID: $Id: dc.h 67588 2011-04-23 16:03:10Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -87,6 +87,13 @@ public: virtual void SetDeviceOrigin(wxCoord x, wxCoord y); virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp); +#if wxUSE_DC_TRANSFORM_MATRIX + virtual bool CanUseTransformMatrix() const; + virtual bool SetTransformMatrix(const wxAffineMatrix2D& matrix); + virtual wxAffineMatrix2D GetTransformMatrix() const; + virtual void ResetTransformMatrix(); +#endif // wxUSE_DC_TRANSFORM_MATRIX + virtual void SetLogicalFunction(wxRasterOperationMode function); // implementation from now on diff --git a/Externals/wxWidgets3/include/wx/msw/debughlp.h b/Externals/wxWidgets3/include/wx/msw/debughlp.h index e4337ce751..f5c34ec2b3 100644 --- a/Externals/wxWidgets3/include/wx/msw/debughlp.h +++ b/Externals/wxWidgets3/include/wx/msw/debughlp.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 2005-01-08 (extracted from msw/crashrpt.cpp) -// RCS-ID: $Id: debughlp.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: debughlp.h 69845 2011-11-27 19:52:13Z VZ $ // Copyright: (c) 2003-2005 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -146,9 +146,9 @@ public: PGET_MODULE_BASE_ROUTINE, PTRANSLATE_ADDRESS_ROUTINE); typedef BOOL (WINAPI *SymFromAddr_t)(HANDLE, DWORD64, PDWORD64, PSYMBOL_INFO); - typedef LPVOID (WINAPI *SymFunctionTableAccess_t)(HANDLE, DWORD); - typedef DWORD (WINAPI *SymGetModuleBase_t)(HANDLE, DWORD); - typedef BOOL (WINAPI *SymGetLineFromAddr_t)(HANDLE, DWORD, + typedef LPVOID (WINAPI *SymFunctionTableAccess_t)(HANDLE, DWORD_PTR); + typedef DWORD_PTR (WINAPI *SymGetModuleBase_t)(HANDLE, DWORD_PTR); + typedef BOOL (WINAPI *SymGetLineFromAddr_t)(HANDLE, DWORD_PTR, PDWORD, PIMAGEHLP_LINE); typedef BOOL (WINAPI *SymSetContext_t)(HANDLE, PIMAGEHLP_STACK_FRAME, PIMAGEHLP_CONTEXT); @@ -164,23 +164,44 @@ public: CONST PMINIDUMP_USER_STREAM_INFORMATION, CONST PMINIDUMP_CALLBACK_INFORMATION); - #define wxDO_FOR_ALL_SYM_FUNCS(what) \ - what(SymGetOptions); \ - what(SymSetOptions); \ - what(SymInitialize); \ - what(StackWalk); \ - what(SymFromAddr); \ - what(SymFunctionTableAccess); \ - what(SymGetModuleBase); \ - what(SymGetLineFromAddr); \ - what(SymSetContext); \ - what(SymEnumSymbols); \ - what(SymGetTypeInfo); \ - what(SymCleanup); \ - what(EnumerateLoadedModules); \ - what(MiniDumpWriteDump) + // The macro called by wxDO_FOR_ALL_SYM_FUNCS() below takes 2 arguments: + // the name of the function in the program code, which never has "64" + // suffix, and the name of the function in the DLL which can have "64" + // suffix in some cases. These 2 helper macros call the macro with the + // correct arguments in both cases. + #define wxSYM_CALL(what, name) what(name, name) +#if defined(_M_AMD64) + #define wxSYM_CALL_64(what, name) what(name, name ## 64) - #define wxDECLARE_SYM_FUNCTION(func) static func ## _t func + // Also undo all the "helpful" definitions done by imagehlp.h that map 32 + // bit functions to 64 bit ones, we don't need this as we do it ourselves. + #undef StackWalk + #undef SymFunctionTableAccess + #undef SymGetModuleBase + #undef SymGetLineFromAddr + #undef EnumerateLoadedModules +#else + #define wxSYM_CALL_64(what, name) what(name, name) +#endif + + #define wxDO_FOR_ALL_SYM_FUNCS(what) \ + wxSYM_CALL_64(what, StackWalk); \ + wxSYM_CALL_64(what, SymFunctionTableAccess); \ + wxSYM_CALL_64(what, SymGetModuleBase); \ + wxSYM_CALL_64(what, SymGetLineFromAddr); \ + wxSYM_CALL_64(what, EnumerateLoadedModules); \ + \ + wxSYM_CALL(what, SymGetOptions); \ + wxSYM_CALL(what, SymSetOptions); \ + wxSYM_CALL(what, SymInitialize); \ + wxSYM_CALL(what, SymFromAddr); \ + wxSYM_CALL(what, SymSetContext); \ + wxSYM_CALL(what, SymEnumSymbols); \ + wxSYM_CALL(what, SymGetTypeInfo); \ + wxSYM_CALL(what, SymCleanup); \ + wxSYM_CALL(what, MiniDumpWriteDump) + + #define wxDECLARE_SYM_FUNCTION(func, name) static func ## _t func wxDO_FOR_ALL_SYM_FUNCS(wxDECLARE_SYM_FUNCTION); diff --git a/Externals/wxWidgets3/include/wx/msw/dialog.h b/Externals/wxWidgets3/include/wx/msw/dialog.h index 9ea9a3766b..ad192925e1 100644 --- a/Externals/wxWidgets3/include/wx/msw/dialog.h +++ b/Externals/wxWidgets3/include/wx/msw/dialog.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: dialog.h 60559 2009-05-09 12:26:15Z VZ $ +// RCS-ID: $Id: dialog.h 70511 2012-02-05 14:18:22Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -16,7 +16,7 @@ // this option is always enabled (there doesn't seem to be any good reason to // disable it) for desktop Windows versions but Windows CE dialogs are usually -// not resizeable and never show resize gripper anyhow so don't use it there +// not resizable and never show resize gripper anyhow so don't use it there #ifdef __WXWINCE__ #define wxUSE_DIALOG_SIZEGRIP 0 #else @@ -92,9 +92,9 @@ public: // override some base class virtuals virtual bool Show(bool show = true); - virtual void Raise(); - +#if wxUSE_DIALOG_SIZEGRIP virtual void SetWindowStyleFlag(long style); +#endif // wxUSE_DIALOG_SIZEGRIP #ifdef __POCKETPC__ // Responds to the OK button in a PocketPC titlebar. This @@ -114,7 +114,7 @@ protected: private: #if wxUSE_DIALOG_SIZEGRIP // these functions deal with the gripper window shown in the corner of - // resizeable dialogs + // resizable dialogs void CreateGripper(); void DestroyGripper(); void ShowGripper(bool show); diff --git a/Externals/wxWidgets3/include/wx/msw/dragimag.h b/Externals/wxWidgets3/include/wx/msw/dragimag.h index 44dafc0025..5118833235 100644 --- a/Externals/wxWidgets3/include/wx/msw/dragimag.h +++ b/Externals/wxWidgets3/include/wx/msw/dragimag.h @@ -5,7 +5,7 @@ // Author: Julian Smart // Modified by: // Created: 08/04/99 -// RCS-ID: $Id: dragimag.h 58757 2009-02-08 11:45:59Z VZ $ +// RCS-ID: $Id: dragimag.h 70584 2012-02-15 00:35:25Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -114,14 +114,6 @@ public: Create(image, cursor); } - // Deprecated form of the above - wxDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot) - { - Init(); - - Create(image, cursor, cursorHotspot); - } - wxDragImage(const wxIcon& image, const wxCursor& cursor = wxNullCursor) { Init(); @@ -129,14 +121,6 @@ public: Create(image, cursor); } - // Deprecated form of the above - wxDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot) - { - Init(); - - Create(image, cursor, cursorHotspot); - } - wxDragImage(const wxString& str, const wxCursor& cursor = wxNullCursor) { Init(); @@ -144,14 +128,6 @@ public: Create(str, cursor); } - // Deprecated form of the above - wxDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot) - { - Init(); - - Create(str, cursor, cursorHotspot); - } - #if wxUSE_TREECTRL wxDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id) { @@ -180,27 +156,12 @@ public: // Create a drag image from a bitmap and optional cursor bool Create(const wxBitmap& image, const wxCursor& cursor = wxNullCursor); - bool Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot)) - { - wxLogDebug(wxT("wxDragImage::Create: use of a cursor hotspot is now deprecated. Please omit this argument.")); - return Create(image, cursor); - } // Create a drag image from an icon and optional cursor bool Create(const wxIcon& image, const wxCursor& cursor = wxNullCursor); - bool Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot)) - { - wxLogDebug(wxT("wxDragImage::Create: use of a cursor hotspot is now deprecated. Please omit this argument.")); - return Create(image, cursor); - } // Create a drag image from a string and optional cursor bool Create(const wxString& str, const wxCursor& cursor = wxNullCursor); - bool Create(const wxString& str, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot)) - { - wxLogDebug(wxT("wxDragImage::Create: use of a cursor hotspot is now deprecated. Please omit this argument.")); - return Create(str, cursor); - } #if wxUSE_TREECTRL // Create a drag image for the given tree control item @@ -248,6 +209,16 @@ public: WXHIMAGELIST GetCursorHIMAGELIST() const { return m_hCursorImageList; } #endif + // don't use in new code, use versions without hot spot parameter +#if WXWIN_COMPATIBILITY_2_8 + wxDEPRECATED_CONSTRUCTOR( wxDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot) ); + wxDEPRECATED_CONSTRUCTOR( wxDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot) ); + wxDEPRECATED_CONSTRUCTOR( wxDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot) ); + wxDEPRECATED( bool Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot) ); + wxDEPRECATED( bool Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot) ); + wxDEPRECATED( bool Create(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot) ); +#endif // WXWIN_COMPATIBILITY_2_8 + protected: WXHIMAGELIST m_hImageList; diff --git a/Externals/wxWidgets3/include/wx/msw/enhmeta.h b/Externals/wxWidgets3/include/wx/msw/enhmeta.h index 89fa8cfa18..e1168ec707 100644 --- a/Externals/wxWidgets3/include/wx/msw/enhmeta.h +++ b/Externals/wxWidgets3/include/wx/msw/enhmeta.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 13.01.00 -// RCS-ID: $Id: enhmeta.h 60843 2009-05-31 19:11:15Z VS $ +// RCS-ID: $Id: enhmeta.h 68317 2011-07-21 13:49:59Z VZ $ // Copyright: (c) 2000 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -89,6 +89,7 @@ public: // as above, but takes reference DC as first argument to take resolution, // size, font metrics etc. from + wxEXPLICIT wxEnhMetaFileDC(const wxDC& referenceDC, const wxString& filename = wxEmptyString, int width = 0, int height = 0, diff --git a/Externals/wxWidgets3/include/wx/msw/font.h b/Externals/wxWidgets3/include/wx/msw/font.h index ef4d59f7c1..8c29e0e6dd 100644 --- a/Externals/wxWidgets3/include/wx/msw/font.h +++ b/Externals/wxWidgets3/include/wx/msw/font.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: font.h 65670 2010-09-29 13:46:09Z VZ $ +// RCS-ID: $Id: font.h 70446 2012-01-23 11:28:28Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -91,6 +91,12 @@ public: Create(info, hFont); } + wxFont(int pointSize, + wxFontFamily family, + int flags = wxFONTFLAG_DEFAULT, + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT); + wxFont(const wxString& fontDesc); @@ -117,6 +123,7 @@ public: virtual wxFontStyle GetStyle() const; virtual wxFontWeight GetWeight() const; virtual bool GetUnderlined() const; + virtual bool GetStrikethrough() const; virtual wxString GetFaceName() const; virtual wxFontEncoding GetEncoding() const; virtual const wxNativeFontInfo *GetNativeFontInfo() const; @@ -128,6 +135,7 @@ public: virtual void SetWeight(wxFontWeight weight); virtual bool SetFaceName(const wxString& faceName); virtual void SetUnderlined(bool underlined); + virtual void SetStrikethrough(bool strikethrough); virtual void SetEncoding(wxFontEncoding encoding); wxDECLARE_COMMON_FONT_METHODS(); diff --git a/Externals/wxWidgets3/include/wx/msw/frame.h b/Externals/wxWidgets3/include/wx/msw/frame.h index fa66386469..7483e1c992 100644 --- a/Externals/wxWidgets3/include/wx/msw/frame.h +++ b/Externals/wxWidgets3/include/wx/msw/frame.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: frame.h 60337 2009-04-25 12:59:09Z FM $ +// RCS-ID: $Id: frame.h 70511 2012-02-05 14:18:22Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -42,7 +42,6 @@ public: // implement base class pure virtuals virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - virtual void Raise(); // implementation only from now on // ------------------------------- @@ -79,7 +78,6 @@ public: bool HandleSize(int x, int y, WXUINT flag); bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu); - bool HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup); // tooltip management #if wxUSE_TOOLTIPS @@ -133,8 +131,17 @@ protected: // wxMDIChildFrame bool MSWDoTranslateMessage(wxFrame *frame, WXMSG *msg); - // handle WM_INITMENUPOPUP message to generate wxEVT_MENU_OPEN - bool HandleInitMenuPopup(WXHMENU hMenu); +#if wxUSE_MENUS + // handle WM_EXITMENULOOP message for Win95 only + bool HandleExitMenuLoop(WXWORD isPopup); + + // handle WM_(UN)INITMENUPOPUP message to generate wxEVT_MENU_OPEN/CLOSE + bool HandleMenuPopup(wxEventType evtType, WXHMENU hMenu); + + // Command part of HandleMenuPopup() and HandleExitMenuLoop(). + bool DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu, bool popup); +#endif // wxUSE_MENUS + virtual bool IsMDIChild() const { return false; } diff --git a/Externals/wxWidgets3/include/wx/msw/fswatcher.h b/Externals/wxWidgets3/include/wx/msw/fswatcher.h index a88d81a869..ea7ca41379 100644 --- a/Externals/wxWidgets3/include/wx/msw/fswatcher.h +++ b/Externals/wxWidgets3/include/wx/msw/fswatcher.h @@ -3,7 +3,7 @@ // Purpose: wxMSWFileSystemWatcher // Author: Bartosz Bekier // Created: 2009-05-26 -// RCS-ID: $Id: fswatcher.h 62474 2009-10-22 11:35:43Z VZ $ +// RCS-ID: $Id: fswatcher.h 67693 2011-05-03 23:31:39Z VZ $ // Copyright: (c) 2009 Bartosz Bekier // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -23,6 +23,12 @@ public: wxMSWFileSystemWatcher(const wxFileName& path, int events = wxFSW_EVENT_ALL); + // Override the base class function to provide a much more efficient + // implementation for it using the platform native support for watching the + // entire directory trees. + virtual bool AddTree(const wxFileName& path, int events = wxFSW_EVENT_ALL, + const wxString& filter = wxEmptyString); + protected: bool Init(); }; diff --git a/Externals/wxWidgets3/include/wx/msw/helpchm.h b/Externals/wxWidgets3/include/wx/msw/helpchm.h index 711d74dfb1..d3fdc9272b 100644 --- a/Externals/wxWidgets3/include/wx/msw/helpchm.h +++ b/Externals/wxWidgets3/include/wx/msw/helpchm.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 16/04/2000 -// RCS-ID: $Id: helpchm.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: helpchm.h 67880 2011-06-07 14:28:55Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -82,7 +82,7 @@ protected: wxString m_helpFile; - DECLARE_CLASS(wxCHMHelpController) + DECLARE_DYNAMIC_CLASS(wxCHMHelpController) }; #endif // wxUSE_MS_HTML_HELP diff --git a/Externals/wxWidgets3/include/wx/msw/helpwin.h b/Externals/wxWidgets3/include/wx/msw/helpwin.h index d209f93f83..828d2b6b4f 100644 --- a/Externals/wxWidgets3/include/wx/msw/helpwin.h +++ b/Externals/wxWidgets3/include/wx/msw/helpwin.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: helpwin.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: helpwin.h 67882 2011-06-07 16:48:36Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -20,7 +20,7 @@ class WXDLLIMPEXP_CORE wxWinHelpController: public wxHelpControllerBase { - DECLARE_CLASS(wxWinHelpController) + DECLARE_DYNAMIC_CLASS(wxWinHelpController) public: wxWinHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) {} diff --git a/Externals/wxWidgets3/include/wx/msw/listctrl.h b/Externals/wxWidgets3/include/wx/msw/listctrl.h index 5b4eacae95..ff49f754bb 100644 --- a/Externals/wxWidgets3/include/wx/msw/listctrl.h +++ b/Externals/wxWidgets3/include/wx/msw/listctrl.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: Agron Selimaj // Created: 01/02/97 -// RCS-ID: $Id: listctrl.h 64532 2010-06-09 13:55:48Z FM $ +// RCS-ID: $Id: listctrl.h 70282 2012-01-07 15:09:43Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -16,7 +16,6 @@ #include "wx/dynarray.h" #include "wx/vector.h" -class WXDLLIMPEXP_FWD_CORE wxImageList; class wxMSWListItemData; // define this symbol to indicate the availability of SetColumnsOrder() and @@ -77,7 +76,7 @@ class wxMSWListItemData; */ -class WXDLLIMPEXP_CORE wxListCtrl: public wxControl +class WXDLLIMPEXP_CORE wxListCtrl: public wxListCtrlBase { public: /* @@ -256,12 +255,6 @@ public: void SetImageList(wxImageList *imageList, int which); void AssignImageList(wxImageList *imageList, int which); - // are we in report mode? - bool InReportView() const { return HasFlag(wxLC_REPORT); } - - // are we in virtual report mode? - bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); } - // refresh items selectively (only useful for virtual list controls) void RefreshItem(long item); void RefreshItems(long itemFrom, long itemTo); @@ -326,14 +319,6 @@ public: // Insert an image/string item long InsertItem(long index, const wxString& label, int imageIndex); - // For list view mode (only), inserts a column. - long InsertColumn(long col, const wxListItem& info); - - long InsertColumn(long col, - const wxString& heading, - int format = wxLIST_FORMAT_LEFT, - int width = -1); - // set the number of items in a virtual list control void SetItemCount(long count); @@ -399,6 +384,9 @@ protected: // common part of all ctors void Init(); + // Implement base class pure virtual methods. + long DoInsertColumn(long col, const wxListItem& info); + // free memory taken by all internal data void FreeAllInternalData(); @@ -466,6 +454,10 @@ private: // destroy m_textCtrl if it's currently valid and reset it to NULL void DeleteEditControl(); + // Intercept Escape and Enter keys to avoid them being stolen from our + // in-place editor control. + void OnCharHook(wxKeyEvent& event); + DECLARE_DYNAMIC_CLASS(wxListCtrl) DECLARE_EVENT_TABLE() diff --git a/Externals/wxWidgets3/include/wx/msw/menu.h b/Externals/wxWidgets3/include/wx/msw/menu.h index e5cc5d0142..53bea80f91 100644 --- a/Externals/wxWidgets3/include/wx/msw/menu.h +++ b/Externals/wxWidgets3/include/wx/msw/menu.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: Vadim Zeitlin (wxMenuItem is now in separate file) // Created: 01/02/97 -// RCS-ID: $Id: menu.h 66178 2010-11-17 01:20:50Z VZ $ +// RCS-ID: $Id: menu.h 70350 2012-01-15 13:41:17Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -25,6 +25,7 @@ class WXDLLIMPEXP_FWD_CORE wxFrame; class WXDLLIMPEXP_FWD_CORE wxToolBar; #endif +class wxMenuRadioItemsData; // Not using a combined wxToolBar/wxMenuBar? then use // a commandbar in WinCE .NET to implement the @@ -60,16 +61,27 @@ public: virtual void SetTitle(const wxString& title); + // MSW-only methods + // ---------------- + + // Create a new menu from the given native HMENU. Takes ownership of the + // menu handle and will delete it when this object is destroyed. + static wxMenu *MSWNewFromHMENU(WXHMENU hMenu) { return new wxMenu(hMenu); } + + // implementation only from now on // ------------------------------- - virtual void Attach(wxMenuBarBase *menubar); - bool MSWCommand(WXUINT param, WXWORD id); // get the native menu handle WXHMENU GetHMenu() const { return m_hMenu; } + // Return the start and end position of the radio group to which the item + // at the given position belongs. Returns false if there is no radio group + // containing this position. + bool MSWGetRadioGroupRange(int pos, int *start, int *end) const; + #if wxUSE_ACCEL // called by wxMenuBar to build its accel table from the accels of all menus bool HasAccels() const { return !m_accels.empty(); } @@ -102,6 +114,9 @@ public: m_maxAccelWidth = -1; } + // get the menu with given handle (recursively) + wxMenu* MSWGetMenu(WXHMENU hMenu); + private: void CalculateMaxAccelWidth(); @@ -113,21 +128,30 @@ protected: virtual wxMenuItem* DoRemove(wxMenuItem *item); private: - // common part of all ctors + // This constructor is private, use MSWNewFromHMENU() to use it. + wxMenu(WXHMENU hMenu); + + // Common part of all ctors, it doesn't create a new HMENU. + void InitNoCreate(); + + // Common part of all ctors except of the one above taking a native menu + // handler: calls InitNoCreate() and also creates a new menu. void Init(); // common part of Append/Insert (behaves as Append is pos == (size_t)-1) bool DoInsertOrAppend(wxMenuItem *item, size_t pos = (size_t)-1); - // terminate the current radio group, if any - void EndRadioGroup(); + + // This variable contains the description of the radio item groups and + // allows to find whether an item at the given position is part of the + // group and also where its group starts and ends. + // + // It is initially NULL and only allocated if we have any radio items. + wxMenuRadioItemsData *m_radioData; // if true, insert a breal before appending the next item bool m_doBreak; - // the position of the first item in the current radio group or -1 - int m_startRadioGroup; - // the menu handle of this menu WXHMENU m_hMenu; @@ -173,6 +197,7 @@ public: virtual wxMenu *Remove(size_t pos); virtual void EnableTop( size_t pos, bool flag ); + virtual bool IsEnabledTop(size_t pos) const; virtual void SetMenuLabel( size_t pos, const wxString& label ); virtual wxString GetMenuLabel( size_t pos ) const; @@ -208,6 +233,9 @@ public: void Refresh( bool eraseBackground, const wxRect *rect = (const wxRect *) NULL ) { wxWindow::Refresh(eraseBackground, rect); } + // get the menu with given handle (recursively) + wxMenu* MSWGetMenu(WXHMENU hMenu); + protected: // common part of all ctors void Init(); diff --git a/Externals/wxWidgets3/include/wx/msw/menuitem.h b/Externals/wxWidgets3/include/wx/msw/menuitem.h index 8cf0698c63..1ccc75bdea 100644 --- a/Externals/wxWidgets3/include/wx/msw/menuitem.h +++ b/Externals/wxWidgets3/include/wx/msw/menuitem.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 11.11.97 -// RCS-ID: $Id: menuitem.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: menuitem.h 70801 2012-03-04 00:29:55Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -61,11 +61,6 @@ public: // Win32 API WXWPARAM GetMSWId() const; - // mark item as belonging to the given radio group - void SetAsRadioGroupStart(); - void SetRadioGroupStart(int start); - void SetRadioGroupEnd(int end); - #if WXWIN_COMPATIBILITY_2_8 // compatibility only, don't use in new code wxDEPRECATED( @@ -124,24 +119,21 @@ private: // helper function for draw std menu check mark void DrawStdCheckMark(WXHDC hdc, const tagRECT* rc, wxODStatus stat); -#endif // wxUSE_OWNER_DRAWN +#else // !wxUSE_OWNER_DRAWN + // Provide stubs for the public functions above to ensure that the code + // still compiles without wxUSE_OWNER_DRAWN -- it makes sense to just drop + // the bitmaps then instead of failing compilation. + void SetBitmaps(const wxBitmap& WXUNUSED(bmpChecked), + const wxBitmap& WXUNUSED(bmpUnchecked) = wxNullBitmap) { } + void SetBitmap(const wxBitmap& WXUNUSED(bmp), + bool WXUNUSED(bChecked) = true) { } + const wxBitmap& GetBitmap() const { return wxNullBitmap; } +#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN private: // common part of all ctors void Init(); - // the positions of the first and last items of the radio group this item - // belongs to or -1: start is the radio group start and is valid for all - // but first radio group items (m_isRadioGroupStart == false), end is valid - // only for the first one - union - { - int start; - int end; - } m_radioGroup; - - // does this item start a radio group? - bool m_isRadioGroupStart; #if wxUSE_OWNER_DRAWN // item bitmaps diff --git a/Externals/wxWidgets3/include/wx/msw/missing.h b/Externals/wxWidgets3/include/wx/msw/missing.h index 0888d1322e..34184c596d 100644 --- a/Externals/wxWidgets3/include/wx/msw/missing.h +++ b/Externals/wxWidgets3/include/wx/msw/missing.h @@ -3,7 +3,7 @@ // Purpose: Declarations for parts of the Win32 SDK that are missing in // the versions that come with some compilers // Created: 2002/04/23 -// RCS-ID: $Id: missing.h 66996 2011-02-22 13:26:06Z VZ $ +// RCS-ID: $Id: missing.h 69844 2011-11-27 19:50:53Z VZ $ // Copyright: (c) 2002 Mattia Barbon // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -94,6 +94,7 @@ #define VK_OEM_5 0xDC #define VK_OEM_6 0xDD #define VK_OEM_7 0xDE + #define VK_OEM_102 0xE2 #endif #ifndef VK_OEM_COMMA @@ -514,6 +515,152 @@ typedef struct #endif +#endif + +//Various defines that will be needed by mingw and possibly VC++6 +//Used by the webview library + +#ifndef DISPID_COMMANDSTATECHANGE +#define DISPID_COMMANDSTATECHANGE 105 +#endif + +#ifndef DISPID_NAVIGATECOMPLETE2 +#define DISPID_NAVIGATECOMPLETE2 252 +#endif + +#ifndef DISPID_NAVIGATEERROR +#define DISPID_NAVIGATEERROR 271 +#endif + +#ifndef DISPID_NEWWINDOW3 +#define DISPID_NEWWINDOW3 273 +#endif + +#ifndef INET_E_ERROR_FIRST +#define INET_E_ERROR_FIRST 0x800C0002L +#endif + +#ifndef INET_E_INVALID_URL +#define INET_E_INVALID_URL 0x800C0002L +#endif + +#ifndef INET_E_NO_SESSION +#define INET_E_NO_SESSION 0x800C0003L +#endif + +#ifndef INET_E_CANNOT_CONNECT +#define INET_E_CANNOT_CONNECT 0x800C0004L +#endif + +#ifndef INET_E_RESOURCE_NOT_FOUND +#define INET_E_RESOURCE_NOT_FOUND 0x800C0005L +#endif + +#ifndef INET_E_OBJECT_NOT_FOUND +#define INET_E_OBJECT_NOT_FOUND 0x800C0006L +#endif + +#ifndef INET_E_DATA_NOT_AVAILABLE +#define INET_E_DATA_NOT_AVAILABLE 0x800C0007L +#endif + +#ifndef INET_E_DOWNLOAD_FAILURE +#define INET_E_DOWNLOAD_FAILURE 0x800C0008L +#endif + +#ifndef INET_E_AUTHENTICATION_REQUIRED +#define INET_E_AUTHENTICATION_REQUIRED 0x800C0009L +#endif + +#ifndef INET_E_NO_VALID_MEDIA +#define INET_E_NO_VALID_MEDIA 0x800C000AL +#endif + +#ifndef INET_E_CONNECTION_TIMEOUT +#define INET_E_CONNECTION_TIMEOUT 0x800C000BL +#endif + +#ifndef INET_E_INVALID_REQUEST +#define INET_E_INVALID_REQUEST 0x800C000CL +#endif + +#ifndef INET_E_UNKNOWN_PROTOCOL +#define INET_E_UNKNOWN_PROTOCOL 0x800C000DL +#endif + +#ifndef INET_E_SECURITY_PROBLEM +#define INET_E_SECURITY_PROBLEM 0x800C000EL +#endif + +#ifndef INET_E_CANNOT_LOAD_DATA +#define INET_E_CANNOT_LOAD_DATA 0x800C000FL +#endif + +#ifndef INET_E_CANNOT_INSTANTIATE_OBJECT +#define INET_E_CANNOT_INSTANTIATE_OBJECT 0x800C0010L +#endif + +#ifndef INET_E_QUERYOPTION_UNKNOWN +#define INET_E_QUERYOPTION_UNKNOWN 0x800C0013L +#endif + +#ifndef INET_E_REDIRECT_FAILED +#define INET_E_REDIRECT_FAILED 0x800C0014L +#endif + +#ifndef INET_E_REDIRECT_TO_DIR +#define INET_E_REDIRECT_TO_DIR 0x800C0015L +#endif + +#ifndef INET_E_CANNOT_LOCK_REQUEST +#define INET_E_CANNOT_LOCK_REQUEST 0x800C0016L +#endif + +#ifndef INET_E_USE_EXTEND_BINDING +#define INET_E_USE_EXTEND_BINDING 0x800C0017L +#endif + +#ifndef INET_E_TERMINATED_BIND +#define INET_E_TERMINATED_BIND 0x800C0018L +#endif + +#ifndef INET_E_INVALID_CERTIFICATE +#define INET_E_INVALID_CERTIFICATE 0x800C0019L +#endif + +#ifndef INET_E_CODE_DOWNLOAD_DECLINED +#define INET_E_CODE_DOWNLOAD_DECLINED 0x800C0100L +#endif + +#ifndef INET_E_RESULT_DISPATCHED +#define INET_E_RESULT_DISPATCHED 0x800C0200L +#endif + +#ifndef INET_E_CANNOT_REPLACE_SFP_FILE +#define INET_E_CANNOT_REPLACE_SFP_FILE 0x800C0300L +#endif + +#ifndef INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY +#define INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY 0x800C0500L +#endif + +#ifndef INET_E_CODE_INSTALL_SUPPRESSED +#define INET_E_CODE_INSTALL_SUPPRESSED 0x800C0400L +#endif + +//We need to check if we are using MinGW or mingw-w64 as their +//definitions are different + +#ifdef __MINGW32__ +#include <_mingw.h> +#endif + +#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) +typedef enum CommandStateChangeConstants { + CSC_UPDATECOMMANDS = (int) 0xFFFFFFFF, + CSC_NAVIGATEFORWARD = 0x1, + CSC_NAVIGATEBACK = 0x2 +} CommandStateChangeConstants; #endif /* diff --git a/Externals/wxWidgets3/include/wx/msw/nonownedwnd.h b/Externals/wxWidgets3/include/wx/msw/nonownedwnd.h new file mode 100644 index 0000000000..789a836aea --- /dev/null +++ b/Externals/wxWidgets3/include/wx/msw/nonownedwnd.h @@ -0,0 +1,39 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/msw/nonownedwnd.h +// Purpose: wxNonOwnedWindow declaration for wxMSW. +// Author: Vadim Zeitlin +// Created: 2011-10-09 +// RCS-ID: $Id: nonownedwnd.h 69462 2011-10-18 21:56:52Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_MSW_NONOWNEDWND_H_ +#define _WX_MSW_NONOWNEDWND_H_ + +class wxNonOwnedWindowShapeImpl; + +// ---------------------------------------------------------------------------- +// wxNonOwnedWindow +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase +{ +public: + wxNonOwnedWindow(); + virtual ~wxNonOwnedWindow(); + +protected: + virtual bool DoClearShape(); + virtual bool DoSetRegionShape(const wxRegion& region); +#if wxUSE_GRAPHICS_CONTEXT + virtual bool DoSetPathShape(const wxGraphicsPath& path); + +private: + wxNonOwnedWindowShapeImpl* m_shapeImpl; +#endif // wxUSE_GRAPHICS_CONTEXT + + wxDECLARE_NO_COPY_CLASS(wxNonOwnedWindow); +}; + +#endif // _WX_MSW_NONOWNEDWND_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/notebook.h b/Externals/wxWidgets3/include/wx/msw/notebook.h index 644231a4d6..bfed8f9794 100644 --- a/Externals/wxWidgets3/include/wx/msw/notebook.h +++ b/Externals/wxWidgets3/include/wx/msw/notebook.h @@ -3,7 +3,7 @@ // Purpose: MSW/GTK compatible notebook (a.k.a. property sheet) // Author: Robert Roebling // Modified by: Vadim Zeitlin for Windows version -// RCS-ID: $Id: notebook.h 67250 2011-03-20 00:00:29Z VZ $ +// RCS-ID: $Id: notebook.h 69793 2011-11-22 13:18:45Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -96,7 +96,7 @@ public: wxNotebookPage *pPage, const wxString& strText, bool bSelect = false, - int imageId = -1); + int imageId = NO_IMAGE); // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH // style. @@ -194,6 +194,9 @@ protected: // true if we have already subclassed our updown control bool m_hasSubclassedUpdown; + + // true if we already refreshed the current page after showing the window + bool m_doneUpdateHack; #endif // __WXWINCE__ #if wxUSE_UXTHEME diff --git a/Externals/wxWidgets3/include/wx/msw/ole/activex.h b/Externals/wxWidgets3/include/wx/msw/ole/activex.h index a0047ae0cc..2acd893ace 100644 --- a/Externals/wxWidgets3/include/wx/msw/ole/activex.h +++ b/Externals/wxWidgets3/include/wx/msw/ole/activex.h @@ -4,7 +4,7 @@ // Author: Ryan Norton // Modified by: // Created: 8/18/05 -// RCS-ID: $Id: activex.h 64533 2010-06-09 14:28:08Z FM $ +// RCS-ID: $Id: activex.h 70361 2012-01-15 19:05:34Z SJL $ // Copyright: (c) Ryan Norton // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -168,6 +168,8 @@ public: void OnPaint(wxPaintEvent&); void OnSetFocus(wxFocusEvent&); void OnKillFocus(wxFocusEvent&); + virtual bool MSWTranslateMessage(WXMSG* pMsg); + virtual bool QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc); protected: friend class FrameSite; diff --git a/Externals/wxWidgets3/include/wx/msw/ole/oleutils.h b/Externals/wxWidgets3/include/wx/msw/ole/oleutils.h index f52e1a294d..dffb3b266e 100644 --- a/Externals/wxWidgets3/include/wx/msw/ole/oleutils.h +++ b/Externals/wxWidgets3/include/wx/msw/ole/oleutils.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 19.02.1998 -// RCS-ID: $Id: oleutils.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: oleutils.h 70162 2011-12-29 11:26:05Z SN $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -82,7 +82,7 @@ inline void ReleaseInterface(IUnknown *pIUnk) #define RELEASE_AND_NULL(p) if ( (p) != NULL ) { p->Release(); p = NULL; }; // return true if the iid is in the array -extern bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount); +extern WXDLLIMPEXP_CORE bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount); // ============================================================================ // IUnknown implementation helpers @@ -140,9 +140,10 @@ private: wxAutoULong m_cRef // macros for declaring supported interfaces -// NB: you should write ADD_INTERFACE(Foo) and not ADD_INTERFACE(IID_IFoo)! +// NB: ADD_IID prepends IID_I whereas ADD_RAW_IID does not #define BEGIN_IID_TABLE(cname) const IID *cname::ms_aIids[] = { #define ADD_IID(iid) &IID_I##iid, +#define ADD_RAW_IID(iid) &iid, #define END_IID_TABLE } // implementation is as straightforward as possible @@ -197,11 +198,11 @@ private: // ---------------------------------------------------------------------------- // tries to translate riid into a symbolic name, if possible -void wxLogQueryInterface(const wxChar *szInterface, REFIID riid); +WXDLLIMPEXP_CORE void wxLogQueryInterface(const wxChar *szInterface, REFIID riid); // these functions print out the new value of reference counter -void wxLogAddRef (const wxChar *szInterface, ULONG cRef); -void wxLogRelease(const wxChar *szInterface, ULONG cRef); +WXDLLIMPEXP_CORE void wxLogAddRef (const wxChar *szInterface, ULONG cRef); +WXDLLIMPEXP_CORE void wxLogRelease(const wxChar *szInterface, ULONG cRef); #else //!__WXDEBUG__ #define wxLogQueryInterface(szInterface, riid) diff --git a/Externals/wxWidgets3/include/wx/msw/palette.h b/Externals/wxWidgets3/include/wx/msw/palette.h index b6e737a8a8..35560e6012 100644 --- a/Externals/wxWidgets3/include/wx/msw/palette.h +++ b/Externals/wxWidgets3/include/wx/msw/palette.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: palette.h 52834 2008-03-26 15:06:00Z FM $ +// RCS-ID: $Id: palette.h 70040 2011-12-17 23:52:47Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,13 +19,13 @@ class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase public: wxPalette() { } wxPalette(int n, - unsigned char *red, unsigned char *green, unsigned char *blue) + const unsigned char *red, const unsigned char *green, const unsigned char *blue) { Create(n, red, green, blue); } bool Create(int n, - unsigned char *red, unsigned char *green, unsigned char *blue); + const unsigned char *red, const unsigned char *green, const unsigned char *blue); virtual int GetColoursCount() const; diff --git a/Externals/wxWidgets3/include/wx/msw/panel.h b/Externals/wxWidgets3/include/wx/msw/panel.h index 6007a6010b..9a2ab283c1 100644 --- a/Externals/wxWidgets3/include/wx/msw/panel.h +++ b/Externals/wxWidgets3/include/wx/msw/panel.h @@ -3,7 +3,7 @@ // Purpose: wxMSW-specific wxPanel class. // Author: Vadim Zeitlin // Created: 2011-03-18 -// RCS-ID: $Id: panel.h 67253 2011-03-20 00:00:49Z VZ $ +// RCS-ID: $Id: panel.h 70098 2011-12-23 05:59:59Z PC $ // Copyright: (c) 2011 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxBrush; class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase { public: - wxPanel() { Init(); } + wxPanel() { } wxPanel(wxWindow *parent, wxWindowID winid = wxID_ANY, @@ -29,8 +29,6 @@ public: long style = wxTAB_TRAVERSAL | wxNO_BORDER, const wxString& name = wxPanelNameStr) { - Init(); - Create(parent, winid, pos, size, style, name); } @@ -40,7 +38,7 @@ public: virtual bool HasTransparentBackground(); -#ifdef WXWIN_COMPATIBILITY_2_8 +#if WXWIN_COMPATIBILITY_2_8 wxDEPRECATED_CONSTRUCTOR( wxPanel(wxWindow *parent, int x, int y, int width, int height, @@ -52,18 +50,7 @@ public: ) #endif // WXWIN_COMPATIBILITY_2_8 -protected: - void Init() - { - m_backgroundBrush = NULL; - } - - virtual void DoSetBackgroundBitmap(const wxBitmap& bmp); - virtual WXHBRUSH MSWGetCustomBgBrush(); - private: - wxBrush *m_backgroundBrush; - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel); }; diff --git a/Externals/wxWidgets3/include/wx/msw/printdlg.h b/Externals/wxWidgets3/include/wx/msw/printdlg.h index f656e75720..a8362bdd06 100644 --- a/Externals/wxWidgets3/include/wx/msw/printdlg.h +++ b/Externals/wxWidgets3/include/wx/msw/printdlg.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: printdlg.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: printdlg.h 70636 2012-02-20 21:55:55Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -20,6 +20,7 @@ #include "wx/printdlg.h" class WXDLLIMPEXP_FWD_CORE wxDC; +class WinPrinter; //---------------------------------------------------------------------------- // wxWindowsPrintNativeData @@ -37,6 +38,7 @@ public: virtual bool Ok() const { return IsOk(); } virtual bool IsOk() const; + void InitializeDevMode(const wxString &printerName = wxEmptyString, WinPrinter* printer = NULL); void* GetDevMode() const { return m_devMode; } void SetDevMode(void* data) { m_devMode = data; } void* GetDevNames() const { return m_devNames; } @@ -105,7 +107,7 @@ public: bool ConvertToNative( wxPageSetupDialogData &data ); bool ConvertFromNative( wxPageSetupDialogData &data ); - virtual wxPageSetupData& GetPageSetupDialogData() { return m_pageSetupData; } + virtual wxPageSetupDialogData& GetPageSetupDialogData() { return m_pageSetupData; } private: wxPageSetupDialogData m_pageSetupData; diff --git a/Externals/wxWidgets3/include/wx/msw/private.h b/Externals/wxWidgets3/include/wx/msw/private.h index 45217c0aae..75f5c65382 100644 --- a/Externals/wxWidgets3/include/wx/msw/private.h +++ b/Externals/wxWidgets3/include/wx/msw/private.h @@ -6,7 +6,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: private.h 65958 2010-10-30 23:50:45Z VZ $ +// RCS-ID: $Id: private.h 69758 2011-11-14 12:51:53Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -454,7 +454,7 @@ private: void DoInit(HGDIOBJ hgdiobj) { m_hgdiobj = ::SelectObject(m_hdc, hgdiobj); } public: - SelectInHDC() : m_hdc(NULL) { } + SelectInHDC() : m_hdc(NULL), m_hgdiobj(NULL) { } SelectInHDC(HDC hdc, HGDIOBJ hgdiobj) : m_hdc(hdc) { DoInit(hgdiobj); } void Init(HDC hdc, HGDIOBJ hgdiobj) @@ -923,6 +923,9 @@ WXDLLIMPEXP_BASE wxWinVersion wxGetWinVersion(); extern HCURSOR wxGetCurrentBusyCursor(); // from msw/utils.cpp extern const wxCursor *wxGetGlobalCursor(); // from msw/cursor.cpp +// GetCursorPos can fail without populating the POINT. This falls back to GetMessagePos. +WXDLLIMPEXP_CORE void wxGetCursorPosMSW(POINT* pt); + WXDLLIMPEXP_CORE void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont& the_font); WXDLLIMPEXP_CORE void wxFillLogFont(LOGFONT *logFont, const wxFont *font); WXDLLIMPEXP_CORE wxFont wxCreateFontFromLogFont(const LOGFONT *logFont); diff --git a/Externals/wxWidgets3/include/wx/msw/private/button.h b/Externals/wxWidgets3/include/wx/msw/private/button.h index 8f16b885c3..c45bcf167a 100644 --- a/Externals/wxWidgets3/include/wx/msw/private/button.h +++ b/Externals/wxWidgets3/include/wx/msw/private/button.h @@ -3,7 +3,7 @@ // Purpose: helper functions used with native BUTTON control // Author: Vadim Zeitlin // Created: 2008-06-07 -// RCS-ID: $Id: button.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: button.h 68922 2011-08-27 14:11:28Z VZ $ // Copyright: (c) 2008 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -44,7 +44,8 @@ void UpdateMultilineStyle(HWND hwnd, const wxString& label); // flags for ComputeBestSize() and GetFittingSize() enum { - Size_AuthNeeded = 1 + Size_AuthNeeded = 1, + Size_ExactFit = 2 }; // NB: All the functions below are implemented in src/msw/button.cpp diff --git a/Externals/wxWidgets3/include/wx/msw/private/fswatcher.h b/Externals/wxWidgets3/include/wx/msw/private/fswatcher.h index d03d4db8ca..f5ef3bbd38 100644 --- a/Externals/wxWidgets3/include/wx/msw/private/fswatcher.h +++ b/Externals/wxWidgets3/include/wx/msw/private/fswatcher.h @@ -3,7 +3,7 @@ // Purpose: File system watcher impl classes // Author: Bartosz Bekier // Created: 2009-05-26 -// RCS-ID: $Id: fswatcher.h 62678 2009-11-18 09:56:52Z VZ $ +// RCS-ID: $Id: fswatcher.h 67806 2011-05-28 19:35:13Z VZ $ // Copyright: (c) 2009 Bartosz Bekier // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -50,7 +50,7 @@ public: m_path); } } - delete m_overlapped; + free(m_overlapped); } bool IsOk() const @@ -104,7 +104,6 @@ private: wxDECLARE_NO_COPY_CLASS(wxFSWatchEntryMSW); }; - // ============================================================================ // wxFSWatcherImplMSW helper classes implementations // ============================================================================ @@ -156,6 +155,48 @@ public: return m_watches.insert(val).second; } + // Removes a watch we're currently using. Notice that this doesn't happen + // immediately, CompleteRemoval() must be called later when it's really + // safe to delete the watch, i.e. after completion of the IO operation + // using it. + bool ScheduleForRemoval(const wxSharedPtr& watch) + { + wxCHECK_MSG( m_iocp != INVALID_HANDLE_VALUE, false, "IOCP not init" ); + wxCHECK_MSG( watch->IsOk(), false, "Invalid watch" ); + + const wxString path = watch->GetPath(); + wxFSWatchEntries::iterator it = m_watches.find(path); + wxCHECK_MSG( it != m_watches.end(), false, + "Can't remove a watch we don't use" ); + + // We can't just delete the watch here as we can have pending events + // for it and if we destroyed it now, we could get a dangling (or, + // worse, reused to point to another object) pointer in ReadEvents() so + // just remember that this one should be removed when CompleteRemoval() + // is called later. + m_removedWatches.insert(wxFSWatchEntries::value_type(path, watch)); + m_watches.erase(it); + + return true; + } + + // Really remove the watch previously passed to ScheduleForRemoval(). + // + // It's ok to call this for a watch that hadn't been removed before, in + // this case we'll just return false and do nothing. + bool CompleteRemoval(wxFSWatchEntryMSW* watch) + { + wxFSWatchEntries::iterator it = m_removedWatches.find(watch->GetPath()); + if ( it == m_removedWatches.end() ) + return false; + + // Removing the object from the map will result in deleting the watch + // itself as it's not referenced from anywhere else now. + m_removedWatches.erase(it); + + return true; + } + // post completion packet bool PostEmptyStatus() { @@ -203,7 +244,13 @@ protected: } HANDLE m_iocp; + + // The hash containing all the wxFSWatchEntryMSW objects currently being + // watched keyed by their paths. wxFSWatchEntries m_watches; + + // Contains the watches which had been removed but are still pending. + wxFSWatchEntries m_removedWatches; }; diff --git a/Externals/wxWidgets3/include/wx/msw/private/hiddenwin.h b/Externals/wxWidgets3/include/wx/msw/private/hiddenwin.h new file mode 100644 index 0000000000..7f592e2e2e --- /dev/null +++ b/Externals/wxWidgets3/include/wx/msw/private/hiddenwin.h @@ -0,0 +1,31 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/msw/private/hiddenwin.h +// Purpose: Helper for creating a hidden window used by wxMSW internally. +// Author: Vadim Zeitlin +// Created: 2011-09-16 +// RCS-ID: $Id: hiddenwin.h 69170 2011-09-21 15:07:32Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_MSW_PRIVATE_HIDDENWIN_H_ +#define _WX_MSW_PRIVATE_HIDDENWIN_H_ + +#include "wx/msw/private.h" + +/* + Creates a hidden window with supplied window proc registering the class for + it if necessary (i.e. the first time only). Caller is responsible for + destroying the window and unregistering the class (note that this must be + done because wxWidgets may be used as a DLL and so may be loaded/unloaded + multiple times into/from the same process so we can't rely on automatic + Windows class unregistration). + + pclassname is a pointer to a caller stored classname, which must initially be + NULL. classname is the desired wndclass classname. If function successfully + registers the class, pclassname will be set to classname. + */ +extern "C" WXDLLIMPEXP_BASE HWND +wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc); + +#endif // _WX_MSW_PRIVATE_HIDDENWIN_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/private/msgdlg.h b/Externals/wxWidgets3/include/wx/msw/private/msgdlg.h index 339b2f5528..82b5246855 100644 --- a/Externals/wxWidgets3/include/wx/msw/private/msgdlg.h +++ b/Externals/wxWidgets3/include/wx/msw/private/msgdlg.h @@ -3,7 +3,7 @@ // Purpose: helper functions used with native message dialog // Author: Rickard Westerlund // Created: 2010-07-12 -// RCS-ID: $Id: msgdlg.h 65348 2010-08-18 22:48:28Z VZ $ +// RCS-ID: $Id: msgdlg.h 68537 2011-08-04 22:53:42Z VZ $ // Copyright: (c) 2010 wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -30,8 +30,10 @@ namespace wxMSWMessageDialog class wxMSWTaskDialogConfig { public: + enum { MAX_BUTTONS = 4 }; + wxMSWTaskDialogConfig() - : buttons(new TASKDIALOG_BUTTON[3]), + : buttons(new TASKDIALOG_BUTTON[MAX_BUTTONS]), parent(NULL), iconId(0), style(0), @@ -53,6 +55,7 @@ namespace wxMSWMessageDialog wxString btnNoLabel; wxString btnOKLabel; wxString btnCancelLabel; + wxString btnHelpLabel; // Will create a task dialog with it's paremeters for it's creation // stored in the provided TASKDIALOGCONFIG parameter. diff --git a/Externals/wxWidgets3/include/wx/msw/private/timer.h b/Externals/wxWidgets3/include/wx/msw/private/timer.h index 145995f9dc..c45ba1df7e 100644 --- a/Externals/wxWidgets3/include/wx/msw/private/timer.h +++ b/Externals/wxWidgets3/include/wx/msw/private/timer.h @@ -3,7 +3,7 @@ // Purpose: wxTimer class // Author: Julian Smart // Created: 01/02/97 -// RCS-ID: $Id: timer.h 63486 2010-02-15 17:34:21Z RD $ +// RCS-ID: $Id: timer.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,7 +19,7 @@ class WXDLLIMPEXP_BASE wxMSWTimerImpl : public wxTimerImpl { public: - wxMSWTimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_id = 0; }; + wxMSWTimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_id = 0; } virtual bool Start(int milliseconds = -1, bool oneShot = false); virtual void Stop(); diff --git a/Externals/wxWidgets3/include/wx/msw/progdlg.h b/Externals/wxWidgets3/include/wx/msw/progdlg.h index 3c1f69407b..096c89a94d 100644 --- a/Externals/wxWidgets3/include/wx/msw/progdlg.h +++ b/Externals/wxWidgets3/include/wx/msw/progdlg.h @@ -3,7 +3,7 @@ // Purpose: wxProgressDialog // Author: Rickard Westerlund // Created: 2010-07-22 -// RCS-ID: $Id: progdlg.h 65574 2010-09-20 13:11:03Z VZ $ +// RCS-ID: $Id: progdlg.h 69041 2011-09-10 03:26:37Z RD $ // Copyright: (c) 2010 wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -47,6 +47,8 @@ public: // Must provide overload to avoid hiding it (and warnings about it) virtual void Update() { wxGenericProgressDialog::Update(); } + virtual WXWidget GetHandle() const; + private: // Performs common routines to Update() and Pulse(). Requires the // shared object to have been entered. diff --git a/Externals/wxWidgets3/include/wx/msw/radiobox.h b/Externals/wxWidgets3/include/wx/msw/radiobox.h index 589bcdc462..4caefafb8f 100644 --- a/Externals/wxWidgets3/include/wx/msw/radiobox.h +++ b/Externals/wxWidgets3/include/wx/msw/radiobox.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: radiobox.h 65957 2010-10-30 23:50:39Z VZ $ +// RCS-ID: $Id: radiobox.h 70498 2012-02-02 14:26:06Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -149,6 +149,9 @@ protected: // get the total size occupied by the radio box buttons wxSize GetTotalButtonSize(const wxSize& sizeBtn) const; + // Adjust all the buttons to the new window size. + void PositionAllButtons(int x, int y, int width, int height); + virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); @@ -163,6 +166,8 @@ protected: virtual WXHRGN MSWGetRegionWithoutChildren(); #endif // __WXWINCE__ + // resolve ambiguity in base classes + virtual wxBorder GetDefaultBorder() const { return wxRadioBoxBase::GetDefaultBorder(); } // the buttons we contain wxSubwindows *m_radioButtons; diff --git a/Externals/wxWidgets3/include/wx/msw/setup0.h b/Externals/wxWidgets3/include/wx/msw/setup0.h index f3c5cf733c..7b0bf0b25f 100644 --- a/Externals/wxWidgets3/include/wx/msw/setup0.h +++ b/Externals/wxWidgets3/include/wx/msw/setup0.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: setup0.h 67062 2011-02-27 12:48:07Z VZ $ +// RCS-ID: $Id: setup0.h 69463 2011-10-18 21:57:02Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -201,15 +201,6 @@ // Recommended setting: 0 (this is still work in progress...) #define wxUSE_EXTENDED_RTTI 0 -// Set wxUSE_STL to 1 to derive wxList(Foo) and wxArray(Foo) from -// std::list and std::vector, with a compatibility interface, -// and for wxHashMap to be implemented with templates. -// -// Default is 0 -// -// Recommended setting: YMMV -#define wxUSE_STL 0 - // Support for message/error logging. This includes wxLogXXX() functions and // wxLog and derived classes. Don't set this to 0 unless you really know what // you are doing. @@ -261,44 +252,6 @@ // Recommended setting: 1 as setting it to 0 disables many other things #define wxUSE_STREAMS 1 -// This is not a real option but is used as the default value for -// wxUSE_STD_IOSTREAM and wxUSE_STD_STRING. -// -// Currently the Digital Mars and Watcom compilers come without standard C++ -// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have -// them (e.g. from STLPort). -// -// VC++ 5.0 does include standard C++ library headers, however they produce -// many warnings that can't be turned off when compiled at warning level 4. -#if defined(__DMC__) || defined(__WATCOMC__) \ - || (defined(_MSC_VER) && _MSC_VER < 1200) - #define wxUSE_STD_DEFAULT 0 -#else - #define wxUSE_STD_DEFAULT 1 -#endif - -// Use standard C++ streams if 1 instead of wx streams in some places. If -// disabled (default), wx streams are used everywhere and wxWidgets doesn't -// depend on the standard streams library. -// -// Notice that enabling this does not replace wx streams with std streams -// everywhere, in a lot of places wx streams are used no matter what. -// -// Default is 0 -// -// Recommended setting: 1 if you use the standard streams anyhow and so -// dependency on the standard streams library is not a -// problem -#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT - -// Enable conversion to standard C++ string if 1. -// -// Default is 1 for most compilers. -// -// Recommended setting: 1 unless you want to ensure your program doesn't use -// the standard C++ library at all. -#define wxUSE_STD_STRING wxUSE_STD_DEFAULT - // Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf. // Note that if the system's implementation does not support positional // parameters, setting this to 1 forces the use of the wxWidgets implementation @@ -314,6 +267,107 @@ // Recommended setting: 1 if you want to support multiple languages #define wxUSE_PRINTF_POS_PARAMS 1 + +// ---------------------------------------------------------------------------- +// Interoperability with the standard library. +// ---------------------------------------------------------------------------- + +// Set wxUSE_STL to 1 to enable maximal interoperability with the standard +// library, even at the cost of backwards compatibility. +// +// Default is 0 +// +// Recommended setting: 0 as the options below already provide a relatively +// good level of interoperability and changing this option arguably isn't worth +// diverging from the official builds of the library. +#define wxUSE_STL 0 + +// This is not a real option but is used as the default value for +// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS. +// +// Currently the Digital Mars and Watcom compilers come without standard C++ +// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have +// them (e.g. from STLPort). +// +// VC++ 5.0 does include standard C++ library headers, however they produce +// many warnings that can't be turned off when compiled at warning level 4. +#if defined(__DMC__) || defined(__WATCOMC__) \ + || (defined(_MSC_VER) && _MSC_VER < 1200) + #define wxUSE_STD_DEFAULT 0 +#else + #define wxUSE_STD_DEFAULT 1 +#endif + +// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<> +// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but +// usually more limited) implementations are used which allows to avoid the +// dependency on the C++ run-time library. +// +// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't +// support using standard containers and that VC6 needs non-default options for +// such build to avoid getting "fatal error C1076: compiler limit : internal +// heap limit reached; use /Zm to specify a higher limit" in its own standard +// headers, so you need to ensure you do increase the heap size before enabling +// this option for this compiler. +// +// Default is 0 for compatibility reasons. +// +// Recommended setting: 1 unless compatibility with the official wxWidgets +// build and/or the existing code is a concern. +#define wxUSE_STD_CONTAINERS 0 + +// Use standard C++ streams if 1 instead of wx streams in some places. If +// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the +// standard streams library. +// +// Notice that enabling this does not replace wx streams with std streams +// everywhere, in a lot of places wx streams are used no matter what. +// +// Default is 1 if compiler supports it. +// +// Recommended setting: 1 if you use the standard streams anyhow and so +// dependency on the standard streams library is not a +// problem +#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT + +// Enable minimal interoperability with the standard C++ string class if 1. +// "Minimal" means that wxString can be constructed from std::string or +// std::wstring but can't be implicitly converted to them. You need to enable +// the option below for the latter. +// +// Default is 1 for most compilers. +// +// Recommended setting: 1 unless you want to ensure your program doesn't use +// the standard C++ library at all. +#define wxUSE_STD_STRING wxUSE_STD_DEFAULT + +// Make wxString as much interchangeable with std::[w]string as possible, in +// particular allow implicit conversion of wxString to either of these classes. +// This comes at a price (or a benefit, depending on your point of view) of not +// allowing implicit conversion to "const char *" and "const wchar_t *". +// +// Because a lot of existing code relies on these conversions, this option is +// disabled by default but can be enabled for your build if you don't care +// about compatibility. +// +// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled. +// +// Recommended setting: 0 to remain compatible with the official builds of +// wxWidgets. +#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL + +// VC++ 4.2 and above allows and but you can't mix +// them. Set this option to 1 to use , 0 to use . +// +// Note that newer compilers (including VC++ 7.1 and later) don't support +// wxUSE_IOSTREAMH == 1 and so will be used anyhow. +// +// Default is 0. +// +// Recommended setting: 0, only set to 1 if you use a really old compiler +#define wxUSE_IOSTREAMH 0 + + // ---------------------------------------------------------------------------- // non GUI features selection // ---------------------------------------------------------------------------- @@ -651,6 +705,34 @@ // Recommended setting: 1 #define wxUSE_STC 1 +// Use wxWidget's web viewing classes +// +// Default is 1 +// +// Recommended setting: 1 +#define wxUSE_WEBVIEW 1 + +// Use the IE wxWebView backend +// +// Default is 1 on MSW +// +// Recommended setting: 1 +#ifdef __WXMSW__ +#define wxUSE_WEBVIEW_IE 1 +#else +#define wxUSE_WEBVIEW_IE 0 +#endif + +// Use the WebKit wxWebView backend +// +// Default is 1 on GTK and OSX +// +// Recommended setting: 1 +#if defined(__WXGTK__) || defined(__WXOSX__) +#define wxUSE_WEBVIEW_WEBKIT 1 +#else +#define wxUSE_WEBVIEW_WEBKIT 0 +#endif // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced // 2D drawing API. (Still somewhat experimental) @@ -749,6 +831,7 @@ // // Recommended setting: 1 #define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl +#define wxUSE_BANNERWINDOW 1 // wxBannerWindow #define wxUSE_BUTTON 1 // wxButton #define wxUSE_BMPBUTTON 1 // wxBitmapButton #define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl @@ -784,8 +867,10 @@ #define wxUSE_STATTEXT 1 // wxStaticText #define wxUSE_STATBMP 1 // wxStaticBitmap #define wxUSE_TEXTCTRL 1 // wxTextCtrl +#define wxUSE_TIMEPICKCTRL 1 // wxTimePickerCtrl #define wxUSE_TOGGLEBTN 1 // requires wxButton #define wxUSE_TREECTRL 1 // wxTreeCtrl +#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR // below either wxStatusBar95 or a generic wxStatusBar will be used. @@ -1002,6 +1087,14 @@ // Recommended setting: 1 #define wxUSE_NOTIFICATION_MESSAGE 1 +// wxRichToolTip is a customizable tooltip class which has more functionality +// than the stock (but native, unlike this class) wxToolTip. +// +// Default is 1. +// +// Recommended setting: 1 (but can be safely set to 0 if you don't need it) +#define wxUSE_RICHTOOLTIP 1 + // Use wxSashWindow class. // // Default is 1. @@ -1307,28 +1400,15 @@ // to create files in SVG (Scalable Vector Graphics) format. #define wxUSE_SVG 1 -// ---------------------------------------------------------------------------- -// other compiler (mis)features -// ---------------------------------------------------------------------------- - -// Set this to 0 if your compiler can't cope with omission of prototype -// parameters. +// Should wxDC provide SetTransformMatrix() and related methods? // -// Default is 1. +// Default is 1 but can be set to 0 if this functionality is not used. Notice +// that currently only wxMSW supports this so setting this to 0 doesn't change +// much for non-MSW platforms (although it will still save a few bytes +// probably). // -// Recommended setting: 1 (should never need to set this to 0) -#define REMOVE_UNUSED_ARG 1 - -// VC++ 4.2 and above allows and but you can't mix -// them. Set this option to 1 to use , 0 to use . -// -// Note that newer compilers (including VC++ 7.1 and later) don't support -// wxUSE_IOSTREAMH == 1 and so will be used anyhow. -// -// Default is 0. -// -// Recommended setting: 0, only set to 1 if you use a really old compiler -#define wxUSE_IOSTREAMH 0 +// Recommended setting: 1. +#define wxUSE_DC_TRANSFORM_MATRIX 1 // ---------------------------------------------------------------------------- // image format support @@ -1452,7 +1532,7 @@ // Recommended setting: 1, required by wxMediaCtrl #define wxUSE_ACTIVEX 1 -// wxDC cacheing implementation +// wxDC caching implementation #define wxUSE_DC_CACHEING 1 // Set this to 1 to enable wxDIB class used internally for manipulating @@ -1533,6 +1613,14 @@ // Recommended setting: 0, this is mainly used for testing #define wxUSE_DATEPICKCTRL_GENERIC 0 +// Set this to 1 to be able to use wxTimePickerCtrlGeneric in addition to the +// native wxTimePickerCtrl for the platforms that have the latter (MSW). +// +// Default is 0. +// +// Recommended setting: 0, this is mainly used for testing +#define wxUSE_TIMEPICKCTRL_GENERIC 0 + // ---------------------------------------------------------------------------- // Crash debugging helpers // ---------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/include/wx/msw/setup_inc.h b/Externals/wxWidgets3/include/wx/msw/setup_inc.h index 5a24539c8b..176796629d 100644 --- a/Externals/wxWidgets3/include/wx/msw/setup_inc.h +++ b/Externals/wxWidgets3/include/wx/msw/setup_inc.h @@ -3,7 +3,7 @@ // Purpose: MSW-specific setup.h options // Author: Vadim Zeitlin // Created: 2007-07-21 (extracted from wx/msw/setup0.h) -// RCS-ID: $Id: setup_inc.h 50586 2007-12-08 20:51:21Z VZ $ +// RCS-ID: $Id: setup_inc.h 69224 2011-09-29 13:43:15Z VZ $ // Copyright: (c) 2007 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -63,7 +63,7 @@ // Recommended setting: 1, required by wxMediaCtrl #define wxUSE_ACTIVEX 1 -// wxDC cacheing implementation +// wxDC caching implementation #define wxUSE_DC_CACHEING 1 // Set this to 1 to enable wxDIB class used internally for manipulating @@ -144,6 +144,14 @@ // Recommended setting: 0, this is mainly used for testing #define wxUSE_DATEPICKCTRL_GENERIC 0 +// Set this to 1 to be able to use wxTimePickerCtrlGeneric in addition to the +// native wxTimePickerCtrl for the platforms that have the latter (MSW). +// +// Default is 0. +// +// Recommended setting: 0, this is mainly used for testing +#define wxUSE_TIMEPICKCTRL_GENERIC 0 + // ---------------------------------------------------------------------------- // Crash debugging helpers // ---------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/include/wx/msw/slider.h b/Externals/wxWidgets3/include/wx/msw/slider.h index 7ac25508c5..99267d7ca3 100644 --- a/Externals/wxWidgets3/include/wx/msw/slider.h +++ b/Externals/wxWidgets3/include/wx/msw/slider.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: slider.h 66844 2011-02-05 16:36:30Z VZ $ +// RCS-ID: $Id: slider.h 68230 2011-07-11 22:49:33Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -106,6 +106,10 @@ protected: wxRect GetBoundingBox() const; // Get the height and, if the pointers are non NULL, widths of both labels. + // + // Notice that the return value will be 0 if we don't have wxSL_LABELS + // style but we do fill widthMin and widthMax even if we don't have + // wxSL_MIN_MAX_LABELS style set so the caller should account for it. int GetLabelsSize(int *widthMin = NULL, int *widthMax = NULL) const; @@ -123,8 +127,6 @@ protected: int m_pageSize; int m_lineSize; int m_tickFreq; - int m_minLabelWidth; - int m_maxLabelWidth; // flag needed to detect whether we're getting THUMBRELEASE event because // of dragging the thumb or scrolling the mouse wheel diff --git a/Externals/wxWidgets3/include/wx/msw/sound.h b/Externals/wxWidgets3/include/wx/msw/sound.h index d6d3061f7b..f8b1134229 100644 --- a/Externals/wxWidgets3/include/wx/msw/sound.h +++ b/Externals/wxWidgets3/include/wx/msw/sound.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: sound.h 58757 2009-02-08 11:45:59Z VZ $ +// RCS-ID: $Id: sound.h 69178 2011-09-21 15:08:02Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,14 +19,14 @@ class WXDLLIMPEXP_ADV wxSound : public wxSoundBase public: wxSound(); wxSound(const wxString& fileName, bool isResource = false); - wxSound(int size, const wxByte* data); + wxSound(size_t size, const void* data); virtual ~wxSound(); // Create from resource or file bool Create(const wxString& fileName, bool isResource = false); // Create from data - bool Create(int size, const wxByte* data); + bool Create(size_t size, const void* data); bool IsOk() const { return m_data != NULL; } diff --git a/Externals/wxWidgets3/include/wx/msw/spinctrl.h b/Externals/wxWidgets3/include/wx/msw/spinctrl.h index 6e986bf94e..c1c0f7975d 100644 --- a/Externals/wxWidgets3/include/wx/msw/spinctrl.h +++ b/Externals/wxWidgets3/include/wx/msw/spinctrl.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 22.07.99 -// RCS-ID: $Id: spinctrl.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: spinctrl.h 70799 2012-03-04 00:29:48Z VZ $ // Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -30,7 +30,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins); class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinButton { public: - wxSpinCtrl() { } + wxSpinCtrl() { Init(); } wxSpinCtrl(wxWindow *parent, wxWindowID id = wxID_ANY, @@ -41,6 +41,8 @@ public: int min = 0, int max = 100, int initial = 0, const wxString& name = wxT("wxSpinCtrl")) { + Init(); + Create(parent, id, value, pos, size, style, min, max, initial, name); } @@ -143,6 +145,9 @@ protected: bool m_blockEvent; private: + // Common part of all ctors. + void Init(); + DECLARE_DYNAMIC_CLASS(wxSpinCtrl) DECLARE_EVENT_TABLE() wxDECLARE_NO_COPY_CLASS(wxSpinCtrl); diff --git a/Externals/wxWidgets3/include/wx/msw/statusbar.h b/Externals/wxWidgets3/include/wx/msw/statusbar.h index 290fda2c08..c69be90c93 100644 --- a/Externals/wxWidgets3/include/wx/msw/statusbar.h +++ b/Externals/wxWidgets3/include/wx/msw/statusbar.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 04.04.98 -// RCS-ID: $Id: statusbar.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: statusbar.h 70310 2012-01-10 17:01:09Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -76,8 +76,10 @@ protected: // used by DoUpdateStatusText() wxClientDC *m_pDC; +#if wxUSE_TOOLTIPS // the tooltips used when wxSTB_SHOW_TIPS is given wxVector m_tooltips; +#endif private: struct MSWBorders diff --git a/Externals/wxWidgets3/include/wx/msw/textctrl.h b/Externals/wxWidgets3/include/wx/msw/textctrl.h index 0c5dda1db6..cbcf8b772e 100644 --- a/Externals/wxWidgets3/include/wx/msw/textctrl.h +++ b/Externals/wxWidgets3/include/wx/msw/textctrl.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: textctrl.h 65564 2010-09-18 16:26:30Z VZ $ +// RCS-ID: $Id: textctrl.h 68450 2011-07-29 15:11:54Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -198,6 +198,8 @@ protected: virtual void DoSetValue(const wxString &value, int flags = 0); + virtual wxPoint DoPositionToCoords(long pos) const; + // return true if this control has a user-set limit on amount of text (i.e. // the limit is due to a previous call to SetMaxLength() and not built in) bool HasSpaceLimit(unsigned int *len) const; diff --git a/Externals/wxWidgets3/include/wx/msw/textentry.h b/Externals/wxWidgets3/include/wx/msw/textentry.h index 0f5b195092..3ba6dcb2ea 100644 --- a/Externals/wxWidgets3/include/wx/msw/textentry.h +++ b/Externals/wxWidgets3/include/wx/msw/textentry.h @@ -3,7 +3,7 @@ // Purpose: wxMSW-specific wxTextEntry implementation // Author: Vadim Zeitlin // Created: 2007-09-26 -// RCS-ID: $Id: textentry.h 61834 2009-09-05 12:39:12Z JMS $ +// RCS-ID: $Id: textentry.h 68918 2011-08-27 14:11:13Z VZ $ // Copyright: (c) 2007 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -11,6 +11,8 @@ #ifndef _WX_MSW_TEXTENTRY_H_ #define _WX_MSW_TEXTENTRY_H_ +class wxTextAutoCompleteData; // private class used only by wxTextEntry itself + // ---------------------------------------------------------------------------- // wxTextEntry: common part of wxComboBox and (single line) wxTextCtrl // ---------------------------------------------------------------------------- @@ -18,12 +20,8 @@ class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase { public: - wxTextEntry() - { -#if wxUSE_OLE - m_enumStrings = NULL; -#endif // wxUSE_OLE - } + wxTextEntry(); + virtual ~wxTextEntry(); // implement wxTextEntryBase pure virtual methods virtual void WriteText(const wxString& text); @@ -46,13 +44,6 @@ public: { DoSetSelection(from, to); } virtual void GetSelection(long *from, long *to) const; - // auto-completion uses COM under Windows so they won't work without - // wxUSE_OLE as OleInitialize() is not called then -#if wxUSE_OLE - virtual bool AutoComplete(const wxArrayString& choices); - virtual bool AutoCompleteFileNames(); -#endif // wxUSE_OLE - virtual bool IsEditable() const; virtual void SetEditable(bool editable); @@ -80,13 +71,29 @@ protected: virtual bool DoSetMargins(const wxPoint& pt); virtual wxPoint DoGetMargins() const; + // auto-completion uses COM under Windows so they won't work without + // wxUSE_OLE as OleInitialize() is not called then +#if wxUSE_OLE + virtual bool DoAutoCompleteStrings(const wxArrayString& choices); + virtual bool DoAutoCompleteFileNames(int flags); + virtual bool DoAutoCompleteCustom(wxTextCompleter *completer); +#endif // wxUSE_OLE + private: // implement this to return the HWND of the EDIT control virtual WXHWND GetEditHWND() const = 0; #if wxUSE_OLE - // enumerator for strings currently used for auto-completion or NULL - class wxIEnumString *m_enumStrings; + // Get the auto-complete object creating it if necessary. Returns NULL if + // creating it failed. + wxTextAutoCompleteData *GetOrCreateCompleter(); + + // Various auto-completion-related stuff, only used if any of AutoComplete() + // methods are called. Use the function above to access it. + wxTextAutoCompleteData *m_autoCompleteData; + + // It needs to call our GetEditableWindow() and GetEditHWND() methods. + friend class wxTextAutoCompleteData; #endif // wxUSE_OLE }; diff --git a/Externals/wxWidgets3/include/wx/msw/tglbtn.h b/Externals/wxWidgets3/include/wx/msw/tglbtn.h index ec15dea83a..7711f70bb6 100644 --- a/Externals/wxWidgets3/include/wx/msw/tglbtn.h +++ b/Externals/wxWidgets3/include/wx/msw/tglbtn.h @@ -5,7 +5,7 @@ // Author: John Norris, minor changes by Axel Schlueter // Modified by: // Created: 08.02.01 -// RCS-ID: $Id: tglbtn.h 66992 2011-02-22 13:25:30Z VZ $ +// RCS-ID: $Id: tglbtn.h 67931 2011-06-14 13:00:42Z VZ $ // Copyright: (c) 2000 Johnny C. Norris II // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,71 +15,11 @@ #include "wx/bitmap.h" -//----------------------------------------------------------------------------- -// wxBitmapToggleButton -//----------------------------------------------------------------------------- - - -class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButtonBase -{ -public: - // construction/destruction - wxBitmapToggleButton() { Init(); } - wxBitmapToggleButton(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - // Create the control - bool Create(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - - // Get/set the value - void SetValue(bool state); - bool GetValue() const; - - // Set the label - virtual void SetLabel(const wxString& label) { wxControl::SetLabel(label); } - virtual void SetLabel(const wxBitmap& label); - bool Enable(bool enable = true); - -protected: - void Init(); - - wxBitmap m_bitmap; - wxBitmap m_disabledBitmap; - bool m_capturing; - bool m_depressed,m_oldValue; - - void OnPaint(wxPaintEvent &event); - void OnMouse(wxMouseEvent &event); - void OnChar(wxKeyEvent &event); - void OnSize(wxSizeEvent &event); - - virtual wxSize DoGetBestSize() const; - -private: - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton) -}; - // Checkbox item (single checkbox) class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase { public: - wxToggleButton() {} + wxToggleButton() { Init(); } wxToggleButton(wxWindow *parent, wxWindowID id, const wxString& label, @@ -104,23 +44,68 @@ public: virtual void SetValue(bool value); virtual bool GetValue() const ; - virtual void SetLabel(const wxString& label); - virtual bool MSWCommand(WXUINT param, WXWORD id); virtual void Command(wxCommandEvent& event); + virtual State GetNormalState() const; + // returns true if the platform should explicitly apply a theme border virtual bool CanApplyThemeBorder() const { return false; } protected: virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - virtual wxSize DoGetBestSize() const; virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; + void Init(); + + // current state of the button (when owner-drawn) + bool m_state; + private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton) }; +//----------------------------------------------------------------------------- +// wxBitmapToggleButton +//----------------------------------------------------------------------------- + + +class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButton +{ +public: + // construction/destruction + wxBitmapToggleButton() {} + wxBitmapToggleButton(wxWindow *parent, + wxWindowID id, + const wxBitmap& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxCheckBoxNameStr) + { + Create(parent, id, label, pos, size, style, validator, name); + } + + // Create the control + bool Create(wxWindow *parent, + wxWindowID id, + const wxBitmap& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxCheckBoxNameStr); + + // deprecated synonym for SetBitmapLabel() + wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap), + SetBitmapLabel(bitmap); ) + // prevent virtual function hiding + virtual void SetLabel(const wxString& label) { wxToggleButton::SetLabel(label); } + +private: + DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton) +}; + #endif // _WX_TOGGLEBUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/timectrl.h b/Externals/wxWidgets3/include/wx/msw/timectrl.h new file mode 100644 index 0000000000..8fbb70196e --- /dev/null +++ b/Externals/wxWidgets3/include/wx/msw/timectrl.h @@ -0,0 +1,61 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/msw/timectrl.h +// Purpose: wxTimePickerCtrl for Windows. +// Author: Vadim Zeitlin +// Created: 2011-09-22 +// RCS-ID: $Id: timectrl.h 69224 2011-09-29 13:43:15Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_MSW_TIMECTRL_H_ +#define _WX_MSW_TIMECTRL_H_ + +// ---------------------------------------------------------------------------- +// wxTimePickerCtrl +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_ADV wxTimePickerCtrl : public wxTimePickerCtrlBase +{ +public: + // ctors + wxTimePickerCtrl() { } + + wxTimePickerCtrl(wxWindow *parent, + wxWindowID id, + const wxDateTime& dt = wxDefaultDateTime, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTP_DEFAULT, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxTimePickerCtrlNameStr) + { + Create(parent, id, dt, pos, size, style, validator, name); + } + + bool Create(wxWindow *parent, + wxWindowID id, + const wxDateTime& dt = wxDefaultDateTime, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTP_DEFAULT, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxTimePickerCtrlNameStr) + { + return MSWCreateDateTimePicker(parent, id, dt, + pos, size, style, + validator, name); + } + + // Override MSW-specific functions used during control creation. + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; + +protected: + virtual wxLocaleInfo MSWGetFormat() const; + virtual bool MSWAllowsNone() const { return false; } + virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch); + + wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTimePickerCtrl); +}; + +#endif // _WX_MSW_TIMECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/toolbar.h b/Externals/wxWidgets3/include/wx/msw/toolbar.h index 9f1c702ee4..1fe458f2aa 100644 --- a/Externals/wxWidgets3/include/wx/msw/toolbar.h +++ b/Externals/wxWidgets3/include/wx/msw/toolbar.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: toolbar.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: toolbar.h 70854 2012-03-10 00:01:09Z RD $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -85,6 +85,17 @@ public: virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, wxWindowMSW *child); #endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK + virtual wxToolBarToolBase *CreateTool(int id, + const wxString& label, + const wxBitmap& bmpNormal, + const wxBitmap& bmpDisabled = wxNullBitmap, + wxItemKind kind = wxITEM_NORMAL, + wxObject *clientData = NULL, + const wxString& shortHelp = wxEmptyString, + const wxString& longHelp = wxEmptyString); + + virtual wxToolBarToolBase *CreateTool(wxControl *control, + const wxString& label); protected: // common part of all ctors void Init(); @@ -103,18 +114,6 @@ protected: virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); - virtual wxToolBarToolBase *CreateTool(int id, - const wxString& label, - const wxBitmap& bmpNormal, - const wxBitmap& bmpDisabled, - wxItemKind kind, - wxObject *clientData, - const wxString& shortHelp, - const wxString& longHelp); - - virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label); - // return the appropriate size and flags for the toolbar control virtual wxSize DoGetBestSize() const; diff --git a/Externals/wxWidgets3/include/wx/msw/toplevel.h b/Externals/wxWidgets3/include/wx/msw/toplevel.h index 48ef335a42..55afcbdb17 100644 --- a/Externals/wxWidgets3/include/wx/msw/toplevel.h +++ b/Externals/wxWidgets3/include/wx/msw/toplevel.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 20.09.01 -// RCS-ID: $Id: toplevel.h 65556 2010-09-16 09:05:48Z VS $ +// RCS-ID: $Id: toplevel.h 70881 2012-03-12 11:42:49Z JS $ // Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -57,12 +57,10 @@ public: virtual void SetLayoutDirection(wxLayoutDirection dir); -#ifndef __WXWINCE__ - virtual bool SetShape(const wxRegion& region); -#endif // __WXWINCE__ virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); virtual bool Show(bool show = true); + virtual void Raise(); virtual void ShowWithoutActivating(); virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); @@ -77,6 +75,19 @@ public: virtual bool CanSetTransparent(); + // MSW-specific methods + // -------------------- + + // Return the menu representing the "system" menu of the window. You can + // call wxMenu::AppendWhatever() methods on it but removing items from it + // is in general not a good idea. + // + // The pointer returned by this method belongs to the window and will be + // deleted when the window itself is, do not delete it yourself. May return + // NULL if getting the system menu failed. + wxMenu *MSWGetSystemMenu() const; + + // implementation from now on // -------------------------- @@ -141,8 +152,6 @@ protected: virtual void DoFreeze(); virtual void DoThaw(); - virtual void DoEnable(bool enable); - // helper of SetIcons(): calls gets the icon with the size specified by the // given system metrics (SM_C{X|Y}[SM]ICON) from the bundle and sets it // using WM_SETICON with the specified wParam (ICOM_SMALL or ICON_BIG); @@ -170,7 +179,16 @@ protected: bool m_fsIsMaximized; bool m_fsIsShowing; - // the last focused child: we restore focus to it on activation + // Save the current focus to m_winLastFocused if we're not iconized (the + // focus is always NULL when we're iconized). + void DoSaveLastFocus(); + + // Restore focus to m_winLastFocused if possible and needed. + void DoRestoreLastFocus(); + + // The last focused child: we remember it when we're deactivated and + // restore focus to it when we're activated (this is done here) or restored + // from iconic state (done by wxFrame). wxWindow *m_winLastFocused; #if defined(__SMARTPHONE__) && defined(__WXWINCE__) @@ -214,6 +232,10 @@ private: void* m_activateInfo; #endif + // The system menu: initially NULL but can be set (once) by + // MSWGetSystemMenu(). Owned by this window. + wxMenu *m_menuSystem; + DECLARE_EVENT_TABLE() wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW); }; diff --git a/Externals/wxWidgets3/include/wx/msw/webview_ie.h b/Externals/wxWidgets3/include/wx/msw/webview_ie.h new file mode 100644 index 0000000000..62b9a49a01 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/msw/webview_ie.h @@ -0,0 +1,518 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: include/wx/msw/webviewie.h +// Purpose: wxMSW IE wxWebView backend +// Author: Marianne Gagnon +// Id: $Id: webview_ie.h 70499 2012-02-02 20:32:08Z SJL $ +// Copyright: (c) 2010 Marianne Gagnon, 2011 Steven Lamerton +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef wxWebViewIE_H +#define wxWebViewIE_H + +#include "wx/setup.h" + +#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE && defined(__WXMSW__) + +#include "wx/control.h" +#include "wx/webview.h" +#include "wx/msw/ole/automtn.h" +#include "wx/msw/ole/activex.h" +#include "wx/msw/ole/oleutils.h" +#include "wx/msw/wrapwin.h" +#include "wx/msw/missing.h" +#include "wx/sharedptr.h" +#include "wx/vector.h" + +/* Classes and definitions from urlmon.h vary in their + * completeness between compilers and versions of compilers. + * We implement our own versions here which should work + * for all compilers. The definitions are taken from the + * mingw-w64 headers which are public domain. + */ + +#ifndef REFRESH_NORMAL +#define REFRESH_NORMAL 0 +#endif + +#ifndef REFRESH_COMPLETELY +#define REFRESH_COMPLETELY 3 +#endif + +typedef enum __wxMIDL_IBindStatusCallback_0006 +{ + wxBSCF_FIRSTDATANOTIFICATION = 0x1, + wxBSCF_INTERMEDIATEDATANOTIFICATION = 0x2, + wxBSCF_LASTDATANOTIFICATION = 0x4, + wxBSCF_DATAFULLYAVAILABLE = 0x8, + wxBSCF_AVAILABLEDATASIZEUNKNOWN = 0x10 +} wxBSCF; + +EXTERN_C const IID CLSID_FileProtocol; + +typedef struct _tagwxBINDINFO +{ + ULONG cbSize; + LPWSTR szExtraInfo; + STGMEDIUM stgmedData; + DWORD grfBindInfoF; + DWORD dwBindVerb; + LPWSTR szCustomVerb; + DWORD cbstgmedData; + DWORD dwOptions; + DWORD dwOptionsFlags; + DWORD dwCodePage; + SECURITY_ATTRIBUTES securityAttributes; + IID iid; + IUnknown *pUnk; + DWORD dwReserved; +} wxBINDINFO; + +typedef struct _tagwxPROTOCOLDATA +{ + DWORD grfFlags; + DWORD dwState; + LPVOID pData; + ULONG cbData; +} wxPROTOCOLDATA; + +class wxIInternetBindInfo : public IUnknown +{ +public: + virtual HRESULT wxSTDCALL GetBindInfo(DWORD *grfBINDF,wxBINDINFO *pbindinfo) = 0; + virtual HRESULT wxSTDCALL GetBindString(ULONG ulStringType,LPOLESTR *ppwzStr, + ULONG cEl,ULONG *pcElFetched) = 0; +}; + +class wxIInternetProtocolSink : public IUnknown +{ +public: + virtual HRESULT wxSTDCALL Switch(wxPROTOCOLDATA *pProtocolData) = 0; + virtual HRESULT wxSTDCALL ReportProgress(ULONG ulStatusCode, + LPCWSTR szStatusText) = 0; + virtual HRESULT wxSTDCALL ReportData(DWORD grfBSCF,ULONG ulProgress, + ULONG ulProgressMax) = 0; + virtual HRESULT wxSTDCALL ReportResult(HRESULT hrResult,DWORD dwError, + LPCWSTR szResult) = 0; +}; + +class wxIInternetProtocolRoot : public IUnknown +{ +public: + virtual HRESULT wxSTDCALL Start(LPCWSTR szUrl,wxIInternetProtocolSink *pOIProtSink, + wxIInternetBindInfo *pOIBindInfo,DWORD grfPI, + HANDLE_PTR dwReserved) = 0; + virtual HRESULT wxSTDCALL Continue(wxPROTOCOLDATA *pProtocolData) = 0; + virtual HRESULT wxSTDCALL Abort(HRESULT hrReason,DWORD dwOptions) = 0; + virtual HRESULT wxSTDCALL Terminate(DWORD dwOptions) = 0; + virtual HRESULT wxSTDCALL Suspend(void) = 0; + virtual HRESULT wxSTDCALL Resume(void) = 0; +}; + + +class wxIInternetProtocol : public wxIInternetProtocolRoot +{ +public: + virtual HRESULT wxSTDCALL Read(void *pv,ULONG cb,ULONG *pcbRead) = 0; + virtual HRESULT wxSTDCALL Seek(LARGE_INTEGER dlibMove,DWORD dwOrigin, + ULARGE_INTEGER *plibNewPosition) = 0; + virtual HRESULT wxSTDCALL LockRequest(DWORD dwOptions) = 0; + virtual HRESULT wxSTDCALL UnlockRequest(void) = 0; +}; + + +class wxIInternetSession : public IUnknown +{ + public: + virtual HRESULT wxSTDCALL RegisterNameSpace(IClassFactory *pCF,REFCLSID rclsid, + LPCWSTR pwzProtocol, + ULONG cPatterns, + const LPCWSTR *ppwzPatterns, + DWORD dwReserved) = 0; + virtual HRESULT wxSTDCALL UnregisterNameSpace(IClassFactory *pCF, + LPCWSTR pszProtocol) = 0; + virtual HRESULT wxSTDCALL RegisterMimeFilter(IClassFactory *pCF, + REFCLSID rclsid, + LPCWSTR pwzType) = 0; + virtual HRESULT wxSTDCALL UnregisterMimeFilter(IClassFactory *pCF, + LPCWSTR pwzType) = 0; + virtual HRESULT wxSTDCALL CreateBinding(LPBC pBC,LPCWSTR szUrl, + IUnknown *pUnkOuter,IUnknown **ppUnk, + wxIInternetProtocol **ppOInetProt, + DWORD dwOption) = 0; + virtual HRESULT wxSTDCALL SetSessionOption(DWORD dwOption,LPVOID pBuffer, + DWORD dwBufferLength, + DWORD dwReserved) = 0; + virtual HRESULT wxSTDCALL GetSessionOption(DWORD dwOption,LPVOID pBuffer, + DWORD *pdwBufferLength, + DWORD dwReserved) = 0; +}; + +/* END OF URLMON.H implementation */ + +/* Same goes for the mshtmhst.h, these are also taken + * from mingw-w64 headers. + */ + +typedef enum _tagwxDOCHOSTUIFLAG +{ + DOCHOSTUIFLAG_DIALOG = 0x1, + DOCHOSTUIFLAG_DISABLE_HELP_MENU = 0x2, + DOCHOSTUIFLAG_NO3DBORDER = 0x4, + DOCHOSTUIFLAG_SCROLL_NO = 0x8, + DOCHOSTUIFLAG_DISABLE_SCRIPT_INACTIVE = 0x10, + DOCHOSTUIFLAG_OPENNEWWIN = 0x20, + DOCHOSTUIFLAG_DISABLE_OFFSCREEN = 0x40, + DOCHOSTUIFLAG_FLAT_SCROLLBAR = 0x80, + DOCHOSTUIFLAG_DIV_BLOCKDEFAULT = 0x100, + DOCHOSTUIFLAG_ACTIVATE_CLIENTHIT_ONLY = 0x200, + DOCHOSTUIFLAG_OVERRIDEBEHAVIORFACTORY = 0x400, + DOCHOSTUIFLAG_CODEPAGELINKEDFONTS = 0x800, + DOCHOSTUIFLAG_URL_ENCODING_DISABLE_UTF8 = 0x1000, + DOCHOSTUIFLAG_URL_ENCODING_ENABLE_UTF8 = 0x2000, + DOCHOSTUIFLAG_ENABLE_FORMS_AUTOCOMPLETE = 0x4000, + DOCHOSTUIFLAG_ENABLE_INPLACE_NAVIGATION = 0x10000, + DOCHOSTUIFLAG_IME_ENABLE_RECONVERSION = 0x20000, + DOCHOSTUIFLAG_THEME = 0x40000, + DOCHOSTUIFLAG_NOTHEME = 0x80000, + DOCHOSTUIFLAG_NOPICS = 0x100000, + DOCHOSTUIFLAG_NO3DOUTERBORDER = 0x200000, + DOCHOSTUIFLAG_DISABLE_EDIT_NS_FIXUP = 0x400000, + DOCHOSTUIFLAG_LOCAL_MACHINE_ACCESS_CHECK = 0x800000, + DOCHOSTUIFLAG_DISABLE_UNTRUSTEDPROTOCOL = 0x1000000 +} DOCHOSTUIFLAG; + +typedef struct _tagwxDOCHOSTUIINFO +{ + ULONG cbSize; + DWORD dwFlags; + DWORD dwDoubleClick; + OLECHAR *pchHostCss; + OLECHAR *pchHostNS; +} DOCHOSTUIINFO; + +class wxIDocHostUIHandler : public IUnknown +{ +public: + virtual HRESULT wxSTDCALL ShowContextMenu(DWORD dwID, POINT *ppt, + IUnknown *pcmdtReserved, + IDispatch *pdispReserved) = 0; + + virtual HRESULT wxSTDCALL GetHostInfo(DOCHOSTUIINFO *pInfo) = 0; + + virtual HRESULT wxSTDCALL ShowUI(DWORD dwID, + IOleInPlaceActiveObject *pActiveObject, + IOleCommandTarget *pCommandTarget, + IOleInPlaceFrame *pFrame, + IOleInPlaceUIWindow *pDoc) = 0; + + virtual HRESULT wxSTDCALL HideUI(void) = 0; + + virtual HRESULT wxSTDCALL UpdateUI(void) = 0; + + virtual HRESULT wxSTDCALL EnableModeless(BOOL fEnable) = 0; + + virtual HRESULT wxSTDCALL OnDocWindowActivate(BOOL fActivate) = 0; + + virtual HRESULT wxSTDCALL OnFrameWindowActivate(BOOL fActivate) = 0; + + virtual HRESULT wxSTDCALL ResizeBorder(LPCRECT prcBorder, + IOleInPlaceUIWindow *pUIWindow, + BOOL fRameWindow) = 0; + + virtual HRESULT wxSTDCALL TranslateAccelerator(LPMSG lpMsg, + const GUID *pguidCmdGroup, + DWORD nCmdID) = 0; + + virtual HRESULT wxSTDCALL GetOptionKeyPath(LPOLESTR *pchKey, + DWORD dw) = 0; + + virtual HRESULT wxSTDCALL GetDropTarget(IDropTarget *pDropTarget, + IDropTarget **ppDropTarget) = 0; + + virtual HRESULT wxSTDCALL GetExternal(IDispatch **ppDispatch) = 0; + + virtual HRESULT wxSTDCALL TranslateUrl(DWORD dwTranslate, + OLECHAR *pchURLIn, + OLECHAR **ppchURLOut) = 0; + + virtual HRESULT wxSTDCALL FilterDataObject(IDataObject *pDO, + IDataObject **ppDORet) = 0; +}; + +/* END OF MSHTMHST.H implementation */ + +struct IHTMLDocument2; +class wxFSFile; +class ClassFactory; +class wxIEContainer; +class DocHostUIHandler; + +class WXDLLIMPEXP_WEBVIEW wxWebViewIE : public wxWebView +{ +public: + + wxWebViewIE() {} + + wxWebViewIE(wxWindow* parent, + wxWindowID id, + const wxString& url = wxWebViewDefaultURLStr, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxWebViewNameStr) + { + Create(parent, id, url, pos, size, style, name); + } + + ~wxWebViewIE(); + + bool Create(wxWindow* parent, + wxWindowID id, + const wxString& url = wxWebViewDefaultURLStr, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxWebViewNameStr); + + virtual void LoadURL(const wxString& url); + virtual void LoadHistoryItem(wxSharedPtr item); + virtual wxVector > GetBackwardHistory(); + virtual wxVector > GetForwardHistory(); + + virtual bool CanGoForward() const; + virtual bool CanGoBack() const; + virtual void GoBack(); + virtual void GoForward(); + virtual void ClearHistory(); + virtual void EnableHistory(bool enable = true); + virtual void Stop(); + virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT); + + virtual wxString GetPageSource() const; + virtual wxString GetPageText() const; + + virtual bool IsBusy() const; + virtual wxString GetCurrentURL() const; + virtual wxString GetCurrentTitle() const; + + virtual void SetZoomType(wxWebViewZoomType); + virtual wxWebViewZoomType GetZoomType() const; + virtual bool CanSetZoomType(wxWebViewZoomType) const; + + virtual void Print(); + + virtual void SetPage(const wxString& html, const wxString& baseUrl); + + virtual wxWebViewZoom GetZoom() const; + virtual void SetZoom(wxWebViewZoom zoom); + + //Clipboard functions + virtual bool CanCut() const; + virtual bool CanCopy() const; + virtual bool CanPaste() const; + virtual void Cut(); + virtual void Copy(); + virtual void Paste(); + + //Undo / redo functionality + virtual bool CanUndo() const; + virtual bool CanRedo() const; + virtual void Undo(); + virtual void Redo(); + + //Editing functions + virtual void SetEditable(bool enable = true); + virtual bool IsEditable() const; + + //Selection + virtual void SelectAll(); + virtual bool HasSelection() const; + virtual void DeleteSelection(); + virtual wxString GetSelectedText() const; + virtual wxString GetSelectedSource() const; + virtual void ClearSelection(); + + virtual void RunScript(const wxString& javascript); + + //Virtual Filesystem Support + virtual void RegisterHandler(wxSharedPtr handler); + + // ---- IE-specific methods + + // FIXME: I seem to be able to access remote webpages even in offline mode... + bool IsOfflineMode(); + void SetOfflineMode(bool offline); + + wxWebViewZoom GetIETextZoom() const; + void SetIETextZoom(wxWebViewZoom level); + + wxWebViewZoom GetIEOpticalZoom() const; + void SetIEOpticalZoom(wxWebViewZoom level); + + void onActiveXEvent(wxActiveXEvent& evt); + void onEraseBg(wxEraseEvent&) {} + + DECLARE_EVENT_TABLE(); + +private: + wxIEContainer* m_container; + wxAutomationObject m_ie; + IWebBrowser2* m_webBrowser; + DWORD m_dwCookie; + DocHostUIHandler* m_uiHandler; + + //We store the current zoom type; + wxWebViewZoomType m_zoomType; + + /** The "Busy" property of IWebBrowser2 does not always return busy when + * we'd want it to; this variable may be set to true in cases where the + * Busy property is false but should be true. + */ + bool m_isBusy; + //We manage our own history, the history list contains the history items + //which are added as documentcomplete events arrive, unless we are loading + //an item from the history. The position is stored as an int, and reflects + //where we are in the history list. + wxVector > m_historyList; + wxVector m_factories; + int m_historyPosition; + bool m_historyLoadingFromList; + bool m_historyEnabled; + + //Generic helper functions for IHtmlDocument commands + bool CanExecCommand(wxString command) const; + void ExecCommand(wxString command); + IHTMLDocument2* GetDocument() const; + //Toggles control features see INTERNETFEATURELIST for values. + bool EnableControlFeature(long flag, bool enable = true); + + wxDECLARE_DYNAMIC_CLASS(wxWebViewIE); +}; + +class VirtualProtocol : public wxIInternetProtocol +{ +protected: + wxIInternetProtocolSink* m_protocolSink; + wxString m_html; + VOID * fileP; + + wxFSFile* m_file; + wxSharedPtr m_handler; + +public: + VirtualProtocol(wxSharedPtr handler); + ~VirtualProtocol() {} + + //IUnknown + DECLARE_IUNKNOWN_METHODS; + + //IInternetProtocolRoot + HRESULT STDMETHODCALLTYPE Abort(HRESULT WXUNUSED(hrReason), + DWORD WXUNUSED(dwOptions)) + { return E_NOTIMPL; } + HRESULT STDMETHODCALLTYPE Continue(wxPROTOCOLDATA *WXUNUSED(pProtocolData)) + { return S_OK; } + HRESULT STDMETHODCALLTYPE Resume() { return S_OK; } + HRESULT STDMETHODCALLTYPE Start(LPCWSTR szUrl, + wxIInternetProtocolSink *pOIProtSink, + wxIInternetBindInfo *pOIBindInfo, + DWORD grfPI, + HANDLE_PTR dwReserved); + HRESULT STDMETHODCALLTYPE Suspend() { return S_OK; } + HRESULT STDMETHODCALLTYPE Terminate(DWORD WXUNUSED(dwOptions)) { return S_OK; } + + //IInternetProtocol + HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions)) + { return S_OK; } + HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead); + HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER WXUNUSED(dlibMove), + DWORD WXUNUSED(dwOrigin), + ULARGE_INTEGER* WXUNUSED(plibNewPosition)) + { return E_FAIL; } + HRESULT STDMETHODCALLTYPE UnlockRequest() { return S_OK; } +}; + +class ClassFactory : public IClassFactory +{ +public: + ClassFactory(wxSharedPtr handler) : m_handler(handler) {} + + //IClassFactory + HRESULT STDMETHODCALLTYPE CreateInstance(IUnknown* pUnkOuter, + REFIID riid, void** ppvObject); + HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock); + + //IUnknown + DECLARE_IUNKNOWN_METHODS; + +private: + wxSharedPtr m_handler; +}; + +class wxIEContainer : public wxActiveXContainer +{ +public: + wxIEContainer(wxWindow *parent, REFIID iid, IUnknown *pUnk, DocHostUIHandler* uiHandler = NULL); + virtual ~wxIEContainer(); + virtual bool QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc); +private: + DocHostUIHandler* m_uiHandler; +}; + +class DocHostUIHandler : public wxIDocHostUIHandler +{ +public: + DocHostUIHandler() {}; + ~DocHostUIHandler() {}; + virtual HRESULT wxSTDCALL ShowContextMenu(DWORD dwID, POINT *ppt, + IUnknown *pcmdtReserved, + IDispatch *pdispReserved); + + virtual HRESULT wxSTDCALL GetHostInfo(DOCHOSTUIINFO *pInfo); + + virtual HRESULT wxSTDCALL ShowUI(DWORD dwID, + IOleInPlaceActiveObject *pActiveObject, + IOleCommandTarget *pCommandTarget, + IOleInPlaceFrame *pFrame, + IOleInPlaceUIWindow *pDoc); + + virtual HRESULT wxSTDCALL HideUI(void); + + virtual HRESULT wxSTDCALL UpdateUI(void); + + virtual HRESULT wxSTDCALL EnableModeless(BOOL fEnable); + + virtual HRESULT wxSTDCALL OnDocWindowActivate(BOOL fActivate); + + virtual HRESULT wxSTDCALL OnFrameWindowActivate(BOOL fActivate); + + virtual HRESULT wxSTDCALL ResizeBorder(LPCRECT prcBorder, + IOleInPlaceUIWindow *pUIWindow, + BOOL fRameWindow); + + virtual HRESULT wxSTDCALL TranslateAccelerator(LPMSG lpMsg, + const GUID *pguidCmdGroup, + DWORD nCmdID); + + virtual HRESULT wxSTDCALL GetOptionKeyPath(LPOLESTR *pchKey, + DWORD dw); + + virtual HRESULT wxSTDCALL GetDropTarget(IDropTarget *pDropTarget, + IDropTarget **ppDropTarget); + + virtual HRESULT wxSTDCALL GetExternal(IDispatch **ppDispatch); + + virtual HRESULT wxSTDCALL TranslateUrl(DWORD dwTranslate, + OLECHAR *pchURLIn, + OLECHAR **ppchURLOut); + + virtual HRESULT wxSTDCALL FilterDataObject(IDataObject *pDO, + IDataObject **ppDORet); + //IUnknown + DECLARE_IUNKNOWN_METHODS; +}; + +#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE && defined(__WXMSW__) + +#endif // wxWebViewIE_H diff --git a/Externals/wxWidgets3/include/wx/msw/webviewhistoryitem_ie.h b/Externals/wxWidgets3/include/wx/msw/webviewhistoryitem_ie.h new file mode 100644 index 0000000000..acfec70014 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/msw/webviewhistoryitem_ie.h @@ -0,0 +1,31 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: include/wx/msw/webviewhistoryitem.h +// Purpose: wxWebViewHistoryItem header for MSW +// Author: Steven Lamerton +// Id: $Id: webviewhistoryitem_ie.h 69074 2011-09-12 18:35:39Z SJL $ +// Copyright: (c) 2011 Steven Lamerton +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_MSW_WEBVIEWHISTORYITEM_H_ +#define _WX_MSW_WEBVIEWHISTORYITEM_H_ + +#include "wx/setup.h" + +#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE && defined(__WXMSW__) + +class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem +{ +public: + wxWebViewHistoryItem(const wxString& url, const wxString& title) : + m_url(url), m_title(title) {} + wxString GetUrl() { return m_url; } + wxString GetTitle() { return m_title; } + +private: + wxString m_url, m_title; +}; + +#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE && defined(__WXMSW__) + +#endif // _WX_MSW_WEBVIEWHISTORYITEM_H_ diff --git a/Externals/wxWidgets3/include/wx/msw/wince/setup.h b/Externals/wxWidgets3/include/wx/msw/wince/setup.h index 0f84386008..a22f9ec48f 100644 --- a/Externals/wxWidgets3/include/wx/msw/wince/setup.h +++ b/Externals/wxWidgets3/include/wx/msw/wince/setup.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: setup.h 67062 2011-02-27 12:48:07Z VZ $ +// RCS-ID: $Id: setup.h 69463 2011-10-18 21:57:02Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -201,15 +201,6 @@ // Recommended setting: 0 (this is still work in progress...) #define wxUSE_EXTENDED_RTTI 0 -// Set wxUSE_STL to 1 to derive wxList(Foo) and wxArray(Foo) from -// std::list and std::vector, with a compatibility interface, -// and for wxHashMap to be implemented with templates. -// -// Default is 0 -// -// Recommended setting: YMMV -#define wxUSE_STL 0 - // Support for message/error logging. This includes wxLogXXX() functions and // wxLog and derived classes. Don't set this to 0 unless you really know what // you are doing. @@ -261,44 +252,6 @@ // Recommended setting: 1 as setting it to 0 disables many other things #define wxUSE_STREAMS 1 -// This is not a real option but is used as the default value for -// wxUSE_STD_IOSTREAM and wxUSE_STD_STRING. -// -// Currently the Digital Mars and Watcom compilers come without standard C++ -// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have -// them (e.g. from STLPort). -// -// VC++ 5.0 does include standard C++ library headers, however they produce -// many warnings that can't be turned off when compiled at warning level 4. -#if defined(__DMC__) || defined(__WATCOMC__) \ - || (defined(_MSC_VER) && _MSC_VER < 1200) - #define wxUSE_STD_DEFAULT 0 -#else - #define wxUSE_STD_DEFAULT 1 -#endif - -// Use standard C++ streams if 1 instead of wx streams in some places. If -// disabled (default), wx streams are used everywhere and wxWidgets doesn't -// depend on the standard streams library. -// -// Notice that enabling this does not replace wx streams with std streams -// everywhere, in a lot of places wx streams are used no matter what. -// -// Default is 0 -// -// Recommended setting: 1 if you use the standard streams anyhow and so -// dependency on the standard streams library is not a -// problem -#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT - -// Enable conversion to standard C++ string if 1. -// -// Default is 1 for most compilers. -// -// Recommended setting: 1 unless you want to ensure your program doesn't use -// the standard C++ library at all. -#define wxUSE_STD_STRING wxUSE_STD_DEFAULT - // Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf. // Note that if the system's implementation does not support positional // parameters, setting this to 1 forces the use of the wxWidgets implementation @@ -314,6 +267,107 @@ // Recommended setting: 1 if you want to support multiple languages #define wxUSE_PRINTF_POS_PARAMS 1 + +// ---------------------------------------------------------------------------- +// Interoperability with the standard library. +// ---------------------------------------------------------------------------- + +// Set wxUSE_STL to 1 to enable maximal interoperability with the standard +// library, even at the cost of backwards compatibility. +// +// Default is 0 +// +// Recommended setting: 0 as the options below already provide a relatively +// good level of interoperability and changing this option arguably isn't worth +// diverging from the official builds of the library. +#define wxUSE_STL 0 + +// This is not a real option but is used as the default value for +// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS. +// +// Currently the Digital Mars and Watcom compilers come without standard C++ +// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have +// them (e.g. from STLPort). +// +// VC++ 5.0 does include standard C++ library headers, however they produce +// many warnings that can't be turned off when compiled at warning level 4. +#if defined(__DMC__) || defined(__WATCOMC__) \ + || (defined(_MSC_VER) && _MSC_VER < 1200) + #define wxUSE_STD_DEFAULT 0 +#else + #define wxUSE_STD_DEFAULT 1 +#endif + +// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<> +// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but +// usually more limited) implementations are used which allows to avoid the +// dependency on the C++ run-time library. +// +// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't +// support using standard containers and that VC6 needs non-default options for +// such build to avoid getting "fatal error C1076: compiler limit : internal +// heap limit reached; use /Zm to specify a higher limit" in its own standard +// headers, so you need to ensure you do increase the heap size before enabling +// this option for this compiler. +// +// Default is 0 for compatibility reasons. +// +// Recommended setting: 1 unless compatibility with the official wxWidgets +// build and/or the existing code is a concern. +#define wxUSE_STD_CONTAINERS 0 + +// Use standard C++ streams if 1 instead of wx streams in some places. If +// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the +// standard streams library. +// +// Notice that enabling this does not replace wx streams with std streams +// everywhere, in a lot of places wx streams are used no matter what. +// +// Default is 1 if compiler supports it. +// +// Recommended setting: 1 if you use the standard streams anyhow and so +// dependency on the standard streams library is not a +// problem +#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT + +// Enable minimal interoperability with the standard C++ string class if 1. +// "Minimal" means that wxString can be constructed from std::string or +// std::wstring but can't be implicitly converted to them. You need to enable +// the option below for the latter. +// +// Default is 1 for most compilers. +// +// Recommended setting: 1 unless you want to ensure your program doesn't use +// the standard C++ library at all. +#define wxUSE_STD_STRING wxUSE_STD_DEFAULT + +// Make wxString as much interchangeable with std::[w]string as possible, in +// particular allow implicit conversion of wxString to either of these classes. +// This comes at a price (or a benefit, depending on your point of view) of not +// allowing implicit conversion to "const char *" and "const wchar_t *". +// +// Because a lot of existing code relies on these conversions, this option is +// disabled by default but can be enabled for your build if you don't care +// about compatibility. +// +// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled. +// +// Recommended setting: 0 to remain compatible with the official builds of +// wxWidgets. +#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL + +// VC++ 4.2 and above allows and but you can't mix +// them. Set this option to 1 to use , 0 to use . +// +// Note that newer compilers (including VC++ 7.1 and later) don't support +// wxUSE_IOSTREAMH == 1 and so will be used anyhow. +// +// Default is 0. +// +// Recommended setting: 0, only set to 1 if you use a really old compiler +#define wxUSE_IOSTREAMH 0 + + // ---------------------------------------------------------------------------- // non GUI features selection // ---------------------------------------------------------------------------- @@ -651,6 +705,34 @@ // Recommended setting: 1 #define wxUSE_STC 1 +// Use wxWidget's web viewing classes +// +// Default is 1 +// +// Recommended setting: 1 +#define wxUSE_WEBVIEW 1 + +// Use the IE wxWebView backend +// +// Default is 1 on MSW +// +// Recommended setting: 1 +#ifdef __WXMSW__ +#define wxUSE_WEBVIEW_IE 1 +#else +#define wxUSE_WEBVIEW_IE 0 +#endif + +// Use the WebKit wxWebView backend +// +// Default is 1 on GTK and OSX +// +// Recommended setting: 1 +#if defined(__WXGTK__) || defined(__WXOSX__) +#define wxUSE_WEBVIEW_WEBKIT 1 +#else +#define wxUSE_WEBVIEW_WEBKIT 0 +#endif // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced // 2D drawing API. (Still somewhat experimental) @@ -749,6 +831,7 @@ // // Recommended setting: 1 #define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl +#define wxUSE_BANNERWINDOW 1 // wxBannerWindow #define wxUSE_BUTTON 1 // wxButton #define wxUSE_BMPBUTTON 1 // wxBitmapButton #define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl @@ -784,8 +867,10 @@ #define wxUSE_STATTEXT 1 // wxStaticText #define wxUSE_STATBMP 1 // wxStaticBitmap #define wxUSE_TEXTCTRL 1 // wxTextCtrl +#define wxUSE_TIMEPICKCTRL 1 // wxTimePickerCtrl #define wxUSE_TOGGLEBTN 1 // requires wxButton #define wxUSE_TREECTRL 1 // wxTreeCtrl +#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR // below either wxStatusBar95 or a generic wxStatusBar will be used. @@ -1002,6 +1087,14 @@ // Recommended setting: 1 #define wxUSE_NOTIFICATION_MESSAGE 1 +// wxRichToolTip is a customizable tooltip class which has more functionality +// than the stock (but native, unlike this class) wxToolTip. +// +// Default is 1. +// +// Recommended setting: 1 (but can be safely set to 0 if you don't need it) +#define wxUSE_RICHTOOLTIP 1 + // Use wxSashWindow class. // // Default is 1. @@ -1307,28 +1400,15 @@ // to create files in SVG (Scalable Vector Graphics) format. #define wxUSE_SVG 1 -// ---------------------------------------------------------------------------- -// other compiler (mis)features -// ---------------------------------------------------------------------------- - -// Set this to 0 if your compiler can't cope with omission of prototype -// parameters. +// Should wxDC provide SetTransformMatrix() and related methods? // -// Default is 1. +// Default is 1 but can be set to 0 if this functionality is not used. Notice +// that currently only wxMSW supports this so setting this to 0 doesn't change +// much for non-MSW platforms (although it will still save a few bytes +// probably). // -// Recommended setting: 1 (should never need to set this to 0) -#define REMOVE_UNUSED_ARG 1 - -// VC++ 4.2 and above allows and but you can't mix -// them. Set this option to 1 to use , 0 to use . -// -// Note that newer compilers (including VC++ 7.1 and later) don't support -// wxUSE_IOSTREAMH == 1 and so will be used anyhow. -// -// Default is 0. -// -// Recommended setting: 0, only set to 1 if you use a really old compiler -#define wxUSE_IOSTREAMH 0 +// Recommended setting: 1. +#define wxUSE_DC_TRANSFORM_MATRIX 1 // ---------------------------------------------------------------------------- // image format support diff --git a/Externals/wxWidgets3/include/wx/msw/window.h b/Externals/wxWidgets3/include/wx/msw/window.h index 303aeee24b..afb6df7a60 100644 --- a/Externals/wxWidgets3/include/wx/msw/window.h +++ b/Externals/wxWidgets3/include/wx/msw/window.h @@ -5,7 +5,7 @@ // Modified by: Vadim Zeitlin on 13.05.99: complete refont of message handling, // elimination of Default(), ... // Created: 01/02/97 -// RCS-ID: $Id: window.h 67250 2011-03-20 00:00:29Z VZ $ +// RCS-ID: $Id: window.h 69348 2011-10-09 22:01:57Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -366,7 +366,21 @@ public: bool HandlePower(WXWPARAM wParam, WXLPARAM lParam, bool *vetoed); - // Window procedure + // The main body of common window proc for all wxWindow objects. It tries + // to handle the given message and returns true if it was handled (the + // appropriate return value is then put in result, which must be non-NULL) + // or false if it wasn't. + // + // This function should be overridden in any new code instead of + // MSWWindowProc() even if currently most of the code overrides + // MSWWindowProc() as it had been written before this function was added. + virtual bool MSWHandleMessage(WXLRESULT *result, + WXUINT message, + WXWPARAM wParam, + WXLPARAM lParam); + + // Common Window procedure for all wxWindow objects: forwards to + // MSWHandleMessage() and MSWDefWindowProc() if the message wasn't handled. virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); // Calls an appropriate default window procedure @@ -453,7 +467,13 @@ public: // This should be overridden to return true for the controls which have // themed background that should through their children. Currently only // wxNotebook uses this. - virtual bool MSWHasInheritableBackground() const { return false; } + // + // The base class version already returns true if we have a solid + // background colour that should be propagated to our children. + virtual bool MSWHasInheritableBackground() const + { + return InheritsBackgroundColour(); + } #if !defined(__WXWINCE__) && !defined(__WXUNIVERSAL__) #define wxHAS_MSW_BACKGROUND_ERASE_HOOK @@ -599,6 +619,14 @@ protected: WXWPARAM wParam, WXLPARAM lParam = 0) const; + // Another helper for creating wxKeyEvent for wxEVT_CHAR and related types. + // + // The wParam and lParam here must come from WM_CHAR event parameters, i.e. + // wParam must be a character and not a virtual code. + wxKeyEvent CreateCharEvent(wxEventType evType, + WXWPARAM wParam, + WXLPARAM lParam) const; + // default OnEraseBackground() implementation, return true if we did erase // the background, false otherwise (i.e. the system should erase it) diff --git a/Externals/wxWidgets3/include/wx/msw/wrapwin.h b/Externals/wxWidgets3/include/wx/msw/wrapwin.h index 85ee355f8a..8ddd5fe79e 100644 --- a/Externals/wxWidgets3/include/wx/msw/wrapwin.h +++ b/Externals/wxWidgets3/include/wx/msw/wrapwin.h @@ -3,7 +3,7 @@ // Purpose: Wrapper around , to be included instead of it // Author: Vaclav Slavik // Created: 2003/07/22 -// RCS-ID: $Id: wrapwin.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: wrapwin.h 69784 2011-11-17 16:43:34Z VZ $ // Copyright: (c) 2003 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -80,6 +80,7 @@ #if (!defined(_MSC_VER) || (_MSC_VER < 1300)) && !defined(__WIN64__) #define UINT_PTR unsigned int #define INT_PTR int + #define HANDLE_PTR unsigned long #define LONG_PTR long #define ULONG_PTR unsigned long #define DWORD_PTR unsigned long diff --git a/Externals/wxWidgets3/include/wx/nonownedwnd.h b/Externals/wxWidgets3/include/wx/nonownedwnd.h index 25e21b670e..03888e4140 100644 --- a/Externals/wxWidgets3/include/wx/nonownedwnd.h +++ b/Externals/wxWidgets3/include/wx/nonownedwnd.h @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // Modified by: // Created: 2006-12-24 -// RCS-ID: $Id: nonownedwnd.h 54125 2008-06-11 19:17:41Z SC $ +// RCS-ID: $Id: nonownedwnd.h 70813 2012-03-05 13:00:57Z VZ $ // Copyright: (c) 2006 TT-Solutions // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -12,15 +12,103 @@ #ifndef _WX_NONOWNEDWND_H_ #define _WX_NONOWNEDWND_H_ +#include "wx/window.h" + +// Styles that can be used with any wxNonOwnedWindow: +#define wxFRAME_SHAPED 0x0010 // Create a window that is able to be shaped + +class WXDLLIMPEXP_FWD_CORE wxGraphicsPath; + +// ---------------------------------------------------------------------------- +// wxNonOwnedWindow: a window that is not a child window of another one. +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxNonOwnedWindowBase : public wxWindow +{ +public: + // Set the shape of the window to the given region. + // Returns true if the platform supports this feature (and the + // operation is successful.) + bool SetShape(const wxRegion& region) + { + // This style is in fact only needed by wxOSX/Carbon so once we don't + // use this port any more, we could get rid of this requirement, but + // for now you must specify wxFRAME_SHAPED for SetShape() to work on + // all platforms. + wxCHECK_MSG + ( + HasFlag(wxFRAME_SHAPED), false, + wxS("Shaped windows must be created with the wxFRAME_SHAPED style.") + ); + + return region.IsEmpty() ? DoClearShape() : DoSetRegionShape(region); + } + +#if wxUSE_GRAPHICS_CONTEXT + // Set the shape using the specified path. + bool SetShape(const wxGraphicsPath& path) + { + wxCHECK_MSG + ( + HasFlag(wxFRAME_SHAPED), false, + wxS("Shaped windows must be created with the wxFRAME_SHAPED style.") + ); + + return DoSetPathShape(path); + } +#endif // wxUSE_GRAPHICS_CONTEXT + + + // Overridden base class methods. + // ------------------------------ + + virtual void AdjustForParentClientOrigin(int& WXUNUSED(x), int& WXUNUSED(y), + int WXUNUSED(sizeFlags) = 0) const + { + // Non owned windows positions don't need to be adjusted for parent + // client area origin so simply do nothing here. + } + + virtual void InheritAttributes() + { + // Non owned windows don't inherit attributes from their parent window + // (if the parent frame is red, it doesn't mean that all dialogs shown + // by it should be red as well), so don't do anything here neither. + } + +protected: + virtual bool DoClearShape() + { + return false; + } + + virtual bool DoSetRegionShape(const wxRegion& WXUNUSED(region)) + { + return false; + } + +#if wxUSE_GRAPHICS_CONTEXT + virtual bool DoSetPathShape(const wxGraphicsPath& WXUNUSED(path)) + { + return false; + } +#endif // wxUSE_GRAPHICS_CONTEXT +}; + #if defined(__WXDFB__) #include "wx/dfb/nonownedwnd.h" +#elif defined(__WXGTK20__) + #include "wx/gtk/nonownedwnd.h" #elif defined(__WXMAC__) #include "wx/osx/nonownedwnd.h" +#elif defined(__WXMSW__) && !defined(__WXWINCE__) + #include "wx/msw/nonownedwnd.h" #else - // other ports can derive both wxTLW and wxPopupWindow directly - // from wxWindow: - #include "wx/window.h" - typedef wxWindow wxNonOwnedWindow; + // No special class needed in other ports, they can derive both wxTLW and + // wxPopupWindow directly from wxWindow and don't implement SetShape(). + class wxNonOwnedWindow : public wxNonOwnedWindowBase + { + }; #endif #endif // _WX_NONOWNEDWND_H_ diff --git a/Externals/wxWidgets3/include/wx/odcombo.h b/Externals/wxWidgets3/include/wx/odcombo.h index 04dccc0731..6e2d9efb86 100644 --- a/Externals/wxWidgets3/include/wx/odcombo.h +++ b/Externals/wxWidgets3/include/wx/odcombo.h @@ -4,7 +4,7 @@ // Author: Jaakko Salli // Modified by: // Created: Apr-30-2006 -// RCS-ID: $Id: odcombo.h 66412 2010-12-20 14:54:04Z JMS $ +// RCS-ID: $Id: odcombo.h 68460 2011-07-30 11:30:08Z VZ $ // Copyright: (c) Jaakko Salli // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -233,15 +233,15 @@ private: // the wxComboCtrl. // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_ADV wxOwnerDrawnComboBox : public wxComboCtrl, - public wxItemContainer +class WXDLLIMPEXP_ADV wxOwnerDrawnComboBox : + public wxWindowWithItems { //friend class wxComboPopupWindow; friend class wxVListBoxComboPopup; public: // ctors and such - wxOwnerDrawnComboBox() : wxComboCtrl() { Init(); } + wxOwnerDrawnComboBox() { Init(); } wxOwnerDrawnComboBox(wxWindow *parent, wxWindowID id, @@ -253,7 +253,6 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr) - : wxComboCtrl() { Init(); @@ -339,8 +338,6 @@ public: virtual bool IsSorted() const { return HasFlag(wxCB_SORT); } - wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST - protected: virtual void DoClear(); virtual void DoDeleteOneItem(unsigned int n); diff --git a/Externals/wxWidgets3/include/wx/osx/anybutton.h b/Externals/wxWidgets3/include/wx/osx/anybutton.h new file mode 100644 index 0000000000..9e11031ae8 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/osx/anybutton.h @@ -0,0 +1,59 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: anybutton.h +// Purpose: wxAnyButton class +// Author: Stefan Csomor +// Created: 1998-01-01 (extracted from button.h) +// RCS-ID: $Id: anybutton.h 67931 2011-06-14 13:00:42Z VZ $ +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_OSX_ANYBUTTON_H_ +#define _WX_OSX_ANYBUTTON_H_ + +// Any button +class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase +{ +public: + wxAnyButton() {} + + static wxSize GetDefaultSize(); + + virtual void SetLabel(const wxString& label); + +protected: + virtual wxSize DoGetBestSize() const ; + + void OnEnterWindow( wxMouseEvent& event); + void OnLeaveWindow( wxMouseEvent& event); + + virtual wxBitmap DoGetBitmap(State which) const; + virtual void DoSetBitmap(const wxBitmap& bitmap, State which); + virtual void DoSetBitmapPosition(wxDirection dir); + + virtual void DoSetBitmapMargins(int x, int y) + { + m_marginX = x; + m_marginY = y; + InvalidateBestSize(); + } + +#if wxUSE_MARKUP && wxOSX_USE_COCOA + virtual bool DoSetLabelMarkup(const wxString& markup); +#endif // wxUSE_MARKUP && wxOSX_USE_COCOA + + + // the margins around the bitmap + int m_marginX; + int m_marginY; + + // the bitmaps for the different state of the buttons, all of them may be + // invalid and the button only shows a bitmap at all if State_Normal bitmap + // is valid + wxBitmap m_bitmaps[State_Max]; + + wxDECLARE_NO_COPY_CLASS(wxAnyButton); + DECLARE_EVENT_TABLE() +}; + +#endif // _WX_OSX_ANYBUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/app.h b/Externals/wxWidgets3/include/wx/osx/app.h index 74ff369b34..3814c79462 100644 --- a/Externals/wxWidgets3/include/wx/osx/app.h +++ b/Externals/wxWidgets3/include/wx/osx/app.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: app.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: app.h 68617 2011-08-09 22:17:12Z DS $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -122,7 +122,10 @@ public: virtual short MacHandleAEQuit(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ; virtual short MacHandleAERApp(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ; #endif - // in response of an open-document apple event + // in response of an openFiles message with Cocoa and an + // open-document apple event with Carbon + virtual void MacOpenFiles(const wxArrayString &fileNames) ; + // called by MacOpenFiles for each file. virtual void MacOpenFile(const wxString &fileName) ; // in response of a get-url apple event virtual void MacOpenURL(const wxString &url) ; diff --git a/Externals/wxWidgets3/include/wx/osx/button.h b/Externals/wxWidgets3/include/wx/osx/button.h index dad3e4cc05..a9a7abbd99 100644 --- a/Externals/wxWidgets3/include/wx/osx/button.h +++ b/Externals/wxWidgets3/include/wx/osx/button.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: button.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: button.h 67931 2011-06-14 13:00:42Z VZ $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -41,8 +41,6 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - static wxSize GetDefaultSize(); - virtual void SetLabel(const wxString& label); virtual wxWindow *SetDefault(); virtual void Command(wxCommandEvent& event); @@ -52,38 +50,7 @@ public: virtual bool OSXHandleClicked( double timestampsec ); protected: - virtual wxSize DoGetBestSize() const ; - - void OnEnterWindow( wxMouseEvent& event); - void OnLeaveWindow( wxMouseEvent& event); - - virtual wxBitmap DoGetBitmap(State which) const; - virtual void DoSetBitmap(const wxBitmap& bitmap, State which); - virtual void DoSetBitmapPosition(wxDirection dir); - - virtual void DoSetBitmapMargins(int x, int y) - { - m_marginX = x; - m_marginY = y; - InvalidateBestSize(); - } - -#if wxUSE_MARKUP && wxOSX_USE_COCOA - virtual bool DoSetLabelMarkup(const wxString& markup); -#endif // wxUSE_MARKUP && wxOSX_USE_COCOA - - - // the margins around the bitmap - int m_marginX; - int m_marginY; - - // the bitmaps for the different state of the buttons, all of them may be - // invalid and the button only shows a bitmap at all if State_Normal bitmap - // is valid - wxBitmap m_bitmaps[State_Max]; - DECLARE_DYNAMIC_CLASS(wxButton) - DECLARE_EVENT_TABLE() }; // OS X specific class, not part of public wx API diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/dataview.h b/Externals/wxWidgets3/include/wx/osx/carbon/dataview.h index 056a2a895c..e4dfeb2940 100644 --- a/Externals/wxWidgets3/include/wx/osx/carbon/dataview.h +++ b/Externals/wxWidgets3/include/wx/osx/carbon/dataview.h @@ -406,6 +406,8 @@ public: // virtual wxDataViewItem GetCurrentItem() const; virtual void SetCurrentItem(const wxDataViewItem& item); + virtual wxDataViewColumn *GetCurrentColumn() const; + virtual int GetSelectedItemsCount() const; virtual int GetSelections(wxDataViewItemArray& sel) const; virtual bool IsSelected (wxDataViewItem const& item) const; virtual void Select (wxDataViewItem const& item); @@ -427,6 +429,8 @@ public: virtual void SetRowHeight(wxDataViewItem const& item, unsigned int height); virtual void OnSize (); + virtual void StartEditor( const wxDataViewItem & item, unsigned int column ); + // // other methods // diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/evtloop.h b/Externals/wxWidgets3/include/wx/osx/carbon/evtloop.h index 2811e5c8c8..c327fff427 100644 --- a/Externals/wxWidgets3/include/wx/osx/carbon/evtloop.h +++ b/Externals/wxWidgets3/include/wx/osx/carbon/evtloop.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 2006-01-12 -// RCS-ID: $Id: evtloop.h 65680 2010-09-30 11:44:45Z VZ $ +// RCS-ID: $Id: evtloop.h 68302 2011-07-19 17:56:57Z SC $ // Copyright: (c) 2006 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -20,6 +20,8 @@ class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxCFEventLoop public: wxGUIEventLoop(); + virtual void WakeUp(); + protected: virtual int DoDispatchTimeout(unsigned long timeout); diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/region.h b/Externals/wxWidgets3/include/wx/osx/carbon/region.h index 22ae118508..e15ca339d8 100644 --- a/Externals/wxWidgets3/include/wx/osx/carbon/region.h +++ b/Externals/wxWidgets3/include/wx/osx/carbon/region.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: region.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: region.h 69459 2011-10-18 21:56:40Z VZ $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,12 +17,13 @@ class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine { public: + wxRegion() { } wxRegion(long x, long y, long w, long h); wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxRect& rect); wxRegion( WXHRGN hRegion ); wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); - wxRegion(); +#if wxUSE_IMAGE wxRegion(const wxBitmap& bmp) { Union(bmp); @@ -32,6 +33,7 @@ public: { Union(bmp, transColour, tolerance); } +#endif virtual ~wxRegion(); diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/statbmp.h b/Externals/wxWidgets3/include/wx/osx/carbon/statbmp.h index 6d378e2d49..4ec79b1054 100644 --- a/Externals/wxWidgets3/include/wx/osx/carbon/statbmp.h +++ b/Externals/wxWidgets3/include/wx/osx/carbon/statbmp.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: statbmp.h 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: statbmp.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -39,8 +39,8 @@ class WXDLLIMPEXP_CORE wxStaticBitmap: public wxStaticBitmapBase virtual void SetBitmap(const wxBitmap& bitmap); - virtual void Command(wxCommandEvent& WXUNUSED(event)) {}; - virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}; + virtual void Command(wxCommandEvent& WXUNUSED(event)) {} + virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {} void OnPaint( wxPaintEvent &event ) ; wxBitmap GetBitmap() const { return m_bitmap; } diff --git a/Externals/wxWidgets3/include/wx/osx/chkconf.h b/Externals/wxWidgets3/include/wx/osx/chkconf.h index 98446dc66f..211411c961 100644 --- a/Externals/wxWidgets3/include/wx/osx/chkconf.h +++ b/Externals/wxWidgets3/include/wx/osx/chkconf.h @@ -4,7 +4,7 @@ * Author: Vadim Zeitlin * Modified by: * Created: 2005-04-05 (extracted from wx/chkconf.h) - * RCS-ID: $Id: chkconf.h 66955 2011-02-18 18:44:43Z SC $ + * RCS-ID: $Id: chkconf.h 67497 2011-04-15 19:18:34Z DS $ * Copyright: (c) 2005 Vadim Zeitlin * Licence: wxWindows licence */ @@ -107,4 +107,4 @@ #include "wx/osx/cocoa/chkconf.h" #endif -#endif // _WX_OSX_CHKCONF_H_ +#endif /* _WX_OSX_CHKCONF_H_ */ diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/dataview.h b/Externals/wxWidgets3/include/wx/osx/cocoa/dataview.h index 335bce5ad7..0859b2dbae 100644 --- a/Externals/wxWidgets3/include/wx/osx/cocoa/dataview.h +++ b/Externals/wxWidgets3/include/wx/osx/cocoa/dataview.h @@ -474,6 +474,8 @@ public: // virtual wxDataViewItem GetCurrentItem() const; virtual void SetCurrentItem(const wxDataViewItem& item); + virtual wxDataViewColumn *GetCurrentColumn() const; + virtual int GetSelectedItemsCount() const; virtual int GetSelections(wxDataViewItemArray& sel) const; virtual bool IsSelected(const wxDataViewItem& item) const; virtual void Select(const wxDataViewItem& item); @@ -496,6 +498,8 @@ public: wxDataViewColumn*& columnPtr) const; virtual void SetRowHeight(const wxDataViewItem& item, unsigned int height); virtual void OnSize(); + + virtual void StartEditor( const wxDataViewItem & item, unsigned int column ); // drag & drop helper methods wxDataFormat GetDnDDataFormat(wxDataObjectComposite* dataObjects); diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/evtloop.h b/Externals/wxWidgets3/include/wx/osx/cocoa/evtloop.h index d3ae6c76d1..4dae4c2184 100644 --- a/Externals/wxWidgets3/include/wx/osx/cocoa/evtloop.h +++ b/Externals/wxWidgets3/include/wx/osx/cocoa/evtloop.h @@ -3,7 +3,7 @@ // Purpose: declaration of wxGUIEventLoop for wxOSX/Cocoa // Author: Vadim Zeitlin // Created: 2008-12-28 -// RCS-ID: $Id: evtloop.h 67129 2011-03-05 12:21:20Z SC $ +// RCS-ID: $Id: evtloop.h 68301 2011-07-19 16:17:44Z SC $ // Copyright: (c) 2006 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -21,6 +21,8 @@ public: void EndModalSession(); + virtual void WakeUp(); + protected: virtual int DoDispatchTimeout(unsigned long timeout); @@ -31,7 +33,12 @@ protected: virtual CFRunLoopRef CFGetCurrentRunLoop() const; void* m_modalSession; + + wxWindow* m_modalWindow; + WXWindow m_dummyWindow; + + int m_modalNestedLevel; }; #endif // _WX_OSX_COCOA_EVTLOOP_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/private.h b/Externals/wxWidgets3/include/wx/osx/cocoa/private.h index 9449772324..0e4a19ac8c 100644 --- a/Externals/wxWidgets3/include/wx/osx/cocoa/private.h +++ b/Externals/wxWidgets3/include/wx/osx/cocoa/private.h @@ -6,7 +6,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: private.h 67233 2011-03-18 15:45:51Z SC $ +// RCS-ID: $Id: private.h 70863 2012-03-10 13:13:51Z SC $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -145,13 +145,13 @@ public : virtual unsigned int draggingUpdated(void* sender, WXWidget slf, void* _cmd); virtual bool performDragOperation(void* sender, WXWidget slf, void* _cmd); virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void* _cmd); + virtual void cursorUpdate(WX_NSEvent event, WXWidget slf, void* _cmd); virtual void keyEvent(WX_NSEvent event, WXWidget slf, void* _cmd); virtual void insertText(NSString* text, WXWidget slf, void* _cmd); virtual bool performKeyEquivalent(WX_NSEvent event, WXWidget slf, void* _cmd); virtual bool acceptsFirstResponder(WXWidget slf, void* _cmd); virtual bool becomeFirstResponder(WXWidget slf, void* _cmd); virtual bool resignFirstResponder(WXWidget slf, void* _cmd); - virtual void resetCursorRects(WXWidget slf, void* _cmd); virtual bool isFlipped(WXWidget slf, void* _cmd); virtual void drawRect(void* rect, WXWidget slf, void* _cmd); @@ -239,6 +239,8 @@ public : virtual void SetModified(bool modified); virtual bool IsModified() const; + virtual void SetRepresentedFilename(const wxString& filename); + wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; } CGWindowLevel GetWindowLevel() const { return m_macWindowLevel; } @@ -352,6 +354,21 @@ protected : - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo; @end + // This interface must be exported in shared 64 bit multilib build but + // using WXEXPORT with Objective C interfaces doesn't work with old (4.0.1) + // gcc when using 10.4 SDK. It does work with newer gcc even in 32 bit + // builds but seems to be unnecessary there so to avoid the expense of a + // configure check verifying if this does work or not with the current + // compiler we just only use it for 64 bit builds where this is always + // supported. + // + // NB: Currently this is the only place where we need to export an + // interface but if we need to do it elsewhere we should define a + // WXEXPORT_OBJC macro once and reuse it in all places it's needed + // instead of duplicating this preprocessor check. +#ifdef __LP64__ + WXEXPORT +#endif // 64 bit builds @interface wxNSAppController : NSObject wxOSX_10_6_AND_LATER() { } diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/private/date.h b/Externals/wxWidgets3/include/wx/osx/cocoa/private/date.h new file mode 100644 index 0000000000..09624ab3f9 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/osx/cocoa/private/date.h @@ -0,0 +1,51 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/osx/cocoa/private/date.h +// Purpose: NSDate-related helpers +// Author: Vadim Zeitlin +// Created: 2011-12-19 +// RCS-ID: $Id: date.h 70070 2011-12-20 21:27:09Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_OSX_COCOA_PRIVATE_DATE_H_ +#define _WX_OSX_COCOA_PRIVATE_DATE_H_ + +#include "wx/datetime.h" + +namespace wxOSXImpl +{ + +// Functions to convert between NSDate and wxDateTime. + +// Returns an NSDate corresponding to the given wxDateTime which can be invalid +// (in which case nil is returned). +inline NSDate* NSDateFromWX(const wxDateTime& dt) +{ + if ( !dt.IsValid() ) + return nil; + + // Get the internal representation as a double used by NSDate. + double ticks = dt.GetValue().ToDouble(); + + // wxDateTime uses milliseconds while NSDate uses (fractional) seconds. + return [NSDate dateWithTimeIntervalSince1970:ticks/1000.]; +} + + +// Returns wxDateTime corresponding to the given NSDate (which may be nil). +inline wxDateTime NSDateToWX(const NSDate* d) +{ + if ( !d ) + return wxDefaultDateTime; + + // Reverse everything done above. + wxLongLong ll; + ll.Assign([d timeIntervalSince1970]*1000); + wxDateTime dt(ll); + return dt; +} + +} // namespace wxOSXImpl + +#endif // _WX_OSX_COCOA_PRIVATE_DATE_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/private/textimpl.h b/Externals/wxWidgets3/include/wx/osx/cocoa/private/textimpl.h index a977555e35..841bf5bd08 100644 --- a/Externals/wxWidgets3/include/wx/osx/cocoa/private/textimpl.h +++ b/Externals/wxWidgets3/include/wx/osx/cocoa/private/textimpl.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 03/02/99 -// RCS-ID: $Id: textimpl.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: textimpl.h 70354 2012-01-15 15:53:56Z SC $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -28,6 +28,9 @@ public : wxNSTextFieldControl( wxWindow *wxPeer, wxTextEntry *entry, WXWidget w ); virtual ~wxNSTextFieldControl(); + virtual bool CanClipMaxLength() const { return true; } + virtual void SetMaxLength(unsigned long len); + virtual wxString GetStringValue() const ; virtual void SetStringValue( const wxString &str) ; virtual void Copy() ; @@ -105,6 +108,9 @@ public : virtual wxString GetStringAtIndex(int pos) const; virtual int FindString(const wxString& text) const; + virtual void Popup(); + virtual void Dismiss(); + private: NSComboBox* m_comboBox; }; diff --git a/Externals/wxWidgets3/include/wx/osx/combobox.h b/Externals/wxWidgets3/include/wx/osx/combobox.h index 0aad2f019d..ba55d4f160 100644 --- a/Externals/wxWidgets3/include/wx/osx/combobox.h +++ b/Externals/wxWidgets3/include/wx/osx/combobox.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: combobox.h 66993 2011-02-22 13:25:38Z VZ $ +// RCS-ID: $Id: combobox.h 69956 2011-12-08 14:47:37Z VZ $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -25,7 +25,14 @@ class wxComboBoxChoice; class wxComboWidgetImpl; // Combobox item -class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase +class WXDLLIMPEXP_CORE wxComboBox : + public wxWindowWithItems< +#if wxOSX_USE_CARBON + wxNavigationEnabled, +#else + wxControl, +#endif + wxComboBoxBase> { DECLARE_DYNAMIC_CLASS(wxComboBox) @@ -42,7 +49,7 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase virtual void DelegateTextChanged( const wxString& value ); virtual void DelegateChoice( const wxString& value ); - wxComboBox() { Init(); } + wxComboBox() { } wxComboBox(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, @@ -53,7 +60,6 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr) { - Init(); Create(parent, id, value, pos, size, n, choices, style, validator, name); } @@ -66,7 +72,6 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr) { - Init(); Create(parent, id, value, pos, size, choices, style, validator, name); } @@ -134,25 +139,20 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase virtual wxTextWidgetImpl* GetTextPeer() const; #endif // wxOSX_USE_CARBON +#if wxOSX_USE_COCOA + virtual void Popup(); + virtual void Dismiss(); +#endif // wxOSX_USE_COCOA // osx specific event handling common for all osx-ports virtual bool OSXHandleClicked( double timestampsec ); -#if wxOSX_USE_CARBON - wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST - - WX_DECLARE_CONTROL_CONTAINER(); -#endif - #if wxOSX_USE_COCOA wxComboWidgetImpl* GetComboPeer() const; #endif protected: - // common part of all ctors - void Init(); - // List functions virtual void DoDeleteOneItem(unsigned int n); virtual void DoClear(); @@ -187,10 +187,6 @@ protected: wxComboBoxChoice* m_choice; wxComboBoxDataArray m_datas; - -#if wxOSX_USE_CARBON - DECLARE_EVENT_TABLE() -#endif }; #endif // _WX_COMBOBOX_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/config_xcode.h b/Externals/wxWidgets3/include/wx/osx/config_xcode.h index 5321a98ee3..5c92ac2032 100644 --- a/Externals/wxWidgets3/include/wx/osx/config_xcode.h +++ b/Externals/wxWidgets3/include/wx/osx/config_xcode.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 29.04.04 -// RCS-ID: $Id: config_xcode.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: config_xcode.h 70021 2011-12-16 22:12:49Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -133,9 +133,9 @@ #define WXWIN_OS_DESCRIPTION "Darwin 7.9.0 Power Macintosh" #define PACKAGE_BUGREPORT "wx-dev@lists.wxwidgets.org" #define PACKAGE_NAME "wxWidgets" -#define PACKAGE_STRING "wxWidgets 2.9.2" +#define PACKAGE_STRING "wxWidgets 2.9.4" #define PACKAGE_TARNAME "wxwidgets" -#define PACKAGE_VERSION "2.9.2" +#define PACKAGE_VERSION "2.9.4" // for regex #define WX_NO_REGEX_ADVANCED 1 diff --git a/Externals/wxWidgets3/include/wx/osx/core/colour.h b/Externals/wxWidgets3/include/wx/osx/core/colour.h index 827c26db69..2765a4c20b 100644 --- a/Externals/wxWidgets3/include/wx/osx/core/colour.h +++ b/Externals/wxWidgets3/include/wx/osx/core/colour.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: colour.h 67068 2011-02-27 12:48:42Z VZ $ +// RCS-ID: $Id: colour.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -42,10 +42,10 @@ public: bool operator != (const wxColour& colour) const { return !(*this == colour); } - CGColorRef GetPixel() const { return m_cgColour; }; + CGColorRef GetPixel() const { return m_cgColour; } - CGColorRef GetCGColor() const { return m_cgColour; }; - CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); }; + CGColorRef GetCGColor() const { return m_cgColour; } + CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); } #if wxOSX_USE_COCOA_OR_CARBON void GetRGBColor( RGBColor *col ) const; diff --git a/Externals/wxWidgets3/include/wx/osx/core/dataview.h b/Externals/wxWidgets3/include/wx/osx/core/dataview.h index 8a24aaefd3..f02d328eea 100644 --- a/Externals/wxWidgets3/include/wx/osx/core/dataview.h +++ b/Externals/wxWidgets3/include/wx/osx/core/dataview.h @@ -89,6 +89,9 @@ public: virtual wxDataViewItem GetCurrentItem() const = 0; virtual void SetCurrentItem(const wxDataViewItem& item) = 0; + virtual wxDataViewColumn *GetCurrentColumn() const = 0; + + virtual int GetSelectedItemsCount() const = 0; virtual int GetSelections(wxDataViewItemArray& sel) const = 0; // returns all selected items in the native control virtual bool IsSelected (wxDataViewItem const& item) const = 0; // checks if the passed item is selected in the native control virtual void Select (wxDataViewItem const& item) = 0; // selects the passed item in the native control @@ -109,6 +112,7 @@ public: virtual void HitTest (wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const = 0; // return the item and column pointer that contains with the passed point virtual void SetRowHeight(wxDataViewItem const& item, unsigned int height) = 0; // sets the height of the row containg the passed item in the native control virtual void OnSize (void) = 0; // updates the layout of the native control after a size event + virtual void StartEditor( const wxDataViewItem & item, unsigned int column ) = 0; // starts editing the passed in item and column }; #endif // _WX_DATAVIEWCTRL_CORE_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/core/mimetype.h b/Externals/wxWidgets3/include/wx/osx/core/mimetype.h index b018d7a560..a6e5b1ead9 100644 --- a/Externals/wxWidgets3/include/wx/osx/core/mimetype.h +++ b/Externals/wxWidgets3/include/wx/osx/core/mimetype.h @@ -4,7 +4,7 @@ // Author: Neil Perkins // Modified by: // Created: 2010-05-15 -// RCS-ID: $Id: mimetype.h 67232 2011-03-18 15:10:15Z DS $ +// RCS-ID: $Id: mimetype.h 68563 2011-08-05 19:02:26Z VZ $ // Copyright: (C) 2010 Neil Perkins // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -56,6 +56,7 @@ private: bool GetMimeTypes(const wxString& uti, wxArrayString& mimeTypes); bool GetIcon(const wxString& uti, wxIconLocation *iconLoc); bool GetDescription(const wxString& uti, wxString *desc); + bool GetApplication(const wxString& uti, wxString *command); // Structure to represent file types typedef struct FileTypeData @@ -63,6 +64,7 @@ private: wxArrayString extensions; wxArrayString mimeTypes; wxIconLocation iconLoc; + wxString application; wxString description; } FileTypeInfo; @@ -95,9 +97,9 @@ public: bool GetMimeTypes(wxArrayString& mimeTypes) const ; bool GetIcon(wxIconLocation *iconLoc) const ; bool GetDescription(wxString *desc) const ; + bool GetOpenCommand(wxString *openCmd, const wxFileType::MessageParameters& params) const; // These functions are only stubs on Mac OS X - bool GetOpenCommand(wxString *openCmd, const wxFileType::MessageParameters& params) const; bool GetPrintCommand(wxString *printCmd, const wxFileType::MessageParameters& params) const; size_t GetAllCommands(wxArrayString *verbs, wxArrayString *commands, const wxFileType::MessageParameters& params) const; bool SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt = TRUE); diff --git a/Externals/wxWidgets3/include/wx/osx/core/private.h b/Externals/wxWidgets3/include/wx/osx/core/private.h index 06f660ccc5..4b69c9bb90 100644 --- a/Externals/wxWidgets3/include/wx/osx/core/private.h +++ b/Externals/wxWidgets3/include/wx/osx/core/private.h @@ -6,7 +6,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: private.h 67233 2011-03-18 15:45:51Z SC $ +// RCS-ID: $Id: private.h 70354 2012-01-15 15:53:56Z SC $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -32,7 +32,7 @@ #define wxOSX_10_6_AND_LATER(x) #endif -#if !wxUSE_GUI || wxOSX_USE_COCOA_OR_CARBON +#if ( !wxUSE_GUI && !wxOSX_USE_IPHONE ) || wxOSX_USE_COCOA_OR_CARBON // Carbon functions are currently still used in wxOSX/Cocoa too (including // wxBase part of it). @@ -47,6 +47,11 @@ WXDLLIMPEXP_BASE wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef add WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef ); WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname ); +// keycode utils from app.cpp + +WXDLLIMPEXP_BASE CGKeyCode wxCharCodeWXToOSX(wxKeyCode code); +WXDLLIMPEXP_BASE long wxMacTranslateKey(unsigned char key, unsigned char code); + #endif #if wxUSE_GUI @@ -626,6 +631,9 @@ public : virtual void GetSelection( long* from, long* to ) const = 0 ; virtual void WriteText( const wxString& str ) = 0 ; + virtual bool CanClipMaxLength() const { return false; } + virtual void SetMaxLength(unsigned long WXUNUSED(len)) {} + virtual bool GetStyle( long position, wxTextAttr& style); virtual void SetStyle( long start, long end, const wxTextAttr& style ) ; virtual void Copy() ; @@ -675,16 +683,18 @@ public : virtual ~wxComboWidgetImpl() {} - virtual int GetSelectedItem() const { return -1; }; - virtual void SetSelectedItem(int WXUNUSED(item)) {}; + virtual int GetSelectedItem() const { return -1; } + virtual void SetSelectedItem(int WXUNUSED(item)) {} - virtual int GetNumberOfItems() const { return -1; }; + virtual int GetNumberOfItems() const { return -1; } virtual void InsertItem(int WXUNUSED(pos), const wxString& WXUNUSED(item)) {} virtual void RemoveItem(int WXUNUSED(pos)) {} virtual void Clear() {} + virtual void Popup() {} + virtual void Dismiss() {} virtual wxString GetStringAtIndex(int WXUNUSED(pos)) const { return wxEmptyString; } @@ -856,6 +866,8 @@ public : virtual void SetModified(bool WXUNUSED(modified)) { } virtual bool IsModified() const { return false; } + virtual void SetRepresentedFilename(const wxString& WXUNUSED(filename)) { } + #if wxOSX_USE_IPHONE virtual CGFloat GetWindowLevel() const { return 0.0; } #else diff --git a/Externals/wxWidgets3/include/wx/osx/core/private/datetimectrl.h b/Externals/wxWidgets3/include/wx/osx/core/private/datetimectrl.h new file mode 100644 index 0000000000..499ff1b94a --- /dev/null +++ b/Externals/wxWidgets3/include/wx/osx/core/private/datetimectrl.h @@ -0,0 +1,71 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/osx/core/private/datetime.h +// Purpose: +// Author: Vadim Zeitlin +// Created: 2011-12-19 +// RCS-ID: $Id: datetimectrl.h 70071 2011-12-20 21:27:14Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_OSX_CORE_PRIVATE_DATETIMECTRL_H_ +#define _WX_OSX_CORE_PRIVATE_DATETIMECTRL_H_ + +#if wxUSE_DATEPICKCTRL + +#include "wx/osx/private.h" + +#include "wx/datetime.h" + +enum wxDateTimeWidgetKind +{ + wxDateTimeWidget_YearMonthDay, + wxDateTimeWidget_HourMinuteSecond +}; + +// ---------------------------------------------------------------------------- +// wxDateTimeWidgetImpl: peer class for wxDateTimePickerCtrl. +// ---------------------------------------------------------------------------- + +class wxDateTimeWidgetImpl +#if wxOSX_USE_COCOA + : public wxWidgetCocoaImpl +#elif wxOSX_USE_CARBON + : public wxMacControl +#else + #error "Unsupported platform" +#endif +{ +public: + static wxDateTimeWidgetImpl* + CreateDateTimePicker(wxDateTimePickerCtrl* wxpeer, + const wxDateTime& dt, + const wxPoint& pos, + const wxSize& size, + long style, + wxDateTimeWidgetKind kind); + + virtual void SetDateTime(const wxDateTime& dt) = 0; + virtual wxDateTime GetDateTime() const = 0; + + virtual void SetDateRange(const wxDateTime& dt1, const wxDateTime& dt2) = 0; + virtual bool GetDateRange(wxDateTime* dt1, wxDateTime* dt2) = 0; + + virtual ~wxDateTimeWidgetImpl() { } + +protected: +#if wxOSX_USE_COCOA + wxDateTimeWidgetImpl(wxDateTimePickerCtrl* wxpeer, WXWidget view) + : wxWidgetCocoaImpl(wxpeer, view) + { + } +#elif wxOSX_USE_CARBON + // There is no Carbon implementation of this control yet so we don't need + // any ctor for it yet but it should be added here if Carbon version is + // written later. +#endif +}; + +#endif // wxUSE_DATEPICKCTRL + +#endif // _WX_OSX_CORE_PRIVATE_DATETIMECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/dataview.h b/Externals/wxWidgets3/include/wx/osx/dataview.h index 5380d55a38..f54188e3df 100644 --- a/Externals/wxWidgets3/include/wx/osx/dataview.h +++ b/Externals/wxWidgets3/include/wx/osx/dataview.h @@ -2,7 +2,7 @@ // Name: wx/osx/dataview.h // Purpose: wxDataViewCtrl native implementation header for OSX // Author: -// Id: $Id: dataview.h 66634 2011-01-07 18:26:58Z VS $ +// Id: $Id: dataview.h 70496 2012-02-02 14:19:30Z VZ $ // Copyright: (c) 2009 // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -60,12 +60,11 @@ public: virtual void SetMaxWidth (int maxWidth); virtual void SetMinWidth (int minWidth); virtual void SetReorderable(bool reorderable); - virtual void SetResizeable (bool resizeable); + virtual void SetResizeable (bool resizable); virtual void SetSortable (bool sortable); virtual void SetSortOrder (bool ascending); virtual void SetTitle (wxString const& title); virtual void SetWidth (int width); - virtual void SetAsSortKey (bool sort = true); // implementation only wxDataViewColumnNativeData* GetNativeData() const @@ -151,7 +150,7 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxDataViewCtrlNameStr); - virtual wxControl* GetMainWindow() // not used for the native implementation + virtual wxWindow* GetMainWindow() // not used for the native implementation { return this; } @@ -175,8 +174,9 @@ public: virtual bool IsExpanded(const wxDataViewItem & item) const; virtual unsigned int GetCount() const; - virtual wxRect GetItemRect(const wxDataViewItem& item, const wxDataViewColumn* columnPtr) const; - virtual wxDataViewItem GetSelection() const; + virtual wxRect GetItemRect(const wxDataViewItem& item, + const wxDataViewColumn* columnPtr = NULL) const; + virtual int GetSelectedItemsCount() const; virtual int GetSelections(wxDataViewItemArray& sel) const; virtual void HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const; @@ -201,6 +201,8 @@ public: // finishes editing of custom items; if no custom item is currently edited the method does nothing void FinishCustomItemEditing(); + + virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column); // returns the n-th pointer to a column; // this method is different from GetColumn(unsigned int pos) because here 'n' is not a position in the control but the n-th @@ -255,6 +257,8 @@ public: m_Deleting = deleting; } + virtual wxDataViewColumn *GetCurrentColumn() const; + virtual wxVisualAttributes GetDefaultAttributes() const { return GetClassDefaultAttributes(GetWindowVariant()); diff --git a/Externals/wxWidgets3/include/wx/osx/datectrl.h b/Externals/wxWidgets3/include/wx/osx/datectrl.h new file mode 100644 index 0000000000..026361aa2f --- /dev/null +++ b/Externals/wxWidgets3/include/wx/osx/datectrl.h @@ -0,0 +1,55 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/osx/datectrl.h +// Purpose: Declaration of wxOSX-specific wxDatePickerCtrl class. +// Author: Vadim Zeitlin +// Created: 2011-12-18 +// RCS-ID: $Id: datectrl.h 70071 2011-12-20 21:27:14Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_OSX_DATECTRL_H_ +#define _WX_OSX_DATECTRL_H_ + +// ---------------------------------------------------------------------------- +// wxDatePickerCtrl +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_ADV wxDatePickerCtrl : public wxDatePickerCtrlBase +{ +public: + // Constructors. + wxDatePickerCtrl() { } + + wxDatePickerCtrl(wxWindow *parent, + wxWindowID id, + const wxDateTime& dt = wxDefaultDateTime, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxDatePickerCtrlNameStr) + { + Create(parent, id, dt, pos, size, style, validator, name); + } + + bool Create(wxWindow *parent, + wxWindowID id, + const wxDateTime& dt = wxDefaultDateTime, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxDatePickerCtrlNameStr); + + // Implement the base class pure virtuals. + virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2); + virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const; + + virtual void OSXGenerateEvent(const wxDateTime& dt); + +private: + wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl); +}; + +#endif // _WX_OSX_DATECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/datetimectrl.h b/Externals/wxWidgets3/include/wx/osx/datetimectrl.h new file mode 100644 index 0000000000..2184229b12 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/osx/datetimectrl.h @@ -0,0 +1,34 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/osx/datetimectrl.h +// Purpose: Declaration of wxOSX-specific wxDateTimePickerCtrl class. +// Author: Vadim Zeitlin +// Created: 2011-12-18 +// RCS-ID: $Id: datetimectrl.h 70071 2011-12-20 21:27:14Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_OSX_DATETIMECTRL_H_ +#define _WX_OSX_DATETIMECTRL_H_ + +class wxDateTimeWidgetImpl; + +// ---------------------------------------------------------------------------- +// wxDateTimePickerCtrl +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_ADV wxDateTimePickerCtrl : public wxDateTimePickerCtrlBase +{ +public: + // Implement the base class pure virtuals. + virtual void SetValue(const wxDateTime& dt); + virtual wxDateTime GetValue() const; + + // Implementation only. + virtual void OSXGenerateEvent(const wxDateTime& dt) = 0; + +protected: + wxDateTimeWidgetImpl* GetDateTimePeer() const; +}; + +#endif // _WX_OSX_DATETIMECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/dirdlg.h b/Externals/wxWidgets3/include/wx/osx/dirdlg.h index 9ff101b44e..1ea6fd2739 100644 --- a/Externals/wxWidgets3/include/wx/osx/dirdlg.h +++ b/Externals/wxWidgets3/include/wx/osx/dirdlg.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: dirdlg.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: dirdlg.h 67896 2011-06-09 00:28:28Z SC $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -23,6 +23,10 @@ public: const wxSize& size = wxDefaultSize, const wxString& name = wxDirDialogNameStr); +#if wxOSX_USE_COCOA + ~wxDirDialog(); +#endif + virtual int ShowModal(); #if wxOSX_USE_COCOA @@ -33,6 +37,10 @@ public: protected: DECLARE_DYNAMIC_CLASS(wxDirDialog) + +#if wxOSX_USE_COCOA + WX_NSObject m_sheetDelegate; +#endif }; #endif diff --git a/Externals/wxWidgets3/include/wx/osx/evtloop.h b/Externals/wxWidgets3/include/wx/osx/evtloop.h index f427594d59..26c75a7ac5 100644 --- a/Externals/wxWidgets3/include/wx/osx/evtloop.h +++ b/Externals/wxWidgets3/include/wx/osx/evtloop.h @@ -6,7 +6,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 2006-01-12 -// RCS-ID: $Id: evtloop.h 65680 2010-09-30 11:44:45Z VZ $ +// RCS-ID: $Id: evtloop.h 67724 2011-05-11 06:46:07Z SC $ // Copyright: (c) 2006 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -53,9 +53,14 @@ public: AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags); #endif // wxUSE_EVENTLOOP_SOURCE - void ObserverCallBack(CFRunLoopObserverRef observer, int activity); protected: + void CommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity); + void DefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity); + + static void OSXCommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info); + static void OSXDefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info); + // get the currently executing CFRunLoop virtual CFRunLoopRef CFGetCurrentRunLoop() const; @@ -74,8 +79,11 @@ protected: // cfrunloop CFRunLoopRef m_runLoop; - // runloop observer - CFRunLoopObserverRef m_runLoopObserver; + // common modes runloop observer + CFRunLoopObserverRef m_commonModeRunLoopObserver; + + // default mode runloop observer + CFRunLoopObserverRef m_defaultModeRunLoopObserver; private: // process all already pending events and dispatch a new one (blocking diff --git a/Externals/wxWidgets3/include/wx/osx/filedlg.h b/Externals/wxWidgets3/include/wx/osx/filedlg.h index 4ac1d59404..6dbc0cb50c 100644 --- a/Externals/wxWidgets3/include/wx/osx/filedlg.h +++ b/Externals/wxWidgets3/include/wx/osx/filedlg.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: filedlg.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: filedlg.h 67896 2011-06-09 00:28:28Z SC $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -41,6 +41,10 @@ public: const wxSize& sz = wxDefaultSize, const wxString& name = wxFileDialogNameStr); +#if wxOSX_USE_COCOA + ~wxFileDialog(); +#endif + virtual void GetPaths(wxArrayString& paths) const { paths = m_paths; } virtual void GetFilenames(wxArrayString& files) const { files = m_fileNames ; } @@ -70,6 +74,7 @@ protected: #if wxOSX_USE_COCOA virtual wxWindow* CreateFilterPanel(wxWindow *extracontrol); + void DoOnFilterSelected(int index); virtual void OnFilterSelected(wxCommandEvent &event); wxArrayString m_filterExtensions; @@ -80,6 +85,7 @@ protected: int m_firstFileTypeFilter; wxArrayString m_currentExtensions; WX_NSObject m_delegate; + WX_NSObject m_sheetDelegate; #endif }; diff --git a/Externals/wxWidgets3/include/wx/osx/font.h b/Externals/wxWidgets3/include/wx/osx/font.h index fc53a77bc8..e1fe572e58 100644 --- a/Externals/wxWidgets3/include/wx/osx/font.h +++ b/Externals/wxWidgets3/include/wx/osx/font.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: font.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: font.h 70445 2012-01-23 11:28:21Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -79,6 +79,19 @@ public: SetPixelSize(pixelSize); } + wxFont(int pointSize, + wxFontFamily family, + int flags = wxFONTFLAG_DEFAULT, + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT) + { + Create(pointSize, family, + GetStyleFromFlags(flags), + GetWeightFromFlags(flags), + GetUnderlinedFromFlags(flags), + face, encoding); + } + bool Create(int size, wxFontFamily family, wxFontStyle style, diff --git a/Externals/wxWidgets3/include/wx/osx/fontdlg.h b/Externals/wxWidgets3/include/wx/osx/fontdlg.h index 81ecf877a7..966a8fa937 100644 --- a/Externals/wxWidgets3/include/wx/osx/fontdlg.h +++ b/Externals/wxWidgets3/include/wx/osx/fontdlg.h @@ -4,7 +4,7 @@ // Author: Ryan Norton // Modified by: // Created: 2004-09-25 -// RCS-ID: $Id: fontdlg.h 66615 2011-01-07 05:26:57Z PC $ +// RCS-ID: $Id: fontdlg.h 70497 2012-02-02 14:19:34Z VZ $ // Copyright: (c) Ryan Norton // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -35,9 +35,11 @@ class WXDLLIMPEXP_CORE wxFontDialog : public wxDialog { public: wxFontDialog(); + wxFontDialog(wxWindow *parent); wxFontDialog(wxWindow *parent, const wxFontData& data); virtual ~wxFontDialog(); + bool Create(wxWindow *parent); bool Create(wxWindow *parent, const wxFontData& data); int ShowModal(); diff --git a/Externals/wxWidgets3/include/wx/osx/frame.h b/Externals/wxWidgets3/include/wx/osx/frame.h index 08d91de60e..ca6ffb51da 100644 --- a/Externals/wxWidgets3/include/wx/osx/frame.h +++ b/Externals/wxWidgets3/include/wx/osx/frame.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: frame.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: frame.h 70765 2012-03-01 15:04:42Z JS $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -59,7 +59,6 @@ public: // event handlers void OnActivate(wxActivateEvent& event); void OnSysColourChanged(wxSysColourChangedEvent& event); - void OnSize(wxSizeEvent& event); // Toolbar #if wxUSE_TOOLBAR @@ -84,6 +83,8 @@ public: void PositionBars(); + // internal response to size events + virtual void MacOnInternalSize() { PositionBars(); } protected: // common part of all ctors diff --git a/Externals/wxWidgets3/include/wx/osx/iphone/chkconf.h b/Externals/wxWidgets3/include/wx/osx/iphone/chkconf.h index ccbe8206f6..c402458f67 100644 --- a/Externals/wxWidgets3/include/wx/osx/iphone/chkconf.h +++ b/Externals/wxWidgets3/include/wx/osx/iphone/chkconf.h @@ -4,7 +4,7 @@ * Author: Stefan Csomor * Modified by: * Created: 2008-07-30 - * RCS-ID: $Id: chkconf.h 67232 2011-03-18 15:10:15Z DS $ + * RCS-ID: $Id: chkconf.h 69818 2011-11-25 14:37:03Z SC $ * Copyright: (c) Stefan Csomor * Licence: wxWindows licence */ @@ -66,6 +66,11 @@ #define wxUSE_DATAVIEWCTRL 0 #endif +#if wxUSE_TREELISTCTRL +#undef wxUSE_TREELISTCTRL +#define wxUSE_TREELISTCTRL 0 +#endif + #if wxUSE_DRAG_AND_DROP #undef wxUSE_DRAG_AND_DROP #define wxUSE_DRAG_AND_DROP 0 @@ -348,6 +353,16 @@ #define wxUSE_RICHTEXT 0 #endif +#if wxUSE_TIMEPICKCTRL +#undef wxUSE_TIMEPICKCTRL +#define wxUSE_TIMEPICKCTRL 0 +#endif + +#if wxUSE_RICHTOOLTIP +#undef wxUSE_RICHTOOLTIP +#define wxUSE_RICHTOOLTIP 0 +#endif + #endif /* _WX_OSX_IPHONE_CHKCONF_H_ */ diff --git a/Externals/wxWidgets3/include/wx/osx/joystick.h b/Externals/wxWidgets3/include/wx/osx/joystick.h index 3608bc1cea..d9d2f06481 100644 --- a/Externals/wxWidgets3/include/wx/osx/joystick.h +++ b/Externals/wxWidgets3/include/wx/osx/joystick.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: joystick.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: joystick.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -22,7 +22,7 @@ class WXDLLIMPEXP_ADV wxJoystick: public wxObject * Public interface */ - wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }; + wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; } // Attributes //////////////////////////////////////////////////////////////////////////// diff --git a/Externals/wxWidgets3/include/wx/osx/listctrl.h b/Externals/wxWidgets3/include/wx/osx/listctrl.h index 7b55e8ff6c..b0412f25f7 100644 --- a/Externals/wxWidgets3/include/wx/osx/listctrl.h +++ b/Externals/wxWidgets3/include/wx/osx/listctrl.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: listctrl.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: listctrl.h 70290 2012-01-08 00:55:22Z VZ $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -23,7 +23,7 @@ class wxListCtrlRenameTimer; WX_DECLARE_EXPORTED_LIST(wxListItem, wxColumnList); -class WXDLLIMPEXP_CORE wxListCtrl: public wxControl +class WXDLLIMPEXP_CORE wxListCtrl: public wxListCtrlBase { DECLARE_DYNAMIC_CLASS(wxListCtrl) public: @@ -63,8 +63,7 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxControl bool GetColumn(int col, wxListItem& item) const; // Sets information about this column - // TODO: NOT const to be compatible with wxGenericListCtrl API - bool SetColumn(int col, wxListItem& item) ; + bool SetColumn(int col, const wxListItem& item) ; // Gets the column width int GetColumnWidth(int col) const; @@ -160,11 +159,6 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxControl // list or report view long GetTopItem() const ; - // are we in report mode? - bool InReportView() const { return HasFlag(wxLC_REPORT); } - - bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); } - // Add or remove a single window style void SetSingleStyle(long style, bool add = true) ; @@ -257,12 +251,6 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxControl // Insert an image/string item long InsertItem(long index, const wxString& label, int imageIndex); - // For list view mode (only), inserts a column. - long InsertColumn(long col, wxListItem& info); - - long InsertColumn(long col, const wxString& heading, int format = wxLIST_FORMAT_LEFT, - int width = -1); - // Scrolls the list control. If in icon, small icon or report view mode, // x specifies the number of pixels to scroll. If in list view mode, x // specifies the number of columns to scroll. @@ -314,10 +302,10 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxControl bool Update(long item); */ - void Command(wxCommandEvent& event) { ProcessCommand(event); }; + void Command(wxCommandEvent& event) { ProcessCommand(event); } - wxListCtrlCompare GetCompareFunc() { return m_compareFunc; }; - wxIntPtr GetCompareFuncData() { return m_compareFuncData; }; + wxListCtrlCompare GetCompareFunc() { return m_compareFunc; } + wxIntPtr GetCompareFuncData() { return m_compareFuncData; } // public overrides needed for pimpl approach @@ -376,14 +364,14 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxControl GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); protected: + // Implement base class pure virtual methods. + long DoInsertColumn(long col, const wxListItem& info); // protected overrides needed for pimpl approach virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); - virtual wxSize DoGetBestSize() const; - long m_current; wxListCtrlTextCtrlWrapper *m_textctrlWrapper; wxListCtrlRenameTimer *m_renameTimer; diff --git a/Externals/wxWidgets3/include/wx/osx/menu.h b/Externals/wxWidgets3/include/wx/osx/menu.h index fa62ad500a..6429ca657d 100644 --- a/Externals/wxWidgets3/include/wx/osx/menu.h +++ b/Externals/wxWidgets3/include/wx/osx/menu.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: menu.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: menu.h 70350 2012-01-15 13:41:17Z VZ $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -83,6 +83,10 @@ private: // terminate the current radio group, if any void EndRadioGroup(); + // Common part of HandleMenu{Opened,Closed}(). + void DoHandleMenuOpenedOrClosed(wxEventType evtType); + + // if TRUE, insert a breal before appending the next item bool m_doBreak; @@ -127,6 +131,7 @@ public: virtual wxMenu *Remove(size_t pos); virtual void EnableTop( size_t pos, bool flag ); + virtual bool IsEnabledTop(size_t pos) const; virtual void SetMenuLabel( size_t pos, const wxString& label ); virtual wxString GetMenuLabel( size_t pos ) const; virtual bool Enable( bool enable = true ); diff --git a/Externals/wxWidgets3/include/wx/osx/metafile.h b/Externals/wxWidgets3/include/wx/osx/metafile.h index 646f60462f..2a7e13e252 100644 --- a/Externals/wxWidgets3/include/wx/osx/metafile.h +++ b/Externals/wxWidgets3/include/wx/osx/metafile.h @@ -6,7 +6,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: metafile.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: metafile.h 70710 2012-02-27 15:37:24Z SC $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -56,13 +56,6 @@ public: // Implementation WXHMETAFILE GetHMETAFILE() const ; void SetHMETAFILE(WXHMETAFILE mf) ; -#if wxOSX_USE_COCOA_OR_CARBON && !defined( __LP64__ ) - // Since the native metafile format is PDF for Quartz - // we need a call that allows setting PICT content for - // backwards compatibility - void SetPICT(void* pictHandle) ; -#endif - protected: virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; @@ -145,7 +138,7 @@ class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObjectSimple public: // ctors wxMetafileDataObject() - : wxDataObjectSimple(wxDF_METAFILE) { }; + : wxDataObjectSimple(wxDF_METAFILE) { } wxMetafileDataObject(const wxMetafile& metafile) : wxDataObjectSimple(wxDF_METAFILE), m_metafile(metafile) { } diff --git a/Externals/wxWidgets3/include/wx/osx/msgdlg.h b/Externals/wxWidgets3/include/wx/osx/msgdlg.h index 00b096e920..173cab4994 100644 --- a/Externals/wxWidgets3/include/wx/osx/msgdlg.h +++ b/Externals/wxWidgets3/include/wx/osx/msgdlg.h @@ -5,7 +5,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: msgdlg.h 65680 2010-09-30 11:44:45Z VZ $ +// RCS-ID: $Id: msgdlg.h 68537 2011-08-04 22:53:42Z VZ $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -22,6 +22,10 @@ public: long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition); +#if wxOSX_USE_COCOA + ~wxMessageDialog(); +#endif + virtual int ShowModal(); #if wxOSX_USE_COCOA @@ -39,9 +43,12 @@ protected: void* ConstructNSAlert(); #endif - int m_buttonId[3]; + int m_buttonId[4]; int m_buttonCount; +#if wxOSX_USE_COCOA + WX_NSObject m_sheetDelegate; +#endif DECLARE_DYNAMIC_CLASS(wxMessageDialog) }; diff --git a/Externals/wxWidgets3/include/wx/osx/nonownedwnd.h b/Externals/wxWidgets3/include/wx/osx/nonownedwnd.h index 8c674bfce2..b6b014f30b 100644 --- a/Externals/wxWidgets3/include/wx/osx/nonownedwnd.h +++ b/Externals/wxWidgets3/include/wx/osx/nonownedwnd.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 2008-03-24 -// RCS-ID: $Id: nonownedwnd.h 67232 2011-03-18 15:10:15Z DS $ +// RCS-ID: $Id: nonownedwnd.h 70488 2012-01-31 17:39:39Z SC $ // Copyright: (c) 2008 Stefan Csomor // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -14,6 +14,8 @@ #include "wx/window.h" +#include "wx/graphics.h" + #if wxUSE_SYSTEM_OPTIONS #define wxMAC_WINDOW_PLAIN_TRANSITION wxT("mac.window-plain-transition") #endif @@ -30,7 +32,7 @@ class wxNonOwnedWindowImpl; -class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxWindow +class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase { public: // constructors and such @@ -79,8 +81,11 @@ public: // implementation from now on // -------------------------- - virtual bool DoSetShape(const wxRegion& region); + // These accessors are Mac-specific and don't exist in other ports. const wxRegion& GetShape() const { return m_shape; } +#if wxUSE_GRAPHICS_CONTEXT + const wxGraphicsPath& GetShapePath() { return m_shapePath; } +#endif // wxUSE_GRAPHICS_CONTEXT // activation hooks only necessary for MDI Implementation static void MacDelayedDeactivation(long timestamp); @@ -109,6 +114,8 @@ public: virtual void HandleResized( double timestampsec ); virtual void HandleMoved( double timestampsec ); virtual void HandleResizing( double timestampsec, wxRect* rect ); + + void WindowWasPainted(); virtual bool Destroy(); @@ -125,6 +132,12 @@ protected: wxShowEffect effect, unsigned timeout); + virtual bool DoClearShape(); + virtual bool DoSetRegionShape(const wxRegion& region); +#if wxUSE_GRAPHICS_CONTEXT + virtual bool DoSetPathShape(const wxGraphicsPath& path); +#endif // wxUSE_GRAPHICS_CONTEXT + virtual void WillBeDestroyed(); wxNonOwnedWindowImpl* m_nowpeer ; @@ -134,7 +147,12 @@ protected: static wxNonOwnedWindow *s_macDeactivateWindow; private : + static clock_t s_lastFlush; + wxRegion m_shape; +#if wxUSE_GRAPHICS_CONTEXT + wxGraphicsPath m_shapePath; +#endif // wxUSE_GRAPHICS_CONTEXT }; // list of all frames and modeless dialogs diff --git a/Externals/wxWidgets3/include/wx/osx/notebook.h b/Externals/wxWidgets3/include/wx/osx/notebook.h index 8dd48fd9ca..62a1accc33 100644 --- a/Externals/wxWidgets3/include/wx/osx/notebook.h +++ b/Externals/wxWidgets3/include/wx/osx/notebook.h @@ -3,7 +3,7 @@ // Purpose: MSW/GTK compatible notebook (a.k.a. property sheet) // Author: Stefan Csomor // Modified by: -// RCS-ID: $Id: notebook.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: notebook.h 68810 2011-08-21 14:08:49Z VZ $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -95,7 +95,7 @@ public: wxNotebookPage *pPage, const wxString& strText, bool bSelect = false, - int imageId = -1); + int imageId = NO_IMAGE); // callbacks // --------- diff --git a/Externals/wxWidgets3/include/wx/osx/pnghand.h b/Externals/wxWidgets3/include/wx/osx/pnghand.h index ce2a8d6daf..135725528b 100644 --- a/Externals/wxWidgets3/include/wx/osx/pnghand.h +++ b/Externals/wxWidgets3/include/wx/osx/pnghand.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: pnghand.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: pnghand.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -25,7 +25,7 @@ public: SetName(wxT("PNG bitmap file")); SetExtension(wxT("bmp")); SetType(wxBITMAP_TYPE_PNG); - }; + } virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, int desiredWidth, int desiredHeight); diff --git a/Externals/wxWidgets3/include/wx/osx/pngread.h b/Externals/wxWidgets3/include/wx/osx/pngread.h index 222a2c5589..bdf466b8a3 100644 --- a/Externals/wxWidgets3/include/wx/osx/pngread.h +++ b/Externals/wxWidgets3/include/wx/osx/pngread.h @@ -61,10 +61,10 @@ public: bool ReadFile( char* ImageFileName=0 ); bool SaveFile( char* ImageFileName=0 ); bool SaveXPM(char *filename, char *name = 0); - int GetWidth( void ) const { return Width; }; - int GetHeight( void ) const { return Height; }; - int GetDepth( void ) const { return Depth; }; - int GetColorType( void ) const { return ColorType; }; + int GetWidth( void ) const { return Width; } + int GetHeight( void ) const { return Height; } + int GetDepth( void ) const { return Depth; } + int GetColorType( void ) const { return ColorType; } int GetIndex(int x, int y); bool GetRGB(int x, int y, byte* r, byte* g, byte* b); diff --git a/Externals/wxWidgets3/include/wx/osx/popupwin.h b/Externals/wxWidgets3/include/wx/osx/popupwin.h index caeaa004f5..3027d5f26c 100644 --- a/Externals/wxWidgets3/include/wx/osx/popupwin.h +++ b/Externals/wxWidgets3/include/wx/osx/popupwin.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: -// RCS-ID: $Id: popupwin.h 65680 2010-09-30 11:44:45Z VZ $ +// RCS-ID: $Id: popupwin.h 70848 2012-03-09 05:50:58Z PC $ // Copyright: (c) 2006 Stefan Csomor // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -27,9 +27,8 @@ public: bool Create(wxWindow *parent, int flags = wxBORDER_NONE); - virtual bool Show(bool show); + virtual bool Show(bool show = true); -protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow) }; diff --git a/Externals/wxWidgets3/include/wx/osx/printdlg.h b/Externals/wxWidgets3/include/wx/osx/printdlg.h index 459a1d4e23..ab87b870e0 100644 --- a/Externals/wxWidgets3/include/wx/osx/printdlg.h +++ b/Externals/wxWidgets3/include/wx/osx/printdlg.h @@ -6,7 +6,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: printdlg.h 64943 2010-07-13 13:29:58Z VZ $ +// RCS-ID: $Id: printdlg.h 70636 2012-02-20 21:55:55Z VZ $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -58,16 +58,16 @@ private: class WXDLLIMPEXP_CORE wxMacPageSetupDialog: public wxPageSetupDialogBase { public: - wxMacPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL); + wxMacPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL); virtual ~wxMacPageSetupDialog(); - virtual wxPageSetupData& GetPageSetupDialogData(); + virtual wxPageSetupDialogData& GetPageSetupDialogData(); - bool Create(wxWindow *parent, wxPageSetupData *data = NULL); + bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL); virtual int ShowModal(); private: - wxPageSetupData m_pageSetupData; + wxPageSetupDialogData m_pageSetupData; wxWindow* m_dialogParent; private: @@ -85,14 +85,14 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl; class WXDLLIMPEXP_CORE wxMacPageMarginsDialog : public wxDialog { public: - wxMacPageMarginsDialog(wxFrame* parent, wxPageSetupData* data); + wxMacPageMarginsDialog(wxFrame* parent, wxPageSetupDialogData* data); bool TransferToWindow(); bool TransferDataFromWindow(); - virtual wxPageSetupData& GetPageSetupDialogData() { return *m_pageSetupDialogData; } + virtual wxPageSetupDialogData& GetPageSetupDialogData() { return *m_pageSetupDialogData; } private: - wxPageSetupData* m_pageSetupDialogData; + wxPageSetupDialogData* m_pageSetupDialogData; wxPoint m_MinMarginTopLeft; wxPoint m_MinMarginBottomRight; diff --git a/Externals/wxWidgets3/include/wx/osx/radiobox.h b/Externals/wxWidgets3/include/wx/osx/radiobox.h index 8738e2514e..5ca8856e20 100644 --- a/Externals/wxWidgets3/include/wx/osx/radiobox.h +++ b/Externals/wxWidgets3/include/wx/osx/radiobox.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: radiobox.h 64943 2010-07-13 13:29:58Z VZ $ +// RCS-ID: $Id: radiobox.h 69544 2011-10-26 05:39:18Z RD $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -89,6 +89,9 @@ public: void OnRadioButton( wxCommandEvent& event ) ; protected: + // resolve ambiguity in base classes + virtual wxBorder GetDefaultBorder() const { return wxRadioBoxBase::GetDefaultBorder(); } + wxRadioButton *m_radioButtonCycle; unsigned int m_noItems; diff --git a/Externals/wxWidgets3/include/wx/osx/setup0.h b/Externals/wxWidgets3/include/wx/osx/setup0.h index 15da2d8110..46bad79d19 100644 --- a/Externals/wxWidgets3/include/wx/osx/setup0.h +++ b/Externals/wxWidgets3/include/wx/osx/setup0.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: Stefan Csomor // Created: 1998-01-01 -// RCS-ID: $Id: setup0.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: setup0.h 70395 2012-01-19 08:55:41Z SC $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -202,15 +202,6 @@ // Recommended setting: 0 (this is still work in progress...) #define wxUSE_EXTENDED_RTTI 0 -// Set wxUSE_STL to 1 to derive wxList(Foo) and wxArray(Foo) from -// std::list and std::vector, with a compatibility interface, -// and for wxHashMap to be implemented with templates. -// -// Default is 0 -// -// Recommended setting: YMMV -#define wxUSE_STL 0 - // Support for message/error logging. This includes wxLogXXX() functions and // wxLog and derived classes. Don't set this to 0 unless you really know what // you are doing. @@ -262,44 +253,6 @@ // Recommended setting: 1 as setting it to 0 disables many other things #define wxUSE_STREAMS 1 -// This is not a real option but is used as the default value for -// wxUSE_STD_IOSTREAM and wxUSE_STD_STRING. -// -// Currently the Digital Mars and Watcom compilers come without standard C++ -// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have -// them (e.g. from STLPort). -// -// VC++ 5.0 does include standard C++ library headers, however they produce -// many warnings that can't be turned off when compiled at warning level 4. -#if defined(__DMC__) || defined(__WATCOMC__) \ - || (defined(_MSC_VER) && _MSC_VER < 1200) - #define wxUSE_STD_DEFAULT 0 -#else - #define wxUSE_STD_DEFAULT 1 -#endif - -// Use standard C++ streams if 1 instead of wx streams in some places. If -// disabled (default), wx streams are used everywhere and wxWidgets doesn't -// depend on the standard streams library. -// -// Notice that enabling this does not replace wx streams with std streams -// everywhere, in a lot of places wx streams are used no matter what. -// -// Default is 0 -// -// Recommended setting: 1 if you use the standard streams anyhow and so -// dependency on the standard streams library is not a -// problem -#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT - -// Enable conversion to standard C++ string if 1. -// -// Default is 1 for most compilers. -// -// Recommended setting: 1 unless you want to ensure your program doesn't use -// the standard C++ library at all. -#define wxUSE_STD_STRING wxUSE_STD_DEFAULT - // Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf. // Note that if the system's implementation does not support positional // parameters, setting this to 1 forces the use of the wxWidgets implementation @@ -315,6 +268,107 @@ // Recommended setting: 1 if you want to support multiple languages #define wxUSE_PRINTF_POS_PARAMS 1 + +// ---------------------------------------------------------------------------- +// Interoperability with the standard library. +// ---------------------------------------------------------------------------- + +// Set wxUSE_STL to 1 to enable maximal interoperability with the standard +// library, even at the cost of backwards compatibility. +// +// Default is 0 +// +// Recommended setting: 0 as the options below already provide a relatively +// good level of interoperability and changing this option arguably isn't worth +// diverging from the official builds of the library. +#define wxUSE_STL 0 + +// This is not a real option but is used as the default value for +// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS. +// +// Currently the Digital Mars and Watcom compilers come without standard C++ +// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have +// them (e.g. from STLPort). +// +// VC++ 5.0 does include standard C++ library headers, however they produce +// many warnings that can't be turned off when compiled at warning level 4. +#if defined(__DMC__) || defined(__WATCOMC__) \ + || (defined(_MSC_VER) && _MSC_VER < 1200) + #define wxUSE_STD_DEFAULT 0 +#else + #define wxUSE_STD_DEFAULT 1 +#endif + +// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<> +// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but +// usually more limited) implementations are used which allows to avoid the +// dependency on the C++ run-time library. +// +// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't +// support using standard containers and that VC6 needs non-default options for +// such build to avoid getting "fatal error C1076: compiler limit : internal +// heap limit reached; use /Zm to specify a higher limit" in its own standard +// headers, so you need to ensure you do increase the heap size before enabling +// this option for this compiler. +// +// Default is 0 for compatibility reasons. +// +// Recommended setting: 1 unless compatibility with the official wxWidgets +// build and/or the existing code is a concern. +#define wxUSE_STD_CONTAINERS 0 + +// Use standard C++ streams if 1 instead of wx streams in some places. If +// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the +// standard streams library. +// +// Notice that enabling this does not replace wx streams with std streams +// everywhere, in a lot of places wx streams are used no matter what. +// +// Default is 1 if compiler supports it. +// +// Recommended setting: 1 if you use the standard streams anyhow and so +// dependency on the standard streams library is not a +// problem +#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT + +// Enable minimal interoperability with the standard C++ string class if 1. +// "Minimal" means that wxString can be constructed from std::string or +// std::wstring but can't be implicitly converted to them. You need to enable +// the option below for the latter. +// +// Default is 1 for most compilers. +// +// Recommended setting: 1 unless you want to ensure your program doesn't use +// the standard C++ library at all. +#define wxUSE_STD_STRING wxUSE_STD_DEFAULT + +// Make wxString as much interchangeable with std::[w]string as possible, in +// particular allow implicit conversion of wxString to either of these classes. +// This comes at a price (or a benefit, depending on your point of view) of not +// allowing implicit conversion to "const char *" and "const wchar_t *". +// +// Because a lot of existing code relies on these conversions, this option is +// disabled by default but can be enabled for your build if you don't care +// about compatibility. +// +// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled. +// +// Recommended setting: 0 to remain compatible with the official builds of +// wxWidgets. +#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL + +// VC++ 4.2 and above allows and but you can't mix +// them. Set this option to 1 to use , 0 to use . +// +// Note that newer compilers (including VC++ 7.1 and later) don't support +// wxUSE_IOSTREAMH == 1 and so will be used anyhow. +// +// Default is 0. +// +// Recommended setting: 0, only set to 1 if you use a really old compiler +#define wxUSE_IOSTREAMH 0 + + // ---------------------------------------------------------------------------- // non GUI features selection // ---------------------------------------------------------------------------- @@ -652,6 +706,34 @@ // Recommended setting: 1 #define wxUSE_STC 1 +// Use wxWidget's web viewing classes +// +// Default is 1 +// +// Recommended setting: 1 +#define wxUSE_WEBVIEW 1 + +// Use the IE wxWebView backend +// +// Default is 1 on MSW +// +// Recommended setting: 1 +#ifdef __WXMSW__ +#define wxUSE_WEBVIEW_IE 1 +#else +#define wxUSE_WEBVIEW_IE 0 +#endif + +// Use the WebKit wxWebView backend +// +// Default is 1 on GTK and OSX +// +// Recommended setting: 1 +#if defined(__WXGTK__) || defined(__WXOSX__) +#define wxUSE_WEBVIEW_WEBKIT 1 +#else +#define wxUSE_WEBVIEW_WEBKIT 0 +#endif // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced // 2D drawing API. (Still somewhat experimental) @@ -750,6 +832,7 @@ // // Recommended setting: 1 #define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl +#define wxUSE_BANNERWINDOW 1 // wxBannerWindow #define wxUSE_BUTTON 1 // wxButton #define wxUSE_BMPBUTTON 1 // wxBitmapButton #define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl @@ -785,8 +868,10 @@ #define wxUSE_STATTEXT 1 // wxStaticText #define wxUSE_STATBMP 1 // wxStaticBitmap #define wxUSE_TEXTCTRL 1 // wxTextCtrl +#define wxUSE_TIMEPICKCTRL 1 // wxTimePickerCtrl #define wxUSE_TOGGLEBTN 1 // requires wxButton #define wxUSE_TREECTRL 1 // wxTreeCtrl +#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR // below either wxStatusBar95 or a generic wxStatusBar will be used. @@ -1003,6 +1088,14 @@ // Recommended setting: 1 #define wxUSE_NOTIFICATION_MESSAGE 1 +// wxRichToolTip is a customizable tooltip class which has more functionality +// than the stock (but native, unlike this class) wxToolTip. +// +// Default is 1. +// +// Recommended setting: 1 (but can be safely set to 0 if you don't need it) +#define wxUSE_RICHTOOLTIP 1 + // Use wxSashWindow class. // // Default is 1. @@ -1308,28 +1401,15 @@ // to create files in SVG (Scalable Vector Graphics) format. #define wxUSE_SVG 1 -// ---------------------------------------------------------------------------- -// other compiler (mis)features -// ---------------------------------------------------------------------------- - -// Set this to 0 if your compiler can't cope with omission of prototype -// parameters. +// Should wxDC provide SetTransformMatrix() and related methods? // -// Default is 1. +// Default is 1 but can be set to 0 if this functionality is not used. Notice +// that currently only wxMSW supports this so setting this to 0 doesn't change +// much for non-MSW platforms (although it will still save a few bytes +// probably). // -// Recommended setting: 1 (should never need to set this to 0) -#define REMOVE_UNUSED_ARG 1 - -// VC++ 4.2 and above allows and but you can't mix -// them. Set this option to 1 to use , 0 to use . -// -// Note that newer compilers (including VC++ 7.1 and later) don't support -// wxUSE_IOSTREAMH == 1 and so will be used anyhow. -// -// Default is 0. -// -// Recommended setting: 0, only set to 1 if you use a really old compiler -#define wxUSE_IOSTREAMH 0 +// Recommended setting: 1. +#define wxUSE_DC_TRANSFORM_MATRIX 1 // ---------------------------------------------------------------------------- // image format support @@ -1397,6 +1477,26 @@ /* --- end common options --- */ +// ---------------------------------------------------------------------------- +// Unix-specific options settings +// ---------------------------------------------------------------------------- + +// use wxSelectDispatcher class +#define wxUSE_SELECT_DISPATCHER 1 + +// use wxEpollDispatcher class (Linux only) +#define wxUSE_EPOLL_DISPATCHER 0 + +/* + Use GStreamer for Unix. + + Default is 0 as this requires a lot of dependencies which might not be + available. + + Recommended setting: 1 (wxMediaCtrl won't work by default without it). + */ +#define wxUSE_GSTREAMER 0 + // ---------------------------------------------------------------------------- // Mac-specific settings // ---------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/include/wx/osx/sound.h b/Externals/wxWidgets3/include/wx/osx/sound.h index 1318e76315..45538773d0 100644 --- a/Externals/wxWidgets3/include/wx/osx/sound.h +++ b/Externals/wxWidgets3/include/wx/osx/sound.h @@ -5,7 +5,7 @@ // Author: Ryan Norton, Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: sound.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: sound.h 69178 2011-09-21 15:08:02Z VZ $ // Copyright: (c) Ryan Norton, Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -49,13 +49,13 @@ class WXDLLIMPEXP_ADV wxSound : public wxSoundBase public: wxSound(); wxSound(const wxString& fileName, bool isResource = false); - wxSound(int size, const wxByte* data); + wxSound(size_t size, const void* data); virtual ~wxSound(); // Create from resource or file bool Create(const wxString& fileName, bool isResource = false); // Create from data - bool Create(int size, const wxByte* data); + bool Create(size_t size, const void* data); bool IsOk() const { return m_data != NULL; } diff --git a/Externals/wxWidgets3/include/wx/osx/spinctrl.h b/Externals/wxWidgets3/include/wx/osx/spinctrl.h index c274fb33f2..3803f9d526 100644 --- a/Externals/wxWidgets3/include/wx/osx/spinctrl.h +++ b/Externals/wxWidgets3/include/wx/osx/spinctrl.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 28.10.99 -// RCS-ID: $Id: spinctrl.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: spinctrl.h 68366 2011-07-24 22:19:33Z VZ $ // Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxSpinCtrlButton; // wxSpinCtrl is a combination of wxTextCtrl and wxSpinButton // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxSpinCtrl : public wxControl +class WXDLLIMPEXP_CORE wxSpinCtrl : public wxNavigationEnabled { public: wxSpinCtrl() { Init(); } @@ -93,8 +93,6 @@ public: // number is out of range bool GetTextValue(int *val) const; - WX_DECLARE_CONTROL_CONTAINER(); - protected: // override the base class virtuals involved into geometry calculations virtual wxSize DoGetBestSize() const; @@ -113,7 +111,6 @@ private: int m_oldValue; private: - DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxSpinCtrl) }; diff --git a/Externals/wxWidgets3/include/wx/osx/statbox.h b/Externals/wxWidgets3/include/wx/osx/statbox.h index df046443fe..cdbdead32e 100644 --- a/Externals/wxWidgets3/include/wx/osx/statbox.h +++ b/Externals/wxWidgets3/include/wx/osx/statbox.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: statbox.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: statbox.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -38,8 +38,8 @@ class WXDLLIMPEXP_CORE wxStaticBox: public wxControl long style = 0, const wxString& name = wxStaticBoxNameStr); - virtual void Command(wxCommandEvent& WXUNUSED(event)) {}; - virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}; + virtual void Command(wxCommandEvent& WXUNUSED(event)) {} + virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {} virtual void GetBordersForSizer(int *borderTop, int *borderOther) const; diff --git a/Externals/wxWidgets3/include/wx/osx/textctrl.h b/Externals/wxWidgets3/include/wx/osx/textctrl.h index 411bfbf30e..70e0863c35 100644 --- a/Externals/wxWidgets3/include/wx/osx/textctrl.h +++ b/Externals/wxWidgets3/include/wx/osx/textctrl.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: textctrl.h 66770 2011-01-26 15:51:39Z SC $ +// RCS-ID: $Id: textctrl.h 70355 2012-01-15 15:54:53Z SC $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -75,10 +75,6 @@ public: virtual void MarkDirty(); virtual void DiscardEdits(); - // set the max number of characters which may be entered - // in a single line text control - virtual void SetMaxLength(unsigned long len); - // set the grayed out hint text virtual bool SetHint(const wxString& hint); virtual wxString GetHint() const; diff --git a/Externals/wxWidgets3/include/wx/osx/textentry.h b/Externals/wxWidgets3/include/wx/osx/textentry.h index 07ae94e81c..7a6a66f58b 100644 --- a/Externals/wxWidgets3/include/wx/osx/textentry.h +++ b/Externals/wxWidgets3/include/wx/osx/textentry.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: Kevin Ollivier // Created: 1998-01-01 -// RCS-ID: $Id: textentry.h 67232 2011-03-18 15:10:15Z DS $ +// RCS-ID: $Id: textentry.h 67526 2011-04-17 23:14:15Z VZ $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -32,12 +32,8 @@ class WXDLLIMPEXP_CORE wxTextEntry: public wxTextEntryBase { public: - wxTextEntry() - : m_editable(true), - m_maxLength(0) - { } - - virtual ~wxTextEntry() {}; + wxTextEntry(); + virtual ~wxTextEntry(); virtual bool IsEditable() const; @@ -88,10 +84,18 @@ public: // -------------- virtual wxTextWidgetImpl * GetTextPeer() const; + wxTextCompleter *OSXGetCompleter() const { return m_completer; } + protected: virtual wxString DoGetValue() const; + virtual bool DoAutoCompleteStrings(const wxArrayString& choices); + virtual bool DoAutoCompleteCustom(wxTextCompleter *completer); + + // The object providing auto-completions or NULL if none. + wxTextCompleter *m_completer; + bool m_editable; // need to make this public because of the current implementation via callbacks diff --git a/Externals/wxWidgets3/include/wx/osx/tglbtn.h b/Externals/wxWidgets3/include/wx/osx/tglbtn.h index 9ea7406baa..e68a2ba60c 100644 --- a/Externals/wxWidgets3/include/wx/osx/tglbtn.h +++ b/Externals/wxWidgets3/include/wx/osx/tglbtn.h @@ -5,7 +5,7 @@ // Author: Stefan Csomor // Modified by: // Created: 08.02.01 -// RCS-ID: $Id: tglbtn.h 66992 2011-02-22 13:25:30Z VZ $ +// RCS-ID: $Id: tglbtn.h 67949 2011-06-16 00:43:22Z RD $ // Copyright: (c) 2004 Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -13,53 +13,6 @@ #ifndef _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_ -class WXDLLIMPEXP_CORE wxBitmapToggleButton : public wxToggleButtonBase -{ -public: - wxBitmapToggleButton() {} - wxBitmapToggleButton(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - - virtual void SetValue(bool value); - virtual bool GetValue() const ; - - virtual bool OSXHandleClicked( double timestampsec ); - - virtual void Command(wxCommandEvent& event); - -private: - wxBitmap m_bitmap; - - int m_marginX, - m_marginY; - -protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - virtual wxSize DoGetBestSize() const; - -private: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapToggleButton) -}; - - class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase { public: @@ -94,11 +47,40 @@ public: protected: virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - virtual wxSize DoGetBestSize() const; private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton) }; + +class WXDLLIMPEXP_CORE wxBitmapToggleButton : public wxToggleButton +{ +public: + wxBitmapToggleButton() {} + wxBitmapToggleButton(wxWindow *parent, + wxWindowID id, + const wxBitmap& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxCheckBoxNameStr) + { + Create(parent, id, label, pos, size, style, validator, name); + } + + bool Create(wxWindow *parent, + wxWindowID id, + const wxBitmap& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxCheckBoxNameStr); + +private: + DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapToggleButton) +}; + #endif // _WX_TOGGLEBUTTON_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/timectrl.h b/Externals/wxWidgets3/include/wx/osx/timectrl.h new file mode 100644 index 0000000000..2d093acd54 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/osx/timectrl.h @@ -0,0 +1,51 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/osx/timectrl.h +// Purpose: Declaration of wxOSX-specific wxTimePickerCtrl class. +// Author: Vadim Zeitlin +// Created: 2011-12-18 +// RCS-ID: $Id: timectrl.h 70071 2011-12-20 21:27:14Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_OSX_TIMECTRL_H_ +#define _WX_OSX_TIMECTRL_H_ + +// ---------------------------------------------------------------------------- +// wxTimePickerCtrl +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_ADV wxTimePickerCtrl : public wxTimePickerCtrlBase +{ +public: + // Constructors. + wxTimePickerCtrl() { } + + wxTimePickerCtrl(wxWindow *parent, + wxWindowID id, + const wxDateTime& dt = wxDefaultDateTime, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTP_DEFAULT, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxTimePickerCtrlNameStr) + { + Create(parent, id, dt, pos, size, style, validator, name); + } + + bool Create(wxWindow *parent, + wxWindowID id, + const wxDateTime& dt = wxDefaultDateTime, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTP_DEFAULT, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxTimePickerCtrlNameStr); + + virtual void OSXGenerateEvent(const wxDateTime& dt); + +private: + wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTimePickerCtrl); +}; + +#endif // _WX_OSX_TIMECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/toolbar.h b/Externals/wxWidgets3/include/wx/osx/toolbar.h index 7ebb40e028..f4a21982a6 100644 --- a/Externals/wxWidgets3/include/wx/osx/toolbar.h +++ b/Externals/wxWidgets3/include/wx/osx/toolbar.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: toolbar.h 66993 2011-02-22 13:25:38Z VZ $ +// RCS-ID: $Id: toolbar.h 70854 2012-03-10 00:01:09Z RD $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -77,6 +77,18 @@ class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase bool MacWantsNativeToolbar(); bool MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const; #endif + + virtual wxToolBarToolBase *CreateTool(int id, + const wxString& label, + const wxBitmap& bmpNormal, + const wxBitmap& bmpDisabled = wxNullBitmap, + wxItemKind kind = wxITEM_NORMAL, + wxObject *clientData = NULL, + const wxString& shortHelp = wxEmptyString, + const wxString& longHelp = wxEmptyString); + virtual wxToolBarToolBase *CreateTool(wxControl *control, + const wxString& label); + protected: // common part of all ctors void Init(); @@ -86,8 +98,11 @@ protected: void DoSetSize(int x, int y, int width, int height, int sizeFlags); #ifndef __WXOSX_IPHONE__ - virtual void DoGetSize(int *width, int *height) const; + virtual void DoGetSize(int *width, int *height) const; virtual wxSize DoGetBestSize() const; +#endif +#ifdef __WXOSX_COCOA__ + virtual void DoGetPosition(int*x, int *y) const; #endif virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); @@ -96,17 +111,6 @@ protected: virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); - virtual wxToolBarToolBase *CreateTool(int id, - const wxString& label, - const wxBitmap& bmpNormal, - const wxBitmap& bmpDisabled, - wxItemKind kind, - wxObject *clientData, - const wxString& shortHelp, - const wxString& longHelp); - virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label); - DECLARE_EVENT_TABLE() #if wxOSX_USE_NATIVE_TOOLBAR bool m_macUsesNativeToolbar ; diff --git a/Externals/wxWidgets3/include/wx/osx/toplevel.h b/Externals/wxWidgets3/include/wx/osx/toplevel.h index c0c6373e08..afe1f1d80f 100644 --- a/Externals/wxWidgets3/include/wx/osx/toplevel.h +++ b/Externals/wxWidgets3/include/wx/osx/toplevel.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 20.09.01 -// RCS-ID: $Id: toplevel.h 65680 2010-09-30 11:44:45Z VZ $ +// RCS-ID: $Id: toplevel.h 70295 2012-01-08 14:52:47Z VZ $ // Copyright: (c) 2001 Stefan Csomor // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -51,9 +51,6 @@ public: virtual wxPoint GetClientAreaOrigin() const; - virtual bool SetShape(const wxRegion& region) - { return DoSetShape(region); } - // Attracts the users attention to this window if the application is // inactive (should be called when a background event occurs) virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); @@ -80,6 +77,8 @@ public: virtual void OSXSetModified(bool modified); virtual bool OSXIsModified() const; + virtual void SetRepresentedFilename(const wxString& filename); + protected: // common part of all ctors void Init(); diff --git a/Externals/wxWidgets3/include/wx/osx/treectrl.h b/Externals/wxWidgets3/include/wx/osx/treectrl.h index 1f5e9bcc00..090111624f 100644 --- a/Externals/wxWidgets3/include/wx/osx/treectrl.h +++ b/Externals/wxWidgets3/include/wx/osx/treectrl.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: treectrl.h 64943 2010-07-13 13:29:58Z VZ $ +// RCS-ID: $Id: treectrl.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -225,7 +225,7 @@ public: bool SortChildren(long item); bool EnsureVisible(long item); - void Command(wxCommandEvent& event) { ProcessCommand(event); }; + void Command(wxCommandEvent& event) { ProcessCommand(event); } protected: wxTextCtrl* m_textCtrl; diff --git a/Externals/wxWidgets3/include/wx/osx/webview_webkit.h b/Externals/wxWidgets3/include/wx/osx/webview_webkit.h new file mode 100644 index 0000000000..d0a93e653e --- /dev/null +++ b/Externals/wxWidgets3/include/wx/osx/webview_webkit.h @@ -0,0 +1,163 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: include/wx/osx/webkit.h +// Purpose: wxWebViewWebKit - embeddable web kit control, +// OS X implementation of web view component +// Author: Jethro Grassie / Kevin Ollivier / Marianne Gagnon +// Modified by: +// Created: 2004-4-16 +// RCS-ID: $Id: webview_webkit.h 69074 2011-09-12 18:35:39Z SJL $ +// Copyright: (c) Jethro Grassie / Kevin Ollivier / Marianne Gagnon +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_WEBKIT_H +#define _WX_WEBKIT_H + +#include "wx/setup.h" + +#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \ + || defined(__WXOSX_CARBON__)) + +#include "wx/control.h" +#include "wx/webview.h" + +// ---------------------------------------------------------------------------- +// Web Kit Control +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView +{ +public: + wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit); + + wxWebViewWebKit() {} + wxWebViewWebKit(wxWindow *parent, + wxWindowID winID = wxID_ANY, + const wxString& strURL = wxWebViewDefaultURLStr, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = 0, + const wxString& name = wxWebViewNameStr) + { + Create(parent, winID, strURL, pos, size, style, name); + } + bool Create(wxWindow *parent, + wxWindowID winID = wxID_ANY, + const wxString& strURL = wxWebViewDefaultURLStr, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = 0, + const wxString& name = wxWebViewNameStr); + virtual ~wxWebViewWebKit(); + + virtual bool CanGoBack() const; + virtual bool CanGoForward() const; + virtual void GoBack(); + virtual void GoForward(); + virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT); + virtual void Stop(); + virtual wxString GetPageSource() const; + virtual wxString GetPageText() const; + + //We do not want to hide the other overloads + using wxWebView::SetPage; + virtual void SetPage(const wxString& html, const wxString& baseUrl); + + virtual void Print(); + + virtual void LoadURL(const wxString& url); + virtual wxString GetCurrentURL() const; + virtual wxString GetCurrentTitle() const; + virtual wxWebViewZoom GetZoom() const; + virtual void SetZoom(wxWebViewZoom zoom); + + virtual void SetZoomType(wxWebViewZoomType zoomType); + virtual wxWebViewZoomType GetZoomType() const; + virtual bool CanSetZoomType(wxWebViewZoomType type) const; + + virtual bool IsBusy() const { return m_busy; } + + //History functions + virtual void ClearHistory(); + virtual void EnableHistory(bool enable = true); + virtual wxVector > GetBackwardHistory(); + virtual wxVector > GetForwardHistory(); + virtual void LoadHistoryItem(wxSharedPtr item); + + //Undo / redo functionality + virtual bool CanUndo() const; + virtual bool CanRedo() const; + virtual void Undo(); + virtual void Redo(); + + //Clipboard functions + virtual bool CanCut() const { return true; } + virtual bool CanCopy() const { return true; } + virtual bool CanPaste() const { return true; } + virtual void Cut(); + virtual void Copy(); + virtual void Paste(); + + //Editing functions + virtual void SetEditable(bool enable = true); + virtual bool IsEditable() const; + + //Selection + virtual void DeleteSelection(); + virtual bool HasSelection() const; + virtual void SelectAll(); + virtual wxString GetSelectedText() const; + virtual wxString GetSelectedSource() const; + virtual void ClearSelection(); + + void RunScript(const wxString& javascript); + + //Virtual Filesystem Support + virtual void RegisterHandler(wxSharedPtr handler); + + // ---- methods not from the parent (common) interface + bool CanGetPageSource() const; + + void SetScrollPos(int pos); + int GetScrollPos(); + + bool CanIncreaseTextSize() const; + void IncreaseTextSize(); + bool CanDecreaseTextSize() const; + void DecreaseTextSize(); + + float GetWebkitZoom() const; + void SetWebkitZoom(float zoom); + + // don't hide base class virtuals + virtual void SetScrollPos( int orient, int pos, bool refresh = true ) + { return wxControl::SetScrollPos(orient, pos, refresh); } + virtual int GetScrollPos( int orient ) const + { return wxControl::GetScrollPos(orient); } + + //we need to resize the webview when the control size changes + void OnSize(wxSizeEvent &event); + void OnMove(wxMoveEvent &event); + void OnMouseEvents(wxMouseEvent &event); + + bool m_busy; + +protected: + DECLARE_EVENT_TABLE() + void MacVisibilityChanged(); + +private: + wxWindow *m_parent; + wxWindowID m_windowID; + wxString m_pageTitle; + + struct objc_object *m_webView; + + // we may use this later to setup our own mouse events, + // so leave it in for now. + void* m_webKitCtrlEventHandler; + //It should be WebView*, but WebView is an Objective-C class + //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this. +}; + +#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT + +#endif // _WX_WEBKIT_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/webviewhistoryitem_webkit.h b/Externals/wxWidgets3/include/wx/osx/webviewhistoryitem_webkit.h new file mode 100644 index 0000000000..05976803f5 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/osx/webviewhistoryitem_webkit.h @@ -0,0 +1,35 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: include/wx/osx/webviewhistoryitem.h +// Purpose: wxWebViewHistoryItem header for OSX +// Author: Steven Lamerton +// Id: $Id: webviewhistoryitem_webkit.h 69074 2011-09-12 18:35:39Z SJL $ +// Copyright: (c) 2011 Steven Lamerton +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_OSX_WEBVIEWHISTORYITEM_H_ +#define _WX_OSX_WEBVIEWHISTORYITEM_H_ + +#include "wx/setup.h" + +#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \ + || defined(__WXOSX_CARBON__)) + +class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem +{ +public: + wxWebViewHistoryItem(const wxString& url, const wxString& title) : + m_url(url), m_title(title) {} + wxString GetUrl() { return m_url; } + wxString GetTitle() { return m_title; } + + friend class wxWebViewWebKit; + +private: + wxString m_url, m_title; + struct objc_object *m_histItem; +}; + +#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT + +#endif // _WX_OSX_WEBVIEWHISTORYITEM_H_ diff --git a/Externals/wxWidgets3/include/wx/osx/window.h b/Externals/wxWidgets3/include/wx/osx/window.h index 49aa250906..1ac3916a8c 100644 --- a/Externals/wxWidgets3/include/wx/osx/window.h +++ b/Externals/wxWidgets3/include/wx/osx/window.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: window.h 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: window.h 70765 2012-03-01 15:04:42Z JS $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -114,6 +114,14 @@ public: virtual bool Reparent( wxWindowBase *newParent ); +#if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON + // hot keys (system wide accelerators) + // ----------------------------------- + + virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode); + virtual bool UnregisterHotKey(int hotkeyId); +#endif // wxUSE_HOTKEY + #if wxUSE_DRAG_AND_DROP virtual void SetDropTarget( wxDropTarget *dropTarget ); #endif @@ -280,6 +288,9 @@ public: float GetContentScaleFactor() const ; + // internal response to size events + virtual void MacOnInternalSize() {} + protected: // For controls like radio buttons which are genuinely composite wxList m_subControls; diff --git a/Externals/wxWidgets3/include/wx/palette.h b/Externals/wxWidgets3/include/wx/palette.h index dab7040c58..4c29f23b98 100644 --- a/Externals/wxWidgets3/include/wx/palette.h +++ b/Externals/wxWidgets3/include/wx/palette.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: -// RCS-ID: $Id: palette.h 61508 2009-07-23 20:30:22Z VZ $ +// RCS-ID: $Id: palette.h 70353 2012-01-15 14:46:41Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -28,16 +28,12 @@ public: virtual int GetColoursCount() const { wxFAIL_MSG( wxT("not implemented") ); return 0; } }; -#if defined(__WXPALMOS__) - #include "wx/palmos/palette.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #include "wx/msw/palette.h" #elif defined(__WXX11__) || defined(__WXMOTIF__) #include "wx/x11/palette.h" #elif defined(__WXGTK__) || defined(__WXCOCOA__) #include "wx/generic/paletteg.h" -#elif defined(__WXMGL__) - #include "wx/mgl/palette.h" #elif defined(__WXMAC__) #include "wx/osx/palette.h" #elif defined(__WXPM__) diff --git a/Externals/wxWidgets3/include/wx/panel.h b/Externals/wxWidgets3/include/wx/panel.h index 8241cc51d0..18c7aacd47 100644 --- a/Externals/wxWidgets3/include/wx/panel.h +++ b/Externals/wxWidgets3/include/wx/panel.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: -// RCS-ID: $Id: panel.h 67253 2011-03-20 00:00:49Z VZ $ +// RCS-ID: $Id: panel.h 69378 2011-10-11 17:07:43Z VZ $ // Copyright: (c) Julian Smart // (c) 2011 Vadim Zeitlin // Licence: wxWindows Licence @@ -28,10 +28,10 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[]; // wxPanel contains other controls and implements TAB traversal between them // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxPanelBase : public wxWindow +class WXDLLIMPEXP_CORE wxPanelBase : public wxNavigationEnabled { public: - wxPanelBase(); + wxPanelBase() { } // Derived classes should also provide this constructor: /* @@ -52,31 +52,12 @@ public: const wxString& name = wxPanelNameStr); - // Use the given bitmap to tile the background of this panel. This bitmap - // will show through any transparent children. - // - // Notice that you must not prevent the base class EVT_ERASE_BACKGROUND - // handler from running (i.e. not to handle this event yourself) for this - // to work. - void SetBackgroundBitmap(const wxBitmap& bmp) - { - DoSetBackgroundBitmap(bmp); - } - - // implementation from now on // -------------------------- virtual void InitDialog(); - WX_DECLARE_CONTROL_CONTAINER(); - -protected: - virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) = 0; - private: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxPanelBase); }; diff --git a/Externals/wxWidgets3/include/wx/pen.h b/Externals/wxWidgets3/include/wx/pen.h index 01895e35f4..75147dcf37 100644 --- a/Externals/wxWidgets3/include/wx/pen.h +++ b/Externals/wxWidgets3/include/wx/pen.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: -// RCS-ID: $Id: pen.h 66054 2010-11-07 13:16:20Z VZ $ +// RCS-ID: $Id: pen.h 70353 2012-01-15 14:46:41Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -99,9 +99,7 @@ public: } }; -#if defined(__WXPALMOS__) - #include "wx/palmos/pen.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #include "wx/msw/pen.h" #elif defined(__WXMOTIF__) || defined(__WXX11__) #include "wx/x11/pen.h" @@ -109,8 +107,6 @@ public: #include "wx/gtk/pen.h" #elif defined(__WXGTK__) #include "wx/gtk1/pen.h" -#elif defined(__WXMGL__) - #include "wx/mgl/pen.h" #elif defined(__WXDFB__) #include "wx/dfb/pen.h" #elif defined(__WXMAC__) diff --git a/Externals/wxWidgets3/include/wx/persist.h b/Externals/wxWidgets3/include/wx/persist.h index e238da9a26..2ac6a4423e 100644 --- a/Externals/wxWidgets3/include/wx/persist.h +++ b/Externals/wxWidgets3/include/wx/persist.h @@ -3,7 +3,7 @@ // Purpose: common classes for persistence support // Author: Vadim Zeitlin // Created: 2009-01-18 -// RCS-ID: $Id: persist.h 64887 2010-07-11 10:44:23Z VZ $ +// RCS-ID: $Id: persist.h 69583 2011-10-30 10:08:18Z VZ $ // Copyright: (c) 2009 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -44,6 +44,14 @@ wxPersistentObject *wxCreatePersistentObject(T *obj); class WXDLLIMPEXP_CORE wxPersistenceManager { public: + // Call this method to specify a non-default persistence manager to use. + // This function should usually be called very early to affect creation of + // all persistent controls and the object passed to it must have a lifetime + // long enough to be still alive when the persistent controls are destroyed + // and need it to save their state so typically this would be a global or a + // wxApp member. + static void Set(wxPersistenceManager& manager); + // accessor to the unique persistence manager object static wxPersistenceManager& Get(); @@ -133,7 +141,7 @@ public: #undef wxPERSIST_DECLARE_SAVE_RESTORE_FOR -private: +protected: // ctor is private, use Get() wxPersistenceManager() { @@ -142,15 +150,18 @@ private: } - // helpers of Save/Restore() - // - // TODO: make this customizable by allowing - // (a) specifying custom wxConfig object to use - // (b) allowing to use something else entirely - wxConfigBase *GetConfig() const { return wxConfigBase::Get(); } - wxString GetKey(const wxPersistentObject& who, const wxString& name) const; + // Return the config object to use, by default just the global one but a + // different one could be used by the derived class if needed. + virtual wxConfigBase *GetConfig() const { return wxConfigBase::Get(); } + + // Return the path to use for saving the setting with the given name for + // the specified object (notice that the name is the name of the setting, + // not the name of the object itself which can be retrieved with GetName()). + virtual wxString GetKey(const wxPersistentObject& who, + const wxString& name) const; +private: // map with the registered objects as keys and associated // wxPersistentObjects as values wxPersistentObjectsMap m_persistentObjects; diff --git a/Externals/wxWidgets3/include/wx/persist/splitter.h b/Externals/wxWidgets3/include/wx/persist/splitter.h new file mode 100644 index 0000000000..5f8fe34158 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/persist/splitter.h @@ -0,0 +1,69 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/persist/splitter.h +// Purpose: Persistence support for wxSplitterWindow. +// Author: Vadim Zeitlin +// Created: 2011-08-31 +// RCS-ID: $Id: splitter.h 69582 2011-10-30 10:08:14Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_PERSIST_SPLITTER_H_ +#define _WX_PERSIST_SPLITTER_H_ + +#include "wx/persist/window.h" + +#include "wx/splitter.h" + +// ---------------------------------------------------------------------------- +// string constants used by wxPersistentSplitter +// ---------------------------------------------------------------------------- + +#define wxPERSIST_SPLITTER_KIND "Splitter" + +// Special position value of -1 means the splitter is not split at all. +#define wxPERSIST_SPLITTER_POSITION "Position" + +// ---------------------------------------------------------------------------- +// wxPersistentSplitter: supports saving/restoring splitter position +// ---------------------------------------------------------------------------- + +class wxPersistentSplitter : public wxPersistentWindow +{ +public: + wxPersistentSplitter(wxSplitterWindow* splitter) + : wxPersistentWindow(splitter) + { + } + + virtual void Save() const + { + wxSplitterWindow* const splitter = Get(); + + int pos = splitter->IsSplit() ? splitter->GetSashPosition() : -1; + SaveValue(wxPERSIST_SPLITTER_POSITION, pos); + } + + virtual bool Restore() + { + int pos; + if ( !RestoreValue(wxPERSIST_SPLITTER_POSITION, &pos) ) + return false; + + if ( pos == -1 ) + Get()->Unsplit(); + else + Get()->SetSashPosition(pos); + + return true; + } + + virtual wxString GetKind() const { return wxPERSIST_SPLITTER_KIND; } +}; + +inline wxPersistentObject *wxCreatePersistentObject(wxSplitterWindow* splitter) +{ + return new wxPersistentSplitter(splitter); +} + +#endif // _WX_PERSIST_SPLITTER_H_ diff --git a/Externals/wxWidgets3/include/wx/pickerbase.h b/Externals/wxWidgets3/include/wx/pickerbase.h index c578a157a0..ff5c86f0de 100644 --- a/Externals/wxWidgets3/include/wx/pickerbase.h +++ b/Externals/wxWidgets3/include/wx/pickerbase.h @@ -5,7 +5,7 @@ // Modified by: // Created: 14/4/2006 // Copyright: (c) Vadim Zeitlin, Francesco Montorsi -// RCS-ID: $Id: pickerbase.h 52834 2008-03-26 15:06:00Z FM $ +// RCS-ID: $Id: pickerbase.h 68921 2011-08-27 14:11:25Z VZ $ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -31,13 +31,14 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[]; // ---------------------------------------------------------------------------- #define wxPB_USE_TEXTCTRL 0x0002 +#define wxPB_SMALL 0x8000 -class WXDLLIMPEXP_CORE wxPickerBase : public wxControl +class WXDLLIMPEXP_CORE wxPickerBase : public wxNavigationEnabled { public: // ctor: text is the associated text control wxPickerBase() : m_text(NULL), m_picker(NULL), m_sizer(NULL) - { WX_INIT_CONTROL_CONTAINER(); } + { } virtual ~wxPickerBase() {} @@ -121,8 +122,6 @@ protected: void OnTextCtrlUpdate(wxCommandEvent &); void OnTextCtrlKillFocus(wxFocusEvent &); - void OnSize(wxSizeEvent &); - // returns the set of styles for the attached wxTextCtrl // from given wxPickerBase's styles virtual long GetTextCtrlStyle(long style) const @@ -178,10 +177,6 @@ protected: private: DECLARE_ABSTRACT_CLASS(wxPickerBase) - DECLARE_EVENT_TABLE() - - // This class must be something just like a panel... - WX_DECLARE_CONTROL_CONTAINER(); }; diff --git a/Externals/wxWidgets3/include/wx/platform.h b/Externals/wxWidgets3/include/wx/platform.h index c6861ca5c2..74ad218a3a 100644 --- a/Externals/wxWidgets3/include/wx/platform.h +++ b/Externals/wxWidgets3/include/wx/platform.h @@ -4,7 +4,7 @@ * Author: Vadim Zeitlin * Modified by: * Created: 29.10.01 (extracted from wx/defs.h) -* RCS-ID: $Id: platform.h 66077 2010-11-09 23:53:42Z VZ $ +* RCS-ID: $Id: platform.h 70757 2012-02-29 22:40:24Z VZ $ * Copyright: (c) 1997-2001 Vadim Zeitlin * Licence: wxWindows licence */ @@ -15,23 +15,35 @@ #define _WX_PLATFORM_H_ + /* Codewarrior doesn't define any Windows symbols until some headers are included */ #ifdef __MWERKS__ # include - -# if !defined(__WXMAC__) && !defined(__WINDOWS__) && !defined(WIN32) && !defined(_WIN32_WCE) -# define __PALMOS__ 0x05000000 -# endif #endif #ifdef __WXMAC_XCODE__ # include # include # include +# ifndef MAC_OS_X_VERSION_10_4 +# define MAC_OS_X_VERSION_10_4 1040 +# endif +# ifndef MAC_OS_X_VERSION_10_5 +# define MAC_OS_X_VERSION_10_5 1050 +# endif +# ifndef MAC_OS_X_VERSION_10_6 +# define MAC_OS_X_VERSION_10_6 1060 +# endif # include "wx/osx/config_xcode.h" +# ifndef __WXOSX__ +# define __WXOSX__ 1 +# endif +# ifndef __WXMAC__ +# define __WXMAC__ 1 +# endif #endif /* @@ -44,33 +56,6 @@ # endif #endif -#if defined(__PALMOS__) -# if __PALMOS__ == 0x06000000 -# define __WXPALMOS6__ 1 -# endif -# if __PALMOS__ == 0x05000000 -# define __WXPALMOS5__ 1 -# endif -# ifndef __WXPALMOS__ -# define __WXPALMOS__ 1 -# endif -# ifdef __WXMSW__ -# undef __WXMSW__ -# endif -# ifdef __WINDOWS__ -# undef __WINDOWS__ -# endif -# ifdef __WIN32__ -# undef __WIN32__ -# endif -# ifdef WIN32 -# undef WIN32 -# endif -# ifdef _WIN32 -# undef _WIN32 -# endif -#endif - #if defined(_WIN64) # ifndef _WIN32 /* @@ -164,6 +149,11 @@ # define __WXHANDHELD__ #endif +#ifdef __ANDROID__ +# define __WXANDROID__ +# include "wx/android/config_android.h" +#endif + /* Include wx/setup.h for the Unix platform defines generated by configure and the library compilation options @@ -182,6 +172,13 @@ #include "wx/setup_gccxml.h" #endif +/* + Convenience for any optional classes that use the wxAnyButton base class. + */ +#if wxUSE_TOGGLEBTN || wxUSE_BUTTON + #define wxHAS_ANY_BUTTON +#endif + /* Hardware platform detection. @@ -273,7 +270,7 @@ /* Preprocessor in older Borland compilers have major problems concatenating with ##. Specifically, if the string operands being - concatenated have special meaning (e.g L"str", 123i64 etc) + concatenated have special meaning (e.g. L"str", 123i64 etc) then ## will not concatenate the operands correctly. As a workaround, define wxPREPEND* and wxAPPEND* without using @@ -434,20 +431,6 @@ # endif # define wxSIZE_T_IS_UINT -/* - OS: Palm OS - */ -#elif defined(__PALMOS__) -# ifdef __WIN32__ -# error "__WIN32__ should not be defined for PalmOS" -# endif -# ifdef __WINDOWS__ -# error "__WINDOWS__ should not be defined for PalmOS" -# endif -# ifdef __WXMSW__ -# error "__WXMSW__ should not be defined for PalmOS" -# endif - /* OS: Otherwise it must be Windows */ @@ -486,6 +469,8 @@ # define __VISUALC9__ # elif __VISUALC__ < 1700 # define __VISUALC10__ +# elif __VISUALC__ < 1800 +# define __VISUALC11__ # else # pragma message("Please update wx/platform.h to recognize this VC++ version") # endif @@ -586,8 +571,7 @@ !defined(__WXPM__) && \ !defined(__WXMOTIF__) && \ !defined(__WXGTK__) && \ - !defined(__WXX11__) && \ - !defined(__WXPALMOS__) + !defined(__WXX11__) # include "wx/msw/gccpriv.h" #else # undef wxCHECK_W32API_VERSION @@ -789,7 +773,7 @@ * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN. */ #ifndef wxUSE_IDLEMENUUPDATES -# if (defined(__WXMSW__) || defined(__WXGTK__)) && !defined(__WXUNIVERSAL__) +# if (defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXOSX__)) && !defined(__WXUNIVERSAL__) # define wxUSE_IDLEMENUUPDATES 0 # else # define wxUSE_IDLEMENUUPDATES 1 @@ -818,31 +802,6 @@ # define wxUSE_WXDIB 1 #endif -#if defined (__WXPALMOS__) -#include "wx/palmos/missing.h" -#endif // __WXPALMOS__ - -#if !defined (__WXPALMOS5__) -#define POSSEC_APPBASE -#define POSSEC_ARCHIVE -#define POSSEC_CLNTDATA -#define POSSEC_CMDLINE -#define POSSEC_CONFIG -#define POSSEC_DATETIME -#define POSSEC_DATETIME2 -#define POSSEC_DATSTRM -#define POSSEC_DIRCMN -#define POSSEC_DYNARRAY -#define POSSEC_DYNLIB -#define POSSEC_DYNLOAD -#define POSSEC_ENCCONV -#define POSSEC_EXTENDED -#define POSSEC_FFILE -#define POSSEC_FILE -#define POSSEC_FILECONF -#define POSSEC_FILEFN -#endif // __WXPALMOS5__ - /* Optionally supported C++ features. */ @@ -866,6 +825,6 @@ # define wxNO_RTTI # endif # endif -#endif // wxNO_RTTI +#endif /* wxNO_RTTI */ #endif /* _WX_PLATFORM_H_ */ diff --git a/Externals/wxWidgets3/include/wx/platinfo.h b/Externals/wxWidgets3/include/wx/platinfo.h index 59a99db827..8adabba16b 100644 --- a/Externals/wxWidgets3/include/wx/platinfo.h +++ b/Externals/wxWidgets3/include/wx/platinfo.h @@ -4,7 +4,7 @@ // Author: Francesco Montorsi // Modified by: // Created: 07.07.2006 (based on wxToolkitInfo) -// RCS-ID: $Id: platinfo.h 64940 2010-07-13 13:29:13Z VZ $ +// RCS-ID: $Id: platinfo.h 70353 2012-01-15 14:46:41Z VZ $ // Copyright: (c) 2006 Francesco Montorsi // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -58,11 +58,7 @@ enum wxOperatingSystemId // 1<<13 and 1<<14 available for other Unix flavours wxOS_DOS = 1 << 15, // Microsoft DOS - wxOS_OS2 = 1 << 16, // OS/2 - - wxOS_PALM_OS = 1 << 17, // Pure Palm OS - wxOS_PALM_LINUX = 1 << 18, // Palm over linux - wxOS_PALM = wxOS_PALM_OS | wxOS_PALM_LINUX + wxOS_OS2 = 1 << 16 // OS/2 }; // list of wxWidgets ports - some of them can be used with more than @@ -76,16 +72,14 @@ enum wxPortId wxPORT_MSW = 1 << 1, // wxMSW, native toolkit is Windows API wxPORT_MOTIF = 1 << 2, // wxMotif, using [Open]Motif or Lesstif wxPORT_GTK = 1 << 3, // wxGTK, using GTK+ 1.x, 2.x, GPE or Maemo - wxPORT_MGL = 1 << 4, // wxMGL, using wxUniversal + wxPORT_DFB = 1 << 4, // wxDFB, using wxUniversal wxPORT_X11 = 1 << 5, // wxX11, using wxUniversal wxPORT_PM = 1 << 6, // wxOS2, using OS/2 Presentation Manager wxPORT_OS2 = wxPORT_PM, // wxOS2, using OS/2 Presentation Manager wxPORT_MAC = 1 << 7, // wxOSX (former wxMac), using Cocoa, Carbon or iPhone API wxPORT_OSX = wxPORT_MAC, // wxOSX, using Cocoa, Carbon or iPhone API wxPORT_COCOA = 1 << 8, // wxCocoa, using Cocoa NextStep/Mac API - wxPORT_WINCE = 1 << 9, // wxWinCE, toolkit is WinCE SDK API - wxPORT_PALMOS = 1 << 10, // wxPalmOS, toolkit is PalmOS API - wxPORT_DFB = 1 << 11 // wxDFB, using wxUniversal + wxPORT_WINCE = 1 << 9 // wxWinCE, toolkit is WinCE SDK API }; // architecture of the operating system @@ -366,9 +360,7 @@ protected: #define wxWinCE wxOS_WINDOWS_CE #define wxWIN32S wxOS_WINDOWS_9X - #define wxPalmOS wxPORT_PALMOS #define wxOS2 wxPORT_OS2 - #define wxMGL wxPORT_MGL #define wxCocoa wxPORT_MAC #define wxMac wxPORT_MAC #define wxMotif wxPORT_MOTIF diff --git a/Externals/wxWidgets3/include/wx/popupwin.h b/Externals/wxWidgets3/include/wx/popupwin.h index 901fee0613..e6ed10c4e3 100644 --- a/Externals/wxWidgets3/include/wx/popupwin.h +++ b/Externals/wxWidgets3/include/wx/popupwin.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 06.01.01 -// RCS-ID: $Id: popupwin.h 67244 2011-03-19 11:57:06Z VZ $ +// RCS-ID: $Id: popupwin.h 70353 2012-01-15 14:46:41Z VZ $ // Copyright: (c) 2001 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -66,8 +66,6 @@ public: #include "wx/motif/popupwin.h" #elif defined(__WXDFB__) #include "wx/dfb/popupwin.h" -#elif defined(__WXMGL__) - #include "wx/mgl/popupwin.h" #elif defined(__WXMAC__) #include "wx/osx/popupwin.h" #else @@ -112,6 +110,9 @@ public: // Overridden to grab the input on some plaforms virtual bool Show( bool show = true ); + // Override to implement delayed destruction of this window. + virtual bool Destroy(); + protected: // common part of all ctors void Init(); @@ -129,8 +130,9 @@ protected: // get alerted when child gets deleted from under us void OnDestroy(wxWindowDestroyEvent& event); -#if defined( __WXMSW__ ) || defined( __WXMAC__) - // check if the mouse needs captured or released +#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_CARBON) + // Check if the mouse needs to be captured or released: we must release + // when it's inside our window if we want the embedded controls to work. void OnIdle(wxIdleEvent& event); #endif diff --git a/Externals/wxWidgets3/include/wx/power.h b/Externals/wxWidgets3/include/wx/power.h index 71a2a8bffe..ea3a11c9fc 100644 --- a/Externals/wxWidgets3/include/wx/power.h +++ b/Externals/wxWidgets3/include/wx/power.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 2006-05-27 -// RCS-ID: $Id: power.h 58718 2009-02-07 18:59:25Z VZ $ +// RCS-ID: $Id: power.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 2006 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -42,7 +42,7 @@ enum wxBatteryState // compiling in the code for handling them which is never going to be invoked // under the other platforms, we define wxHAS_POWER_EVENTS symbol if this event // is available, it should be used to guard all code using wxPowerEvent -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #define wxHAS_POWER_EVENTS diff --git a/Externals/wxWidgets3/include/wx/private/fontmgr.h b/Externals/wxWidgets3/include/wx/private/fontmgr.h index 68d7fc7ab3..e29ac1eece 100644 --- a/Externals/wxWidgets3/include/wx/private/fontmgr.h +++ b/Externals/wxWidgets3/include/wx/private/fontmgr.h @@ -3,7 +3,7 @@ // Purpose: font management for ports that don't have their own // Author: Vaclav Slavik // Created: 2006-11-18 -// RCS-ID: $Id: fontmgr.h 62349 2009-10-09 13:04:59Z VZ $ +// RCS-ID: $Id: fontmgr.h 70353 2012-01-15 14:46:41Z VZ $ // Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // (c) 2006 REA Elektronik GmbH // Licence: wxWindows licence @@ -192,9 +192,7 @@ protected: -#if defined(__WXMGL__) - #include "wx/mgl/private/fontmgr.h" -#elif defined(__WXDFB__) +#if defined(__WXDFB__) #include "wx/dfb/private/fontmgr.h" #endif diff --git a/Externals/wxWidgets3/include/wx/private/fswatcher.h b/Externals/wxWidgets3/include/wx/private/fswatcher.h index c0438243a9..8f6f72ed47 100644 --- a/Externals/wxWidgets3/include/wx/private/fswatcher.h +++ b/Externals/wxWidgets3/include/wx/private/fswatcher.h @@ -3,7 +3,7 @@ // Purpose: File system watcher impl classes // Author: Bartosz Bekier // Created: 2009-05-26 -// RCS-ID: $Id: fswatcher.h 62475 2009-10-22 11:36:35Z VZ $ +// RCS-ID: $Id: fswatcher.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 2009 Bartosz Bekier // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -23,7 +23,7 @@ #define wxFSWatchEntry wxFSWatchEntryKq WX_DECLARE_STRING_HASH_MAP(wxSharedPtr,wxFSWatchEntries); #include "wx/unix/private/fswatcher_kqueue.h" -#elif defined(__WXMSW__) +#elif defined(__WINDOWS__) class wxFSWatchEntryMSW; #define wxFSWatchEntry wxFSWatchEntryMSW WX_DECLARE_STRING_HASH_MAP(wxSharedPtr,wxFSWatchEntries); diff --git a/Externals/wxWidgets3/include/wx/private/markupparserattr.h b/Externals/wxWidgets3/include/wx/private/markupparserattr.h index 3bf3ddcba6..1cce2f8cce 100644 --- a/Externals/wxWidgets3/include/wx/private/markupparserattr.h +++ b/Externals/wxWidgets3/include/wx/private/markupparserattr.h @@ -3,7 +3,7 @@ // Purpose: Classes mapping markup attributes to wxFont/wxColour. // Author: Vadim Zeitlin // Created: 2011-02-18 -// RCS-ID: $Id: markupparserattr.h 67073 2011-02-27 14:01:36Z VZ $ +// RCS-ID: $Id: markupparserattr.h 70447 2012-01-23 11:28:32Z VZ $ // Copyright: (c) 2011 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -78,8 +78,8 @@ public: virtual void OnUnderlinedStart() { DoChangeFont(&wxFont::Underlined); } virtual void OnUnderlinedEnd() { DoEndAttr(); } - virtual void OnStrikethroughStart() { } // TODO: No support in wxFont yet. - virtual void OnStrikethroughEnd() { } + virtual void OnStrikethroughStart() { DoChangeFont(&wxFont::Strikethrough); } + virtual void OnStrikethroughEnd() { DoEndAttr(); } virtual void OnBigStart() { DoChangeFont(&wxFont::Larger); } virtual void OnBigEnd() { DoEndAttr(); } diff --git a/Externals/wxWidgets3/include/wx/private/richtooltip.h b/Externals/wxWidgets3/include/wx/private/richtooltip.h new file mode 100644 index 0000000000..1334778e56 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/private/richtooltip.h @@ -0,0 +1,44 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/private/richtooltip.h +// Purpose: wxRichToolTipImpl declaration. +// Author: Vadim Zeitlin +// Created: 2011-10-18 +// RCS-ID: $Id: richtooltip.h 69463 2011-10-18 21:57:02Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_PRIVATE_RICHTOOLTIP_H_ +#define _WX_PRIVATE_RICHTOOLTIP_H_ + +#include "wx/richtooltip.h" + +// ---------------------------------------------------------------------------- +// wxRichToolTipImpl: defines wxRichToolTip implementation. +// ---------------------------------------------------------------------------- + +class wxRichToolTipImpl +{ +public: + // This is implemented in a platform-specific way. + static wxRichToolTipImpl* Create(const wxString& title, + const wxString& message); + + // These methods simply mirror the public wxRichToolTip ones. + virtual void SetBackgroundColour(const wxColour& col, + const wxColour& colEnd) = 0; + virtual void SetCustomIcon(const wxIcon& icon) = 0; + virtual void SetStandardIcon(int icon) = 0; + virtual void SetTimeout(unsigned milliseconds) = 0; + virtual void SetTipKind(wxTipKind tipKind) = 0; + virtual void SetTitleFont(const wxFont& font) = 0; + + virtual void ShowFor(wxWindow* win) = 0; + + virtual ~wxRichToolTipImpl() { } + +protected: + wxRichToolTipImpl() { } +}; + +#endif // _WX_PRIVATE_RICHTOOLTIP_H_ diff --git a/Externals/wxWidgets3/include/wx/private/sckaddr.h b/Externals/wxWidgets3/include/wx/private/sckaddr.h index 07b061bd3d..cebd608d0e 100644 --- a/Externals/wxWidgets3/include/wx/private/sckaddr.h +++ b/Externals/wxWidgets3/include/wx/private/sckaddr.h @@ -3,7 +3,7 @@ // Purpose: wxSockAddressImpl // Author: Vadim Zeitlin // Created: 2008-12-28 -// RCS-ID: $Id: sckaddr.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: sckaddr.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 2008 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -11,7 +11,7 @@ #ifndef _WX_PRIVATE_SOCKADDR_H_ #define _WX_PRIVATE_SOCKADDR_H_ -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #include "wx/msw/wrapwin.h" #if wxUSE_IPV6 diff --git a/Externals/wxWidgets3/include/wx/private/socket.h b/Externals/wxWidgets3/include/wx/private/socket.h index dcdeca02df..1664066d65 100644 --- a/Externals/wxWidgets3/include/wx/private/socket.h +++ b/Externals/wxWidgets3/include/wx/private/socket.h @@ -3,7 +3,7 @@ // Purpose: wxSocketImpl and related declarations // Authors: Guilhem Lavaux, Vadim Zeitlin // Created: April 1997 -// RCS-ID: $Id: socket.h 61675 2009-08-16 23:13:45Z VZ $ +// RCS-ID: $Id: socket.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1997 Guilhem Lavaux // (c) 2008 Vadim Zeitlin // Licence: wxWindows licence @@ -61,7 +61,7 @@ // include the header defining timeval: under Windows this struct is used only // with sockets so we need to include winsock.h which we do via windows.h -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #include "wx/msw/wrapwin.h" #else #include // for timeval @@ -79,7 +79,7 @@ // define some symbols which winsock.h defines but traditional BSD headers // don't -#ifndef __WXMSW__ +#ifndef __WINDOWS__ #define SOCKET int #endif @@ -367,7 +367,7 @@ private: wxDECLARE_NO_COPY_CLASS(wxSocketImpl); }; -#if defined(__WXMSW__) +#if defined(__WINDOWS__) #include "wx/msw/private/sockmsw.h" #else #include "wx/unix/private/sockunix.h" diff --git a/Externals/wxWidgets3/include/wx/private/wxprintf.h b/Externals/wxWidgets3/include/wx/private/wxprintf.h index af20eab169..0bb0098cb5 100644 --- a/Externals/wxWidgets3/include/wx/private/wxprintf.h +++ b/Externals/wxWidgets3/include/wx/private/wxprintf.h @@ -4,7 +4,7 @@ // Author: Ove Kaven // Modified by: Ron Lee, Francesco Montorsi // Created: 09/04/99 -// RCS-ID: $Id: wxprintf.h 65690 2010-09-30 14:30:35Z VZ $ +// RCS-ID: $Id: wxprintf.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) wxWidgets copyright // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -289,7 +289,7 @@ bool wxPrintfConvSpec::Parse(const CharType *format) CHECK_PREC m_szFlags[flagofs++] = char(ch); break; -#ifdef __WXMSW__ +#ifdef __WINDOWS__ // under Windows we support the special '%I64' notation as longlong // integer conversion specifier for MSVC compatibility // (it behaves exactly as '%lli' or '%Li' or '%qi') @@ -308,7 +308,7 @@ bool wxPrintfConvSpec::Parse(const CharType *format) break; } // else: fall-through, 'I' is MSVC equivalent of C99 'z' -#endif // __WXMSW__ +#endif // __WINDOWS__ case wxT('z'): case wxT('Z'): diff --git a/Externals/wxWidgets3/include/wx/prntbase.h b/Externals/wxWidgets3/include/wx/prntbase.h index 24d941683c..8b71a0658f 100644 --- a/Externals/wxWidgets3/include/wx/prntbase.h +++ b/Externals/wxWidgets3/include/wx/prntbase.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: prntbase.h 66539 2011-01-03 15:57:21Z VZ $ +// RCS-ID: $Id: prntbase.h 68026 2011-06-22 22:58:07Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -40,6 +40,7 @@ class WXDLLIMPEXP_FWD_CORE wxPreviewFrame; class WXDLLIMPEXP_FWD_CORE wxPrintFactory; class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase; class WXDLLIMPEXP_FWD_CORE wxPrintPreview; +class wxPrintPageMaxCtrl; class wxPrintPageTextCtrl; //---------------------------------------------------------------------------- @@ -53,6 +54,19 @@ enum wxPrinterError wxPRINTER_ERROR }; +// Preview frame modality kind used with wxPreviewFrame::Initialize() +enum wxPreviewFrameModalityKind +{ + // Disable all the other top level windows while the preview is shown. + wxPreviewFrame_AppModal, + + // Disable only the parent window while the preview is shown. + wxPreviewFrame_WindowModal, + + // Don't disable any windows. + wxPreviewFrame_NonModal +}; + //---------------------------------------------------------------------------- // wxPrintFactory //---------------------------------------------------------------------------- @@ -384,8 +398,26 @@ public: const wxString& name = wxFrameNameStr); virtual ~wxPreviewFrame(); + // Either Initialize() or InitializeWithModality() must be called before + // showing the preview frame, the former being just a particular case of + // the latter initializing the frame for being showing app-modally. + + // Notice that we must keep Initialize() with its existing signature to + // avoid breaking the old code that overrides it and we can't reuse the + // same name for the other functions to avoid virtual function hiding + // problem and the associated warnings given by some compilers (e.g. from + // g++ with -Woverloaded-virtual). + virtual void Initialize() + { + InitializeWithModality(wxPreviewFrame_AppModal); + } + + // Also note that this method is not virtual as it doesn't need to be + // overridden: it's never called by wxWidgets (of course, the same is true + // for Initialize() but, again, it must remain virtual for compatibility). + void InitializeWithModality(wxPreviewFrameModalityKind kind); + void OnCloseWindow(wxCloseEvent& event); - virtual void Initialize(); virtual void CreateCanvas(); virtual void CreateControlBar(); @@ -397,6 +429,9 @@ protected: wxPrintPreviewBase* m_printPreview; wxWindowDisabler* m_windowDisabler; + wxPreviewFrameModalityKind m_modalityKind; + + private: void OnChar(wxKeyEvent& event); @@ -453,6 +488,7 @@ public: virtual ~wxPreviewControlBar(); virtual void CreateButtons(); + virtual void SetPageInfo(int minPage, int maxPage); virtual void SetZoomControl(int zoom); virtual int GetZoomControl(); virtual wxPrintPreviewBase *GetPrintPreview() const @@ -496,7 +532,8 @@ protected: wxPrintPreviewBase* m_printPreview; wxButton* m_closeButton; wxChoice* m_zoomControl; - wxPrintPageTextCtrl* m_currentPageText; + wxPrintPageTextCtrl* m_currentPageText; + wxPrintPageMaxCtrl* m_maxPageText; long m_buttonFlags; diff --git a/Externals/wxWidgets3/include/wx/progdlg.h b/Externals/wxWidgets3/include/wx/progdlg.h index 7507e07ba2..e6d4132765 100644 --- a/Externals/wxWidgets3/include/wx/progdlg.h +++ b/Externals/wxWidgets3/include/wx/progdlg.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: -// RCS-ID: $Id: progdlg.h 66930 2011-02-16 23:45:00Z VZ $ +// RCS-ID: $Id: progdlg.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -29,31 +29,27 @@ #define wxPD_CAN_SKIP 0x0080 -#ifdef __WXPALMOS__ - #include "wx/palmos/progdlg.h" +#include "wx/generic/progdlgg.h" + +#if defined(__WXMSW__) && wxUSE_THREADS && !defined(__WXUNIVERSAL__) + #include "wx/msw/progdlg.h" #else - #include "wx/generic/progdlgg.h" + class WXDLLIMPEXP_CORE wxProgressDialog + : public wxGenericProgressDialog + { + public: + wxProgressDialog( const wxString& title, const wxString& message, + int maximum = 100, + wxWindow *parent = NULL, + int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE ) + : wxGenericProgressDialog( title, message, maximum, + parent, style ) + { } - #if defined(__WXMSW__) && wxUSE_THREADS && !defined(__WXUNIVERSAL__) - #include "wx/msw/progdlg.h" - #else - class WXDLLIMPEXP_CORE wxProgressDialog - : public wxGenericProgressDialog - { - public: - wxProgressDialog( const wxString& title, const wxString& message, - int maximum = 100, - wxWindow *parent = NULL, - int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE ) - : wxGenericProgressDialog( title, message, maximum, - parent, style ) - { } - - private: - wxDECLARE_DYNAMIC_CLASS_NO_COPY( wxProgressDialog ); - }; - #endif // defined(__WXMSW__) && wxUSE_THREADS -#endif // __WXPALMOS__ + private: + wxDECLARE_DYNAMIC_CLASS_NO_COPY( wxProgressDialog ); + }; +#endif // defined(__WXMSW__) && wxUSE_THREADS #endif // wxUSE_PROGRESSDLG diff --git a/Externals/wxWidgets3/include/wx/protocol/ftp.h b/Externals/wxWidgets3/include/wx/protocol/ftp.h index cb03a70639..bae8c78fdc 100644 --- a/Externals/wxWidgets3/include/wx/protocol/ftp.h +++ b/Externals/wxWidgets3/include/wx/protocol/ftp.h @@ -5,7 +5,7 @@ // Modified by: Mark Johnson, wxWindows@mj10777.de // 20000917 : RmDir, GetLastResult, GetList // Created: 07/07/1997 -// RCS-ID: $Id: ftp.h 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: ftp.h 67384 2011-04-03 20:31:32Z DS $ // Copyright: (c) 1997, 1998 Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -139,7 +139,7 @@ protected: wxString GetPortCmdArgument(const wxIPV4address& Local, const wxIPV4address& New); // accept connection from server in active mode, returns the same socket as - // passed in in passive mode + // passed in passive mode wxSocketBase *AcceptIfActive(wxSocketBase *sock); diff --git a/Externals/wxWidgets3/include/wx/protocol/http.h b/Externals/wxWidgets3/include/wx/protocol/http.h index 8618b311a5..d3fff96500 100644 --- a/Externals/wxWidgets3/include/wx/protocol/http.h +++ b/Externals/wxWidgets3/include/wx/protocol/http.h @@ -4,7 +4,7 @@ // Author: Guilhem Lavaux // Modified by: Simo Virokannas (authentication, Dec 2005) // Created: August 1997 -// RCS-ID: $Id: http.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: http.h 70408 2012-01-20 12:22:25Z VZ $ // Copyright: (c) 1997, 1998 Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,6 +17,7 @@ #include "wx/hashmap.h" #include "wx/protocol/protocol.h" +#include "wx/buffer.h" class WXDLLIMPEXP_NET wxHTTP : public wxProtocol { @@ -36,13 +37,19 @@ public: int GetResponse() const { return m_http_response; } void SetHeader(const wxString& header, const wxString& h_data); - void SetPostBuffer(const wxString& post_buf); + bool SetPostText(const wxString& contentType, + const wxString& data, + const wxMBConv& conv = wxConvUTF8); + bool SetPostBuffer(const wxString& contentType, const wxMemoryBuffer& data); void SetProxyMode(bool on); /* Cookies */ wxString GetCookie(const wxString& cookie) const; bool HasCookies() const { return m_cookies.size() > 0; } + // Use the other SetPostBuffer() overload or SetPostText() instead. + wxDEPRECATED(void SetPostBuffer(const wxString& post_buf)); + protected: enum wxHTTP_Req { @@ -80,7 +87,8 @@ protected: bool m_read, m_proxy_mode; wxSockAddress *m_addr; - wxString m_post_buf; + wxMemoryBuffer m_postBuffer; + wxString m_contentType; int m_http_response; DECLARE_DYNAMIC_CLASS(wxHTTP) diff --git a/Externals/wxWidgets3/include/wx/radiobox.h b/Externals/wxWidgets3/include/wx/radiobox.h index 768c63e787..7b7960c215 100644 --- a/Externals/wxWidgets3/include/wx/radiobox.h +++ b/Externals/wxWidgets3/include/wx/radiobox.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 10.09.00 -// RCS-ID: $Id: radiobox.h 65668 2010-09-29 13:45:51Z VZ $ +// RCS-ID: $Id: radiobox.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -168,8 +168,6 @@ private: #include "wx/cocoa/radiobox.h" #elif defined(__WXPM__) #include "wx/os2/radiobox.h" -#elif defined(__WXPALMOS__) - #include "wx/palmos/radiobox.h" #endif #endif // wxUSE_RADIOBOX diff --git a/Externals/wxWidgets3/include/wx/radiobut.h b/Externals/wxWidgets3/include/wx/radiobut.h index a0bf142b77..d69ec49579 100644 --- a/Externals/wxWidgets3/include/wx/radiobut.h +++ b/Externals/wxWidgets3/include/wx/radiobut.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 07.09.00 -// RCS-ID: $Id: radiobut.h 54125 2008-06-11 19:17:41Z SC $ +// RCS-ID: $Id: radiobut.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -51,8 +51,6 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxRadioButtonNameStr[]; #include "wx/cocoa/radiobut.h" #elif defined(__WXPM__) #include "wx/os2/radiobut.h" -#elif defined(__WXPALMOS__) - #include "wx/palmos/radiobut.h" #endif #endif // wxUSE_RADIOBTN diff --git a/Externals/wxWidgets3/include/wx/rawbmp.h b/Externals/wxWidgets3/include/wx/rawbmp.h index 69c6df19f9..2fca1857d4 100644 --- a/Externals/wxWidgets3/include/wx/rawbmp.h +++ b/Externals/wxWidgets3/include/wx/rawbmp.h @@ -4,7 +4,7 @@ // Author: Eric Kidd, Vadim Zeitlin // Modified by: // Created: 10.03.03 -// RCS-ID: $Id: rawbmp.h 66054 2010-11-07 13:16:20Z VZ $ +// RCS-ID: $Id: rawbmp.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) 2002 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -172,6 +172,11 @@ typedef wxPixelFormat wxImagePixelFormat; // Under GTK+ 2.X we use GdkPixbuf, which is standard RGB or RGBA typedef wxPixelFormat wxNativePixelFormat; + #define wxPIXEL_FORMAT_ALPHA 3 +#elif defined(__WXPM__) + // Under PM, we can use standard RGB or RGBA + typedef wxPixelFormat wxNativePixelFormat; + #define wxPIXEL_FORMAT_ALPHA 3 #elif defined(__WXDFB__) // Under DirectFB, RGB components are reversed, they're in BGR order @@ -596,7 +601,7 @@ struct wxPixelDataOut // data access // ----------- - // access to invidividual colour components + // access to individual colour components ChannelType& Red() { return m_ptr[PixelFormat::RED]; } ChannelType& Green() { return m_ptr[PixelFormat::GREEN]; } ChannelType& Blue() { return m_ptr[PixelFormat::BLUE]; } diff --git a/Externals/wxWidgets3/include/wx/region.h b/Externals/wxWidgets3/include/wx/region.h index 8ad565e04f..c032903f3d 100644 --- a/Externals/wxWidgets3/include/wx/region.h +++ b/Externals/wxWidgets3/include/wx/region.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: -// RCS-ID: $Id: region.h 58804 2009-02-09 09:01:19Z SC $ +// RCS-ID: $Id: region.h 70353 2012-01-15 14:46:41Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -181,8 +181,7 @@ protected: // some ports implement a generic Combine() function while others only // implement individual wxRegion operations, factor out the common code for the // ports with Combine() in this class -#if defined(__WXPALMOS__) || \ - defined(__WXMSW__) || \ +#if defined(__WXMSW__) || \ ( defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON ) || \ defined(__WXPM__) @@ -213,9 +212,7 @@ protected: #endif // ports with wxRegion::Combine() -#if defined(__WXPALMOS__) - #include "wx/palmos/region.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #include "wx/msw/region.h" #elif defined(__WXGTK20__) #include "wx/gtk/region.h" @@ -223,8 +220,6 @@ protected: #include "wx/gtk1/region.h" #elif defined(__WXMOTIF__) || defined(__WXX11__) #include "wx/x11/region.h" -#elif defined(__WXMGL__) - #include "wx/mgl/region.h" #elif defined(__WXDFB__) #include "wx/dfb/region.h" #elif defined(__WXMAC__) diff --git a/Externals/wxWidgets3/include/wx/richmsgdlg.h b/Externals/wxWidgets3/include/wx/richmsgdlg.h index 4204cffeba..6d1ac376fd 100644 --- a/Externals/wxWidgets3/include/wx/richmsgdlg.h +++ b/Externals/wxWidgets3/include/wx/richmsgdlg.h @@ -3,7 +3,7 @@ // Purpose: wxRichMessageDialogBase // Author: Rickard Westerlund // Created: 2010-07-03 -// RCS-ID: $Id: richmsgdlg.h 65349 2010-08-18 22:48:41Z VZ $ +// RCS-ID: $Id: richmsgdlg.h 70165 2011-12-29 14:42:13Z SN $ // Copyright: (c) 2010 wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -45,7 +45,7 @@ public: wxString GetDetailedText() const { return m_detailedText; } - virtual bool IsCheckBoxChecked() const { return m_checkBoxValue; }; + virtual bool IsCheckBoxChecked() const { return m_checkBoxValue; } protected: const wxString m_detailsExpanderCollapsedLabel; diff --git a/Externals/wxWidgets3/include/wx/richtooltip.h b/Externals/wxWidgets3/include/wx/richtooltip.h new file mode 100644 index 0000000000..0005edb8b1 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/richtooltip.h @@ -0,0 +1,103 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/richtooltip.h +// Purpose: Declaration of wxRichToolTip class. +// Author: Vadim Zeitlin +// Created: 2011-10-07 +// RCS-ID: $Id: richtooltip.h 69480 2011-10-19 21:53:10Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_RICHTOOLTIP_H_ +#define _WX_RICHTOOLTIP_H_ + +#include "wx/defs.h" + +#if wxUSE_RICHTOOLTIP + +#include "wx/colour.h" + +class WXDLLIMPEXP_FWD_CORE wxFont; +class WXDLLIMPEXP_FWD_CORE wxIcon; +class WXDLLIMPEXP_FWD_CORE wxWindow; + +class wxRichToolTipImpl; + +// This enum describes the kind of the tip shown which combines both the tip +// position and appearance because the two are related (when the tip is +// positioned asymmetrically, a right handed triangle is used but an +// equilateral one when it's in the middle of a side). +// +// Automatic selects the tip appearance best suited for the current platform +// and the position best suited for the window the tooltip is shown for, i.e. +// chosen in such a way that the tooltip is always fully on screen. +// +// Other values describe the position of the tooltip itself, not the window it +// relates to. E.g. wxTipKind_Top places the tip on the top of the tooltip and +// so the tooltip itself is located beneath its associated window. +enum wxTipKind +{ + wxTipKind_None, + wxTipKind_TopLeft, + wxTipKind_Top, + wxTipKind_TopRight, + wxTipKind_BottomLeft, + wxTipKind_Bottom, + wxTipKind_BottomRight, + wxTipKind_Auto +}; + +// ---------------------------------------------------------------------------- +// wxRichToolTip: a customizable but not necessarily native tooltip. +// ---------------------------------------------------------------------------- + +// Notice that this class does not inherit from wxWindow. +class WXDLLIMPEXP_ADV wxRichToolTip +{ +public: + // Ctor must specify the tooltip title and main message, additional + // attributes can be set later. + wxRichToolTip(const wxString& title, const wxString& message); + + // Set the background colour: if two colours are specified, the background + // is drawn using a gradient from top to bottom, otherwise a single solid + // colour is used. + void SetBackgroundColour(const wxColour& col, + const wxColour& colEnd = wxColour()); + + // Set the small icon to show: either one of the standard information/ + // warning/error ones (the question icon doesn't make sense for a tooltip) + // or a custom icon. + void SetIcon(int icon = wxICON_INFORMATION); + void SetIcon(const wxIcon& icon); + + // Set timeout after which the tooltip should disappear, in milliseconds. + // By default the tooltip is hidden after system-dependent interval of time + // elapses but this method can be used to change this or also disable + // hiding the tooltip automatically entirely by passing 0 in this parameter + // (but doing this can result in native version not being used). + void SetTimeout(unsigned milliseconds); + + // Choose the tip kind, possibly none. By default the tip is positioned + // automatically, as if wxTipKind_Auto was used. + void SetTipKind(wxTipKind tipKind); + + // Set the title text font. By default it's emphasized using the font style + // or colour appropriate for the current platform. + void SetTitleFont(const wxFont& font); + + // Show the tooltip for the given window. + void ShowFor(wxWindow* win); + + // Non-virtual dtor as this class is not supposed to be derived from. + ~wxRichToolTip(); + +private: + wxRichToolTipImpl* const m_impl; + + wxDECLARE_NO_COPY_CLASS(wxRichToolTip); +}; + +#endif // wxUSE_RICHTOOLTIP + +#endif // _WX_RICHTOOLTIP_H_ diff --git a/Externals/wxWidgets3/include/wx/rtti.h b/Externals/wxWidgets3/include/wx/rtti.h index ddc3a35b7e..43e3939c41 100644 --- a/Externals/wxWidgets3/include/wx/rtti.h +++ b/Externals/wxWidgets3/include/wx/rtti.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: Ron Lee // Created: 01/02/97 -// RCS-ID: $Id: rtti.h 66636 2011-01-07 20:55:00Z SC $ +// RCS-ID: $Id: rtti.h 67879 2011-06-07 13:06:17Z VZ $ // Copyright: (c) 1997 Julian Smart // (c) 2001 Ron Lee // Licence: wxWindows licence @@ -144,7 +144,7 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name); static wxObject* wxCreateObject() #define wxDECLARE_CLASS(name) \ - wxDECLARE_DYNAMIC_CLASS(name) + wxDECLARE_ABSTRACT_CLASS(name) // common part of the macros below diff --git a/Externals/wxWidgets3/include/wx/scopedarray.h b/Externals/wxWidgets3/include/wx/scopedarray.h index 35257a224b..11cc04130a 100644 --- a/Externals/wxWidgets3/include/wx/scopedarray.h +++ b/Externals/wxWidgets3/include/wx/scopedarray.h @@ -3,7 +3,7 @@ // Purpose: scoped smart pointer class // Author: Vadim Zeitlin // Created: 2009-02-03 -// RCS-ID: $Id: scopedarray.h 58634 2009-02-03 12:01:46Z VZ $ +// RCS-ID: $Id: scopedarray.h 70109 2011-12-24 15:43:14Z VZ $ // Copyright: (c) Jesse Lovelace and original Boost authors (see below) // (c) 2009 Vadim Zeitlin // Licence: wxWindows licence @@ -41,7 +41,7 @@ public: { if ( array != m_array ) { - delete m_array; + delete [] m_array; m_array = array; } } diff --git a/Externals/wxWidgets3/include/wx/scopeguard.h b/Externals/wxWidgets3/include/wx/scopeguard.h index 85ca52385b..c0c354536a 100644 --- a/Externals/wxWidgets3/include/wx/scopeguard.h +++ b/Externals/wxWidgets3/include/wx/scopeguard.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 03.07.2003 -// RCS-ID: $Id: scopeguard.h 63473 2010-02-12 22:47:21Z VZ $ +// RCS-ID: $Id: scopeguard.h 67592 2011-04-24 13:14:47Z VS $ // Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -390,7 +390,7 @@ namespace wxPrivate { // empty class just to be able to define a reference to it -class VariableSetterBase { }; +class VariableSetterBase : public wxScopeGuardImplBase { }; typedef const VariableSetterBase& VariableSetter; @@ -404,10 +404,9 @@ public: { } - ~VariableSetterImpl() - { - m_var = m_value; - } + ~VariableSetterImpl() { wxPrivateOnScopeExit(*this); } + + void Execute() { m_var = m_value; } private: T& m_var; @@ -426,10 +425,9 @@ public: { } - ~VariableNullerImpl() - { - m_var = NULL; - } + ~VariableNullerImpl() { wxPrivateOnScopeExit(*this); } + + void Execute() { m_var = NULL; } private: T& m_var; diff --git a/Externals/wxWidgets3/include/wx/setup_inc.h b/Externals/wxWidgets3/include/wx/setup_inc.h index ec25baa50d..32b19dfbb8 100644 --- a/Externals/wxWidgets3/include/wx/setup_inc.h +++ b/Externals/wxWidgets3/include/wx/setup_inc.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: -// RCS-ID: $Id: setup_inc.h 67062 2011-02-27 12:48:07Z VZ $ +// RCS-ID: $Id: setup_inc.h 69463 2011-10-18 21:57:02Z VZ $ // Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -197,15 +197,6 @@ // Recommended setting: 0 (this is still work in progress...) #define wxUSE_EXTENDED_RTTI 0 -// Set wxUSE_STL to 1 to derive wxList(Foo) and wxArray(Foo) from -// std::list and std::vector, with a compatibility interface, -// and for wxHashMap to be implemented with templates. -// -// Default is 0 -// -// Recommended setting: YMMV -#define wxUSE_STL 0 - // Support for message/error logging. This includes wxLogXXX() functions and // wxLog and derived classes. Don't set this to 0 unless you really know what // you are doing. @@ -257,44 +248,6 @@ // Recommended setting: 1 as setting it to 0 disables many other things #define wxUSE_STREAMS 1 -// This is not a real option but is used as the default value for -// wxUSE_STD_IOSTREAM and wxUSE_STD_STRING. -// -// Currently the Digital Mars and Watcom compilers come without standard C++ -// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have -// them (e.g. from STLPort). -// -// VC++ 5.0 does include standard C++ library headers, however they produce -// many warnings that can't be turned off when compiled at warning level 4. -#if defined(__DMC__) || defined(__WATCOMC__) \ - || (defined(_MSC_VER) && _MSC_VER < 1200) - #define wxUSE_STD_DEFAULT 0 -#else - #define wxUSE_STD_DEFAULT 1 -#endif - -// Use standard C++ streams if 1 instead of wx streams in some places. If -// disabled (default), wx streams are used everywhere and wxWidgets doesn't -// depend on the standard streams library. -// -// Notice that enabling this does not replace wx streams with std streams -// everywhere, in a lot of places wx streams are used no matter what. -// -// Default is 0 -// -// Recommended setting: 1 if you use the standard streams anyhow and so -// dependency on the standard streams library is not a -// problem -#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT - -// Enable conversion to standard C++ string if 1. -// -// Default is 1 for most compilers. -// -// Recommended setting: 1 unless you want to ensure your program doesn't use -// the standard C++ library at all. -#define wxUSE_STD_STRING wxUSE_STD_DEFAULT - // Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf. // Note that if the system's implementation does not support positional // parameters, setting this to 1 forces the use of the wxWidgets implementation @@ -310,6 +263,107 @@ // Recommended setting: 1 if you want to support multiple languages #define wxUSE_PRINTF_POS_PARAMS 1 + +// ---------------------------------------------------------------------------- +// Interoperability with the standard library. +// ---------------------------------------------------------------------------- + +// Set wxUSE_STL to 1 to enable maximal interoperability with the standard +// library, even at the cost of backwards compatibility. +// +// Default is 0 +// +// Recommended setting: 0 as the options below already provide a relatively +// good level of interoperability and changing this option arguably isn't worth +// diverging from the official builds of the library. +#define wxUSE_STL 0 + +// This is not a real option but is used as the default value for +// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS. +// +// Currently the Digital Mars and Watcom compilers come without standard C++ +// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have +// them (e.g. from STLPort). +// +// VC++ 5.0 does include standard C++ library headers, however they produce +// many warnings that can't be turned off when compiled at warning level 4. +#if defined(__DMC__) || defined(__WATCOMC__) \ + || (defined(_MSC_VER) && _MSC_VER < 1200) + #define wxUSE_STD_DEFAULT 0 +#else + #define wxUSE_STD_DEFAULT 1 +#endif + +// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<> +// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but +// usually more limited) implementations are used which allows to avoid the +// dependency on the C++ run-time library. +// +// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't +// support using standard containers and that VC6 needs non-default options for +// such build to avoid getting "fatal error C1076: compiler limit : internal +// heap limit reached; use /Zm to specify a higher limit" in its own standard +// headers, so you need to ensure you do increase the heap size before enabling +// this option for this compiler. +// +// Default is 0 for compatibility reasons. +// +// Recommended setting: 1 unless compatibility with the official wxWidgets +// build and/or the existing code is a concern. +#define wxUSE_STD_CONTAINERS 0 + +// Use standard C++ streams if 1 instead of wx streams in some places. If +// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the +// standard streams library. +// +// Notice that enabling this does not replace wx streams with std streams +// everywhere, in a lot of places wx streams are used no matter what. +// +// Default is 1 if compiler supports it. +// +// Recommended setting: 1 if you use the standard streams anyhow and so +// dependency on the standard streams library is not a +// problem +#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT + +// Enable minimal interoperability with the standard C++ string class if 1. +// "Minimal" means that wxString can be constructed from std::string or +// std::wstring but can't be implicitly converted to them. You need to enable +// the option below for the latter. +// +// Default is 1 for most compilers. +// +// Recommended setting: 1 unless you want to ensure your program doesn't use +// the standard C++ library at all. +#define wxUSE_STD_STRING wxUSE_STD_DEFAULT + +// Make wxString as much interchangeable with std::[w]string as possible, in +// particular allow implicit conversion of wxString to either of these classes. +// This comes at a price (or a benefit, depending on your point of view) of not +// allowing implicit conversion to "const char *" and "const wchar_t *". +// +// Because a lot of existing code relies on these conversions, this option is +// disabled by default but can be enabled for your build if you don't care +// about compatibility. +// +// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled. +// +// Recommended setting: 0 to remain compatible with the official builds of +// wxWidgets. +#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL + +// VC++ 4.2 and above allows and but you can't mix +// them. Set this option to 1 to use , 0 to use . +// +// Note that newer compilers (including VC++ 7.1 and later) don't support +// wxUSE_IOSTREAMH == 1 and so will be used anyhow. +// +// Default is 0. +// +// Recommended setting: 0, only set to 1 if you use a really old compiler +#define wxUSE_IOSTREAMH 0 + + // ---------------------------------------------------------------------------- // non GUI features selection // ---------------------------------------------------------------------------- @@ -647,6 +701,34 @@ // Recommended setting: 1 #define wxUSE_STC 1 +// Use wxWidget's web viewing classes +// +// Default is 1 +// +// Recommended setting: 1 +#define wxUSE_WEBVIEW 1 + +// Use the IE wxWebView backend +// +// Default is 1 on MSW +// +// Recommended setting: 1 +#ifdef __WXMSW__ +#define wxUSE_WEBVIEW_IE 1 +#else +#define wxUSE_WEBVIEW_IE 0 +#endif + +// Use the WebKit wxWebView backend +// +// Default is 1 on GTK and OSX +// +// Recommended setting: 1 +#if defined(__WXGTK__) || defined(__WXOSX__) +#define wxUSE_WEBVIEW_WEBKIT 1 +#else +#define wxUSE_WEBVIEW_WEBKIT 0 +#endif // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced // 2D drawing API. (Still somewhat experimental) @@ -745,6 +827,7 @@ // // Recommended setting: 1 #define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl +#define wxUSE_BANNERWINDOW 1 // wxBannerWindow #define wxUSE_BUTTON 1 // wxButton #define wxUSE_BMPBUTTON 1 // wxBitmapButton #define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl @@ -780,8 +863,10 @@ #define wxUSE_STATTEXT 1 // wxStaticText #define wxUSE_STATBMP 1 // wxStaticBitmap #define wxUSE_TEXTCTRL 1 // wxTextCtrl +#define wxUSE_TIMEPICKCTRL 1 // wxTimePickerCtrl #define wxUSE_TOGGLEBTN 1 // requires wxButton #define wxUSE_TREECTRL 1 // wxTreeCtrl +#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR // below either wxStatusBar95 or a generic wxStatusBar will be used. @@ -998,6 +1083,14 @@ // Recommended setting: 1 #define wxUSE_NOTIFICATION_MESSAGE 1 +// wxRichToolTip is a customizable tooltip class which has more functionality +// than the stock (but native, unlike this class) wxToolTip. +// +// Default is 1. +// +// Recommended setting: 1 (but can be safely set to 0 if you don't need it) +#define wxUSE_RICHTOOLTIP 1 + // Use wxSashWindow class. // // Default is 1. @@ -1303,28 +1396,15 @@ // to create files in SVG (Scalable Vector Graphics) format. #define wxUSE_SVG 1 -// ---------------------------------------------------------------------------- -// other compiler (mis)features -// ---------------------------------------------------------------------------- - -// Set this to 0 if your compiler can't cope with omission of prototype -// parameters. +// Should wxDC provide SetTransformMatrix() and related methods? // -// Default is 1. +// Default is 1 but can be set to 0 if this functionality is not used. Notice +// that currently only wxMSW supports this so setting this to 0 doesn't change +// much for non-MSW platforms (although it will still save a few bytes +// probably). // -// Recommended setting: 1 (should never need to set this to 0) -#define REMOVE_UNUSED_ARG 1 - -// VC++ 4.2 and above allows and but you can't mix -// them. Set this option to 1 to use , 0 to use . -// -// Note that newer compilers (including VC++ 7.1 and later) don't support -// wxUSE_IOSTREAMH == 1 and so will be used anyhow. -// -// Default is 0. -// -// Recommended setting: 0, only set to 1 if you use a really old compiler -#define wxUSE_IOSTREAMH 0 +// Recommended setting: 1. +#define wxUSE_DC_TRANSFORM_MATRIX 1 // ---------------------------------------------------------------------------- // image format support diff --git a/Externals/wxWidgets3/include/wx/sizer.h b/Externals/wxWidgets3/include/wx/sizer.h index ddd8ef06a0..249f2d8389 100644 --- a/Externals/wxWidgets3/include/wx/sizer.h +++ b/Externals/wxWidgets3/include/wx/sizer.h @@ -4,7 +4,7 @@ // Author: Robert Roebling and Robin Dunn // Modified by: Ron Lee, Vadim Zeitlin (wxSizerFlags) // Created: -// RCS-ID: $Id: sizer.h 66862 2011-02-08 13:36:13Z VZ $ +// RCS-ID: $Id: sizer.h 69970 2011-12-10 04:34:06Z RD $ // Copyright: (c) Robin Dunn, Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -251,10 +251,10 @@ class WXDLLIMPEXP_CORE wxSizerItem : public wxObject public: // window wxSizerItem( wxWindow *window, - int proportion, - int flag, - int border, - wxObject* userData ); + int proportion=0, + int flag=0, + int border=0, + wxObject* userData=NULL ); // window with flags wxSizerItem(wxWindow *window, const wxSizerFlags& flags) @@ -266,10 +266,10 @@ public: // subsizer wxSizerItem( wxSizer *sizer, - int proportion, - int flag, - int border, - wxObject* userData ); + int proportion=0, + int flag=0, + int border=0, + wxObject* userData=NULL ); // sizer with flags wxSizerItem(wxSizer *sizer, const wxSizerFlags& flags) @@ -282,10 +282,10 @@ public: // spacer wxSizerItem( int width, int height, - int proportion, - int flag, - int border, - wxObject* userData); + int proportion=0, + int flag=0, + int border=0, + wxObject* userData=NULL); // spacer with flags wxSizerItem(int width, int height, const wxSizerFlags& flags) diff --git a/Externals/wxWidgets3/include/wx/slider.h b/Externals/wxWidgets3/include/wx/slider.h index 344d442b2a..e6d9f5e6ea 100644 --- a/Externals/wxWidgets3/include/wx/slider.h +++ b/Externals/wxWidgets3/include/wx/slider.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 09.02.01 -// RCS-ID: $Id: slider.h 66844 2011-02-05 16:36:30Z VZ $ +// RCS-ID: $Id: slider.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) 1996-2001 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -105,7 +105,7 @@ public: virtual int GetSelStart() const { return GetMax(); } virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { } -#ifdef WXWIN_COMPATIBILITY_2_8 +#if WXWIN_COMPATIBILITY_2_8 wxDEPRECATED_INLINE( void SetTickFreq(int freq, int), DoSetTickFreq(freq); ) #endif @@ -149,8 +149,6 @@ private: #include "wx/cocoa/slider.h" #elif defined(__WXPM__) #include "wx/os2/slider.h" -#elif defined(__WXPALMOS__) - #include "wx/palmos/slider.h" #endif #endif // wxUSE_SLIDER diff --git a/Externals/wxWidgets3/include/wx/sound.h b/Externals/wxWidgets3/include/wx/sound.h index d19a2d10b5..863b1d3298 100644 --- a/Externals/wxWidgets3/include/wx/sound.h +++ b/Externals/wxWidgets3/include/wx/sound.h @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // Modified by: // Created: 2004/02/01 -// RCS-ID: $Id: sound.h 61508 2009-07-23 20:30:22Z VZ $ +// RCS-ID: $Id: sound.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 2004, Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -55,7 +55,7 @@ protected: // wxSound class implementation // ---------------------------------------------------------------------------- -#if defined(__WXMSW__) +#if defined(__WINDOWS__) #include "wx/msw/sound.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/sound.h" diff --git a/Externals/wxWidgets3/include/wx/srchctrl.h b/Externals/wxWidgets3/include/wx/srchctrl.h index 6dc5ee4435..bae24ec5d1 100644 --- a/Externals/wxWidgets3/include/wx/srchctrl.h +++ b/Externals/wxWidgets3/include/wx/srchctrl.h @@ -3,7 +3,7 @@ // Purpose: wxSearchCtrlBase class // Author: Vince Harron // Created: 2006-02-18 -// RCS-ID: $Id: srchctrl.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: srchctrl.h 68911 2011-08-27 12:13:23Z VZ $ // Copyright: (c) Vince Harron // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -26,8 +26,12 @@ // no native version, use the generic one #define wxUSE_NATIVE_SEARCH_CONTROL 0 - class WXDLLIMPEXP_CORE wxSearchCtrlBaseBaseClass : public wxControl, - public wxTextCtrlIface + #include "wx/compositewin.h" + #include "wx/containr.h" + + class WXDLLIMPEXP_CORE wxSearchCtrlBaseBaseClass + : public wxCompositeWindow< wxNavigationEnabled >, + public wxTextCtrlIface { }; #endif diff --git a/Externals/wxWidgets3/include/wx/sstream.h b/Externals/wxWidgets3/include/wx/sstream.h index a891306dfa..405af50f4e 100644 --- a/Externals/wxWidgets3/include/wx/sstream.h +++ b/Externals/wxWidgets3/include/wx/sstream.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 2004-09-19 -// RCS-ID: $Id: sstream.h 63248 2010-01-24 11:33:17Z VZ $ +// RCS-ID: $Id: sstream.h 67968 2011-06-16 16:22:15Z VZ $ // Copyright: (c) 2004 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -66,9 +66,9 @@ public: wxStringOutputStream(wxString *pString = NULL, wxMBConv& conv = wxConvUTF8) : m_conv(conv) -#if wxUSE_UNICODE_WCHAR +#if wxUSE_UNICODE , m_unconv(0) -#endif // wxUSE_UNICODE_WCHAR +#endif // wxUSE_UNICODE { m_str = pString ? pString : &m_strInternal; m_pos = m_str->length() / sizeof(wxChar); @@ -98,10 +98,10 @@ private: // arbitrary 8 bit data wxMBConv& m_conv; -#if wxUSE_UNICODE_WCHAR +#if wxUSE_UNICODE // unconverted data from the last call to OnSysWrite() wxMemoryBuffer m_unconv; -#endif // wxUSE_UNICODE_WCHAR +#endif // wxUSE_UNICODE wxDECLARE_NO_COPY_CLASS(wxStringOutputStream); }; diff --git a/Externals/wxWidgets3/include/wx/stack.h b/Externals/wxWidgets3/include/wx/stack.h index 1ca3cd657a..b4e8ed2f8a 100644 --- a/Externals/wxWidgets3/include/wx/stack.h +++ b/Externals/wxWidgets3/include/wx/stack.h @@ -13,12 +13,12 @@ #include "wx/vector.h" -#if wxUSE_STL +#if wxUSE_STD_CONTAINERS #include #define wxStack std::stack -#else // !wxUSE_STL +#else // !wxUSE_STD_CONTAINERS // Notice that unlike std::stack, wxStack currently always uses wxVector and // can't be used with any other underlying container type. @@ -53,7 +53,7 @@ private: container_type m_cont; }; -#endif // wxUSE_STL/!wxUSE_STL +#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS // Deprecated macro-based class for compatibility only, don't use any more. diff --git a/Externals/wxWidgets3/include/wx/stackwalk.h b/Externals/wxWidgets3/include/wx/stackwalk.h index 2032d830fe..22cf370868 100644 --- a/Externals/wxWidgets3/include/wx/stackwalk.h +++ b/Externals/wxWidgets3/include/wx/stackwalk.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 2005-01-07 -// RCS-ID: $Id: stackwalk.h 64754 2010-06-26 11:43:13Z FM $ +// RCS-ID: $Id: stackwalk.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 2004 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -146,7 +146,7 @@ protected: virtual void OnStackFrame(const wxStackFrame& frame) = 0; }; -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #include "wx/msw/stackwalk.h" #elif defined(__UNIX__) #include "wx/unix/stackwalk.h" diff --git a/Externals/wxWidgets3/include/wx/stattext.h b/Externals/wxWidgets3/include/wx/stattext.h index f9ca7a0e82..a3165cc877 100644 --- a/Externals/wxWidgets3/include/wx/stattext.h +++ b/Externals/wxWidgets3/include/wx/stattext.h @@ -5,7 +5,7 @@ // Modified by: // Created: // Copyright: (c) Julian Smart -// RCS-ID: $Id: stattext.h 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: stattext.h 70345 2012-01-15 01:05:28Z VZ $ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -102,8 +102,6 @@ private: #include "wx/cocoa/stattext.h" #elif defined(__WXPM__) #include "wx/os2/stattext.h" -#elif defined(__WXPALMOS__) - #include "wx/palmos/stattext.h" #endif #endif // !wxNO_PORT_STATTEXT_INCLUDE diff --git a/Externals/wxWidgets3/include/wx/statusbr.h b/Externals/wxWidgets3/include/wx/statusbr.h index 255ec251ed..f76eb72864 100644 --- a/Externals/wxWidgets3/include/wx/statusbr.h +++ b/Externals/wxWidgets3/include/wx/statusbr.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 05.02.00 -// RCS-ID: $Id: statusbr.h 66226 2010-11-22 01:22:36Z VZ $ +// RCS-ID: $Id: statusbr.h 70808 2012-03-04 20:31:42Z VZ $ // Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -234,10 +234,7 @@ protected: #if defined(__WXUNIVERSAL__) #define wxStatusBarUniv wxStatusBar #include "wx/univ/statusbr.h" -#elif defined(__WXPALMOS__) - #define wxStatusBarPalm wxStatusBar - #include "wx/palmos/statusbr.h" -#elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR +#elif defined(__WXMSW__) && wxUSE_NATIVE_STATUSBAR #include "wx/msw/statusbar.h" #elif defined(__WXMAC__) #define wxStatusBarMac wxStatusBar diff --git a/Externals/wxWidgets3/include/wx/stdpaths.h b/Externals/wxWidgets3/include/wx/stdpaths.h index 92b49f740c..5288ae626a 100644 --- a/Externals/wxWidgets3/include/wx/stdpaths.h +++ b/Externals/wxWidgets3/include/wx/stdpaths.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 2004-10-17 -// RCS-ID: $Id: stdpaths.h 65652 2010-09-27 11:51:50Z VZ $ +// RCS-ID: $Id: stdpaths.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 2004 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -171,7 +171,7 @@ protected: }; #if wxUSE_STDPATHS - #if defined(__WXMSW__) + #if defined(__WINDOWS__) #include "wx/msw/stdpaths.h" #define wxHAS_NATIVE_STDPATHS // We want CoreFoundation paths on both CarbonLib and Darwin (for all ports) @@ -184,9 +184,6 @@ protected: #elif defined(__UNIX__) #include "wx/unix/stdpaths.h" #define wxHAS_NATIVE_STDPATHS - #elif defined(__PALMOS__) - #include "wx/palmos/stdpaths.h" - #define wxHAS_NATIVE_STDPATHS #endif #endif diff --git a/Externals/wxWidgets3/include/wx/stdstream.h b/Externals/wxWidgets3/include/wx/stdstream.h index 33cfa34747..4e3ab6dc65 100644 --- a/Externals/wxWidgets3/include/wx/stdstream.h +++ b/Externals/wxWidgets3/include/wx/stdstream.h @@ -4,7 +4,7 @@ // wxInputStream and wxOutputStream // Author: Jonathan Liu // Created: 2009-05-02 -// RCS-ID: $Id: stdstream.h 64924 2010-07-12 22:50:51Z VZ $ +// RCS-ID: $Id: stdstream.h 70515 2012-02-05 14:18:37Z VZ $ // Copyright: (c) 2009 Jonathan Liu // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -47,6 +47,18 @@ protected: virtual int uflow(); virtual int pbackfail(int c = EOF); + // Special work around for VC8/9 (this bug was fixed in VC10 and later): + // these versions have non-standard _Xsgetn_s() that it being called from + // the stream code instead of xsgetn() and so our overridden implementation + // never actually gets used. To work around this, forward to it explicitly. +#if defined(__VISUALC8__) || defined(__VISUALC9__) + virtual std::streamsize + _Xsgetn_s(char *s, size_t WXUNUSED(size), std::streamsize n) + { + return xsgetn(s, n); + } +#endif // VC8 or VC9 + wxInputStream& m_stream; int m_lastChar; }; diff --git a/Externals/wxWidgets3/include/wx/stopwatch.h b/Externals/wxWidgets3/include/wx/stopwatch.h index 6e124f1547..da5069e975 100644 --- a/Externals/wxWidgets3/include/wx/stopwatch.h +++ b/Externals/wxWidgets3/include/wx/stopwatch.h @@ -1,10 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/stopwatch.h // Purpose: wxStopWatch and global time-related functions -// Author: Julian Smart (wxTimer), Sylvain Bougnoux (wxStopWatch) +// Author: Julian Smart (wxTimer), Sylvain Bougnoux (wxStopWatch), +// Vadim Zeitlin (time functions, current wxStopWatch) // Created: 26.06.03 (extracted from wx/timer.h) -// RCS-ID: $Id: stopwatch.h 61508 2009-07-23 20:30:22Z VZ $ +// RCS-ID: $Id: stopwatch.h 69838 2011-11-27 19:50:27Z VZ $ // Copyright: (c) 1998-2003 Julian Smart, Sylvain Bougnoux +// (c) 2011 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -14,6 +16,11 @@ #include "wx/defs.h" #include "wx/longlong.h" +// Time-related functions are also available via this header for compatibility +// but you should include wx/time.h directly if you need only them and not +// wxStopWatch itself. +#include "wx/time.h" + // ---------------------------------------------------------------------------- // wxStopWatch: measure time intervals with up to 1ms resolution // ---------------------------------------------------------------------------- @@ -26,14 +33,16 @@ public: // ctor starts the stop watch wxStopWatch() { m_pauseCount = 0; Start(); } - // start the stop watch at the moment t0 + // Start the stop watch at the moment t0 expressed in milliseconds (i.e. + // calling Time() immediately afterwards returns t0). This can be used to + // restart an existing stopwatch. void Start(long t0 = 0); // pause the stop watch void Pause() { if ( m_pauseCount++ == 0 ) - m_pause = GetElapsedTime(); + m_elapsedBeforePause = GetCurrentClockValue() - m_t0; } // resume it @@ -43,22 +52,37 @@ public: wxT("Resuming stop watch which is not paused") ); if ( --m_pauseCount == 0 ) - Start(m_pause); + { + DoStart(); + m_t0 -= m_elapsedBeforePause; + } } - // get elapsed time since the last Start() in milliseconds - long Time() const; + // Get elapsed time since the last Start() in microseconds. + wxLongLong TimeInMicro() const; -protected: - // returns the elapsed time since t0 - long GetElapsedTime() const; + // get elapsed time since the last Start() in milliseconds + long Time() const { return (TimeInMicro()/1000).ToLong(); } private: - // the time of the last Start() + // Really starts the stop watch. The initial time is set to current clock + // value. + void DoStart(); + + // Returns the current clock value in its native units. + wxLongLong GetCurrentClockValue() const; + + // Return the frequency of the clock used in its ticks per second. + wxLongLong GetClockFreq() const; + + + // The clock value when the stop watch was last started. Its units vary + // depending on the platform. wxLongLong m_t0; - // the time of the last Pause() (only valid if m_pauseCount > 0) - long m_pause; + // The elapsed time as of last Pause() call (only valid if m_pauseCount > + // 0) in the same units as m_t0. + wxLongLong m_elapsedBeforePause; // if > 0, the stop watch is paused, otherwise it is running int m_pauseCount; @@ -78,37 +102,4 @@ private: #endif // wxUSE_LONGLONG && WXWIN_COMPATIBILITY_2_6 -// ---------------------------------------------------------------------------- -// global time functions -// ---------------------------------------------------------------------------- - -// Get number of seconds since local time 00:00:00 Jan 1st 1970. -extern long WXDLLIMPEXP_BASE wxGetLocalTime(); - -// Get number of seconds since GMT 00:00:00, Jan 1st 1970. -extern long WXDLLIMPEXP_BASE wxGetUTCTime(); - -#if wxUSE_LONGLONG - typedef wxLongLong wxMilliClock_t; - inline long wxMilliClockToLong(wxLongLong ll) { return ll.ToLong(); } -#else - typedef double wxMilliClock_t; - inline long wxMilliClockToLong(double d) { return wx_truncate_cast(long, d); } -#endif // wxUSE_LONGLONG - -// Get number of milliseconds since local time 00:00:00 Jan 1st 1970 -extern wxMilliClock_t WXDLLIMPEXP_BASE wxGetLocalTimeMillis(); - -#define wxGetCurrentTime() wxGetLocalTime() - -// on some really old systems gettimeofday() doesn't have the second argument, -// define wxGetTimeOfDay() to hide this difference -#ifdef HAVE_GETTIMEOFDAY - #ifdef WX_GETTIMEOFDAY_NO_TZ - #define wxGetTimeOfDay(tv) gettimeofday(tv) - #else - #define wxGetTimeOfDay(tv) gettimeofday((tv), NULL) - #endif -#endif // HAVE_GETTIMEOFDAY - #endif // _WX_STOPWATCH_H_ diff --git a/Externals/wxWidgets3/include/wx/strconv.h b/Externals/wxWidgets3/include/wx/strconv.h index 49fd028da3..26b5314ca5 100644 --- a/Externals/wxWidgets3/include/wx/strconv.h +++ b/Externals/wxWidgets3/include/wx/strconv.h @@ -4,7 +4,7 @@ // Author: Ove Kaaven, Robert Roebling, Vadim Zeitlin // Modified by: // Created: 29/01/98 -// RCS-ID: $Id: strconv.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: strconv.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) 1998 Ove Kaaven, Robert Roebling // (c) 1998-2006 Vadim Zeitlin // Licence: wxWindows licence @@ -25,9 +25,7 @@ # undef __BSEXCPT__ #endif -#ifndef __WXPALMOS5__ #include -#endif // ! __WXPALMOS5__ class WXDLLIMPEXP_FWD_BASE wxString; diff --git a/Externals/wxWidgets3/include/wx/stream.h b/Externals/wxWidgets3/include/wx/stream.h index b29089b073..7103c8d970 100644 --- a/Externals/wxWidgets3/include/wx/stream.h +++ b/Externals/wxWidgets3/include/wx/stream.h @@ -4,7 +4,7 @@ // Author: Guilhem Lavaux, Guillermo Rodriguez Garcia, Vadim Zeitlin // Modified by: // Created: 11/07/98 -// RCS-ID: $Id: stream.h 59761 2009-03-23 10:59:40Z VZ $ +// RCS-ID: $Id: stream.h 68331 2011-07-22 16:16:00Z VZ $ // Copyright: (c) Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -64,7 +64,7 @@ public: bool operator!() const { return !IsOk(); } // reset the stream state - void Reset() { m_lasterror = wxSTREAM_NO_ERROR; } + void Reset(wxStreamError error = wxSTREAM_NO_ERROR) { m_lasterror = error; } // this doesn't make sense for all streams, always test its return value virtual size_t GetSize() const; diff --git a/Externals/wxWidgets3/include/wx/string.h b/Externals/wxWidgets3/include/wx/string.h index ae0c706ed5..930e822d25 100644 --- a/Externals/wxWidgets3/include/wx/string.h +++ b/Externals/wxWidgets3/include/wx/string.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 29/01/98 -// RCS-ID: $Id: string.h 67181 2011-03-13 13:53:54Z VZ $ +// RCS-ID: $Id: string.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -24,7 +24,6 @@ #include "wx/defs.h" // everybody should include this -#ifndef __WXPALMOS5__ #if defined(__WXMAC__) || defined(__VISAGECPP__) #include #endif @@ -47,7 +46,6 @@ #ifdef HAVE_STRCASECMP_IN_STRINGS_H #include // for strcasecmp() #endif // HAVE_STRCASECMP_IN_STRINGS_H -#endif // ! __WXPALMOS5__ #include "wx/wxcrtbase.h" // for wxChar, wxStrlen() etc. #include "wx/strvararg.h" @@ -71,7 +69,7 @@ // it would have to be re-tested and probably corrected // CS: under OSX release builds the string destructor/cache cleanup sometimes // crashes, disable until we find the true reason or a better workaround -#if wxUSE_UNICODE_UTF8 && !defined(__WXMSW__) && !defined(__WXOSX__) +#if wxUSE_UNICODE_UTF8 && !defined(__WINDOWS__) && !defined(__WXOSX__) #define wxUSE_STRING_POS_CACHE 1 #else #define wxUSE_STRING_POS_CACHE 0 @@ -170,8 +168,7 @@ inline int Stricmp(const char *psz1, const char *psz2) return stricmp(psz1, psz2); #elif defined(__WXPM__) return stricmp(psz1, psz2); -#elif defined(__WXPALMOS__) || \ - defined(HAVE_STRCASECMP_IN_STRING_H) || \ +#elif defined(HAVE_STRCASECMP_IN_STRING_H) || \ defined(HAVE_STRCASECMP_IN_STRINGS_H) || \ defined(__GNUWIN32__) return strcasecmp(psz1, psz2); @@ -1345,12 +1342,13 @@ public: } #endif // wxUSE_STRING_POS_CACHE - // even if we're not built with wxUSE_STL == 1 it is very convenient to allow - // implicit conversions from std::string to wxString and vice verse as this - // allows to use the same strings in non-GUI and GUI code, however we don't - // want to unconditionally add this ctor as it would make wx lib dependent on - // libstdc++ on some Linux versions which is bad, so instead we ask the - // client code to define this wxUSE_STD_STRING symbol if they need it + // even if we're not built with wxUSE_STD_STRING_CONV_IN_WXSTRING == 1 it is + // very convenient to allow implicit conversions from std::string to wxString + // and vice verse as this allows to use the same strings in non-GUI and GUI + // code, however we don't want to unconditionally add this ctor as it would + // make wx lib dependent on libstdc++ on some Linux versions which is bad, so + // instead we ask the client code to define this wxUSE_STD_STRING symbol if + // they need it #if wxUSE_STD_STRING #if wxUSE_UNICODE_WCHAR wxString(const wxStdWideString& str) : m_impl(str) {} @@ -1368,10 +1366,8 @@ public: #endif #endif // wxUSE_STD_STRING - // Unlike ctor from std::string, we provide conversion to std::string only - // if wxUSE_STL and not merely wxUSE_STD_STRING (which is on by default), - // because it conflicts with operator const char/wchar_t* but we still - // provide explicit conversions to std::[w]string for convenience in any case + // Also always provide explicit conversions to std::[w]string in any case, + // see below for the implicit ones. #if wxUSE_STD_STRING // We can avoid a copy if we already use this string type internally, // otherwise we create a copy on the fly: @@ -1408,13 +1404,14 @@ public: } #endif -#if wxUSE_STL - // In wxUSE_STL case we also provide implicit conversions as there is no - // ambiguity with the const char/wchar_t* ones as they are disabled in this - // build (for consistency with std::basic_string<>) +#if wxUSE_STD_STRING_CONV_IN_WXSTRING + // Implicit conversions to std::[w]string are not provided by default as + // they conflict with the implicit conversions to "const char/wchar_t *" + // which we use for backwards compatibility but do provide them if + // explicitly requested. operator wxStringToStdStringRetType() const { return ToStdString(); } operator wxStringToStdWstringRetType() const { return ToStdWstring(); } -#endif // wxUSE_STL +#endif // wxUSE_STD_STRING_CONV_IN_WXSTRING #undef wxStringToStdStringRetType #undef wxStringToStdWstringRetType @@ -1654,11 +1651,12 @@ public: operator wxCStrData() const { return c_str(); } // the first two operators conflict with operators for conversion to - // std::string and they must be disabled in STL build; the next one only - // makes sense if conversions to char* are also defined and not defining it - // in STL build also helps us to get more clear error messages for the code - // which relies on implicit conversion to char* in STL build -#if !wxUSE_STL + // std::string and they must be disabled if those conversions are enabled; + // the next one only makes sense if conversions to char* are also defined + // and not defining it in STL build also helps us to get more clear error + // messages for the code which relies on implicit conversion to char* in + // STL build +#if !wxUSE_STD_STRING_CONV_IN_WXSTRING operator const char*() const { return c_str(); } operator const wchar_t*() const { return c_str(); } @@ -1666,7 +1664,7 @@ public: // wxWidgets versions: this is the same as conversion to const char * so it // may fail! operator const void*() const { return c_str(); } -#endif // wxUSE_STL +#endif // !wxUSE_STD_STRING_CONV_IN_WXSTRING // identical to c_str(), for MFC compatibility const wxCStrData GetData() const { return c_str(); } diff --git a/Externals/wxWidgets3/include/wx/stringimpl.h b/Externals/wxWidgets3/include/wx/stringimpl.h index f2229c4ece..fd611454ca 100644 --- a/Externals/wxWidgets3/include/wx/stringimpl.h +++ b/Externals/wxWidgets3/include/wx/stringimpl.h @@ -4,14 +4,14 @@ // Author: Vadim Zeitlin // Modified by: // Created: 29/01/98 -// RCS-ID: $Id: stringimpl.h 61508 2009-07-23 20:30:22Z VZ $ +// RCS-ID: $Id: stringimpl.h 67343 2011-03-30 14:16:04Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// /* This header implements std::string-like string class, wxStringImpl, that is - used by wxString to store the data. Alternatively, if wxUSE_STL=1, + used by wxString to store the data. Alternatively, if wxUSE_STD_STRING=1, wxStringImpl is just a typedef to std:: string class. */ @@ -50,15 +50,9 @@ extern WXDLLIMPEXP_DATA_BASE(const wxStringCharType*) wxEmptyStringImpl; // ---------------------------------------------------------------------------- -// deal with STL/non-STL/non-STL-but-wxUSE_STD_STRING +// deal with various build options // ---------------------------------------------------------------------------- -// using STL implies using std::string -#if wxUSE_STL - #undef wxUSE_STD_STRING - #define wxUSE_STD_STRING 1 -#endif - // we use STL-based string internally if we use std::string at all now, there // should be no reason to prefer our internal implement but if you really need // it you can predefine wxUSE_STL_BASED_WXSTRING as 0 when building the library diff --git a/Externals/wxWidgets3/include/wx/strvararg.h b/Externals/wxWidgets3/include/wx/strvararg.h index 13409da707..78f44579db 100644 --- a/Externals/wxWidgets3/include/wx/strvararg.h +++ b/Externals/wxWidgets3/include/wx/strvararg.h @@ -3,7 +3,7 @@ // Purpose: macros for implementing type-safe vararg passing of strings // Author: Vaclav Slavik // Created: 2007-02-19 -// RCS-ID: $Id: strvararg.h 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: strvararg.h 67760 2011-05-17 22:12:39Z VZ $ // Copyright: (c) 2007 REA Elektronik GmbH // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -825,7 +825,7 @@ WX_ARG_NORMALIZER_FORWARD(const signed char&, signed char); #undef WX_ARG_NORMALIZER_FORWARD #undef _WX_ARG_NORMALIZER_FORWARD_IMPL -#undef wxASSERT_ARG_TYPE +// NB: Don't #undef wxASSERT_ARG_TYPE here as it's also used in wx/longlong.h. // ---------------------------------------------------------------------------- // WX_VA_ARG_STRING diff --git a/Externals/wxWidgets3/include/wx/taskbar.h b/Externals/wxWidgets3/include/wx/taskbar.h index 7df9b4f190..0e7de72668 100644 --- a/Externals/wxWidgets3/include/wx/taskbar.h +++ b/Externals/wxWidgets3/include/wx/taskbar.h @@ -5,7 +5,7 @@ // Modified by: // Created: // Copyright: (c) Julian Smart -// RCS-ID: $Id: taskbar.h 58822 2009-02-10 03:43:30Z PC $ +// RCS-ID: $Id: taskbar.h 70345 2012-01-15 01:05:28Z VZ $ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -32,7 +32,7 @@ public: #if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) static bool IsAvailable(); #else - static bool IsAvailable() { return true; }; + static bool IsAvailable() { return true; } #endif // Operations: @@ -61,9 +61,7 @@ private: // now include the actual class declaration // ---------------------------------------------------------------------------- -#if defined(__WXPALMOS__) - #include "wx/palmos/taskbar.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #include "wx/msw/taskbar.h" #elif defined(__WXGTK20__) #include "wx/gtk/taskbar.h" diff --git a/Externals/wxWidgets3/include/wx/tbarbase.h b/Externals/wxWidgets3/include/wx/tbarbase.h index 3e2b4c4f9e..fb4e7fde74 100644 --- a/Externals/wxWidgets3/include/wx/tbarbase.h +++ b/Externals/wxWidgets3/include/wx/tbarbase.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: tbarbase.h 64854 2010-07-08 17:35:04Z JS $ +// RCS-ID: $Id: tbarbase.h 70854 2012-03-10 00:01:09Z RD $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -473,7 +473,7 @@ public: { return GetToolBitmapSize(); } // returns a (non separator) tool containing the point (x, y) or NULL if - // there is no tool at this point (corrdinates are client) + // there is no tool at this point (coordinates are client) virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const = 0; @@ -567,6 +567,33 @@ public: // use GetToolMargins() instead wxSize GetMargins() const { return GetToolMargins(); } + // Tool factories, + // helper functions to create toolbar tools + // ------------------------- + virtual wxToolBarToolBase *CreateTool(int toolid, + const wxString& label, + const wxBitmap& bmpNormal, + const wxBitmap& bmpDisabled = wxNullBitmap, + wxItemKind kind = wxITEM_NORMAL, + wxObject *clientData = NULL, + const wxString& shortHelp = wxEmptyString, + const wxString& longHelp = wxEmptyString) = 0; + + virtual wxToolBarToolBase *CreateTool(wxControl *control, + const wxString& label) = 0; + + // this one is not virtual but just a simple helper/wrapper around + // CreateTool() for separators + wxToolBarToolBase *CreateSeparator() + { + return CreateTool(wxID_SEPARATOR, + wxEmptyString, + wxNullBitmap, wxNullBitmap, + wxITEM_SEPARATOR, NULL, + wxEmptyString, wxEmptyString); + } + + // implementation only from now on // ------------------------------- @@ -618,29 +645,6 @@ protected: // called when the tools "can be toggled" flag changes virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) = 0; - // the functions to create toolbar tools - virtual wxToolBarToolBase *CreateTool(int toolid, - const wxString& label, - const wxBitmap& bmpNormal, - const wxBitmap& bmpDisabled, - wxItemKind kind, - wxObject *clientData, - const wxString& shortHelp, - const wxString& longHelp) = 0; - - virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label) = 0; - - // this one is not virtual but just a simple helper/wrapper around - // CreateTool() for separators - wxToolBarToolBase *CreateSeparator() - { - return CreateTool(wxID_SEPARATOR, - wxEmptyString, - wxNullBitmap, wxNullBitmap, - wxITEM_SEPARATOR, NULL, - wxEmptyString, wxEmptyString); - } // helper functions // ---------------- diff --git a/Externals/wxWidgets3/include/wx/textcompleter.h b/Externals/wxWidgets3/include/wx/textcompleter.h new file mode 100644 index 0000000000..fa422d309d --- /dev/null +++ b/Externals/wxWidgets3/include/wx/textcompleter.h @@ -0,0 +1,87 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/textcompleter.h +// Purpose: Declaration of wxTextCompleter class. +// Author: Vadim Zeitlin +// Created: 2011-04-13 +// RCS-ID: $Id: textcompleter.h 67525 2011-04-17 23:14:11Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_TEXTCOMPLETER_H_ +#define _WX_TEXTCOMPLETER_H_ + +// ---------------------------------------------------------------------------- +// wxTextCompleter: used by wxTextEnter::AutoComplete() +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxTextCompleter +{ +public: + wxTextCompleter() { } + + // The virtual functions to be implemented by the derived classes: the + // first one is called to start preparing for completions for the given + // prefix and, if it returns true, GetNext() is called until it returns an + // empty string indicating that there are no more completions. + virtual bool Start(const wxString& prefix) = 0; + virtual wxString GetNext() = 0; + + virtual ~wxTextCompleter(); + +private: + wxDECLARE_NO_COPY_CLASS(wxTextCompleter); +}; + +// ---------------------------------------------------------------------------- +// wxTextCompleterSimple: returns the entire set of completions at once +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxTextCompleterSimple : public wxTextCompleter +{ +public: + wxTextCompleterSimple() { } + + // Must be implemented to return all the completions for the given prefix. + virtual void GetCompletions(const wxString& prefix, wxArrayString& res) = 0; + + virtual bool Start(const wxString& prefix); + virtual wxString GetNext(); + +private: + wxArrayString m_completions; + unsigned m_index; + + wxDECLARE_NO_COPY_CLASS(wxTextCompleterSimple); +}; + +// ---------------------------------------------------------------------------- +// wxTextCompleterFixed: Trivial wxTextCompleter implementation which always +// returns the same fixed array of completions. +// ---------------------------------------------------------------------------- + +// NB: This class is private and intentionally not documented as it is +// currently used only for implementation of completion with the fixed list +// of strings only by wxWidgets itself, do not use it outside of wxWidgets. + +class wxTextCompleterFixed : public wxTextCompleterSimple +{ +public: + void SetCompletions(const wxArrayString& strings) + { + m_strings = strings; + } + + virtual void GetCompletions(const wxString& WXUNUSED(prefix), + wxArrayString& res) + { + res = m_strings; + } + +private: + wxArrayString m_strings; +}; + + +#endif // _WX_TEXTCOMPLETER_H_ + diff --git a/Externals/wxWidgets3/include/wx/textctrl.h b/Externals/wxWidgets3/include/wx/textctrl.h index 57fa252843..eb7a03c96e 100644 --- a/Externals/wxWidgets3/include/wx/textctrl.h +++ b/Externals/wxWidgets3/include/wx/textctrl.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 13.07.99 -// RCS-ID: $Id: textctrl.h 65756 2010-10-04 08:37:31Z JS $ +// RCS-ID: $Id: textctrl.h 70446 2012-01-23 11:28:28Z VZ $ // Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -171,11 +171,12 @@ enum wxTextAttrFlags wxTEXT_ATTR_FONT_WEIGHT = 0x00000010, wxTEXT_ATTR_FONT_ITALIC = 0x00000020, wxTEXT_ATTR_FONT_UNDERLINE = 0x00000040, + wxTEXT_ATTR_FONT_STRIKETHROUGH = 0x08000000, wxTEXT_ATTR_FONT_ENCODING = 0x02000000, wxTEXT_ATTR_FONT_FAMILY = 0x04000000, wxTEXT_ATTR_FONT = \ ( wxTEXT_ATTR_FONT_FACE | wxTEXT_ATTR_FONT_SIZE | wxTEXT_ATTR_FONT_WEIGHT | \ - wxTEXT_ATTR_FONT_ITALIC | wxTEXT_ATTR_FONT_UNDERLINE | wxTEXT_ATTR_FONT_ENCODING | wxTEXT_ATTR_FONT_FAMILY ), + wxTEXT_ATTR_FONT_ITALIC | wxTEXT_ATTR_FONT_UNDERLINE | wxTEXT_ATTR_FONT_STRIKETHROUGH | wxTEXT_ATTR_FONT_ENCODING | wxTEXT_ATTR_FONT_FAMILY ), wxTEXT_ATTR_ALIGNMENT = 0x00000080, wxTEXT_ATTR_LEFT_INDENT = 0x00000100, @@ -317,6 +318,7 @@ public: void SetFontWeight(wxFontWeight fontWeight) { m_fontWeight = fontWeight; m_flags |= wxTEXT_ATTR_FONT_WEIGHT; } void SetFontFaceName(const wxString& faceName) { m_fontFaceName = faceName; m_flags |= wxTEXT_ATTR_FONT_FACE; } void SetFontUnderlined(bool underlined) { m_fontUnderlined = underlined; m_flags |= wxTEXT_ATTR_FONT_UNDERLINE; } + void SetFontStrikethrough(bool strikethrough) { m_fontStrikethrough = strikethrough; m_flags |= wxTEXT_ATTR_FONT_STRIKETHROUGH; } void SetFontEncoding(wxFontEncoding encoding) { m_fontEncoding = encoding; m_flags |= wxTEXT_ATTR_FONT_ENCODING; } void SetFontFamily(wxFontFamily family) { m_fontFamily = family; m_flags |= wxTEXT_ATTR_FONT_FAMILY; } @@ -355,6 +357,7 @@ public: wxFontStyle GetFontStyle() const { return m_fontStyle; } wxFontWeight GetFontWeight() const { return m_fontWeight; } bool GetFontUnderlined() const { return m_fontUnderlined; } + bool GetFontStrikethrough() const { return m_fontStrikethrough; } const wxString& GetFontFaceName() const { return m_fontFaceName; } wxFontEncoding GetFontEncoding() const { return m_fontEncoding; } wxFontFamily GetFontFamily() const { return m_fontFamily; } @@ -379,8 +382,8 @@ public: int GetOutlineLevel() const { return m_outlineLevel; } // accessors - bool HasTextColour() const { return m_colText.Ok() && HasFlag(wxTEXT_ATTR_TEXT_COLOUR) ; } - bool HasBackgroundColour() const { return m_colBack.Ok() && HasFlag(wxTEXT_ATTR_BACKGROUND_COLOUR) ; } + bool HasTextColour() const { return m_colText.IsOk() && HasFlag(wxTEXT_ATTR_TEXT_COLOUR) ; } + bool HasBackgroundColour() const { return m_colBack.IsOk() && HasFlag(wxTEXT_ATTR_BACKGROUND_COLOUR) ; } bool HasAlignment() const { return (m_textAlignment != wxTEXT_ALIGNMENT_DEFAULT) && HasFlag(wxTEXT_ATTR_ALIGNMENT) ; } bool HasTabs() const { return HasFlag(wxTEXT_ATTR_TABS) ; } bool HasLeftIndent() const { return HasFlag(wxTEXT_ATTR_LEFT_INDENT); } @@ -389,6 +392,7 @@ public: bool HasFontSize() const { return HasFlag(wxTEXT_ATTR_FONT_SIZE); } bool HasFontItalic() const { return HasFlag(wxTEXT_ATTR_FONT_ITALIC); } bool HasFontUnderlined() const { return HasFlag(wxTEXT_ATTR_FONT_UNDERLINE); } + bool HasFontStrikethrough() const { return HasFlag(wxTEXT_ATTR_FONT_STRIKETHROUGH); } bool HasFontFaceName() const { return HasFlag(wxTEXT_ATTR_FONT_FACE); } bool HasFontEncoding() const { return HasFlag(wxTEXT_ATTR_FONT_ENCODING); } bool HasFontFamily() const { return HasFlag(wxTEXT_ATTR_FONT_FAMILY); } @@ -500,6 +504,7 @@ private: wxFontWeight m_fontWeight; wxFontFamily m_fontFamily; bool m_fontUnderlined; + bool m_fontStrikethrough; wxString m_fontFaceName; // Character style @@ -574,6 +579,11 @@ public: virtual long XYToPosition(long x, long y) const = 0; virtual bool PositionToXY(long pos, long *x, long *y) const = 0; + // translate the given position (which is just an index in the text control) + // to client coordinates + wxPoint PositionToCoords(long pos) const; + + virtual void ShowPosition(long pos) = 0; // find the character at position given in pixels @@ -592,6 +602,13 @@ protected: virtual bool DoLoadFile(const wxString& file, int fileType); virtual bool DoSaveFile(const wxString& file, int fileType); + // Return true if the given position is valid, i.e. positive and less than + // the last position. + virtual bool IsValidPosition(long pos) const = 0; + + // Default stub implementation of PositionToCoords() always returns + // wxDefaultPosition. + virtual wxPoint DoPositionToCoords(long pos) const; // the name of the last file loaded with LoadFile() which will be used by // SaveFile() by default @@ -625,6 +642,12 @@ public: wxTextEntryBase::SetValue(value); } +protected: + virtual bool IsValidPosition(long pos) const + { + return pos >= 0 && pos <= GetLastPosition(); + } + private: wxDECLARE_NO_COPY_CLASS(wxTextCtrlIface); }; @@ -723,6 +746,12 @@ protected: virtual bool DoLoadFile(const wxString& file, int fileType); virtual bool DoSaveFile(const wxString& file, int fileType); + // Another wxTextAreaBase override. + virtual bool IsValidPosition(long pos) const + { + return pos >= 0 && pos <= GetLastPosition(); + } + // implement the wxTextEntry pure virtual method virtual wxWindow *GetEditableWindow() { return this; } @@ -754,8 +783,6 @@ protected: #include "wx/cocoa/textctrl.h" #elif defined(__WXPM__) #include "wx/os2/textctrl.h" -#elif defined(__WXPALMOS__) - #include "wx/palmos/textctrl.h" #endif // ---------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/include/wx/textentry.h b/Externals/wxWidgets3/include/wx/textentry.h index a2bfc97e67..aeeffa652b 100644 --- a/Externals/wxWidgets3/include/wx/textentry.h +++ b/Externals/wxWidgets3/include/wx/textentry.h @@ -3,7 +3,7 @@ // Purpose: declares wxTextEntry interface defining a simple text entry // Author: Vadim Zeitlin // Created: 2007-09-24 -// RCS-ID: $Id: textentry.h 65552 2010-09-15 22:10:20Z VZ $ +// RCS-ID: $Id: textentry.h 68918 2011-08-27 14:11:13Z VZ $ // Copyright: (c) 2007 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -16,9 +16,11 @@ typedef long wxTextPos; class WXDLLIMPEXP_FWD_BASE wxArrayString; +class WXDLLIMPEXP_FWD_CORE wxTextCompleter; class WXDLLIMPEXP_FWD_CORE wxTextEntryHintData; class WXDLLIMPEXP_FWD_CORE wxWindow; +#include "wx/filefn.h" // for wxFILE and wxDIR only #include "wx/gdicmn.h" // for wxPoint // ---------------------------------------------------------------------------- @@ -106,18 +108,26 @@ public: // these functions allow to auto-complete the text already entered into the // control using either the given fixed list of strings, the paths from the - // file system or, in the future, an arbitrary user-defined completer + // file system or an arbitrary user-defined completer // // they all return true if completion was enabled or false on error (most // commonly meaning that this functionality is not available under the // current platform) - virtual bool AutoComplete(const wxArrayString& WXUNUSED(choices)) - { - return false; - } + bool AutoComplete(const wxArrayString& choices) + { return DoAutoCompleteStrings(choices); } - virtual bool AutoCompleteFileNames() { return false; } + bool AutoCompleteFileNames() + { return DoAutoCompleteFileNames(wxFILE); } + + bool AutoCompleteDirectories() + { return DoAutoCompleteFileNames(wxDIR); } + + // notice that we take ownership of the pointer and will delete it + // + // if the pointer is NULL auto-completion is disabled + bool AutoComplete(wxTextCompleter *completer) + { return DoAutoCompleteCustom(completer); } // status @@ -218,6 +228,16 @@ protected: virtual bool DoSetMargins(const wxPoint& pt); virtual wxPoint DoGetMargins() const; + // the derived classes should override these virtual methods to implement + // auto-completion, they do the same thing as their public counterparts but + // have different names to allow overriding just one of them without hiding + // the other one(s) + virtual bool DoAutoCompleteStrings(const wxArrayString& WXUNUSED(choices)) + { return false; } + virtual bool DoAutoCompleteFileNames(int WXUNUSED(flags)) // wxFILE | wxDIR + { return false; } + virtual bool DoAutoCompleteCustom(wxTextCompleter *completer); + // class which should be used to temporarily disable text change events // diff --git a/Externals/wxWidgets3/include/wx/textwrapper.h b/Externals/wxWidgets3/include/wx/textwrapper.h index 69b13fe2ab..f776b9939e 100644 --- a/Externals/wxWidgets3/include/wx/textwrapper.h +++ b/Externals/wxWidgets3/include/wx/textwrapper.h @@ -3,7 +3,7 @@ // Purpose: declaration of wxTextWrapper class // Author: Vadim Zeitlin // Created: 2009-05-31 (extracted from dlgcmn.cpp via wx/private/stattext.h) -// RCS-ID: $Id: textwrapper.h 65363 2010-08-19 15:41:18Z VZ $ +// RCS-ID: $Id: textwrapper.h 70433 2012-01-22 00:58:05Z VZ $ // Copyright: (c) 1999, 2009 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -98,7 +98,8 @@ public: protected: virtual wxWindow *OnCreateLine(const wxString& line) { - return new wxStaticText(m_win, wxID_ANY, line); + return new wxStaticText(m_win, wxID_ANY, + wxControl::EscapeMnemonics(line)); } virtual void OnOutputLine(const wxString& line) diff --git a/Externals/wxWidgets3/include/wx/tglbtn.h b/Externals/wxWidgets3/include/wx/tglbtn.h index 010dfb1622..72966cc759 100644 --- a/Externals/wxWidgets3/include/wx/tglbtn.h +++ b/Externals/wxWidgets3/include/wx/tglbtn.h @@ -5,7 +5,7 @@ // Author: John Norris, minor changes by Axel Schlueter // Modified by: // Created: 08.02.01 -// RCS-ID: $Id: tglbtn.h 66992 2011-02-22 13:25:30Z VZ $ +// RCS-ID: $Id: tglbtn.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) 2000 Johnny C. Norris II // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -18,7 +18,7 @@ #if wxUSE_TOGGLEBTN #include "wx/event.h" -#include "wx/control.h" // base class +#include "wx/anybutton.h" // base class extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[]; @@ -28,7 +28,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, // wxToggleButtonBase // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxToggleButtonBase : public wxControl +class WXDLLIMPEXP_CORE wxToggleButtonBase : public wxAnyButton { public: wxToggleButtonBase() { } @@ -89,8 +89,6 @@ protected: #elif defined(__WXMAC__) #include "wx/osx/tglbtn.h" #define wxHAS_BITMAPTOGGLEBUTTON -#elif defined(__WXPALMOS__) - #include "wx/palmos/tglbtn.h" #elif defined(__WXPM__) #include "wx/os2/tglbtn.h" #endif diff --git a/Externals/wxWidgets3/include/wx/thread.h b/Externals/wxWidgets3/include/wx/thread.h index 49c131a216..59ccfc952a 100644 --- a/Externals/wxWidgets3/include/wx/thread.h +++ b/Externals/wxWidgets3/include/wx/thread.h @@ -5,7 +5,7 @@ // Modified by: Vadim Zeitlin (modifications partly inspired by omnithreads // package from Olivetti & Oracle Research Laboratory) // Created: 04/13/98 -// RCS-ID: $Id: thread.h 67185 2011-03-14 11:54:32Z VZ $ +// RCS-ID: $Id: thread.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -219,7 +219,7 @@ private: // in order to avoid any overhead under platforms where critical sections are // just mutexes make all wxCriticalSection class functions inline -#if !defined(__WXMSW__) +#if !defined(__WINDOWS__) #define wxCRITSECT_IS_MUTEX 1 #define wxCRITSECT_INLINE WXEXPORT inline @@ -249,13 +249,16 @@ public: // enter the section (the same as locking a mutex) wxCRITSECT_INLINE void Enter(); + // try to enter the section (the same as trying to lock a mutex) + wxCRITSECT_INLINE bool TryEnter(); + // leave the critical section (same as unlocking a mutex) wxCRITSECT_INLINE void Leave(); private: #if wxCRITSECT_IS_MUTEX wxMutex m_mutex; -#elif defined(__WXMSW__) +#elif defined(__WINDOWS__) // we can't allocate any memory in the ctor, so use placement new - // unfortunately, we have to hardcode the sizeof() here because we can't // include windows.h from this public header and we also have to use the @@ -291,6 +294,7 @@ private: inline wxCriticalSection::~wxCriticalSection() { } inline void wxCriticalSection::Enter() { (void)m_mutex.Lock(); } + inline bool wxCriticalSection::TryEnter() { return m_mutex.TryLock() == wxMUTEX_NO_ERROR; } inline void wxCriticalSection::Leave() { (void)m_mutex.Unlock(); } #endif // wxCRITSECT_IS_MUTEX @@ -840,7 +844,7 @@ public: #if wxUSE_THREADS -#if defined(__WXMSW__) || defined(__OS2__) || defined(__EMX__) || defined(__WXOSX__) +#if defined(__WINDOWS__) || defined(__OS2__) || defined(__EMX__) || defined(__WXOSX__) // unlock GUI if there are threads waiting for and lock it back when // there are no more of them - should be called periodically by the main // thread diff --git a/Externals/wxWidgets3/include/wx/thrimpl.cpp b/Externals/wxWidgets3/include/wx/thrimpl.cpp index ca3234b4a9..39a75a770b 100644 --- a/Externals/wxWidgets3/include/wx/thrimpl.cpp +++ b/Externals/wxWidgets3/include/wx/thrimpl.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 04.06.02 (extracted from src/*/thread.cpp files) -// RCS-ID: $Id: thrimpl.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: thrimpl.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) Vadim Zeitlin (2002) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -76,7 +76,7 @@ wxMutexError wxMutex::Unlock() // variables and their events/event semaphores have quite different semantics, // so we reimplement the conditions from scratch using the mutexes and // semaphores -#if defined(__WXMSW__) || defined(__OS2__) || defined(__EMX__) +#if defined(__WINDOWS__) || defined(__OS2__) || defined(__EMX__) class wxConditionInternal { @@ -223,7 +223,7 @@ wxCondError wxConditionInternal::Broadcast() return wxCOND_NO_ERROR; } -#endif // MSW or OS2 +#endif // __WINDOWS__ || __OS2__ || __EMX__ // ---------------------------------------------------------------------------- // wxCondition diff --git a/Externals/wxWidgets3/include/wx/time.h b/Externals/wxWidgets3/include/wx/time.h new file mode 100644 index 0000000000..4dc6bf8d19 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/time.h @@ -0,0 +1,77 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/time.h +// Purpose: Miscellaneous time-related functions. +// Author: Vadim Zeitlin +// Created: 2011-11-26 +// RCS-ID: $Id: time.h 69846 2011-11-27 20:28:43Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_TIME_H_ +#define _WX_TIME_H_ + +#include "wx/longlong.h" + +// Returns the difference between UTC and local time in seconds. +WXDLLIMPEXP_BASE int wxGetTimeZone(); + +// Get number of seconds since local time 00:00:00 Jan 1st 1970. +extern long WXDLLIMPEXP_BASE wxGetLocalTime(); + +// Get number of seconds since GMT 00:00:00, Jan 1st 1970. +extern long WXDLLIMPEXP_BASE wxGetUTCTime(); + +#if wxUSE_LONGLONG + typedef wxLongLong wxMilliClock_t; + inline long wxMilliClockToLong(wxLongLong ll) { return ll.ToLong(); } +#else + typedef double wxMilliClock_t; + inline long wxMilliClockToLong(double d) { return wx_truncate_cast(long, d); } +#endif // wxUSE_LONGLONG + +// Get number of milliseconds since local time 00:00:00 Jan 1st 1970 +extern wxMilliClock_t WXDLLIMPEXP_BASE wxGetLocalTimeMillis(); + +#if wxUSE_LONGLONG + +// Get the number of milliseconds or microseconds since the Epoch. +wxLongLong WXDLLIMPEXP_BASE wxGetUTCTimeMillis(); +wxLongLong WXDLLIMPEXP_BASE wxGetUTCTimeUSec(); + +#endif // wxUSE_LONGLONG + +#define wxGetCurrentTime() wxGetLocalTime() + +// on some really old systems gettimeofday() doesn't have the second argument, +// define wxGetTimeOfDay() to hide this difference +#ifdef HAVE_GETTIMEOFDAY + #ifdef WX_GETTIMEOFDAY_NO_TZ + #define wxGetTimeOfDay(tv) gettimeofday(tv) + #else + #define wxGetTimeOfDay(tv) gettimeofday((tv), NULL) + #endif +#endif // HAVE_GETTIMEOFDAY + +/* Two wrapper functions for thread safety */ +#ifdef HAVE_LOCALTIME_R +#define wxLocaltime_r localtime_r +#else +WXDLLIMPEXP_BASE struct tm *wxLocaltime_r(const time_t*, struct tm*); +#if wxUSE_THREADS && !defined(__WINDOWS__) && !defined(__WATCOMC__) + // On Windows, localtime _is_ threadsafe! +#warning using pseudo thread-safe wrapper for localtime to emulate localtime_r +#endif +#endif + +#ifdef HAVE_GMTIME_R +#define wxGmtime_r gmtime_r +#else +WXDLLIMPEXP_BASE struct tm *wxGmtime_r(const time_t*, struct tm*); +#if wxUSE_THREADS && !defined(__WINDOWS__) && !defined(__WATCOMC__) + // On Windows, gmtime _is_ threadsafe! +#warning using pseudo thread-safe wrapper for gmtime to emulate gmtime_r +#endif +#endif + +#endif // _WX_TIME_H_ diff --git a/Externals/wxWidgets3/include/wx/timectrl.h b/Externals/wxWidgets3/include/wx/timectrl.h new file mode 100644 index 0000000000..832cc67708 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/timectrl.h @@ -0,0 +1,92 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/timectrl.h +// Purpose: Declaration of wxTimePickerCtrl class. +// Author: Vadim Zeitlin +// Created: 2011-09-22 +// RCS-ID: $Id: timectrl.h 70071 2011-12-20 21:27:14Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_TIMECTRL_H_ +#define _WX_TIMECTRL_H_ + +#include "wx/defs.h" + +#if wxUSE_TIMEPICKCTRL + +#include "wx/datetimectrl.h" + +#define wxTimePickerCtrlNameStr wxS("timectrl") + +// No special styles are currently defined for this control but still define a +// symbolic constant for the default style for consistency. +enum +{ + wxTP_DEFAULT = 0 +}; + +// ---------------------------------------------------------------------------- +// wxTimePickerCtrl: Allow the user to enter the time. +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_ADV wxTimePickerCtrlBase : public wxDateTimePickerCtrl +{ +public: + /* + The derived classes should implement ctor and Create() method with the + following signature: + + bool Create(wxWindow *parent, + wxWindowID id, + const wxDateTime& dt = wxDefaultDateTime, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTP_DEFAULT, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxTimePickerCtrlNameStr); + */ + + /* + We also inherit Set/GetValue() methods from the base class which define + our public API. Notice that the date portion of the date passed as + input is ignored and for the result date it's always today, but only + the time part of wxDateTime objects is really significant here. + */ +}; + +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) + #include "wx/msw/timectrl.h" + + #define wxHAS_NATIVE_TIMEPICKERCTRL +#elif defined(__WXOSX_COCOA__) && !defined(__WXUNIVERSAL__) + #include "wx/osx/timectrl.h" + + #define wxHAS_NATIVE_TIMEPICKERCTRL +#else + #include "wx/generic/timectrl.h" + + class WXDLLIMPEXP_ADV wxTimePickerCtrl : public wxTimePickerCtrlGeneric + { + public: + wxTimePickerCtrl() { } + wxTimePickerCtrl(wxWindow *parent, + wxWindowID id, + const wxDateTime& date = wxDefaultDateTime, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTP_DEFAULT, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxTimePickerCtrlNameStr) + : wxTimePickerCtrlGeneric(parent, id, date, pos, size, style, validator, name) + { + } + + private: + wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTimePickerCtrl); + }; +#endif + +#endif // wxUSE_TIMEPICKCTRL + +#endif // _WX_TIMECTRL_H_ diff --git a/Externals/wxWidgets3/include/wx/tls.h b/Externals/wxWidgets3/include/wx/tls.h index 40f91fce9e..0dfa87d2c5 100644 --- a/Externals/wxWidgets3/include/wx/tls.h +++ b/Externals/wxWidgets3/include/wx/tls.h @@ -3,7 +3,7 @@ // Purpose: Implementation of thread local storage // Author: Vadim Zeitlin // Created: 2008-08-08 -// RCS-ID: $Id: tls.h 65747 2010-10-03 17:16:15Z VZ $ +// RCS-ID: $Id: tls.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 2008 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -50,7 +50,7 @@ typedef void (*wxTlsDestructorFunction)(void*); } - #if defined(__WXMSW__) + #if defined(__WINDOWS__) #include "wx/msw/tls.h" #elif defined(__OS2__) #include "wx/os2/tls.h" @@ -132,7 +132,7 @@ }; #define wxTLS_TYPE(T) wxTlsValue - #define wxTLS_PTR(var) (var) + #define wxTLS_PTR(var) ((var).Get()) #define wxTLS_VALUE(var) (*(var)) #endif // wxHAS_COMPILER_TLS/!wxHAS_COMPILER_TLS diff --git a/Externals/wxWidgets3/include/wx/toolbar.h b/Externals/wxWidgets3/include/wx/toolbar.h index d90e4ed516..5e6298320e 100644 --- a/Externals/wxWidgets3/include/wx/toolbar.h +++ b/Externals/wxWidgets3/include/wx/toolbar.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 20.11.99 -// RCS-ID: $Id: toolbar.h 62849 2009-12-10 03:04:07Z VZ $ +// RCS-ID: $Id: toolbar.h 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -68,8 +68,6 @@ enum #if defined(__WXUNIVERSAL__) #include "wx/univ/toolbar.h" - #elif defined(__WXPALMOS__) - #include "wx/palmos/toolbar.h" #elif defined(__WXMSW__) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__))) #include "wx/msw/toolbar.h" #elif defined(__WXWINCE__) diff --git a/Externals/wxWidgets3/include/wx/toolbook.h b/Externals/wxWidgets3/include/wx/toolbook.h index 5ddffc7a5c..2efd27434e 100644 --- a/Externals/wxWidgets3/include/wx/toolbook.h +++ b/Externals/wxWidgets3/include/wx/toolbook.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 2006-01-29 -// RCS-ID: $Id: toolbook.h 65931 2010-10-27 16:54:36Z VZ $ +// RCS-ID: $Id: toolbook.h 68810 2011-08-21 14:08:49Z VZ $ // Copyright: (c) 2006 Julian Smart // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -78,7 +78,7 @@ public: wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = -1); + int imageId = NO_IMAGE); virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); } virtual int ChangeSelection(size_t n) { return DoSetSelection(n); } virtual void SetImageList(wxImageList *imageList); diff --git a/Externals/wxWidgets3/include/wx/toplevel.h b/Externals/wxWidgets3/include/wx/toplevel.h index be0c70b824..bf1049350c 100644 --- a/Externals/wxWidgets3/include/wx/toplevel.h +++ b/Externals/wxWidgets3/include/wx/toplevel.h @@ -5,7 +5,7 @@ // Author: Vadim Zeitlin, Vaclav Slavik // Modified by: // Created: 06.08.01 -// RCS-ID: $Id: toplevel.h 65680 2010-09-30 11:44:45Z VZ $ +// RCS-ID: $Id: toplevel.h 70353 2012-01-15 14:46:41Z VZ $ // Copyright: (c) 2001 Vadim Zeitlin // Vaclav Slavik // Licence: wxWindows licence @@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowBase; // ---------------------------------------------------------------------------- /* - Summary of the bits used (some of them are defined in wx/frame.g and + Summary of the bits used (some of them are defined in wx/frame.h and wx/dialog.h and not here): +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ @@ -45,10 +45,10 @@ class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowBase; | | | | | | | | | | | | | \_______ wxFRAME_TOOL_WINDOW | | | | | | | | | | | | \__________ wxFRAME_FLOAT_ON_PARENT | | | | | | | | | | | \_____________ wxFRAME_SHAPED - | | | | | | | | | | \________________ + | | | | | | | | | | \________________ wxDIALOG_NO_PARENT | | | | | | | | | \___________________ wxRESIZE_BORDER | | | | | | | | \______________________ wxTINY_CAPTION_VERT - | | | | | | | \_________________________ wxDIALOG_NO_PARENT + | | | | | | | \_________________________ | | | | | | \____________________________ wxMAXIMIZE_BOX | | | | | \_______________________________ wxMINIMIZE_BOX | | | | \__________________________________ wxSYSTEM_MENU @@ -70,14 +70,14 @@ class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowBase; #define wxICONIZE 0x4000 #define wxMINIMIZE wxICONIZE #define wxMAXIMIZE 0x2000 -#define wxCLOSE_BOX 0x1000 +#define wxCLOSE_BOX 0x1000 // == wxHELP so can't be used with it #define wxSYSTEM_MENU 0x0800 #define wxMINIMIZE_BOX 0x0400 #define wxMAXIMIZE_BOX 0x0200 #define wxTINY_CAPTION 0x0080 // clashes with wxNO_DEFAULT -#define wxRESIZE_BORDER 0x0040 +#define wxRESIZE_BORDER 0x0040 // == wxCLOSE #if WXWIN_COMPATIBILITY_2_8 // HORIZ and VERT styles are equivalent anyhow so don't use different names @@ -157,7 +157,8 @@ enum // wxTopLevelWindow: a top level (as opposed to child) window // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxTopLevelWindowBase : public wxNonOwnedWindow +class WXDLLIMPEXP_CORE wxTopLevelWindowBase : + public wxNavigationEnabled { public: // construction @@ -218,11 +219,6 @@ public: // enable/disable close button [x] virtual bool EnableCloseButton(bool WXUNUSED(enable) ) { return false; } - // Set the shape of the window to the given region. - // Returns true if the platform supports this feature (and the - // operation is successful.) - virtual bool SetShape(const wxRegion& WXUNUSED(region)) { return false; } - // Attracts the users attention to this window if the application is // inactive (should be called when a background event occurs) virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); @@ -281,6 +277,7 @@ public: // override some base class virtuals virtual bool Destroy(); virtual bool IsTopLevel() const { return true; } + virtual bool IsTopNavigationDomain() const { return true; } virtual bool IsVisible() const { return IsShown(); } // event handlers @@ -304,6 +301,8 @@ public: virtual void OSXSetModified(bool modified) { m_modified = modified; } virtual bool OSXIsModified() const { return m_modified; } + virtual void SetRepresentedFilename(const wxString& WXUNUSED(filename)) { } + protected: // the frame client to screen translation should take account of the // toolbar which may shift the origin of the client area @@ -352,15 +351,11 @@ protected: wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowBase); DECLARE_EVENT_TABLE() - WX_DECLARE_CONTROL_CONTAINER(); }; // include the real class declaration -#if defined(__WXPALMOS__) - #include "wx/palmos/toplevel.h" - #define wxTopLevelWindowNative wxTopLevelWindowPalm -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #include "wx/msw/toplevel.h" #define wxTopLevelWindowNative wxTopLevelWindowMSW #elif defined(__WXGTK20__) @@ -372,9 +367,6 @@ protected: #elif defined(__WXX11__) #include "wx/x11/toplevel.h" #define wxTopLevelWindowNative wxTopLevelWindowX11 -#elif defined(__WXMGL__) - #include "wx/mgl/toplevel.h" - #define wxTopLevelWindowNative wxTopLevelWindowMGL #elif defined(__WXDFB__) #include "wx/dfb/toplevel.h" #define wxTopLevelWindowNative wxTopLevelWindowDFB diff --git a/Externals/wxWidgets3/include/wx/treebase.h b/Externals/wxWidgets3/include/wx/treebase.h index 99d74f8aab..dc03d28f88 100644 --- a/Externals/wxWidgets3/include/wx/treebase.h +++ b/Externals/wxWidgets3/include/wx/treebase.h @@ -4,7 +4,7 @@ // Author: Julian Smart et al // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: treebase.h 58718 2009-02-07 18:59:25Z VZ $ +// RCS-ID: $Id: treebase.h 68812 2011-08-21 14:08:56Z VZ $ // Copyright: (c) 1997,1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -23,6 +23,7 @@ #include "wx/window.h" // for wxClientData #include "wx/event.h" #include "wx/dynarray.h" +#include "wx/itemid.h" #if WXWIN_COMPATIBILITY_2_6 @@ -38,53 +39,19 @@ enum #endif // WXWIN_COMPATIBILITY_2_6 // ---------------------------------------------------------------------------- -// wxTreeItemId identifies an element of the tree. In this implementation, it's -// just a trivial wrapper around Win32 HTREEITEM or a pointer to some private -// data structure in the generic version. It's opaque for the application and -// the only method which can be used by user code is IsOk(). +// wxTreeItemId identifies an element of the tree. It's opaque for the +// application and the only method which can be used by user code is IsOk(). // ---------------------------------------------------------------------------- -// Using this typedef removes an ambiguity when calling Remove() -typedef void *wxTreeItemIdValue; - -class WXDLLIMPEXP_CORE wxTreeItemId +// This is a class and not a typedef because existing code may forward declare +// wxTreeItemId as a class and we don't want to break it without good reason. +class wxTreeItemId : public wxItemId { - friend bool operator==(const wxTreeItemId&, const wxTreeItemId&); public: - // ctors - // 0 is invalid value for HTREEITEM - wxTreeItemId() { m_pItem = 0; } - - // construct wxTreeItemId from the native item id - wxTreeItemId(void *pItem) { m_pItem = pItem; } - - // default copy ctor/assignment operator are ok for us - - // accessors - // is this a valid tree item? - bool IsOk() const { return m_pItem != 0; } - // return true if this item is not valid - bool operator!() const { return !IsOk(); } - - // operations - // invalidate the item - void Unset() { m_pItem = 0; } - - operator bool() const { return IsOk(); } - - wxTreeItemIdValue m_pItem; + wxTreeItemId() : wxItemId() { } + wxTreeItemId(void* pItem) : wxItemId(pItem) { } }; -inline bool operator==(const wxTreeItemId& i1, const wxTreeItemId& i2) -{ - return i1.m_pItem == i2.m_pItem; -} - -inline bool operator!=(const wxTreeItemId& i1, const wxTreeItemId& i2) -{ - return i1.m_pItem != i2.m_pItem; -} - // ---------------------------------------------------------------------------- // wxTreeItemData is some (arbitrary) user class associated with some item. The // main advantage of having this class (compared to old untyped interface) is @@ -119,10 +86,12 @@ protected: wxTreeItemId m_pItem; }; +typedef void *wxTreeItemIdValue; + WX_DEFINE_EXPORTED_ARRAY_PTR(wxTreeItemIdValue, wxArrayTreeItemIdsBase); // this is a wrapper around the array class defined above which allow to wok -// with vaue of natural wxTreeItemId type instead of using wxTreeItemIdValue +// with values of natural wxTreeItemId type instead of using wxTreeItemIdValue // and does it without any loss of efficiency class WXDLLIMPEXP_CORE wxArrayTreeItemIds : public wxArrayTreeItemIdsBase { @@ -252,9 +221,9 @@ public: void SetFont(const wxFont& font) { m_font = font; } // accessors - bool HasTextColour() const { return m_colText.Ok(); } - bool HasBackgroundColour() const { return m_colBack.Ok(); } - bool HasFont() const { return m_font.Ok(); } + bool HasTextColour() const { return m_colText.IsOk(); } + bool HasBackgroundColour() const { return m_colBack.IsOk(); } + bool HasFont() const { return m_font.IsOk(); } const wxColour& GetTextColour() const { return m_colText; } const wxColour& GetBackgroundColour() const { return m_colBack; } diff --git a/Externals/wxWidgets3/include/wx/treebook.h b/Externals/wxWidgets3/include/wx/treebook.h index bc39e8f698..86bdf0b0da 100644 --- a/Externals/wxWidgets3/include/wx/treebook.h +++ b/Externals/wxWidgets3/include/wx/treebook.h @@ -4,7 +4,7 @@ // Author: Evgeniy Tarassov, Vadim Zeitlin // Modified by: // Created: 2005-09-15 -// RCS-ID: $Id: treebook.h 65931 2010-10-27 16:54:36Z VZ $ +// RCS-ID: $Id: treebook.h 68810 2011-08-21 14:08:49Z VZ $ // Copyright: (c) 2005 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -74,27 +74,27 @@ public: wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = wxNOT_FOUND); + int imageId = NO_IMAGE); // Inserts a new sub-page to the end of children of the page at given pos. virtual bool InsertSubPage(size_t pos, wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = wxNOT_FOUND); + int imageId = NO_IMAGE); // Adds a new page at top level after all other pages. virtual bool AddPage(wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = wxNOT_FOUND); + int imageId = NO_IMAGE); // Adds a new child-page to the last top-level page inserted. // Useful when constructing 1 level tree structure. virtual bool AddSubPage(wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = wxNOT_FOUND); + int imageId = NO_IMAGE); // Deletes the page and ALL its children. Could trigger page selection // change in a case when selected page is removed. In that case its parent @@ -169,16 +169,16 @@ private: wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = wxNOT_FOUND); + int imageId = NO_IMAGE); bool DoInsertSubPage(size_t pos, wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = wxNOT_FOUND); + int imageId = NO_IMAGE); bool DoAddSubPage(wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = wxNOT_FOUND); + int imageId = NO_IMAGE); // Sets selection in the tree control and updates the page being shown. int DoSetSelection(size_t pos, int flags = 0); diff --git a/Externals/wxWidgets3/include/wx/treectrl.h b/Externals/wxWidgets3/include/wx/treectrl.h index 1b46241a20..feefbd7638 100644 --- a/Externals/wxWidgets3/include/wx/treectrl.h +++ b/Externals/wxWidgets3/include/wx/treectrl.h @@ -5,7 +5,7 @@ // Modified by: // Created: // Copyright: (c) Karsten Ballueder -// RCS-ID: $Id: treectrl.h 64532 2010-06-09 13:55:48Z FM $ +// RCS-ID: $Id: treectrl.h 70345 2012-01-15 01:05:28Z VZ $ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -33,20 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxImageList; class WXDLLIMPEXP_CORE wxTreeCtrlBase : public wxControl { public: - wxTreeCtrlBase() - { - m_imageListNormal = - m_imageListState = NULL; - m_ownsImageListNormal = - m_ownsImageListState = false; - - // arbitrary default - m_spacing = 18; - - // quick DoGetBestSize calculation - m_quickBestSize = true; - } - + wxTreeCtrlBase(); virtual ~wxTreeCtrlBase(); // accessors @@ -452,6 +439,13 @@ protected: bool m_quickBestSize; +private: + // Intercept Escape and Return keys to ensure that our in-place edit + // control always gets them before they're used for dialog navigation or + // anything else. + void OnCharHook(wxKeyEvent& event); + + wxDECLARE_NO_COPY_CLASS(wxTreeCtrlBase); }; @@ -461,8 +455,6 @@ protected: #if defined(__WXUNIVERSAL__) #include "wx/generic/treectlg.h" -#elif defined(__WXPALMOS__) - #include "wx/generic/treectlg.h" #elif defined(__WXMSW__) #include "wx/msw/treectrl.h" #elif defined(__WXMOTIF__) diff --git a/Externals/wxWidgets3/include/wx/treelist.h b/Externals/wxWidgets3/include/wx/treelist.h new file mode 100644 index 0000000000..bb4f3b0f11 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/treelist.h @@ -0,0 +1,567 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/treelist.h +// Purpose: wxTreeListCtrl class declaration. +// Author: Vadim Zeitlin +// Created: 2011-08-17 +// RCS-ID: $Id: treelist.h 69619 2011-10-31 19:41:06Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_TREELIST_H_ +#define _WX_TREELIST_H_ + +#include "wx/defs.h" + +#if wxUSE_TREELISTCTRL + +#include "wx/compositewin.h" +#include "wx/containr.h" +#include "wx/headercol.h" +#include "wx/itemid.h" +#include "wx/vector.h" +#include "wx/window.h" +#include "wx/withimages.h" + +class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl; +class WXDLLIMPEXP_FWD_ADV wxDataViewEvent; + +extern WXDLLIMPEXP_DATA_ADV(const char) wxTreeListCtrlNameStr[]; + +class wxTreeListCtrl; +class wxTreeListModel; +class wxTreeListModelNode; + +// ---------------------------------------------------------------------------- +// Constants. +// ---------------------------------------------------------------------------- + +// wxTreeListCtrl styles. +// +// Notice that using wxTL_USER_3STATE implies wxTL_3STATE and wxTL_3STATE in +// turn implies wxTL_CHECKBOX. +enum +{ + wxTL_SINGLE = 0x0000, // This is the default anyhow. + wxTL_MULTIPLE = 0x0001, // Allow multiple selection. + wxTL_CHECKBOX = 0x0002, // Show checkboxes in the first column. + wxTL_3STATE = 0x0004, // Allow 3rd state in checkboxes. + wxTL_USER_3STATE = 0x0008, // Allow user to set 3rd state. + + wxTL_DEFAULT_STYLE = wxTL_SINGLE, + wxTL_STYLE_MASK = wxTL_SINGLE | + wxTL_MULTIPLE | + wxTL_CHECKBOX | + wxTL_3STATE | + wxTL_USER_3STATE +}; + +// ---------------------------------------------------------------------------- +// wxTreeListItem: unique identifier of an item in wxTreeListCtrl. +// ---------------------------------------------------------------------------- + +// Make wxTreeListItem a forward-declarable class even though it's simple +// enough to possibly be declared as a simple typedef. +class wxTreeListItem : public wxItemId +{ +public: + wxTreeListItem(wxTreeListModelNode* item = NULL) + : wxItemId(item) + { + } +}; + +// Container of multiple items. +typedef wxVector wxTreeListItems; + +// Some special "items" that can be used with InsertItem(): +extern WXDLLIMPEXP_DATA_ADV(const wxTreeListItem) wxTLI_FIRST; +extern WXDLLIMPEXP_DATA_ADV(const wxTreeListItem) wxTLI_LAST; + +// ---------------------------------------------------------------------------- +// wxTreeListItemComparator: defines order of wxTreeListCtrl items. +// ---------------------------------------------------------------------------- + +class wxTreeListItemComparator +{ +public: + wxTreeListItemComparator() { } + + // The comparison function should return negative, null or positive value + // depending on whether the first item is less than, equal to or greater + // than the second one. The items should be compared using their values for + // the given column. + virtual int + Compare(wxTreeListCtrl* treelist, + unsigned column, + wxTreeListItem first, + wxTreeListItem second) = 0; + + // Although this class is not used polymorphically by wxWidgets itself, + // provide virtual dtor in case it's used like this in the user code. + virtual ~wxTreeListItemComparator() { } + +private: + wxDECLARE_NO_COPY_CLASS(wxTreeListItemComparator); +}; + +// ---------------------------------------------------------------------------- +// wxTreeListCtrl: a control combining wxTree- and wxListCtrl features. +// ---------------------------------------------------------------------------- + +// This control also provides easy to use high level interface. Although the +// implementation uses wxDataViewCtrl internally, this class is intentionally +// simpler than wxDataViewCtrl and doesn't provide all of its functionality. +// +// If you need extra features you can always use GetDataView() accessor to work +// with wxDataViewCtrl directly but doing this makes your unportable to possible +// future non-wxDataViewCtrl-based implementations of this class. + +class WXDLLIMPEXP_ADV wxTreeListCtrl + : public wxCompositeWindow< wxNavigationEnabled >, + public wxWithImages +{ +public: + // Constructors and such + // --------------------- + + wxTreeListCtrl() { Init(); } + wxTreeListCtrl(wxWindow* parent, + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTL_DEFAULT_STYLE, + const wxString& name = wxTreeListCtrlNameStr) + { + Init(); + + Create(parent, id, pos, size, style, name); + } + + bool Create(wxWindow* parent, + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTL_DEFAULT_STYLE, + const wxString& name = wxTreeListCtrlNameStr); + + + virtual ~wxTreeListCtrl(); + + // Columns methods + // --------------- + + // Add a column with the given title and attributes, returns the index of + // the new column or -1 on failure. + int AppendColumn(const wxString& title, + int width = wxCOL_WIDTH_AUTOSIZE, + wxAlignment align = wxALIGN_LEFT, + int flags = wxCOL_RESIZABLE) + { + return DoInsertColumn(title, -1, width, align, flags); + } + + // Return the total number of columns. + unsigned GetColumnCount() const; + + // Delete the column with the given index, returns false if index is + // invalid or deleting the column failed for some other reason. + bool DeleteColumn(unsigned col); + + // Delete all columns. + void ClearColumns(); + + // Set column width to either the given value in pixels or to the value + // large enough to fit all of the items if width == wxCOL_WIDTH_AUTOSIZE. + void SetColumnWidth(unsigned col, int width); + + // Get the current width of the given column in pixels. + int GetColumnWidth(unsigned col) const; + + // Get the width appropriate for showing the given text. This is typically + // used as second argument for AppendColumn() or with SetColumnWidth(). + int WidthFor(const wxString& text) const; + + + // Item methods + // ------------ + + // Adding items. The parent and text of the first column of the new item + // must always be specified, the rest is optional. + // + // Each item can have two images: one used for closed state and another for + // opened one. Only the first one is ever used for the items that don't + // have children. And both are not set by default. + // + // It is also possible to associate arbitrary client data pointer with the + // new item. It will be deleted by the control when the item is deleted + // (either by an explicit DeleteItem() call or because the entire control + // is destroyed). + + wxTreeListItem AppendItem(wxTreeListItem parent, + const wxString& text, + int imageClosed = NO_IMAGE, + int imageOpened = NO_IMAGE, + wxClientData* data = NULL) + { + return DoInsertItem(parent, wxTLI_LAST, text, + imageClosed, imageOpened, data); + } + + wxTreeListItem InsertItem(wxTreeListItem parent, + wxTreeListItem previous, + const wxString& text, + int imageClosed = NO_IMAGE, + int imageOpened = NO_IMAGE, + wxClientData* data = NULL) + { + return DoInsertItem(parent, previous, text, + imageClosed, imageOpened, data); + } + + wxTreeListItem PrependItem(wxTreeListItem parent, + const wxString& text, + int imageClosed = NO_IMAGE, + int imageOpened = NO_IMAGE, + wxClientData* data = NULL) + { + return DoInsertItem(parent, wxTLI_FIRST, text, + imageClosed, imageOpened, data); + } + + // Deleting items. + void DeleteItem(wxTreeListItem item); + void DeleteAllItems(); + + + // Tree navigation + // --------------- + + // Return the (never shown) root item. + wxTreeListItem GetRootItem() const; + + // The parent item may be invalid for the root-level items. + wxTreeListItem GetItemParent(wxTreeListItem item) const; + + // Iterate over the given item children: start by calling GetFirstChild() + // and then call GetNextSibling() for as long as it returns valid item. + wxTreeListItem GetFirstChild(wxTreeListItem item) const; + wxTreeListItem GetNextSibling(wxTreeListItem item) const; + + // Return the first child of the root item, which is also the first item of + // the tree in depth-first traversal order. + wxTreeListItem GetFirstItem() const { return GetFirstChild(GetRootItem()); } + + // Get item after the given one in the depth-first tree-traversal order. + // Calling this function starting with the result of GetFirstItem() allows + // iterating over all items in the tree. + wxTreeListItem GetNextItem(wxTreeListItem item) const; + + + // Items attributes + // ---------------- + + const wxString& GetItemText(wxTreeListItem item, unsigned col = 0) const; + + // The convenience overload below sets the text for the first column. + void SetItemText(wxTreeListItem item, unsigned col, const wxString& text); + void SetItemText(wxTreeListItem item, const wxString& text) + { + SetItemText(item, 0, text); + } + + // By default the opened image is the same as the normal, closed one (if + // it's used at all). + void SetItemImage(wxTreeListItem item, int closed, int opened = NO_IMAGE); + + // Retrieve or set the data associated with the item. + wxClientData* GetItemData(wxTreeListItem item) const; + void SetItemData(wxTreeListItem item, wxClientData* data); + + + // Expanding and collapsing + // ------------------------ + + void Expand(wxTreeListItem item); + void Collapse(wxTreeListItem item); + bool IsExpanded(wxTreeListItem item) const; + + + // Selection handling + // ------------------ + + // This function can be used with single selection controls, use + // GetSelections() with the multi-selection ones. + wxTreeListItem GetSelection() const; + + // This one can be used with either single or multi-selection controls. + unsigned GetSelections(wxTreeListItems& selections) const; + + // In single selection mode Select() deselects any other selected items, in + // multi-selection case it adds to the selection. + void Select(wxTreeListItem item); + + // Can be used in multiple selection mode only, single selected item in the + // single selection mode can't be unselected. + void Unselect(wxTreeListItem item); + + // Return true if the item is selected, can be used in both single and + // multiple selection modes. + bool IsSelected(wxTreeListItem item) const; + + // Select or unselect all items, only valid in multiple selection mode. + void SelectAll(); + void UnselectAll(); + + + // Checkbox handling + // ----------------- + + // Methods in this section can only be used with the controls created with + // wxTL_CHECKBOX style. + + // Simple set, unset or query the checked state. + void CheckItem(wxTreeListItem item, wxCheckBoxState state = wxCHK_CHECKED); + void UncheckItem(wxTreeListItem item) { CheckItem(item, wxCHK_UNCHECKED); } + + // The same but do it recursively for this item itself and its children. + void CheckItemRecursively(wxTreeListItem item, + wxCheckBoxState state = wxCHK_CHECKED); + + // Update the parent of this item recursively: if this item and all its + // siblings are checked, the parent will become checked as well. If this + // item and all its siblings are unchecked, the parent will be unchecked. + // And if the siblings of this item are not all in the same state, the + // parent will be switched to indeterminate state. And then the same logic + // will be applied to the parents parent and so on recursively. + // + // This is typically called when the state of the given item has changed + // from EVT_TREELIST_ITEM_CHECKED() handler in the controls which have + // wxTL_3STATE flag. Notice that without this flag this function can't work + // as it would be unable to set the state of a parent with both checked and + // unchecked items so it's only allowed to call it when this flag is set. + void UpdateItemParentStateRecursively(wxTreeListItem item); + + // Return the current state. + wxCheckBoxState GetCheckedState(wxTreeListItem item) const; + + // Return true if all item children (if any) are in the given state. + bool AreAllChildrenInState(wxTreeListItem item, + wxCheckBoxState state) const; + + + + // Sorting. + // -------- + + // Sort by the given column, either in ascending (default) or descending + // sort order. + // + // By default, simple alphabetical sorting is done by this column contents + // but SetItemComparator() may be called to perform comparison in some + // other way. + void SetSortColumn(unsigned col, bool ascendingOrder = true); + + // If the control contents is sorted, return true and fill the output + // parameters with the column which is currently used for sorting and + // whether we sort using ascending or descending order. Otherwise, i.e. if + // the control contents is unsorted, simply return false. + bool GetSortColumn(unsigned* col, bool* ascendingOrder = NULL); + + // Set the object to use for comparing the items. It will be called when + // the control is being sorted because the user clicked on a sortable + // column. + // + // The provided pointer is stored by the control so the object it points to + // must have a life-time equal or greater to that of the control itself. In + // addition, the pointer can be NULL to stop using custom comparator and + // revert to the default alphabetical comparison. + void SetItemComparator(wxTreeListItemComparator* comparator); + + + // View window functions. + // ---------------------- + + // This control itself is entirely covered by the "view window" which is + // currently a wxDataViewCtrl but if you want to avoid relying on this to + // allow your code to work with later versions which might not be + // wxDataViewCtrl-based, use the first function only and only use the + // second one if you really need to call wxDataViewCtrl methods on it. + wxWindow* GetView() const; + wxDataViewCtrl* GetDataView() const { return m_view; } + +private: + // Common part of all ctors. + void Init(); + + // Pure virtual method inherited from wxCompositeWindow. + virtual wxWindowList GetCompositeWindowParts() const; + + // Implementation of AppendColumn(). + int DoInsertColumn(const wxString& title, + int pos, // May be -1 meaning "append". + int width, + wxAlignment align, + int flags); + + // Common part of {Append,Insert,Prepend}Item(). + wxTreeListItem DoInsertItem(wxTreeListItem parent, + wxTreeListItem previous, + const wxString& text, + int imageClosed, + int imageOpened, + wxClientData* data); + + // Send wxTreeListEvent corresponding to the given wxDataViewEvent for an + // item (as opposed for column-oriented events). + // + // Also updates the original event "skipped" and "vetoed" flags. + void SendItemEvent(wxEventType evt, wxDataViewEvent& event); + + // Send wxTreeListEvent corresponding to the given column wxDataViewEvent. + void SendColumnEvent(wxEventType evt, wxDataViewEvent& event); + + + // Called by wxTreeListModel when an item is toggled by the user. + void OnItemToggled(wxTreeListItem item, wxCheckBoxState stateOld); + + // Event handlers. + void OnSelectionChanged(wxDataViewEvent& event); + void OnItemExpanding(wxDataViewEvent& event); + void OnItemExpanded(wxDataViewEvent& event); + void OnItemActivated(wxDataViewEvent& event); + void OnItemContextMenu(wxDataViewEvent& event); + void OnColumnSorted(wxDataViewEvent& event); + void OnSize(wxSizeEvent& event); + + wxDECLARE_EVENT_TABLE(); + + + wxDataViewCtrl* m_view; + wxTreeListModel* m_model; + + wxTreeListItemComparator* m_comparator; + + + // It calls our inherited protected wxWithImages::GetImage() method. + friend class wxTreeListModel; + + wxDECLARE_NO_COPY_CLASS(wxTreeListCtrl); +}; + +// ---------------------------------------------------------------------------- +// wxTreeListEvent: event generated by wxTreeListCtrl. +// ---------------------------------------------------------------------------- + +class wxTreeListEvent : public wxNotifyEvent +{ +public: + // Default ctor is provided for wxRTTI needs only but should never be used. + wxTreeListEvent() { Init(); } + + // The item affected by the event. Valid for all events except + // column-specific ones such as COLUMN_SORTED. + wxTreeListItem GetItem() const { return m_item; } + + // The previous state of the item checkbox for ITEM_CHECKED events only. + wxCheckBoxState GetOldCheckedState() const { return m_oldCheckedState; } + + // The index of the column affected by the event. Currently only used by + // COLUMN_SORTED event. + unsigned GetColumn() const { return m_column; } + + virtual wxEvent* Clone() const { return new wxTreeListEvent(*this); } + +private: + // Common part of all ctors. + void Init() + { + m_column = static_cast(-1); + + m_oldCheckedState = wxCHK_UNDETERMINED; + } + + // Ctor is private, only wxTreeListCtrl can create events of this type. + wxTreeListEvent(wxEventType evtType, + wxTreeListCtrl* treelist, + wxTreeListItem item) + : wxNotifyEvent(evtType, treelist->GetId()), + m_item(item) + { + SetEventObject(treelist); + + Init(); + } + + // Set the checkbox state before this event for ITEM_CHECKED events. + void SetOldCheckedState(wxCheckBoxState state) + { + m_oldCheckedState = state; + } + + // Set the column affected by this event for COLUMN_SORTED events. + void SetColumn(unsigned column) + { + m_column = column; + } + + + const wxTreeListItem m_item; + + wxCheckBoxState m_oldCheckedState; + + unsigned m_column; + + friend class wxTreeListCtrl; + + wxDECLARE_DYNAMIC_CLASS(wxTreeListEvent); +}; + +// Event types and event table macros. + +typedef void (wxEvtHandler::*wxTreeListEventFunction)(wxTreeListEvent&); + +#define wxTreeListEventHandler(func) \ + wxEVENT_HANDLER_CAST(wxTreeListEventFunction, func) + +#define wxEVT_TREELIST_GENERIC(name, id, fn) \ + wx__DECLARE_EVT1(wxEVT_COMMAND_TREELIST_##name, id, wxTreeListEventHandler(fn)) + +#define wxDECLARE_TREELIST_EVENT(name) \ + wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, \ + wxEVT_COMMAND_TREELIST_##name, \ + wxTreeListEvent) + +wxDECLARE_TREELIST_EVENT(SELECTION_CHANGED); +#define EVT_TREELIST_SELECTION_CHANGED(id, fn) \ + wxEVT_TREELIST_GENERIC(SELECTION_CHANGED, id, fn) + +wxDECLARE_TREELIST_EVENT(ITEM_EXPANDING); +#define EVT_TREELIST_ITEM_EXPANDING(id, fn) \ + wxEVT_TREELIST_GENERIC(ITEM_EXPANDING, id, fn) + +wxDECLARE_TREELIST_EVENT(ITEM_EXPANDED); +#define EVT_TREELIST_ITEM_EXPANDED(id, fn) \ + wxEVT_TREELIST_GENERIC(ITEM_EXPANDED, id, fn) + +wxDECLARE_TREELIST_EVENT(ITEM_CHECKED); +#define EVT_TREELIST_ITEM_CHECKED(id, fn) \ + wxEVT_TREELIST_GENERIC(ITEM_CHECKED, id, fn) + +wxDECLARE_TREELIST_EVENT(ITEM_ACTIVATED); +#define EVT_TREELIST_ITEM_ACTIVATED(id, fn) \ + wxEVT_TREELIST_GENERIC(ITEM_ACTIVATED, id, fn) + +wxDECLARE_TREELIST_EVENT(ITEM_CONTEXT_MENU); +#define EVT_TREELIST_ITEM_CONTEXT_MENU(id, fn) \ + wxEVT_TREELIST_GENERIC(ITEM_CONTEXT_MENU, id, fn) + +wxDECLARE_TREELIST_EVENT(COLUMN_SORTED); +#define EVT_TREELIST_COLUMN_SORTED(id, fn) \ + wxEVT_TREELIST_GENERIC(COLUMN_SORTED, id, fn) + +#undef wxDECLARE_TREELIST_EVENT + +#endif // wxUSE_TREELISTCTRL + +#endif // _WX_TREELIST_H_ diff --git a/Externals/wxWidgets3/include/wx/uiaction.h b/Externals/wxWidgets3/include/wx/uiaction.h index 738deca738..af2b162c49 100644 --- a/Externals/wxWidgets3/include/wx/uiaction.h +++ b/Externals/wxWidgets3/include/wx/uiaction.h @@ -4,7 +4,7 @@ // Author: Kevin Ollivier, Steven Lamerton, Vadim Zeitlin // Modified by: // Created: 2010-03-06 -// RCS-ID: $Id: uiaction.h 67232 2011-03-18 15:10:15Z DS $ +// RCS-ID: $Id: uiaction.h 69762 2011-11-15 15:56:55Z VZ $ // Copyright: (c) Kevin Ollivier // (c) 2010 Steven Lamerton // (c) 2010 Vadim Zeitlin @@ -58,8 +58,8 @@ public: { return Key(keycode, modifiers, false); } // Higher level methods for generating both the key press and release for a - // single key or for all characters in the ASCII string "text" which can - // currently contain letters only (no digits, no punctuation). + // single key or for all characters in the ASCII string "text" which can currently + // contain letters, digits and characters for the definition of numbers [+-., ]. bool Char(int keycode, int modifiers = wxMOD_NONE); bool Text(const char *text); diff --git a/Externals/wxWidgets3/include/wx/unix/private/timer.h b/Externals/wxWidgets3/include/wx/unix/private/timer.h index eeff719c9b..764f3a9954 100644 --- a/Externals/wxWidgets3/include/wx/unix/private/timer.h +++ b/Externals/wxWidgets3/include/wx/unix/private/timer.h @@ -3,7 +3,7 @@ // Purpose: wxTimer for wxBase (unix) // Author: Lukasz Michalski // Created: 15/01/2005 -// RCS-ID: $Id: timer.h 61508 2009-07-23 20:30:22Z VZ $ +// RCS-ID: $Id: timer.h 69839 2011-11-27 19:50:33Z VZ $ // Copyright: (c) Lukasz Michalski // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -134,12 +134,6 @@ private: static wxTimerScheduler *ms_instance; }; -// this helper function currently only exists for Unix platforms but could be -// moved to wx/stopwatch.h if it turns out to be useful elsewhere -// -// returns the number of microseconds since the Epoch -extern wxUsecClock_t wxGetLocalTimeUsec(); - #endif // wxUSE_TIMER #endif // _WX_UNIX_PRIVATE_TIMER_H_ diff --git a/Externals/wxWidgets3/include/wx/unix/sound.h b/Externals/wxWidgets3/include/wx/unix/sound.h index 98916f699a..d2f2220b5b 100644 --- a/Externals/wxWidgets3/include/wx/unix/sound.h +++ b/Externals/wxWidgets3/include/wx/unix/sound.h @@ -4,7 +4,7 @@ // Author: Julian Smart, Vaclav Slavik // Modified by: // Created: 25/10/98 -// RCS-ID: $Id: sound.h 47254 2007-07-09 10:09:52Z VS $ +// RCS-ID: $Id: sound.h 69178 2011-09-21 15:08:02Z VZ $ // Copyright: (c) Julian Smart, Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -60,13 +60,13 @@ class WXDLLIMPEXP_ADV wxSound : public wxSoundBase public: wxSound(); wxSound(const wxString& fileName, bool isResource = false); - wxSound(int size, const wxByte* data); + wxSound(size_t size, const void* data); virtual ~wxSound(); // Create from resource or file bool Create(const wxString& fileName, bool isResource = false); // Create from data - bool Create(int size, const wxByte* data); + bool Create(size_t size, const void* data); bool IsOk() const { return m_data != NULL; } @@ -84,7 +84,7 @@ protected: static void EnsureBackend(); void Free(); - bool LoadWAV(const wxUint8 *data, size_t length, bool copyData); + bool LoadWAV(const void* data, size_t length, bool copyData); static wxSoundBackend *ms_backend; #if wxUSE_LIBSDL && wxUSE_PLUGINS diff --git a/Externals/wxWidgets3/include/wx/utils.h b/Externals/wxWidgets3/include/wx/utils.h index f085a7a59b..bccc7411a8 100644 --- a/Externals/wxWidgets3/include/wx/utils.h +++ b/Externals/wxWidgets3/include/wx/utils.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 29/01/98 -// RCS-ID: $Id: utils.h 67129 2011-03-05 12:21:20Z SC $ +// RCS-ID: $Id: utils.h 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998 Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -113,7 +113,7 @@ wxClip(T1 a, T2 b, T3 c) // String functions (deprecated, use wxString) // ---------------------------------------------------------------------------- -#ifdef WXWIN_COMPATIBILITY_2_8 +#if WXWIN_COMPATIBILITY_2_8 // A shorter way of using strcmp wxDEPRECATED_INLINE(inline bool wxStringEq(const char *s1, const char *s2), return wxCRT_StrcmpA(s1, s2) == 0; ) @@ -334,10 +334,17 @@ enum // under Windows, don't hide the child even if it's IO is redirected (this // is done by default) - wxEXEC_NOHIDE = 2, + wxEXEC_SHOW_CONSOLE = 2, + + // deprecated synonym for wxEXEC_SHOW_CONSOLE, use the new name as it's + // more clear + wxEXEC_NOHIDE = wxEXEC_SHOW_CONSOLE, // under Unix, if the process is the group leader then passing wxKILL_CHILDREN to wxKill // kills all children as well as pid + // under Windows (NT family only), sets the CREATE_NEW_PROCESS_GROUP flag, + // which allows to target Ctrl-Break signal to the spawned process. + // applies to console processes only. wxEXEC_MAKE_GROUP_LEADER = 4, // by default synchronous execution disables all program windows to avoid @@ -350,6 +357,10 @@ enum // until the child process finishes wxEXEC_NOEVENTS = 16, + // under Windows, hide the console of the child process if it has one, even + // if its IO is not redirected + wxEXEC_HIDE_CONSOLE = 32, + // convenient synonym for flags given system()-like behaviour wxEXEC_BLOCK = wxEXEC_SYNC | wxEXEC_NOEVENTS }; @@ -399,12 +410,12 @@ WXDLLIMPEXP_BASE long wxExecute(const wxString& command, int flags = 0, const wxExecuteEnv *env = NULL); -#if defined(__WXMSW__) && wxUSE_IPC +#if defined(__WINDOWS__) && wxUSE_IPC // ask a DDE server to execute the DDE request with given parameters WXDLLIMPEXP_BASE bool wxExecuteDDE(const wxString& ddeServer, const wxString& ddeTopic, const wxString& ddeCommand); -#endif // __WXMSW__ && wxUSE_IPC +#endif // __WINDOWS__ && wxUSE_IPC enum wxSignal { @@ -588,14 +599,14 @@ WXDLLIMPEXP_BASE bool wxGetDiskSpace(const wxString& path, -extern "C" -{ -typedef int (wxCMPFUNC_CONV *CMPFUNCDATA)(const void* pItem1, const void* pItem2, const void* user_data); -} +typedef int (*wxSortCallback)(const void* pItem1, + const void* pItem2, + const void* user_data); -WXDLLIMPEXP_BASE void wxQsort(void *const pbase, size_t total_elems, - size_t size, CMPFUNCDATA cmp, const void* user_data); +WXDLLIMPEXP_BASE void wxQsort(void* pbase, size_t total_elems, + size_t size, wxSortCallback cmp, + const void* user_data); #if wxUSE_GUI // GUI only things from now on @@ -804,8 +815,8 @@ WXDLLIMPEXP_CORE bool wxYieldIfNeeded(); // Windows resources access // ---------------------------------------------------------------------------- -// MSW only: get user-defined resource from the .res file. -#ifdef __WXMSW__ +// Windows only: get user-defined resource from the .res file. +#ifdef __WINDOWS__ // default resource type for wxLoadUserResource() extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxUserResourceStr; @@ -832,7 +843,7 @@ WXDLLIMPEXP_CORE bool wxYieldIfNeeded(); const wxString& resourceType = wxUserResourceStr, int* pLen = NULL, WXHINSTANCE module = 0); -#endif // MSW +#endif // __WINDOWS__ #endif // _WX_UTILSH__ diff --git a/Externals/wxWidgets3/include/wx/valgen.h b/Externals/wxWidgets3/include/wx/valgen.h index a0c81bf88f..9e6f0c3479 100644 --- a/Externals/wxWidgets3/include/wx/valgen.h +++ b/Externals/wxWidgets3/include/wx/valgen.h @@ -3,7 +3,7 @@ // Purpose: wxGenericValidator class // Author: Kevin Smith // Created: Jan 22 1999 -// RCS-ID: $Id: valgen.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: valgen.h 68217 2011-07-09 23:37:28Z VZ $ // Copyright: (c) 1999 Julian Smart (assigned from Kevin) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -16,6 +16,7 @@ #if wxUSE_VALIDATORS class WXDLLIMPEXP_FWD_BASE wxDateTime; +class WXDLLIMPEXP_FWD_BASE wxFileName; // ---------------------------------------------------------------------------- // wxGenericValidator performs data transfer between many standard controls and @@ -42,6 +43,13 @@ public: // wxDatePickerCtrl wxGenericValidator(wxDateTime* val); #endif // wxUSE_DATETIME + // wxTextCtrl + wxGenericValidator(wxFileName* val); + // wxTextCtrl + wxGenericValidator(float* val); + // wxTextCtrl + wxGenericValidator(double* val); + wxGenericValidator(const wxGenericValidator& copyFrom); virtual ~wxGenericValidator(){} @@ -73,6 +81,9 @@ protected: #if wxUSE_DATETIME wxDateTime* m_pDateTime; #endif // wxUSE_DATETIME + wxFileName* m_pFileName; + float* m_pFloat; + double* m_pDouble; private: DECLARE_CLASS(wxGenericValidator) diff --git a/Externals/wxWidgets3/include/wx/vector.h b/Externals/wxWidgets3/include/wx/vector.h index 1d785e949d..e95d4103ef 100644 --- a/Externals/wxWidgets3/include/wx/vector.h +++ b/Externals/wxWidgets3/include/wx/vector.h @@ -14,7 +14,7 @@ #include "wx/defs.h" -#if wxUSE_STL +#if wxUSE_STD_CONTAINERS #include #include @@ -26,7 +26,7 @@ inline void wxVectorSort(wxVector& v) std::sort(v.begin(), v.end()); } -#else // !wxUSE_STL +#else // !wxUSE_STD_CONTAINERS #include "wx/utils.h" #include "wx/scopeguard.h" @@ -457,7 +457,7 @@ namespace wxPrivate template struct wxVectorComparator { - static int wxCMPFUNC_CONV + static int Compare(const void* pitem1, const void* pitem2, const void* ) { const T& item1 = *reinterpret_cast(pitem1); @@ -485,7 +485,7 @@ void wxVectorSort(wxVector& v) -#endif // wxUSE_STL/!wxUSE_STL +#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS #if WXWIN_COMPATIBILITY_2_8 #define WX_DECLARE_VECTORBASE(obj, cls) typedef wxVector cls diff --git a/Externals/wxWidgets3/include/wx/version.h b/Externals/wxWidgets3/include/wx/version.h index 67888da9d6..fb634a97fb 100644 --- a/Externals/wxWidgets3/include/wx/version.h +++ b/Externals/wxWidgets3/include/wx/version.h @@ -4,7 +4,7 @@ * Author: Julian Smart * Modified by: Ryan Norton (Converted to C) * Created: 29/01/98 - * RCS-ID: $Id: version.h 65038 2010-07-22 12:09:04Z VZ $ + * RCS-ID: $Id: version.h 70021 2011-12-16 22:12:49Z VZ $ * Copyright: (c) 1998 Julian Smart * Licence: wxWindows licence */ @@ -28,9 +28,9 @@ /* NB: this file is parsed by automatic tools so don't change its format! */ #define wxMAJOR_VERSION 2 #define wxMINOR_VERSION 9 -#define wxRELEASE_NUMBER 2 +#define wxRELEASE_NUMBER 4 #define wxSUBRELEASE_NUMBER 0 -#define wxVERSION_STRING wxT("wxWidgets 2.9.2") +#define wxVERSION_STRING wxT("wxWidgets 2.9.4") /* nothing to update below this line when updating the version */ /* ---------------------------------------------------------------------------- */ diff --git a/Externals/wxWidgets3/include/wx/vscroll.h b/Externals/wxWidgets3/include/wx/vscroll.h index d13ecf26f7..6bf9623c36 100644 --- a/Externals/wxWidgets3/include/wx/vscroll.h +++ b/Externals/wxWidgets3/include/wx/vscroll.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: Brad Anderson, Bryan Petty // Created: 30.05.03 -// RCS-ID: $Id: vscroll.h 64943 2010-07-13 13:29:58Z VZ $ +// RCS-ID: $Id: vscroll.h 70085 2011-12-22 01:26:11Z RD $ // Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -236,7 +236,7 @@ protected: #ifdef __WXMAC__ // queue mac window update after handling scroll event - virtual void UpdateMacScrollWindow() = 0; + virtual void UpdateMacScrollWindow() { } #endif // __WXMAC__ // change the target window diff --git a/Externals/wxWidgets3/include/wx/webview.h b/Externals/wxWidgets3/include/wx/webview.h new file mode 100644 index 0000000000..993d99cfa5 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/webview.h @@ -0,0 +1,242 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: webview.h +// Purpose: Common interface and events for web view component +// Author: Marianne Gagnon +// Id: $Id: webview.h 70038 2011-12-17 23:52:40Z VZ $ +// Copyright: (c) 2010 Marianne Gagnon, 2011 Steven Lamerton +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_WEB_VIEW_H_ +#define _WX_WEB_VIEW_H_ + +#include "wx/defs.h" + +#if wxUSE_WEBVIEW + +#include "wx/control.h" +#include "wx/event.h" +#include "wx/sstream.h" +#include "wx/sharedptr.h" +#include "wx/vector.h" + +#if defined(__WXOSX__) + #include "wx/osx/webviewhistoryitem_webkit.h" +#elif defined(__WXGTK__) + #include "wx/gtk/webviewhistoryitem_webkit.h" +#elif defined(__WXMSW__) + #include "wx/msw/webviewhistoryitem_ie.h" +#else + #error "wxWebView not implemented on this platform." +#endif + +class wxFSFile; +class wxFileSystem; + +enum wxWebViewZoom +{ + wxWEB_VIEW_ZOOM_TINY, + wxWEB_VIEW_ZOOM_SMALL, + wxWEB_VIEW_ZOOM_MEDIUM, + wxWEB_VIEW_ZOOM_LARGE, + wxWEB_VIEW_ZOOM_LARGEST +}; + +enum wxWebViewZoomType +{ + //Scales entire page, including images + wxWEB_VIEW_ZOOM_TYPE_LAYOUT, + wxWEB_VIEW_ZOOM_TYPE_TEXT +}; + +enum wxWebViewNavigationError +{ + wxWEB_NAV_ERR_CONNECTION, + wxWEB_NAV_ERR_CERTIFICATE, + wxWEB_NAV_ERR_AUTH, + wxWEB_NAV_ERR_SECURITY, + wxWEB_NAV_ERR_NOT_FOUND, + wxWEB_NAV_ERR_REQUEST, + wxWEB_NAV_ERR_USER_CANCELLED, + wxWEB_NAV_ERR_OTHER +}; + +enum wxWebViewReloadFlags +{ + //Default, may access cache + wxWEB_VIEW_RELOAD_DEFAULT, + wxWEB_VIEW_RELOAD_NO_CACHE +}; + +enum wxWebViewBackend +{ + wxWEB_VIEW_BACKEND_DEFAULT, + wxWEB_VIEW_BACKEND_WEBKIT, + wxWEB_VIEW_BACKEND_IE +}; + +//Base class for custom scheme handlers +class WXDLLIMPEXP_WEBVIEW wxWebViewHandler +{ +public: + wxWebViewHandler(const wxString& scheme) : m_scheme(scheme) {} + virtual ~wxWebViewHandler() {} + virtual wxString GetName() const { return m_scheme; } + virtual wxFSFile* GetFile(const wxString &uri) = 0; +private: + wxString m_scheme; +}; + +extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewNameStr[]; +extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewDefaultURLStr[]; + +class WXDLLIMPEXP_WEBVIEW wxWebView : public wxControl +{ +public: + virtual ~wxWebView() {} + + virtual bool Create(wxWindow* parent, + wxWindowID id, + const wxString& url = wxWebViewDefaultURLStr, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxWebViewNameStr) = 0; + + static wxWebView* New(wxWebViewBackend backend = wxWEB_VIEW_BACKEND_DEFAULT); + static wxWebView* New(wxWindow* parent, + wxWindowID id, + const wxString& url = wxWebViewDefaultURLStr, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + wxWebViewBackend backend = wxWEB_VIEW_BACKEND_DEFAULT, + long style = 0, + const wxString& name = wxWebViewNameStr); + + //General methods + virtual wxString GetCurrentTitle() const = 0; + virtual wxString GetCurrentURL() const = 0; + // TODO: handle choosing a frame when calling GetPageSource()? + virtual wxString GetPageSource() const = 0; + virtual wxString GetPageText() const = 0; + virtual bool IsBusy() const = 0; + virtual bool IsEditable() const = 0; + virtual void LoadURL(const wxString& url) = 0; + virtual void Print() = 0; + virtual void RegisterHandler(wxSharedPtr handler) = 0; + virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT) = 0; + virtual void RunScript(const wxString& javascript) = 0; + virtual void SetEditable(bool enable = true) = 0; + virtual void SetPage(const wxString& html, const wxString& baseUrl) = 0; + virtual void SetPage(wxInputStream& html, wxString baseUrl) + { + wxStringOutputStream stream; + stream.Write(html); + SetPage(stream.GetString(), baseUrl); + } + virtual void Stop() = 0; + + //History + virtual bool CanGoBack() const = 0; + virtual bool CanGoForward() const = 0; + virtual void GoBack() = 0; + virtual void GoForward() = 0; + virtual void ClearHistory() = 0; + virtual void EnableHistory(bool enable = true) = 0; + virtual wxVector > GetBackwardHistory() = 0; + virtual wxVector > GetForwardHistory() = 0; + virtual void LoadHistoryItem(wxSharedPtr item) = 0; + + //Zoom + virtual bool CanSetZoomType(wxWebViewZoomType type) const = 0; + virtual wxWebViewZoom GetZoom() const = 0; + virtual wxWebViewZoomType GetZoomType() const = 0; + virtual void SetZoom(wxWebViewZoom zoom) = 0; + virtual void SetZoomType(wxWebViewZoomType zoomType) = 0; + + //Selection + virtual void SelectAll() = 0; + virtual bool HasSelection() const = 0; + virtual void DeleteSelection() = 0; + virtual wxString GetSelectedText() const = 0; + virtual wxString GetSelectedSource() const = 0; + virtual void ClearSelection() = 0; + + //Clipboard functions + virtual bool CanCut() const = 0; + virtual bool CanCopy() const = 0; + virtual bool CanPaste() const = 0; + virtual void Cut() = 0; + virtual void Copy() = 0; + virtual void Paste() = 0; + + //Undo / redo functionality + virtual bool CanUndo() const = 0; + virtual bool CanRedo() const = 0; + virtual void Undo() = 0; + virtual void Redo() = 0; + + wxDECLARE_ABSTRACT_CLASS(wxWebView); +}; + +class WXDLLIMPEXP_WEBVIEW wxWebViewEvent : public wxNotifyEvent +{ +public: + wxWebViewEvent() {} + wxWebViewEvent(wxEventType type, int id, const wxString url, + const wxString target) + : wxNotifyEvent(type, id), m_url(url), m_target(target) + {} + + + const wxString& GetURL() const { return m_url; } + const wxString& GetTarget() const { return m_target; } + + virtual wxEvent* Clone() const { return new wxWebViewEvent(*this); } +private: + wxString m_url; + wxString m_target; + + wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWebViewEvent); +}; + +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebViewEvent ); +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebViewEvent ); +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebViewEvent ); +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebViewEvent ); +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, wxWebViewEvent ); +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, wxWebViewEvent ); + +typedef void (wxEvtHandler::*wxWebViewEventFunction) + (wxWebViewEvent&); + +#define wxWebViewEventHandler(func) \ + wxEVENT_HANDLER_CAST(wxWebViewEventFunction, func) + +#define EVT_WEB_VIEW_NAVIGATING(id, fn) \ + wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_NAVIGATING, id, \ + wxWebViewEventHandler(fn)) + +#define EVT_WEB_VIEW_NAVIGATED(id, fn) \ + wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_NAVIGATED, id, \ + wxWebViewEventHandler(fn)) + +#define EVT_WEB_VIEW_LOADED(id, fn) \ + wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_LOADED, id, \ + wxWebViewEventHandler(fn)) + +#define EVT_WEB_VIEW_ERROR(id, fn) \ + wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_ERROR, id, \ + wxWebViewEventHandler(fn)) + +#define EVT_WEB_VIEW_NEWWINDOW(id, fn) \ + wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, id, \ + wxWebViewEventHandler(fn)) + +#define EVT_WEB_VIEW_TITLE_CHANGED(id, fn) \ + wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, id, \ + wxWebViewEventHandler(fn)) + +#endif // wxUSE_WEBVIEW + +#endif // _WX_WEB_VIEW_H_ diff --git a/Externals/wxWidgets3/include/wx/webviewarchivehandler.h b/Externals/wxWidgets3/include/wx/webviewarchivehandler.h new file mode 100644 index 0000000000..4cd91dc4af --- /dev/null +++ b/Externals/wxWidgets3/include/wx/webviewarchivehandler.h @@ -0,0 +1,37 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: webviewarchivehandler.h +// Purpose: Custom webview handler to allow archive browsing +// Author: Steven Lamerton +// Id: $Id: webviewarchivehandler.h 69316 2011-10-05 21:21:51Z SJL $ +// Copyright: (c) 2011 Steven Lamerton +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_WEB_VIEW_FILE_HANDLER_H_ +#define _WX_WEB_VIEW_FILE_HANDLER_H_ + +#include "wx/setup.h" + +#if wxUSE_WEBVIEW + +class wxFSFile; +class wxFileSystem; + +#include "wx/webview.h" + +//Loads from uris such as scheme:///C:/example/example.html or archives such as +//scheme:///C:/example/example.zip;protocol=zip/example.html + +class WXDLLIMPEXP_WEBVIEW wxWebViewArchiveHandler : public wxWebViewHandler +{ +public: + wxWebViewArchiveHandler(const wxString& scheme); + virtual ~wxWebViewArchiveHandler(); + virtual wxFSFile* GetFile(const wxString &uri); +private: + wxFileSystem* m_fileSystem; +}; + +#endif // wxUSE_WEBVIEW + +#endif // _WX_WEB_VIEW_FILE_HANDLER_H_ diff --git a/Externals/wxWidgets3/include/wx/window.h b/Externals/wxWidgets3/include/wx/window.h index e108fac563..3ec3b57692 100644 --- a/Externals/wxWidgets3/include/wx/window.h +++ b/Externals/wxWidgets3/include/wx/window.h @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: Ron Lee // Created: 01/02/97 -// RCS-ID: $Id: window.h 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: window.h 70838 2012-03-07 23:50:21Z VZ $ // Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -480,7 +480,7 @@ public: // windows this is just the client area of the window, but for // some like scrolled windows it is more or less independent of // the screen window size. You may override the DoXXXVirtual - // methods below for classes where that is is the case. + // methods below for classes where that is the case. void SetVirtualSize( const wxSize &size ) { DoSetVirtualSize( size.x, size.y ); } void SetVirtualSize( int x, int y ) { DoSetVirtualSize( x, y ); } @@ -623,9 +623,10 @@ public: bool HasExtraStyle(int exFlag) const { return (m_exStyle & exFlag) != 0; } +#if WXWIN_COMPATIBILITY_2_8 // make the window modal (all other windows unresponsive) - virtual void MakeModal(bool modal = true); - + wxDEPRECATED( virtual void MakeModal(bool modal = true) ); +#endif // (primitive) theming support // --------------------------- @@ -1029,8 +1030,7 @@ public: wxColour GetForegroundColour() const; // Set/get the background style. - virtual bool SetBackgroundStyle(wxBackgroundStyle style) - { m_backgroundStyle = style; return true; } + virtual bool SetBackgroundStyle(wxBackgroundStyle style); wxBackgroundStyle GetBackgroundStyle() const { return m_backgroundStyle; } @@ -1039,6 +1039,13 @@ public: // from a parent window virtual bool HasTransparentBackground() { return false; } + // Returns true if background transparency is supported for this + // window, i.e. if calling SetBackgroundStyle(wxBG_STYLE_TRANSPARENT) + // has a chance of succeeding. If reason argument is non-NULL, returns a + // user-readable explanation of why it isn't supported if the return + // value is false. + virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const; + // set/retrieve the font for the window (SetFont() returns true if the // font really changed) virtual bool SetFont(const wxFont& font) = 0; @@ -1254,6 +1261,15 @@ public: // get the associated tooltip or NULL if none wxToolTip* GetToolTip() const { return m_tooltip; } wxString GetToolTipText() const; + + // Use the same tool tip as the given one (which can be NULL to indicate + // that no tooltip should be used) for this window. This is currently only + // used by wxCompositeWindow::DoSetToolTip() implementation and is not part + // of the public wx API. + // + // Returns true if tip was valid and we copied it or false if it was NULL + // and we reset our own tooltip too. + bool CopyToolTip(wxToolTip *tip); #else // !wxUSE_TOOLTIPS // make it much easier to compile apps in an environment // that doesn't support tooltips, such as PocketPC @@ -1422,6 +1438,15 @@ public: virtual wxWindow *GetMainWindowOfCompositeControl() { return (wxWindow*)this; } + // If this function returns true, keyboard navigation events shouldn't + // escape from it. A typical example of such "navigation domain" is a top + // level window because pressing TAB in one of them must not transfer focus + // to a different top level window. But it's not limited to them, e.g. MDI + // children frames are not top level windows (and their IsTopLevel() + // returns false) but still are self-contained navigation domains as well. + virtual bool IsTopNavigationDomain() const { return false; } + + protected: // helper for the derived class Create() methods: the first overload, with // validator parameter, should be used for child windows while the second @@ -1794,14 +1819,7 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size) // ---------------------------------------------------------------------------- // include the declaration of the platform-specific class -#if defined(__WXPALMOS__) - #ifdef __WXUNIVERSAL__ - #define wxWindowNative wxWindowPalm - #else // !wxUniv - #define wxWindowPalm wxWindow - #endif // wxUniv/!wxUniv - #include "wx/palmos/window.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #ifdef __WXUNIVERSAL__ #define wxWindowNative wxWindowMSW #else // !wxUniv @@ -1831,9 +1849,6 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size) #define wxWindowX11 wxWindow #endif // wxUniv #include "wx/x11/window.h" -#elif defined(__WXMGL__) - #define wxWindowNative wxWindowMGL - #include "wx/mgl/window.h" #elif defined(__WXDFB__) #define wxWindowNative wxWindowDFB #include "wx/dfb/window.h" diff --git a/Externals/wxWidgets3/include/wx/withimages.h b/Externals/wxWidgets3/include/wx/withimages.h new file mode 100644 index 0000000000..f8ce1c85e4 --- /dev/null +++ b/Externals/wxWidgets3/include/wx/withimages.h @@ -0,0 +1,97 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/withimages.h +// Purpose: Declaration of a simple wxWithImages class. +// Author: Vadim Zeitlin +// Created: 2011-08-17 +// RCS-ID: $Id: withimages.h 68813 2011-08-21 14:52:16Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_WITHIMAGES_H_ +#define _WX_WITHIMAGES_H_ + +#include "wx/defs.h" +#include "wx/icon.h" +#include "wx/imaglist.h" + +// ---------------------------------------------------------------------------- +// wxWithImages: mix-in class providing access to wxImageList. +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxWithImages +{ +public: + enum + { + NO_IMAGE = -1 + }; + + wxWithImages() + { + m_imageList = NULL; + m_ownsImageList = false; + } + + virtual ~wxWithImages() + { + FreeIfNeeded(); + } + + // Sets the image list to use, it is *not* deleted by the control. + virtual void SetImageList(wxImageList* imageList) + { + FreeIfNeeded(); + m_imageList = imageList; + } + + // As SetImageList() but we will delete the image list ourselves. + void AssignImageList(wxImageList* imageList) + { + SetImageList(imageList); + m_ownsImageList = true; + } + + // Get pointer (may be NULL) to the associated image list. + wxImageList* GetImageList() const { return m_imageList; } + +protected: + // Return true if we have a valid image list. + bool HasImageList() const { return m_imageList != NULL; } + + // Return the image with the given index from the image list. + // + // If there is no image list or if index == NO_IMAGE, silently returns + // wxNullIcon. + wxIcon GetImage(int iconIndex) const + { + return m_imageList && iconIndex != NO_IMAGE + ? m_imageList->GetIcon(iconIndex) + : wxNullIcon; + } + +private: + // Free the image list if necessary, i.e. if we own it. + void FreeIfNeeded() + { + if ( m_ownsImageList ) + { + delete m_imageList; + m_imageList = NULL; + + // We don't own it any more. + m_ownsImageList = false; + } + } + + + // The associated image list or NULL. + wxImageList* m_imageList; + + // False by default, if true then we delete m_imageList. + bool m_ownsImageList; + + wxDECLARE_NO_COPY_CLASS(wxWithImages); +}; + +#endif // _WX_WITHIMAGES_H_ diff --git a/Externals/wxWidgets3/include/wx/wizard.h b/Externals/wxWidgets3/include/wx/wizard.h index 997631bfb4..bd23ce582a 100644 --- a/Externals/wxWidgets3/include/wx/wizard.h +++ b/Externals/wxWidgets3/include/wx/wizard.h @@ -9,7 +9,7 @@ // Added wxWIZARD_HELP event // Robert Vazan (sizers) // Created: 15.08.99 -// RCS-ID: $Id: wizard.h 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: wizard.h 70630 2012-02-20 11:38:52Z JS $ // Copyright: (c) 1999 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -291,6 +291,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_CANCEL, wxWizardEvent ); wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_HELP, wxWizardEvent ); wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_FINISHED, wxWizardEvent ); wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_PAGE_SHOWN, wxWizardEvent ); +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_WIZARD_BEFORE_PAGE_CHANGED, wxWizardEvent ); typedef void (wxEvtHandler::*wxWizardEventFunction)(wxWizardEvent&); @@ -307,6 +308,10 @@ typedef void (wxEvtHandler::*wxWizardEventFunction)(wxWizardEvent&); // changed - unless the event handler vetoes the event #define EVT_WIZARD_PAGE_CHANGING(id, fn) wx__DECLARE_WIZARDEVT(PAGE_CHANGING, id, fn) +// Called before GetNext/GetPrev is called, so that the handler can change state that will be +// used when GetNext/GetPrev is called. PAGE_CHANGING is called too late to influence GetNext/GetPrev. +#define EVT_WIZARD_BEFORE_PAGE_CHANGED(id, fn) wx__DECLARE_WIZARDEVT(BEFORE_PAGE_CHANGED, id, fn) + // the user pressed "Cancel" button and the wizard is going to be dismissed - // unless the event handler vetoes the event #define EVT_WIZARD_CANCEL(id, fn) wx__DECLARE_WIZARDEVT(CANCEL, id, fn) diff --git a/Externals/wxWidgets3/include/wx/wxcrt.h b/Externals/wxWidgets3/include/wx/wxcrt.h index 19cb0d6258..e464e36c80 100644 --- a/Externals/wxWidgets3/include/wx/wxcrt.h +++ b/Externals/wxWidgets3/include/wx/wxcrt.h @@ -5,7 +5,7 @@ // Author: Joel Farley, Ove Kaaven // Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee, Vaclav Slavik // Created: 1998/06/12 -// RCS-ID: $Id: wxcrt.h 66798 2011-01-28 06:18:33Z PC $ +// RCS-ID: $Id: wxcrt.h 68594 2011-08-08 08:33:19Z VZ $ // Copyright: (c) 1998-2006 wxWidgets dev team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -467,7 +467,7 @@ WX_STRCMP_FUNC(wxStricmp, wxCRT_StricmpA, wxCRT_StricmpW, wxStricmp_String) // forward-declare the template and implement it below WX_STRCMP_FUNC. OTOH, // this fails to compile with VC6, so don't do it for VC. It also causes // problems with GCC visibility in newer GCC versions. -#if !(defined(__VISUALC__) || wxCHECK_GCC_VERSION(3,5)) || defined(__clang__) +#if !(defined(__VISUALC__) || (wxCHECK_GCC_VERSION(3,5) && !wxCHECK_GCC_VERSION(4,7))) || defined(__clang__) #define wxNEEDS_DECL_BEFORE_TEMPLATE #endif diff --git a/Externals/wxWidgets3/include/wx/wxcrtbase.h b/Externals/wxWidgets3/include/wx/wxcrtbase.h index 845a443c45..4d3d9ebb22 100644 --- a/Externals/wxWidgets3/include/wx/wxcrtbase.h +++ b/Externals/wxWidgets3/include/wx/wxcrtbase.h @@ -5,7 +5,7 @@ * Author: Joel Farley, Ove Kaaven * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee * Created: 1998/06/12 - * RCS-ID: $Id: wxcrtbase.h 66446 2010-12-25 14:18:58Z VZ $ + * RCS-ID: $Id: wxcrtbase.h 70345 2012-01-15 01:05:28Z VZ $ * Copyright: (c) 1998-2006 wxWidgets dev team * Licence: wxWindows licence */ @@ -32,17 +32,11 @@ */ -#if !defined(__WXPALMOS5__) #include #include #include -#if defined(__WXPALMOS__) - #include -#else - #include -#endif +#include #include -#endif #if defined(__WINDOWS__) && !defined(__WXWINCE__) #include @@ -179,7 +173,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size ); #define wxCRT_StrstrW wcsstr /* these functions are not defined under CE, at least in VC8 CRT */ -#if !defined(__WXWINCE__) && !defined(__WXPALMOS__) +#if !defined(__WXWINCE__) #define wxCRT_StrcollA strcoll #define wxCRT_StrxfrmA strxfrm @@ -188,9 +182,12 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size ); #endif /* __WXWINCE__ */ /* Almost all compiler have strdup(), but not quite all: CodeWarrior under - Mac and VC++ for Windows CE don't provide it; additionally, gcc under - Mac and OpenVMS do not have wcsdup: */ -#if defined(__VISUALC__) && __VISUALC__ >= 1400 + Mac and VC++ for Windows CE don't provide it. Another special case is gcc in + strict ANSI mode: normally it doesn't provide strdup() but MinGW does + provide it under MSVC-compatible name so test for it before checking + __WX_STRICT_ANSI_GCC__. */ +#if (defined(__VISUALC__) && __VISUALC__ >= 1400) || \ + defined(__MINGW32__) #define wxCRT_StrdupA _strdup #elif !((defined(__MWERKS__) && defined(__WXMAC__)) || \ defined(__WXWINCE__) || \ @@ -198,7 +195,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size ); #define wxCRT_StrdupA strdup #endif -// most Windows compilers provide _wcsdup() +/* most Windows compilers provide _wcsdup() */ #if defined(__WINDOWS__) && \ !(defined(__CYGWIN__) || defined(__WX_STRICT_ANSI_GCC__)) #define wxCRT_StrdupW _wcsdup @@ -271,12 +268,6 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size ); defined(__EMX__) || defined(__DJGPP__) #define wxCRT_StricmpA stricmp #define wxCRT_StrnicmpA strnicmp -#elif defined(__WXPALMOS__) - /* FIXME: There is no equivalent to strnicmp in the Palm OS API. This - * quick hack should do until one can be written. - */ - #define wxCRT_StricmpA StrCaselessCompare - #define wxCRT_StrnicmpA StrNCaselessCompare #elif defined(__SYMANTEC__) || defined(__VISUALC__) || \ (defined(__MWERKS__) && defined(__INTEL__)) #define wxCRT_StricmpA _stricmp @@ -449,14 +440,14 @@ WXDLLIMPEXP_BASE wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wcha wchar_t** endptr, int base); #endif -#endif // wxLongLong_t +#endif /* wxLongLong_t */ /* ------------------------------------------------------------------------- stdio.h ------------------------------------------------------------------------- */ -#if defined(__UNIX__) || defined(__WXMAC__) || defined(__WXPALMOS__) +#if defined(__UNIX__) || defined(__WXMAC__) #define wxMBFILES 1 #else #define wxMBFILES 0 @@ -616,12 +607,9 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name); #if defined(__MWERKS__) && defined(__MSL__) #define wxNEED_WX_MBSTOWCS #endif -#if defined(__WXPALMOS__) - #define wxNEED_WX_MBSTOWCS -#endif #ifdef __DARWIN__ - #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 + #if !defined(__WXOSX_IPHONE__) && MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 #define wxNEED_WX_MBSTOWCS #endif #endif @@ -664,13 +652,14 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name); _xpg5_wcsftime(wchar_t *, size_t, const wchar_t *, const struct tm * ); #define wxCRT_StrftimeW _xpg5_wcsftime #else - // Assume it's always available under non-Unix systems with the exception - // of Palm OS, this does seem to be the case for now. And under Unix we - // trust configure to detect it (except for SGI special case above). - #if defined(HAVE_WCSFTIME) || \ - !(defined(__UNIX__) || defined(__WXPALMOS__)) + /* + Assume it's always available under non-Unix systems as this does seem + to be the case for now. And under Unix we trust configure to detect it + (except for SGI special case above). + */ + #if defined(HAVE_WCSFTIME) || !defined(__UNIX__) #define wxCRT_StrftimeW wcsftime - #endif /* ! __WXPALMOS__ */ + #endif #endif #ifndef wxCRT_StrftimeW diff --git a/Externals/wxWidgets3/include/wx/wxprec.h b/Externals/wxWidgets3/include/wx/wxprec.h index 48f0034877..d1e3fe8a30 100644 --- a/Externals/wxWidgets3/include/wx/wxprec.h +++ b/Externals/wxWidgets3/include/wx/wxprec.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: wxprec.h 61724 2009-08-21 10:41:26Z VZ $ +// RCS-ID: $Id: wxprec.h 70353 2012-01-15 14:46:41Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -49,21 +49,11 @@ #include "wx/msw/missing.h" #endif -// include all PalmOS headers at once -#ifdef __WXPALMOS__ -# include -#endif - // include #ifdef __OS2__ # include "wx/os2/private.h" #endif -// include mgl headers -#ifdef __WXMGL__ -# include "wx/mgl/private.h" -#endif - // include the most common wx headers #include "wx/wx.h" diff --git a/Externals/wxWidgets3/include/wx/xti.h b/Externals/wxWidgets3/include/wx/xti.h index 34bcdeece5..abd8ae0934 100644 --- a/Externals/wxWidgets3/include/wx/xti.h +++ b/Externals/wxWidgets3/include/wx/xti.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: Francesco Montorsi // Created: 27/07/03 -// RCS-ID: $Id: xti.h 66646 2011-01-07 22:52:46Z SC $ +// RCS-ID: $Id: xti.h 70396 2012-01-19 09:00:29Z SC $ // Copyright: (c) 1997 Julian Smart // (c) 2003 Stefan Csomor // Licence: wxWindows licence @@ -96,7 +96,7 @@ typedef bool (*wxObjectStreamingCallback) ( const wxObject *, wxObjectWriter *, class WXDLLIMPEXP_BASE wxClassInfo { friend class WXDLLIMPEXP_BASE wxPropertyInfo; - friend class WXDLLIMPEXP_BASE wxHandlerInfo; + friend class /* WXDLLIMPEXP_BASE */ wxHandlerInfo; friend wxObject *wxCreateDynamicObject(const wxString& name); public: @@ -333,7 +333,6 @@ private: wxPropertyInfoFn m_firstPropertyFn; wxHandlerInfoFn m_firstHandlerFn; - mutable bool m_firstInited; protected: void EnsureInfosInited() const @@ -351,6 +350,8 @@ protected: mutable wxHandlerInfo* m_firstHandler; private: + mutable bool m_firstInited; + const wxClassInfo** m_parents; const wxChar* m_unitName; diff --git a/Externals/wxWidgets3/include/wx/xtiprop.h b/Externals/wxWidgets3/include/wx/xtiprop.h index 464047004e..75539f51e4 100644 --- a/Externals/wxWidgets3/include/wx/xtiprop.h +++ b/Externals/wxWidgets3/include/wx/xtiprop.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: Francesco Montorsi // Created: 27/07/03 -// RCS-ID: $Id: xtiprop.h 66651 2011-01-08 10:22:30Z SC $ +// RCS-ID: $Id: xtiprop.h 70398 2012-01-19 09:50:46Z SC $ // Copyright: (c) 1997 Julian Smart // (c) 2003 Stefan Csomor // Licence: wxWindows licence @@ -20,9 +20,11 @@ #include "wx/xti.h" #include "wx/any.h" +/* class WXDLLIMPEXP_BASE wxObject; class WXDLLIMPEXP_BASE wxClassInfo; class WXDLLIMPEXP_BASE wxDynamicClassInfo; +*/ class WXDLLIMPEXP_BASE wxHashTable; class WXDLLIMPEXP_BASE wxHashTable_Node; class WXDLLIMPEXP_BASE wxEvent; @@ -302,7 +304,7 @@ enum class WXDLLIMPEXP_BASE wxPropertyInfo { - friend class WXDLLIMPEXP_BASE wxDynamicClassInfo; + friend class /* WXDLLIMPEXP_BASE */ wxDynamicClassInfo; public: wxPropertyInfo(wxPropertyInfo* &iter, @@ -443,9 +445,20 @@ private: // when the component is dropped on the container. }; -WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxPropertyInfo*, wxPropertyInfoMap, +// stl is giving problems when forwarding declarations, therefore we define it as a subclass + +WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxPropertyInfo*, wxPropertyInfoMapBase, class WXDLLIMPEXP_BASE ); +class WXDLLIMPEXP_BASE wxPropertyInfoMap : public wxPropertyInfoMapBase { +}; + +WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxAny, wxStringToAnyHashMapBase, + class WXDLLIMPEXP_BASE ); + +class WXDLLIMPEXP_FWD_BASE wxStringToAnyHashMap : public wxStringToAnyHashMapBase { +}; + #define wxBEGIN_PROPERTIES_TABLE(theClass) \ wxPropertyInfo *theClass::GetPropertiesStatic() \ { \ @@ -544,8 +557,5 @@ public: \ void Set##name( type const & p) { m_##name = p; } \ type const & Get##name() const { return m_##name; } -WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxAny, wxStringToAnyHashMap, - class WXDLLIMPEXP_BASE ); - #endif // wxUSE_EXTENDED_RTTI #endif // _XTIPROP_H_ diff --git a/Externals/wxWidgets3/include/wx/xtistrm.h b/Externals/wxWidgets3/include/wx/xtistrm.h index 2a5369240a..e304803494 100644 --- a/Externals/wxWidgets3/include/wx/xtistrm.h +++ b/Externals/wxWidgets3/include/wx/xtistrm.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 27/07/03 -// RCS-ID: $Id: xtistrm.h 66621 2011-01-07 17:22:59Z SC $ +// RCS-ID: $Id: xtistrm.h 70396 2012-01-19 09:00:29Z SC $ // Copyright: (c) 2003 Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -38,14 +38,16 @@ const int wxNullObjectID = -3; // or modify the value before it is streamed-out. // ---------------------------------------------------------------------------- +/* + class WXDLLIMPEXP_BASE wxClassInfo; + class WXDLLIMPEXP_BASE wxAnyList; + class WXDLLIMPEXP_BASE wxPropertyInfo; + class WXDLLIMPEXP_BASE wxAny; + class WXDLLIMPEXP_BASE wxHandlerInfo; + */ + class WXDLLIMPEXP_BASE wxObjectWriter; class WXDLLIMPEXP_BASE wxObjectReader; -class WXDLLIMPEXP_BASE wxClassInfo; -class WXDLLIMPEXP_BASE wxAnyList; -class WXDLLIMPEXP_BASE wxPropertyInfo; -class WXDLLIMPEXP_BASE wxAny; -class WXDLLIMPEXP_BASE wxObjectWriter; -class WXDLLIMPEXP_BASE wxHandlerInfo; class WXDLLIMPEXP_BASE wxObjectWriterCallback { diff --git a/Externals/wxWidgets3/include/wx/xtitypes.h b/Externals/wxWidgets3/include/wx/xtitypes.h index 2f689d3126..6724bf4c35 100644 --- a/Externals/wxWidgets3/include/wx/xtitypes.h +++ b/Externals/wxWidgets3/include/wx/xtitypes.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: Francesco Montorsi // Created: 27/07/03 -// RCS-ID: $Id: xtitypes.h 66651 2011-01-08 10:22:30Z SC $ +// RCS-ID: $Id: xtitypes.h 70384 2012-01-18 14:05:39Z SC $ // Copyright: (c) 1997 Julian Smart // (c) 2003 Stefan Csomor // Licence: wxWindows licence @@ -88,7 +88,7 @@ private: wxEnumData s_enumData##e( s_enumDataMembers##e ); \ wxEnumData *wxGetEnumData(e) { return &s_enumData##e; } \ template<> void wxStringReadValue(const wxString& s, e &data ) \ - { data = (e) s_enumData##e.GetEnumMemberValue(s); } \ + { data = (e) s_enumData##e.GetEnumMemberValue(s.c_str()); } \ template<> void wxStringWriteValue(wxString &s, const e &data ) \ { s = s_enumData##e.GetEnumMemberName((int)data); } \ void FromLong##e( long data, wxAny& result ) \ @@ -147,7 +147,7 @@ void wxSetFromString(const wxString &s, wxBitset &data ) { flag = array[i]; int ivalue; - if ( edata->HasEnumMemberValue( flag, &ivalue ) ) + if ( edata->HasEnumMemberValue( flag.c_str(), &ivalue ) ) { data.set( (e) ivalue ); } @@ -202,7 +202,7 @@ void wxFlagsFromString(const wxString &s, e &data ) { flag = array[i]; int ivalue; - if ( edata->HasEnumMemberValue( flag, &ivalue ) ) + if ( edata->HasEnumMemberValue( flag.c_str(), &ivalue ) ) { data.m_data |= ivalue; } @@ -355,7 +355,7 @@ public: if ( m_toString ) (*m_toString)( data, result ); else - wxLogError( wxGetTranslation(_T("String conversions not supported")) ); + wxLogError( wxGetTranslation(wxT("String conversions not supported")) ); } // convert a string into a wxAny holding the corresponding data in this type @@ -364,7 +364,7 @@ public: if( m_fromString ) (*m_fromString)( data, result ); else - wxLogError( wxGetTranslation(_T("String conversions not supported")) ); + wxLogError( wxGetTranslation(wxT("String conversions not supported")) ); } // statics: @@ -428,7 +428,7 @@ public: if( m_toLong ) (*m_toLong)( data, result ); else - wxLogError( wxGetTranslation(_T("Long Conversions not supported")) ); + wxLogError( wxGetTranslation(wxT("Long Conversions not supported")) ); } // convert a long into a wxAny holding the corresponding data in this type @@ -437,7 +437,7 @@ public: if( m_fromLong ) (*m_fromLong)( data, result ); else - wxLogError( wxGetTranslation(_T("Long Conversions not supported")) ); + wxLogError( wxGetTranslation(wxT("Long Conversions not supported")) ); } private: diff --git a/Externals/wxWidgets3/include/wx/xtixml.h b/Externals/wxWidgets3/include/wx/xtixml.h index b68f02438a..5eaf03fa51 100644 --- a/Externals/wxWidgets3/include/wx/xtixml.h +++ b/Externals/wxWidgets3/include/wx/xtixml.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 27/07/03 -// RCS-ID: $Id: xtixml.h 66621 2011-01-07 17:22:59Z SC $ +// RCS-ID: $Id: xtixml.h 70397 2012-01-19 09:45:49Z SC $ // Copyright: (c) 2003 Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,6 +19,7 @@ #include "wx/string.h" #include "wx/xtistrm.h" +/* class WXDLLIMPEXP_XML wxXmlNode; class WXDLLIMPEXP_BASE wxPropertyInfo; class WXDLLIMPEXP_BASE wxObject; @@ -26,6 +27,7 @@ class WXDLLIMPEXP_BASE wxClassInfo; class WXDLLIMPEXP_BASE wxAnyList; class WXDLLIMPEXP_BASE wxHandlerInfo; class WXDLLIMPEXP_BASE wxObjectWriterCallback; +*/ class WXDLLIMPEXP_XML wxObjectXmlWriter: public wxObjectWriter { diff --git a/Externals/wxWidgets3/src/aui/auibar.cpp b/Externals/wxWidgets3/src/aui/auibar.cpp index 6e9eb92037..b6654e2fb4 100644 --- a/Externals/wxWidgets3/src/aui/auibar.cpp +++ b/Externals/wxWidgets3/src/aui/auibar.cpp @@ -5,7 +5,7 @@ // Author: Benjamin I. Williams // Modified by: // Created: 2005-05-17 -// RCS-ID: $Id: auibar.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: auibar.cpp 70748 2012-02-29 13:58:52Z VZ $ // Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved // Licence: wxWindows Library Licence, Version 3.1 /////////////////////////////////////////////////////////////////////////////// @@ -69,60 +69,25 @@ const int BUTTON_DROPDOWN_WIDTH = 10; wxBitmap wxAuiBitmapFromBits(const unsigned char bits[], int w, int h, const wxColour& color); -static wxBitmap MakeDisabledBitmap(wxBitmap& bmp) -{ - wxImage image = bmp.ConvertToImage(); - - int mr, mg, mb; - mr = image.GetMaskRed(); - mg = image.GetMaskGreen(); - mb = image.GetMaskBlue(); - - unsigned char* data = image.GetData(); - int width = image.GetWidth(); - int height = image.GetHeight(); - bool has_mask = image.HasMask(); - - for (int y = height-1; y >= 0; --y) - { - for (int x = width-1; x >= 0; --x) - { - data = image.GetData() + (y*(width*3))+(x*3); - unsigned char* r = data; - unsigned char* g = data+1; - unsigned char* b = data+2; - - if (has_mask && *r == mr && *g == mg && *b == mb) - continue; - - *r = wxColour::AlphaBlend(*r, 255, 0.4); - *g = wxColour::AlphaBlend(*g, 255, 0.4); - *b = wxColour::AlphaBlend(*b, 255, 0.4); - } - } - - return wxBitmap(image); -} - static wxColor GetBaseColor() { #if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON - wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground)); + wxColor baseColour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground)); #else - wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); + wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); #endif - // the base_colour is too pale to use as our base colour, + // the baseColour is too pale to use as our base colour, // so darken it a bit -- - if ((255-base_colour.Red()) + - (255-base_colour.Green()) + - (255-base_colour.Blue()) < 60) + if ((255-baseColour.Red()) + + (255-baseColour.Green()) + + (255-baseColour.Blue()) < 60) { - base_colour = base_colour.ChangeLightness(92); + baseColour = baseColour.ChangeLightness(92); } - return base_colour; + return baseColour; } @@ -131,14 +96,14 @@ class ToolbarCommandCapture : public wxEvtHandler { public: - ToolbarCommandCapture() { m_last_id = 0; } - int GetCommandId() const { return m_last_id; } + ToolbarCommandCapture() { m_lastId = 0; } + int GetCommandId() const { return m_lastId; } bool ProcessEvent(wxEvent& evt) { if (evt.GetEventType() == wxEVT_COMMAND_MENU_SELECTED) { - m_last_id = evt.GetId(); + m_lastId = evt.GetId(); return true; } @@ -149,7 +114,7 @@ public: } private: - int m_last_id; + int m_lastId; }; @@ -162,36 +127,36 @@ const wxColour DISABLED_TEXT_COLOR(DISABLED_TEXT_GREY_HUE, wxAuiDefaultToolBarArt::wxAuiDefaultToolBarArt() { - m_base_colour = GetBaseColor(); + m_baseColour = GetBaseColor(); m_flags = 0; - m_text_orientation = wxAUI_TBTOOL_TEXT_BOTTOM; - m_highlight_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); + m_textOrientation = wxAUI_TBTOOL_TEXT_BOTTOM; + m_highlightColour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); - m_separator_size = 7; - m_gripper_size = 7; - m_overflow_size = 16; + m_separatorSize = 7; + m_gripperSize = 7; + m_overflowSize = 16; - wxColor darker1_colour = m_base_colour.ChangeLightness(85); - wxColor darker2_colour = m_base_colour.ChangeLightness(75); - wxColor darker3_colour = m_base_colour.ChangeLightness(60); - wxColor darker4_colour = m_base_colour.ChangeLightness(50); - wxColor darker5_colour = m_base_colour.ChangeLightness(40); + wxColor darker1Colour = m_baseColour.ChangeLightness(85); + wxColor darker2Colour = m_baseColour.ChangeLightness(75); + wxColor darker3Colour = m_baseColour.ChangeLightness(60); + wxColor darker4Colour = m_baseColour.ChangeLightness(50); + wxColor darker5Colour = m_baseColour.ChangeLightness(40); - m_gripper_pen1 = wxPen(darker5_colour); - m_gripper_pen2 = wxPen(darker3_colour); - m_gripper_pen3 = *wxWHITE_PEN; + m_gripperPen1 = wxPen(darker5Colour); + m_gripperPen2 = wxPen(darker3Colour); + m_gripperPen3 = *wxWHITE_PEN; - static const unsigned char button_dropdown_bits[] = { 0xe0, 0xf1, 0xfb }; - static const unsigned char overflow_bits[] = { 0x80, 0xff, 0x80, 0xc1, 0xe3, 0xf7 }; + static const unsigned char buttonDropdownBits[] = { 0xe0, 0xf1, 0xfb }; + static const unsigned char overflowBits[] = { 0x80, 0xff, 0x80, 0xc1, 0xe3, 0xf7 }; - m_button_dropdown_bmp = wxAuiBitmapFromBits(button_dropdown_bits, 5, 3, + m_buttonDropDownBmp = wxAuiBitmapFromBits(buttonDropdownBits, 5, 3, *wxBLACK); - m_disabled_button_dropdown_bmp = wxAuiBitmapFromBits( - button_dropdown_bits, 5, 3, + m_disabledButtonDropDownBmp = wxAuiBitmapFromBits( + buttonDropdownBits, 5, 3, wxColor(128,128,128)); - m_overflow_bmp = wxAuiBitmapFromBits(overflow_bits, 7, 6, *wxBLACK); - m_disabled_overflow_bmp = wxAuiBitmapFromBits(overflow_bits, 7, 6, wxColor(128,128,128)); + m_overflowBmp = wxAuiBitmapFromBits(overflowBits, 7, 6, *wxBLACK); + m_disabledOverflowBmp = wxAuiBitmapFromBits(overflowBits, 7, 6, wxColor(128,128,128)); m_font = *wxNORMAL_FONT; } @@ -219,7 +184,7 @@ void wxAuiDefaultToolBarArt::SetFont(const wxFont& font) void wxAuiDefaultToolBarArt::SetTextOrientation(int orientation) { - m_text_orientation = orientation; + m_textOrientation = orientation; } unsigned int wxAuiDefaultToolBarArt::GetFlags() @@ -234,7 +199,7 @@ wxFont wxAuiDefaultToolBarArt::GetFont() int wxAuiDefaultToolBarArt::GetTextOrientation() { - return m_text_orientation; + return m_textOrientation; } void wxAuiDefaultToolBarArt::DrawBackground( @@ -244,9 +209,9 @@ void wxAuiDefaultToolBarArt::DrawBackground( { wxRect rect = _rect; rect.height++; - wxColour start_colour = m_base_colour.ChangeLightness(150); - wxColour end_colour = m_base_colour.ChangeLightness(90); - dc.GradientFillLinear(rect, start_colour, end_colour, wxSOUTH); + wxColour startColour = m_baseColour.ChangeLightness(150); + wxColour endColour = m_baseColour.ChangeLightness(90); + dc.GradientFillLinear(rect, startColour, endColour, wxSOUTH); } void wxAuiDefaultToolBarArt::DrawLabel( @@ -260,18 +225,18 @@ void wxAuiDefaultToolBarArt::DrawLabel( // we only care about the text height here since the text // will get cropped based on the width of the item - int text_width = 0, text_height = 0; - dc.GetTextExtent(wxT("ABCDHgj"), &text_width, &text_height); + int textWidth = 0, textHeight = 0; + dc.GetTextExtent(wxT("ABCDHgj"), &textWidth, &textHeight); // set the clipping region - wxRect clip_rect = rect; - clip_rect.width -= 1; - dc.SetClippingRegion(clip_rect); + wxRect clipRect = rect; + clipRect.width -= 1; + dc.SetClippingRegion(clipRect); - int text_x, text_y; - text_x = rect.x + 1; - text_y = rect.y + (rect.height-text_height)/2; - dc.DrawText(item.GetLabel(), text_x, text_y); + int textX, textY; + textX = rect.x + 1; + textY = rect.y + (rect.height-textHeight)/2; + dc.DrawText(item.GetLabel(), textX, textY); dc.DestroyClippingRegion(); } @@ -282,7 +247,7 @@ void wxAuiDefaultToolBarArt::DrawButton( const wxAuiToolBarItem& item, const wxRect& rect) { - int text_width = 0, text_height = 0; + int textWidth = 0, textHeight = 0; if (m_flags & wxAUI_TB_TEXT) { @@ -290,39 +255,39 @@ void wxAuiDefaultToolBarArt::DrawButton( int tx, ty; - dc.GetTextExtent(wxT("ABCDHgj"), &tx, &text_height); - text_width = 0; - dc.GetTextExtent(item.GetLabel(), &text_width, &ty); + dc.GetTextExtent(wxT("ABCDHgj"), &tx, &textHeight); + textWidth = 0; + dc.GetTextExtent(item.GetLabel(), &textWidth, &ty); } - int bmp_x = 0, bmp_y = 0; - int text_x = 0, text_y = 0; + int bmpX = 0, bmpY = 0; + int textX = 0, textY = 0; - if (m_text_orientation == wxAUI_TBTOOL_TEXT_BOTTOM) + if (m_textOrientation == wxAUI_TBTOOL_TEXT_BOTTOM) { - bmp_x = rect.x + + bmpX = rect.x + (rect.width/2) - (item.GetBitmap().GetWidth()/2); - bmp_y = rect.y + - ((rect.height-text_height)/2) - + bmpY = rect.y + + ((rect.height-textHeight)/2) - (item.GetBitmap().GetHeight()/2); - text_x = rect.x + (rect.width/2) - (text_width/2) + 1; - text_y = rect.y + rect.height - text_height - 1; + textX = rect.x + (rect.width/2) - (textWidth/2) + 1; + textY = rect.y + rect.height - textHeight - 1; } - else if (m_text_orientation == wxAUI_TBTOOL_TEXT_RIGHT) + else if (m_textOrientation == wxAUI_TBTOOL_TEXT_RIGHT) { - bmp_x = rect.x + 3; + bmpX = rect.x + 3; - bmp_y = rect.y + + bmpY = rect.y + (rect.height/2) - (item.GetBitmap().GetHeight()/2); - text_x = bmp_x + 3 + item.GetBitmap().GetWidth(); - text_y = rect.y + + textX = bmpX + 3 + item.GetBitmap().GetWidth(); + textY = rect.y + (rect.height/2) - - (text_height/2); + (textHeight/2); } @@ -330,19 +295,19 @@ void wxAuiDefaultToolBarArt::DrawButton( { if (item.GetState() & wxAUI_BUTTON_STATE_PRESSED) { - dc.SetPen(wxPen(m_highlight_colour)); - dc.SetBrush(wxBrush(m_highlight_colour.ChangeLightness(150))); + dc.SetPen(wxPen(m_highlightColour)); + dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(150))); dc.DrawRectangle(rect); } else if ((item.GetState() & wxAUI_BUTTON_STATE_HOVER) || item.IsSticky()) { - dc.SetPen(wxPen(m_highlight_colour)); - dc.SetBrush(wxBrush(m_highlight_colour.ChangeLightness(170))); + dc.SetPen(wxPen(m_highlightColour)); + dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(170))); // draw an even lighter background for checked item hovers (since // the hover background is the same color as the check background) if (item.GetState() & wxAUI_BUTTON_STATE_CHECKED) - dc.SetBrush(wxBrush(m_highlight_colour.ChangeLightness(180))); + dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(180))); dc.DrawRectangle(rect); } @@ -350,8 +315,8 @@ void wxAuiDefaultToolBarArt::DrawButton( { // it's important to put this code in an else statment after the // hover, otherwise hovers won't draw properly for checked items - dc.SetPen(wxPen(m_highlight_colour)); - dc.SetBrush(wxBrush(m_highlight_colour.ChangeLightness(170))); + dc.SetPen(wxPen(m_highlightColour)); + dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(170))); dc.DrawRectangle(rect); } } @@ -362,10 +327,8 @@ void wxAuiDefaultToolBarArt::DrawButton( else bmp = item.GetBitmap(); - if (!bmp.IsOk()) - return; - - dc.DrawBitmap(bmp, bmp_x, bmp_y, true); + if ( bmp.IsOk() ) + dc.DrawBitmap(bmp, bmpX, bmpY, true); // set the item's text color based on if it is disabled dc.SetTextForeground(*wxBLACK); @@ -374,7 +337,7 @@ void wxAuiDefaultToolBarArt::DrawButton( if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() ) { - dc.DrawText(item.GetLabel(), text_x, text_y); + dc.DrawText(item.GetLabel(), textX, textY); } } @@ -385,14 +348,14 @@ void wxAuiDefaultToolBarArt::DrawDropDownButton( const wxAuiToolBarItem& item, const wxRect& rect) { - int text_width = 0, text_height = 0, text_x = 0, text_y = 0; - int bmp_x = 0, bmp_y = 0, dropbmp_x = 0, dropbmp_y = 0; + int textWidth = 0, textHeight = 0, textX = 0, textY = 0; + int bmpX = 0, bmpY = 0, dropBmpX = 0, dropBmpY = 0; - wxRect button_rect = wxRect(rect.x, + wxRect buttonRect = wxRect(rect.x, rect.y, rect.width-BUTTON_DROPDOWN_WIDTH, rect.height); - wxRect dropdown_rect = wxRect(rect.x+rect.width-BUTTON_DROPDOWN_WIDTH-1, + wxRect dropDownRect = wxRect(rect.x+rect.width-BUTTON_DROPDOWN_WIDTH-1, rect.y, BUTTON_DROPDOWN_WIDTH+1, rect.height); @@ -404,66 +367,75 @@ void wxAuiDefaultToolBarArt::DrawDropDownButton( int tx, ty; if (m_flags & wxAUI_TB_TEXT) { - dc.GetTextExtent(wxT("ABCDHgj"), &tx, &text_height); - text_width = 0; + dc.GetTextExtent(wxT("ABCDHgj"), &tx, &textHeight); + textWidth = 0; } - dc.GetTextExtent(item.GetLabel(), &text_width, &ty); + dc.GetTextExtent(item.GetLabel(), &textWidth, &ty); } - dropbmp_x = dropdown_rect.x + - (dropdown_rect.width/2) - - (m_button_dropdown_bmp.GetWidth()/2); - dropbmp_y = dropdown_rect.y + - (dropdown_rect.height/2) - - (m_button_dropdown_bmp.GetHeight()/2); + dropBmpX = dropDownRect.x + + (dropDownRect.width/2) - + (m_buttonDropDownBmp.GetWidth()/2); + dropBmpY = dropDownRect.y + + (dropDownRect.height/2) - + (m_buttonDropDownBmp.GetHeight()/2); - if (m_text_orientation == wxAUI_TBTOOL_TEXT_BOTTOM) + if (m_textOrientation == wxAUI_TBTOOL_TEXT_BOTTOM) { - bmp_x = button_rect.x + - (button_rect.width/2) - + bmpX = buttonRect.x + + (buttonRect.width/2) - (item.GetBitmap().GetWidth()/2); - bmp_y = button_rect.y + - ((button_rect.height-text_height)/2) - + bmpY = buttonRect.y + + ((buttonRect.height-textHeight)/2) - (item.GetBitmap().GetHeight()/2); - text_x = rect.x + (rect.width/2) - (text_width/2) + 1; - text_y = rect.y + rect.height - text_height - 1; + textX = rect.x + (rect.width/2) - (textWidth/2) + 1; + textY = rect.y + rect.height - textHeight - 1; } - else if (m_text_orientation == wxAUI_TBTOOL_TEXT_RIGHT) + else if (m_textOrientation == wxAUI_TBTOOL_TEXT_RIGHT) { - bmp_x = rect.x + 3; + bmpX = rect.x + 3; - bmp_y = rect.y + + bmpY = rect.y + (rect.height/2) - (item.GetBitmap().GetHeight()/2); - text_x = bmp_x + 3 + item.GetBitmap().GetWidth(); - text_y = rect.y + + textX = bmpX + 3 + item.GetBitmap().GetWidth(); + textY = rect.y + (rect.height/2) - - (text_height/2); + (textHeight/2); } if (item.GetState() & wxAUI_BUTTON_STATE_PRESSED) { - dc.SetPen(wxPen(m_highlight_colour)); - dc.SetBrush(wxBrush(m_highlight_colour.ChangeLightness(140))); - dc.DrawRectangle(button_rect); + dc.SetPen(wxPen(m_highlightColour)); + dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(140))); + dc.DrawRectangle(buttonRect); - dc.SetBrush(wxBrush(m_highlight_colour.ChangeLightness(170))); - dc.DrawRectangle(dropdown_rect); + dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(170))); + dc.DrawRectangle(dropDownRect); } else if (item.GetState() & wxAUI_BUTTON_STATE_HOVER || item.IsSticky()) { - dc.SetPen(wxPen(m_highlight_colour)); - dc.SetBrush(wxBrush(m_highlight_colour.ChangeLightness(170))); - dc.DrawRectangle(button_rect); - dc.DrawRectangle(dropdown_rect); + dc.SetPen(wxPen(m_highlightColour)); + dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(170))); + dc.DrawRectangle(buttonRect); + dc.DrawRectangle(dropDownRect); + } + else if (item.GetState() & wxAUI_BUTTON_STATE_CHECKED) + { + // Notice that this branch must come after the hover one to ensure the + // correct appearance when the mouse hovers over a checked item.m_ + dc.SetPen(wxPen(m_highlightColour)); + dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(170))); + dc.DrawRectangle(buttonRect); + dc.DrawRectangle(dropDownRect); } wxBitmap bmp; @@ -471,19 +443,19 @@ void wxAuiDefaultToolBarArt::DrawDropDownButton( if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED) { bmp = item.GetDisabledBitmap(); - dropbmp = m_disabled_button_dropdown_bmp; + dropbmp = m_disabledButtonDropDownBmp; } else { bmp = item.GetBitmap(); - dropbmp = m_button_dropdown_bmp; + dropbmp = m_buttonDropDownBmp; } if (!bmp.IsOk()) return; - dc.DrawBitmap(bmp, bmp_x, bmp_y, true); - dc.DrawBitmap(dropbmp, dropbmp_x, dropbmp_y, true); + dc.DrawBitmap(bmp, bmpX, bmpY, true); + dc.DrawBitmap(dropbmp, dropBmpX, dropBmpY, true); // set the item's text color based on if it is disabled dc.SetTextForeground(*wxBLACK); @@ -492,7 +464,7 @@ void wxAuiDefaultToolBarArt::DrawDropDownButton( if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() ) { - dc.DrawText(item.GetLabel(), text_x, text_y); + dc.DrawText(item.GetLabel(), textX, textY); } } @@ -505,36 +477,36 @@ void wxAuiDefaultToolBarArt::DrawControlLabel( if (!(m_flags & wxAUI_TB_TEXT)) return; - if (m_text_orientation != wxAUI_TBTOOL_TEXT_BOTTOM) + if (m_textOrientation != wxAUI_TBTOOL_TEXT_BOTTOM) return; - int text_x = 0, text_y = 0; - int text_width = 0, text_height = 0; + int textX = 0, textY = 0; + int textWidth = 0, textHeight = 0; dc.SetFont(m_font); int tx, ty; if (m_flags & wxAUI_TB_TEXT) { - dc.GetTextExtent(wxT("ABCDHgj"), &tx, &text_height); - text_width = 0; + dc.GetTextExtent(wxT("ABCDHgj"), &tx, &textHeight); + textWidth = 0; } - dc.GetTextExtent(item.GetLabel(), &text_width, &ty); + dc.GetTextExtent(item.GetLabel(), &textWidth, &ty); // don't draw the label if it is wider than the item width - if (text_width > rect.width) + if (textWidth > rect.width) return; // set the label's text color dc.SetTextForeground(*wxBLACK); - text_x = rect.x + (rect.width/2) - (text_width/2) + 1; - text_y = rect.y + rect.height - text_height - 1; + textX = rect.x + (rect.width/2) - (textWidth/2) + 1; + textY = rect.y + rect.height - textHeight - 1; if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() ) { - dc.DrawText(item.GetLabel(), text_x, text_y); + dc.DrawText(item.GetLabel(), textX, textY); } } @@ -577,7 +549,7 @@ wxSize wxAuiDefaultToolBarArt::GetToolSize( dc.SetFont(m_font); int tx, ty; - if (m_text_orientation == wxAUI_TBTOOL_TEXT_BOTTOM) + if (m_textOrientation == wxAUI_TBTOOL_TEXT_BOTTOM) { dc.GetTextExtent(wxT("ABCDHgj"), &tx, &ty); height += ty; @@ -588,7 +560,7 @@ wxSize wxAuiDefaultToolBarArt::GetToolSize( width = wxMax(width, tx+6); } } - else if ( m_text_orientation == wxAUI_TBTOOL_TEXT_RIGHT && + else if ( m_textOrientation == wxAUI_TBTOOL_TEXT_RIGHT && !item.GetLabel().empty() ) { width += 3; // space between left border and bitmap @@ -638,9 +610,9 @@ void wxAuiDefaultToolBarArt::DrawSeparator( rect.width = new_width; } - wxColour start_colour = m_base_colour.ChangeLightness(80); - wxColour end_colour = m_base_colour.ChangeLightness(80); - dc.GradientFillLinear(rect, start_colour, end_colour, horizontal ? wxSOUTH : wxEAST); + wxColour startColour = m_baseColour.ChangeLightness(80); + wxColour endColour = m_baseColour.ChangeLightness(80); + dc.GradientFillLinear(rect, startColour, endColour, horizontal ? wxSOUTH : wxEAST); } void wxAuiDefaultToolBarArt::DrawGripper(wxDC& dc, @@ -667,12 +639,12 @@ void wxAuiDefaultToolBarArt::DrawGripper(wxDC& dc, break; } - dc.SetPen(m_gripper_pen1); + dc.SetPen(m_gripperPen1); dc.DrawPoint(x, y); - dc.SetPen(m_gripper_pen2); + dc.SetPen(m_gripperPen2); dc.DrawPoint(x, y+1); dc.DrawPoint(x+1, y); - dc.SetPen(m_gripper_pen3); + dc.SetPen(m_gripperPen3); dc.DrawPoint(x+2, y+1); dc.DrawPoint(x+2, y+2); dc.DrawPoint(x+1, y+2); @@ -683,19 +655,18 @@ void wxAuiDefaultToolBarArt::DrawGripper(wxDC& dc, } void wxAuiDefaultToolBarArt::DrawOverflowButton(wxDC& dc, - wxWindow* wnd, + wxWindow* /*wnd*/, const wxRect& rect, int state) { if (state & wxAUI_BUTTON_STATE_HOVER || state & wxAUI_BUTTON_STATE_PRESSED) { - wxRect cli_rect = wnd->GetClientRect(); - wxColor light_gray_bg = m_highlight_colour.ChangeLightness(170); + wxColor light_gray_bg = m_highlightColour.ChangeLightness(170); if (m_flags & wxAUI_TB_VERTICAL) { - dc.SetPen(wxPen(m_highlight_colour)); + dc.SetPen(wxPen(m_highlightColour)); dc.DrawLine(rect.x, rect.y, rect.x+rect.width, rect.y); dc.SetPen(wxPen(light_gray_bg)); dc.SetBrush(wxBrush(light_gray_bg)); @@ -703,7 +674,7 @@ void wxAuiDefaultToolBarArt::DrawOverflowButton(wxDC& dc, } else { - dc.SetPen(wxPen(m_highlight_colour)); + dc.SetPen(wxPen(m_highlightColour)); dc.DrawLine(rect.x, rect.y, rect.x, rect.y+rect.height); dc.SetPen(wxPen(light_gray_bg)); dc.SetBrush(wxBrush(light_gray_bg)); @@ -711,18 +682,18 @@ void wxAuiDefaultToolBarArt::DrawOverflowButton(wxDC& dc, } } - int x = rect.x+1+(rect.width-m_overflow_bmp.GetWidth())/2; - int y = rect.y+1+(rect.height-m_overflow_bmp.GetHeight())/2; - dc.DrawBitmap(m_overflow_bmp, x, y, true); + int x = rect.x+1+(rect.width-m_overflowBmp.GetWidth())/2; + int y = rect.y+1+(rect.height-m_overflowBmp.GetHeight())/2; + dc.DrawBitmap(m_overflowBmp, x, y, true); } int wxAuiDefaultToolBarArt::GetElementSize(int element_id) { switch (element_id) { - case wxAUI_TBART_SEPARATOR_SIZE: return m_separator_size; - case wxAUI_TBART_GRIPPER_SIZE: return m_gripper_size; - case wxAUI_TBART_OVERFLOW_SIZE: return m_overflow_size; + case wxAUI_TBART_SEPARATOR_SIZE: return m_separatorSize; + case wxAUI_TBART_GRIPPER_SIZE: return m_gripperSize; + case wxAUI_TBART_OVERFLOW_SIZE: return m_overflowSize; default: return 0; } } @@ -731,9 +702,9 @@ void wxAuiDefaultToolBarArt::SetElementSize(int element_id, int size) { switch (element_id) { - case wxAUI_TBART_SEPARATOR_SIZE: m_separator_size = size; break; - case wxAUI_TBART_GRIPPER_SIZE: m_gripper_size = size; break; - case wxAUI_TBART_OVERFLOW_SIZE: m_overflow_size = size; break; + case wxAUI_TBART_SEPARATOR_SIZE: m_separatorSize = size; break; + case wxAUI_TBART_GRIPPER_SIZE: m_gripperSize = size; break; + case wxAUI_TBART_OVERFLOW_SIZE: m_overflowSize = size; break; } } @@ -840,18 +811,18 @@ wxAuiToolBar::wxAuiToolBar(wxWindow* parent, style | wxBORDER_NONE) { m_sizer = new wxBoxSizer(wxHORIZONTAL); - m_button_width = -1; - m_button_height = -1; - m_sizer_element_count = 0; - m_action_pos = wxPoint(-1,-1); - m_action_item = NULL; - m_tip_item = NULL; + m_buttonWidth = -1; + m_buttonHeight = -1; + m_sizerElementCount = 0; + m_actionPos = wxPoint(-1,-1); + m_actionItem = NULL; + m_tipItem = NULL; m_art = new wxAuiDefaultToolBarArt; - m_tool_packing = 2; - m_tool_border_padding = 3; - m_tool_text_orientation = wxAUI_TBTOOL_TEXT_BOTTOM; - m_gripper_sizer_item = NULL; - m_overflow_sizer_item = NULL; + m_toolPacking = 2; + m_toolBorderPadding = 3; + m_toolTextOrientation = wxAUI_TBTOOL_TEXT_BOTTOM; + m_gripperSizerItem = NULL; + m_overflowSizerItem = NULL; m_dragging = false; m_orientation = GetOrientation(style); if (m_orientation == wxBOTH) @@ -859,9 +830,9 @@ wxAuiToolBar::wxAuiToolBar(wxWindow* parent, m_orientation = wxHORIZONTAL; } m_style = style | wxBORDER_NONE; - m_gripper_visible = (m_style & wxAUI_TB_GRIPPER) ? true : false; - m_overflow_visible = (m_style & wxAUI_TB_OVERFLOW) ? true : false; - m_overflow_state = 0; + m_gripperVisible = (m_style & wxAUI_TB_GRIPPER) ? true : false; + m_overflowVisible = (m_style & wxAUI_TB_OVERFLOW) ? true : false; + m_overflowState = 0; SetMargins(5, 5, 2, 2); SetFont(*wxNORMAL_FONT); SetArtFlags(); @@ -894,15 +865,15 @@ void wxAuiToolBar::SetWindowStyleFlag(long style) } if (m_style & wxAUI_TB_GRIPPER) - m_gripper_visible = true; + m_gripperVisible = true; else - m_gripper_visible = false; + m_gripperVisible = false; if (m_style & wxAUI_TB_OVERFLOW) - m_overflow_visible = true; + m_overflowVisible = true; else - m_overflow_visible = false; + m_overflowVisible = false; if (style & wxAUI_TB_HORZ_LAYOUT) SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT); @@ -924,7 +895,7 @@ void wxAuiToolBar::SetArtProvider(wxAuiToolBarArt* art) if (m_art) { SetArtFlags(); - m_art->SetTextOrientation(m_tool_text_orientation); + m_art->SetTextOrientation(m_toolTextOrientation); } } @@ -939,7 +910,7 @@ wxAuiToolBarArt* wxAuiToolBar::GetArtProvider() const wxAuiToolBarItem* wxAuiToolBar::AddTool(int tool_id, const wxString& label, const wxBitmap& bitmap, - const wxString& short_help_string, + const wxString& shortHelp_string, wxItemKind kind) { return AddTool(tool_id, @@ -947,7 +918,7 @@ wxAuiToolBarItem* wxAuiToolBar::AddTool(int tool_id, bitmap, wxNullBitmap, kind, - short_help_string, + shortHelp_string, wxEmptyString, NULL); } @@ -956,43 +927,40 @@ wxAuiToolBarItem* wxAuiToolBar::AddTool(int tool_id, wxAuiToolBarItem* wxAuiToolBar::AddTool(int tool_id, const wxString& label, const wxBitmap& bitmap, - const wxBitmap& disabled_bitmap, + const wxBitmap& disabledBitmap, wxItemKind kind, - const wxString& short_help_string, - const wxString& long_help_string, + const wxString& shortHelpString, + const wxString& longHelpString, wxObject* WXUNUSED(client_data)) { wxAuiToolBarItem item; - item.window = NULL; - item.label = label; - item.bitmap = bitmap; - item.disabled_bitmap = disabled_bitmap; - item.short_help = short_help_string; - item.long_help = long_help_string; - item.active = true; - item.dropdown = false; - item.spacer_pixels = 0; - item.toolid = tool_id; - item.state = 0; - item.proportion = 0; - item.kind = kind; - item.sizer_item = NULL; - item.min_size = wxDefaultSize; - item.user_data = 0; - item.sticky = false; + item.m_window = NULL; + item.m_label = label; + item.m_bitmap = bitmap; + item.m_disabledBitmap = disabledBitmap; + item.m_shortHelp = shortHelpString; + item.m_longHelp = longHelpString; + item.m_active = true; + item.m_dropDown = false; + item.m_spacerPixels = 0; + item.m_toolId = tool_id; + item.m_state = 0; + item.m_proportion = 0; + item.m_kind = kind; + item.m_sizerItem = NULL; + item.m_minSize = wxDefaultSize; + item.m_userData = 0; + item.m_sticky = false; - if (item.toolid == wxID_ANY) - item.toolid = wxNewId(); + if (item.m_toolId == wxID_ANY) + item.m_toolId = wxNewId(); - if (!item.disabled_bitmap.IsOk()) + if (!item.m_disabledBitmap.IsOk()) { // no disabled bitmap specified, we need to make one - if (item.bitmap.IsOk()) + if (item.m_bitmap.IsOk()) { - //wxImage img = item.bitmap.ConvertToImage(); - //wxImage grey_version = img.ConvertToGreyscale(); - //item.disabled_bitmap = wxBitmap(grey_version); - item.disabled_bitmap = MakeDisabledBitmap(item.bitmap); + item.m_disabledBitmap = item.m_bitmap.ConvertToDisabled(); } } m_items.Add(item); @@ -1003,21 +971,21 @@ wxAuiToolBarItem* wxAuiToolBar::AddControl(wxControl* control, const wxString& label) { wxAuiToolBarItem item; - item.window = (wxWindow*)control; - item.label = label; - item.bitmap = wxNullBitmap; - item.disabled_bitmap = wxNullBitmap; - item.active = true; - item.dropdown = false; - item.spacer_pixels = 0; - item.toolid = control->GetId(); - item.state = 0; - item.proportion = 0; - item.kind = wxITEM_CONTROL; - item.sizer_item = NULL; - item.min_size = control->GetEffectiveMinSize(); - item.user_data = 0; - item.sticky = false; + item.m_window = (wxWindow*)control; + item.m_label = label; + item.m_bitmap = wxNullBitmap; + item.m_disabledBitmap = wxNullBitmap; + item.m_active = true; + item.m_dropDown = false; + item.m_spacerPixels = 0; + item.m_toolId = control->GetId(); + item.m_state = 0; + item.m_proportion = 0; + item.m_kind = wxITEM_CONTROL; + item.m_sizerItem = NULL; + item.m_minSize = control->GetEffectiveMinSize(); + item.m_userData = 0; + item.m_sticky = false; m_items.Add(item); return &m_items.Last(); @@ -1032,24 +1000,24 @@ wxAuiToolBarItem* wxAuiToolBar::AddLabel(int tool_id, min_size.x = width; wxAuiToolBarItem item; - item.window = NULL; - item.label = label; - item.bitmap = wxNullBitmap; - item.disabled_bitmap = wxNullBitmap; - item.active = true; - item.dropdown = false; - item.spacer_pixels = 0; - item.toolid = tool_id; - item.state = 0; - item.proportion = 0; - item.kind = wxITEM_LABEL; - item.sizer_item = NULL; - item.min_size = min_size; - item.user_data = 0; - item.sticky = false; + item.m_window = NULL; + item.m_label = label; + item.m_bitmap = wxNullBitmap; + item.m_disabledBitmap = wxNullBitmap; + item.m_active = true; + item.m_dropDown = false; + item.m_spacerPixels = 0; + item.m_toolId = tool_id; + item.m_state = 0; + item.m_proportion = 0; + item.m_kind = wxITEM_LABEL; + item.m_sizerItem = NULL; + item.m_minSize = min_size; + item.m_userData = 0; + item.m_sticky = false; - if (item.toolid == wxID_ANY) - item.toolid = wxNewId(); + if (item.m_toolId == wxID_ANY) + item.m_toolId = wxNewId(); m_items.Add(item); return &m_items.Last(); @@ -1058,20 +1026,20 @@ wxAuiToolBarItem* wxAuiToolBar::AddLabel(int tool_id, wxAuiToolBarItem* wxAuiToolBar::AddSeparator() { wxAuiToolBarItem item; - item.window = NULL; - item.label = wxEmptyString; - item.bitmap = wxNullBitmap; - item.disabled_bitmap = wxNullBitmap; - item.active = true; - item.dropdown = false; - item.toolid = -1; - item.state = 0; - item.proportion = 0; - item.kind = wxITEM_SEPARATOR; - item.sizer_item = NULL; - item.min_size = wxDefaultSize; - item.user_data = 0; - item.sticky = false; + item.m_window = NULL; + item.m_label = wxEmptyString; + item.m_bitmap = wxNullBitmap; + item.m_disabledBitmap = wxNullBitmap; + item.m_active = true; + item.m_dropDown = false; + item.m_toolId = -1; + item.m_state = 0; + item.m_proportion = 0; + item.m_kind = wxITEM_SEPARATOR; + item.m_sizerItem = NULL; + item.m_minSize = wxDefaultSize; + item.m_userData = 0; + item.m_sticky = false; m_items.Add(item); return &m_items.Last(); @@ -1080,21 +1048,21 @@ wxAuiToolBarItem* wxAuiToolBar::AddSeparator() wxAuiToolBarItem* wxAuiToolBar::AddSpacer(int pixels) { wxAuiToolBarItem item; - item.window = NULL; - item.label = wxEmptyString; - item.bitmap = wxNullBitmap; - item.disabled_bitmap = wxNullBitmap; - item.active = true; - item.dropdown = false; - item.spacer_pixels = pixels; - item.toolid = -1; - item.state = 0; - item.proportion = 0; - item.kind = wxITEM_SPACER; - item.sizer_item = NULL; - item.min_size = wxDefaultSize; - item.user_data = 0; - item.sticky = false; + item.m_window = NULL; + item.m_label = wxEmptyString; + item.m_bitmap = wxNullBitmap; + item.m_disabledBitmap = wxNullBitmap; + item.m_active = true; + item.m_dropDown = false; + item.m_spacerPixels = pixels; + item.m_toolId = -1; + item.m_state = 0; + item.m_proportion = 0; + item.m_kind = wxITEM_SPACER; + item.m_sizerItem = NULL; + item.m_minSize = wxDefaultSize; + item.m_userData = 0; + item.m_sticky = false; m_items.Add(item); return &m_items.Last(); @@ -1103,21 +1071,21 @@ wxAuiToolBarItem* wxAuiToolBar::AddSpacer(int pixels) wxAuiToolBarItem* wxAuiToolBar::AddStretchSpacer(int proportion) { wxAuiToolBarItem item; - item.window = NULL; - item.label = wxEmptyString; - item.bitmap = wxNullBitmap; - item.disabled_bitmap = wxNullBitmap; - item.active = true; - item.dropdown = false; - item.spacer_pixels = 0; - item.toolid = -1; - item.state = 0; - item.proportion = proportion; - item.kind = wxITEM_SPACER; - item.sizer_item = NULL; - item.min_size = wxDefaultSize; - item.user_data = 0; - item.sticky = false; + item.m_window = NULL; + item.m_label = wxEmptyString; + item.m_bitmap = wxNullBitmap; + item.m_disabledBitmap = wxNullBitmap; + item.m_active = true; + item.m_dropDown = false; + item.m_spacerPixels = 0; + item.m_toolId = -1; + item.m_state = 0; + item.m_proportion = proportion; + item.m_kind = wxITEM_SPACER; + item.m_sizerItem = NULL; + item.m_minSize = wxDefaultSize; + item.m_userData = 0; + item.m_sticky = false; m_items.Add(item); return &m_items.Last(); @@ -1126,7 +1094,7 @@ wxAuiToolBarItem* wxAuiToolBar::AddStretchSpacer(int proportion) void wxAuiToolBar::Clear() { m_items.Clear(); - m_sizer_element_count = 0; + m_sizerElementCount = 0; } bool wxAuiToolBar::DeleteTool(int tool_id) @@ -1167,7 +1135,7 @@ wxAuiToolBarItem* wxAuiToolBar::FindTool(int tool_id) const for (i = 0, count = m_items.GetCount(); i < count; ++i) { wxAuiToolBarItem& item = m_items.Item(i); - if (item.toolid == tool_id) + if (item.m_toolId == tool_id) return &item; } @@ -1181,10 +1149,10 @@ wxAuiToolBarItem* wxAuiToolBar::FindToolByPosition(wxCoord x, wxCoord y) const { wxAuiToolBarItem& item = m_items.Item(i); - if (!item.sizer_item) + if (!item.m_sizerItem) continue; - wxRect rect = item.sizer_item->GetRect(); + wxRect rect = item.m_sizerItem->GetRect(); if (rect.Contains(x,y)) { // if the item doesn't fit on the toolbar, return NULL @@ -1205,14 +1173,14 @@ wxAuiToolBarItem* wxAuiToolBar::FindToolByPositionWithPacking(wxCoord x, wxCoord { wxAuiToolBarItem& item = m_items.Item(i); - if (!item.sizer_item) + if (!item.m_sizerItem) continue; - wxRect rect = item.sizer_item->GetRect(); + wxRect rect = item.m_sizerItem->GetRect(); // apply tool packing if (i+1 < count) - rect.width += m_tool_packing; + rect.width += m_toolPacking; if (rect.Contains(x,y)) { @@ -1255,7 +1223,7 @@ void wxAuiToolBar::SetToolProportion(int tool_id, int proportion) if (!item) return; - item->proportion = proportion; + item->m_proportion = proportion; } int wxAuiToolBar::GetToolProportion(int tool_id) const @@ -1264,7 +1232,7 @@ int wxAuiToolBar::GetToolProportion(int tool_id) const if (!item) return 0; - return item->proportion; + return item->m_proportion; } void wxAuiToolBar::SetToolSeparation(int separation) @@ -1288,7 +1256,7 @@ void wxAuiToolBar::SetToolDropDown(int tool_id, bool dropdown) if (!item) return; - item->dropdown = dropdown; + item->m_dropDown = dropdown; } bool wxAuiToolBar::GetToolDropDown(int tool_id) const @@ -1297,7 +1265,7 @@ bool wxAuiToolBar::GetToolDropDown(int tool_id) const if (!item) return 0; - return item->dropdown; + return item->m_dropDown; } void wxAuiToolBar::SetToolSticky(int tool_id, bool sticky) @@ -1310,10 +1278,10 @@ void wxAuiToolBar::SetToolSticky(int tool_id, bool sticky) if (!item) return; - if (item->sticky == sticky) + if (item->m_sticky == sticky) return; - item->sticky = sticky; + item->m_sticky = sticky; Refresh(false); Update(); @@ -1325,7 +1293,7 @@ bool wxAuiToolBar::GetToolSticky(int tool_id) const if (!item) return 0; - return item->sticky; + return item->m_sticky; } @@ -1333,17 +1301,17 @@ bool wxAuiToolBar::GetToolSticky(int tool_id) const void wxAuiToolBar::SetToolBorderPadding(int padding) { - m_tool_border_padding = padding; + m_toolBorderPadding = padding; } int wxAuiToolBar::GetToolBorderPadding() const { - return m_tool_border_padding; + return m_toolBorderPadding; } void wxAuiToolBar::SetToolTextOrientation(int orientation) { - m_tool_text_orientation = orientation; + m_toolTextOrientation = orientation; if (m_art) { @@ -1353,17 +1321,17 @@ void wxAuiToolBar::SetToolTextOrientation(int orientation) int wxAuiToolBar::GetToolTextOrientation() const { - return m_tool_text_orientation; + return m_toolTextOrientation; } void wxAuiToolBar::SetToolPacking(int packing) { - m_tool_packing = packing; + m_toolPacking = packing; } int wxAuiToolBar::GetToolPacking() const { - return m_tool_packing; + return m_toolPacking; } @@ -1382,23 +1350,23 @@ void wxAuiToolBar::SetOrientation(int orientation) void wxAuiToolBar::SetMargins(int left, int right, int top, int bottom) { if (left != -1) - m_left_padding = left; + m_leftPadding = left; if (right != -1) - m_right_padding = right; + m_rightPadding = right; if (top != -1) - m_top_padding = top; + m_topPadding = top; if (bottom != -1) - m_bottom_padding = bottom; + m_bottomPadding = bottom; } bool wxAuiToolBar::GetGripperVisible() const { - return m_gripper_visible; + return m_gripperVisible; } void wxAuiToolBar::SetGripperVisible(bool visible) { - m_gripper_visible = visible; + m_gripperVisible = visible; if (visible) m_style |= wxAUI_TB_GRIPPER; else @@ -1410,12 +1378,12 @@ void wxAuiToolBar::SetGripperVisible(bool visible) bool wxAuiToolBar::GetOverflowVisible() const { - return m_overflow_visible; + return m_overflowVisible; } void wxAuiToolBar::SetOverflowVisible(bool visible) { - m_overflow_visible = visible; + m_overflowVisible = visible; if (visible) m_style |= wxAUI_TB_OVERFLOW; else @@ -1444,14 +1412,14 @@ void wxAuiToolBar::SetHoverItem(wxAuiToolBarItem* pitem) for (i = 0, count = m_items.GetCount(); i < count; ++i) { wxAuiToolBarItem& item = m_items.Item(i); - if (item.state & wxAUI_BUTTON_STATE_HOVER) + if (item.m_state & wxAUI_BUTTON_STATE_HOVER) former_hover = &item; - item.state &= ~wxAUI_BUTTON_STATE_HOVER; + item.m_state &= ~wxAUI_BUTTON_STATE_HOVER; } if (pitem) { - pitem->state |= wxAUI_BUTTON_STATE_HOVER; + pitem->m_state |= wxAUI_BUTTON_STATE_HOVER; } if (former_hover != pitem) @@ -1469,15 +1437,15 @@ void wxAuiToolBar::SetPressedItem(wxAuiToolBarItem* pitem) for (i = 0, count = m_items.GetCount(); i < count; ++i) { wxAuiToolBarItem& item = m_items.Item(i); - if (item.state & wxAUI_BUTTON_STATE_PRESSED) + if (item.m_state & wxAUI_BUTTON_STATE_PRESSED) former_item = &item; - item.state &= ~wxAUI_BUTTON_STATE_PRESSED; + item.m_state &= ~wxAUI_BUTTON_STATE_PRESSED; } if (pitem) { - pitem->state &= ~wxAUI_BUTTON_STATE_HOVER; - pitem->state |= wxAUI_BUTTON_STATE_PRESSED; + pitem->m_state &= ~wxAUI_BUTTON_STATE_HOVER; + pitem->m_state |= wxAUI_BUTTON_STATE_PRESSED; } if (former_item != pitem) @@ -1489,9 +1457,9 @@ void wxAuiToolBar::SetPressedItem(wxAuiToolBarItem* pitem) void wxAuiToolBar::RefreshOverflowState() { - if (!m_overflow_sizer_item) + if (!m_overflowSizerItem) { - m_overflow_state = 0; + m_overflowState = 0; return; } @@ -1513,23 +1481,23 @@ void wxAuiToolBar::RefreshOverflowState() overflow_state = wxAUI_BUTTON_STATE_HOVER; } - if (overflow_state != m_overflow_state) + if (overflow_state != m_overflowState) { - m_overflow_state = overflow_state; + m_overflowState = overflow_state; Refresh(false); Update(); } - m_overflow_state = overflow_state; + m_overflowState = overflow_state; } void wxAuiToolBar::ToggleTool(int tool_id, bool state) { wxAuiToolBarItem* tool = FindTool(tool_id); - if (tool && (tool->kind == wxITEM_CHECK || tool->kind == wxITEM_RADIO)) + if (tool && (tool->m_kind == wxITEM_CHECK || tool->m_kind == wxITEM_RADIO)) { - if (tool->kind == wxITEM_RADIO) + if (tool->m_kind == wxITEM_RADIO) { int i, idx, count; idx = GetToolIndex(tool_id); @@ -1537,28 +1505,28 @@ void wxAuiToolBar::ToggleTool(int tool_id, bool state) if (idx >= 0 && idx < count) { - for (i = idx; i < count; ++i) + for (i = idx + 1; i < count; ++i) { - if (m_items[i].kind != wxITEM_RADIO) + if (m_items[i].m_kind != wxITEM_RADIO) break; - m_items[i].state &= ~wxAUI_BUTTON_STATE_CHECKED; + m_items[i].m_state &= ~wxAUI_BUTTON_STATE_CHECKED; } - for (i = idx; i > 0; i--) + for (i = idx - 1; i >= 0; i--) { - if (m_items[i].kind != wxITEM_RADIO) + if (m_items[i].m_kind != wxITEM_RADIO) break; - m_items[i].state &= ~wxAUI_BUTTON_STATE_CHECKED; + m_items[i].m_state &= ~wxAUI_BUTTON_STATE_CHECKED; } } - tool->state |= wxAUI_BUTTON_STATE_CHECKED; + tool->m_state |= wxAUI_BUTTON_STATE_CHECKED; } - else if (tool->kind == wxITEM_CHECK) + else if (tool->m_kind == wxITEM_CHECK) { if (state == true) - tool->state |= wxAUI_BUTTON_STATE_CHECKED; + tool->m_state |= wxAUI_BUTTON_STATE_CHECKED; else - tool->state &= ~wxAUI_BUTTON_STATE_CHECKED; + tool->m_state &= ~wxAUI_BUTTON_STATE_CHECKED; } } } @@ -1569,10 +1537,10 @@ bool wxAuiToolBar::GetToolToggled(int tool_id) const if (tool) { - if ( (tool->kind != wxITEM_CHECK) && (tool->kind != wxITEM_RADIO) ) + if ( (tool->m_kind != wxITEM_CHECK) && (tool->m_kind != wxITEM_RADIO) ) return false; - return (tool->state & wxAUI_BUTTON_STATE_CHECKED) ? true : false; + return (tool->m_state & wxAUI_BUTTON_STATE_CHECKED) ? true : false; } return false; @@ -1585,9 +1553,9 @@ void wxAuiToolBar::EnableTool(int tool_id, bool state) if (tool) { if (state == true) - tool->state &= ~wxAUI_BUTTON_STATE_DISABLED; + tool->m_state &= ~wxAUI_BUTTON_STATE_DISABLED; else - tool->state |= wxAUI_BUTTON_STATE_DISABLED; + tool->m_state |= wxAUI_BUTTON_STATE_DISABLED; } } @@ -1596,7 +1564,7 @@ bool wxAuiToolBar::GetToolEnabled(int tool_id) const wxAuiToolBarItem* tool = FindTool(tool_id); if (tool) - return (tool->state & wxAUI_BUTTON_STATE_DISABLED) ? false : true; + return (tool->m_state & wxAUI_BUTTON_STATE_DISABLED) ? false : true; return false; } @@ -1608,7 +1576,7 @@ wxString wxAuiToolBar::GetToolLabel(int tool_id) const if (!tool) return wxEmptyString; - return tool->label; + return tool->m_label; } void wxAuiToolBar::SetToolLabel(int tool_id, const wxString& label) @@ -1616,7 +1584,7 @@ void wxAuiToolBar::SetToolLabel(int tool_id, const wxString& label) wxAuiToolBarItem* tool = FindTool(tool_id); if (tool) { - tool->label = label; + tool->m_label = label; } } @@ -1627,7 +1595,7 @@ wxBitmap wxAuiToolBar::GetToolBitmap(int tool_id) const if (!tool) return wxNullBitmap; - return tool->bitmap; + return tool->m_bitmap; } void wxAuiToolBar::SetToolBitmap(int tool_id, const wxBitmap& bitmap) @@ -1635,7 +1603,7 @@ void wxAuiToolBar::SetToolBitmap(int tool_id, const wxBitmap& bitmap) wxAuiToolBarItem* tool = FindTool(tool_id); if (tool) { - tool->bitmap = bitmap; + tool->m_bitmap = bitmap; } } @@ -1646,7 +1614,7 @@ wxString wxAuiToolBar::GetToolShortHelp(int tool_id) const if (!tool) return wxEmptyString; - return tool->short_help; + return tool->m_shortHelp; } void wxAuiToolBar::SetToolShortHelp(int tool_id, const wxString& help_string) @@ -1654,7 +1622,7 @@ void wxAuiToolBar::SetToolShortHelp(int tool_id, const wxString& help_string) wxAuiToolBarItem* tool = FindTool(tool_id); if (tool) { - tool->short_help = help_string; + tool->m_shortHelp = help_string; } } @@ -1665,7 +1633,7 @@ wxString wxAuiToolBar::GetToolLongHelp(int tool_id) const if (!tool) return wxEmptyString; - return tool->long_help; + return tool->m_longHelp; } void wxAuiToolBar::SetToolLongHelp(int tool_id, const wxString& help_string) @@ -1673,15 +1641,15 @@ void wxAuiToolBar::SetToolLongHelp(int tool_id, const wxString& help_string) wxAuiToolBarItem* tool = FindTool(tool_id); if (tool) { - tool->long_help = help_string; + tool->m_longHelp = help_string; } } void wxAuiToolBar::SetCustomOverflowItems(const wxAuiToolBarItemArray& prepend, const wxAuiToolBarItemArray& append) { - m_custom_overflow_prepend = prepend; - m_custom_overflow_append = append; + m_customOverflowPrepend = prepend; + m_customOverflowAppend = append; } // get size of hint rectangle for a particular dock location @@ -1696,8 +1664,9 @@ wxSize wxAuiToolBar::GetHintSize(int dock_direction) const case wxAUI_DOCK_LEFT: return m_vertHintSize; default: - wxCHECK_MSG(false, wxDefaultSize, "invalid dock location value"); + wxFAIL_MSG("invalid dock location value"); } + return wxDefaultSize; } bool wxAuiToolBar::IsPaneValid(const wxAuiPaneInfo& pane) const @@ -1760,7 +1729,7 @@ int wxAuiToolBar::GetToolIndex(int tool_id) const for (i = 0; i < count; ++i) { wxAuiToolBarItem& item = m_items.Item(i); - if (item.toolid == tool_id) + if (item.m_toolId == tool_id) return i; } @@ -1772,19 +1741,19 @@ bool wxAuiToolBar::GetToolFitsByIndex(int tool_idx) const if (tool_idx < 0 || tool_idx >= (int)m_items.GetCount()) return false; - if (!m_items[tool_idx].sizer_item) + if (!m_items[tool_idx].m_sizerItem) return false; int cli_w, cli_h; GetClientSize(&cli_w, &cli_h); - wxRect rect = m_items[tool_idx].sizer_item->GetRect(); + wxRect rect = m_items[tool_idx].m_sizerItem->GetRect(); if (m_orientation == wxVERTICAL) { // take the dropdown size into account - if (m_overflow_visible) - cli_h -= m_overflow_sizer_item->GetSize().y; + if (m_overflowVisible) + cli_h -= m_overflowSizerItem->GetSize().y; if (rect.y+rect.height < cli_h) return true; @@ -1792,8 +1761,8 @@ bool wxAuiToolBar::GetToolFitsByIndex(int tool_idx) const else { // take the dropdown size into account - if (m_overflow_visible) - cli_w -= m_overflow_sizer_item->GetSize().x; + if (m_overflowVisible) + cli_w -= m_overflowSizerItem->GetSize().x; if (rect.x+rect.width < cli_w) return true; @@ -1811,9 +1780,9 @@ bool wxAuiToolBar::GetToolFits(int tool_id) const wxRect wxAuiToolBar::GetToolRect(int tool_id) const { wxAuiToolBarItem* tool = FindTool(tool_id); - if (tool && tool->sizer_item) + if (tool && tool->m_sizerItem) { - return tool->sizer_item->GetRect(); + return tool->m_sizerItem->GetRect(); } return wxRect(); @@ -1875,47 +1844,47 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal) wxBoxSizer* sizer = new wxBoxSizer(horizontal ? wxHORIZONTAL : wxVERTICAL); // add gripper area - int separator_size = m_art->GetElementSize(wxAUI_TBART_SEPARATOR_SIZE); - int gripper_size = m_art->GetElementSize(wxAUI_TBART_GRIPPER_SIZE); - if (gripper_size > 0 && m_gripper_visible) + int separatorSize = m_art->GetElementSize(wxAUI_TBART_SEPARATOR_SIZE); + int gripperSize = m_art->GetElementSize(wxAUI_TBART_GRIPPER_SIZE); + if (gripperSize > 0 && m_gripperVisible) { if (horizontal) - m_gripper_sizer_item = sizer->Add(gripper_size, 1, 0, wxEXPAND); + m_gripperSizerItem = sizer->Add(gripperSize, 1, 0, wxEXPAND); else - m_gripper_sizer_item = sizer->Add(1, gripper_size, 0, wxEXPAND); + m_gripperSizerItem = sizer->Add(1, gripperSize, 0, wxEXPAND); } else { - m_gripper_sizer_item = NULL; + m_gripperSizerItem = NULL; } // add "left" padding - if (m_left_padding > 0) + if (m_leftPadding > 0) { if (horizontal) - sizer->Add(m_left_padding, 1); + sizer->Add(m_leftPadding, 1); else - sizer->Add(1, m_left_padding); + sizer->Add(1, m_leftPadding); } size_t i, count; for (i = 0, count = m_items.GetCount(); i < count; ++i) { wxAuiToolBarItem& item = m_items.Item(i); - wxSizerItem* sizer_item = NULL; + wxSizerItem* m_sizerItem = NULL; - switch (item.kind) + switch (item.m_kind) { case wxITEM_LABEL: { wxSize size = m_art->GetLabelSize(dc, this, item); - sizer_item = sizer->Add(size.x + (m_tool_border_padding*2), - size.y + (m_tool_border_padding*2), - item.proportion, - item.alignment); + m_sizerItem = sizer->Add(size.x + (m_toolBorderPadding*2), + size.y + (m_toolBorderPadding*2), + item.m_proportion, + item.m_alignment); if (i+1 < count) { - sizer->AddSpacer(m_tool_packing); + sizer->AddSpacer(m_toolPacking); } break; @@ -1926,14 +1895,14 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal) case wxITEM_RADIO: { wxSize size = m_art->GetToolSize(dc, this, item); - sizer_item = sizer->Add(size.x + (m_tool_border_padding*2), - size.y + (m_tool_border_padding*2), + m_sizerItem = sizer->Add(size.x + (m_toolBorderPadding*2), + size.y + (m_toolBorderPadding*2), 0, - item.alignment); + item.m_alignment); // add tool packing if (i+1 < count) { - sizer->AddSpacer(m_tool_packing); + sizer->AddSpacer(m_toolPacking); } break; @@ -1942,37 +1911,37 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal) case wxITEM_SEPARATOR: { if (horizontal) - sizer_item = sizer->Add(separator_size, 1, 0, wxEXPAND); + m_sizerItem = sizer->Add(separatorSize, 1, 0, wxEXPAND); else - sizer_item = sizer->Add(1, separator_size, 0, wxEXPAND); + m_sizerItem = sizer->Add(1, separatorSize, 0, wxEXPAND); // add tool packing if (i+1 < count) { - sizer->AddSpacer(m_tool_packing); + sizer->AddSpacer(m_toolPacking); } break; } case wxITEM_SPACER: - if (item.proportion > 0) - sizer_item = sizer->AddStretchSpacer(item.proportion); + if (item.m_proportion > 0) + m_sizerItem = sizer->AddStretchSpacer(item.m_proportion); else - sizer_item = sizer->Add(item.spacer_pixels, 1); + m_sizerItem = sizer->Add(item.m_spacerPixels, 1); break; case wxITEM_CONTROL: { - //sizer_item = sizer->Add(item.window, item.proportion, wxEXPAND); - wxSizerItem* ctrl_sizer_item; + //m_sizerItem = sizer->Add(item.m_window, item.m_proportion, wxEXPAND); + wxSizerItem* ctrl_m_sizerItem; wxBoxSizer* vert_sizer = new wxBoxSizer(wxVERTICAL); vert_sizer->AddStretchSpacer(1); - ctrl_sizer_item = vert_sizer->Add(item.window, 0, wxEXPAND); + ctrl_m_sizerItem = vert_sizer->Add(item.m_window, 0, wxEXPAND); vert_sizer->AddStretchSpacer(1); if ( (m_style & wxAUI_TB_TEXT) && - m_tool_text_orientation == wxAUI_TBTOOL_TEXT_BOTTOM && + m_toolTextOrientation == wxAUI_TBTOOL_TEXT_BOTTOM && !item.GetLabel().empty() ) { wxSize s = GetLabelSize(item.GetLabel()); @@ -1980,60 +1949,60 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal) } - sizer_item = sizer->Add(vert_sizer, item.proportion, wxEXPAND); + m_sizerItem = sizer->Add(vert_sizer, item.m_proportion, wxEXPAND); - wxSize min_size = item.min_size; + wxSize min_size = item.m_minSize; // proportional items will disappear from the toolbar if // their min width is not set to something really small - if (item.proportion != 0) + if (item.m_proportion != 0) { min_size.x = 1; } if (min_size.IsFullySpecified()) { - sizer_item->SetMinSize(min_size); - ctrl_sizer_item->SetMinSize(min_size); + m_sizerItem->SetMinSize(min_size); + ctrl_m_sizerItem->SetMinSize(min_size); } // add tool packing if (i+1 < count) { - sizer->AddSpacer(m_tool_packing); + sizer->AddSpacer(m_toolPacking); } } } - item.sizer_item = sizer_item; + item.m_sizerItem = m_sizerItem; } // add "right" padding - if (m_right_padding > 0) + if (m_rightPadding > 0) { if (horizontal) - sizer->Add(m_right_padding, 1); + sizer->Add(m_rightPadding, 1); else - sizer->Add(1, m_right_padding); + sizer->Add(1, m_rightPadding); } // add drop down area - m_overflow_sizer_item = NULL; + m_overflowSizerItem = NULL; if (m_style & wxAUI_TB_OVERFLOW) { int overflow_size = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE); - if (overflow_size > 0 && m_overflow_visible) + if (overflow_size > 0 && m_overflowVisible) { if (horizontal) - m_overflow_sizer_item = sizer->Add(overflow_size, 1, 0, wxEXPAND); + m_overflowSizerItem = sizer->Add(overflow_size, 1, 0, wxEXPAND); else - m_overflow_sizer_item = sizer->Add(1, overflow_size, 0, wxEXPAND); + m_overflowSizerItem = sizer->Add(1, overflow_size, 0, wxEXPAND); } else { - m_overflow_sizer_item = NULL; + m_overflowSizerItem = NULL; } } @@ -2042,24 +2011,24 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal) wxBoxSizer* outside_sizer = new wxBoxSizer(horizontal ? wxVERTICAL : wxHORIZONTAL); // add "top" padding - if (m_top_padding > 0) + if (m_topPadding > 0) { if (horizontal) - outside_sizer->Add(1, m_top_padding); + outside_sizer->Add(1, m_topPadding); else - outside_sizer->Add(m_top_padding, 1); + outside_sizer->Add(m_topPadding, 1); } // add the sizer that contains all of the toolbar elements outside_sizer->Add(sizer, 1, wxEXPAND); // add "bottom" padding - if (m_bottom_padding > 0) + if (m_bottomPadding > 0) { if (horizontal) - outside_sizer->Add(1, m_bottom_padding); + outside_sizer->Add(1, m_bottomPadding); else - outside_sizer->Add(m_bottom_padding, 1); + outside_sizer->Add(m_bottomPadding, 1); } delete m_sizer; // remove old sizer @@ -2069,18 +2038,18 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal) for (i = 0, count = m_items.GetCount(); i < count; ++i) { wxAuiToolBarItem& item = m_items.Item(i); - if (item.sizer_item && item.proportion > 0 && item.min_size.IsFullySpecified()) - item.sizer_item->SetMinSize(0,0); + if (item.m_sizerItem && item.m_proportion > 0 && item.m_minSize.IsFullySpecified()) + item.m_sizerItem->SetMinSize(0,0); } - m_absolute_min_size = m_sizer->GetMinSize(); + m_absoluteMinSize = m_sizer->GetMinSize(); // reset the min sizes to what they were for (i = 0, count = m_items.GetCount(); i < count; ++i) { wxAuiToolBarItem& item = m_items.Item(i); - if (item.sizer_item && item.proportion > 0 && item.min_size.IsFullySpecified()) - item.sizer_item->SetMinSize(item.min_size); + if (item.m_sizerItem && item.m_proportion > 0 && item.m_minSize.IsFullySpecified()) + item.m_sizerItem->SetMinSize(item.m_minSize); } // set control size @@ -2090,21 +2059,21 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal) if ((m_style & wxAUI_TB_NO_AUTORESIZE) == 0) { - wxSize cur_size = GetClientSize(); + wxSize curSize = GetClientSize(); wxSize new_size = GetMinSize(); - if (new_size != cur_size) + if (new_size != curSize) { SetClientSize(new_size); } else { - m_sizer->SetDimension(0, 0, cur_size.x, cur_size.y); + m_sizer->SetDimension(0, 0, curSize.x, curSize.y); } } else { - wxSize cur_size = GetClientSize(); - m_sizer->SetDimension(0, 0, cur_size.x, cur_size.y); + wxSize curSize = GetClientSize(); + m_sizer->SetDimension(0, 0, curSize.x, curSize.y); } return true; @@ -2112,13 +2081,13 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal) int wxAuiToolBar::GetOverflowState() const { - return m_overflow_state; + return m_overflowState; } wxRect wxAuiToolBar::GetOverflowRect() const { wxRect cli_rect(wxPoint(0,0), GetClientSize()); - wxRect overflow_rect = m_overflow_sizer_item->GetRect(); + wxRect overflow_rect = m_overflowSizerItem->GetRect(); int overflow_size = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE); if (m_orientation == wxVERTICAL) @@ -2144,17 +2113,17 @@ wxSize wxAuiToolBar::GetLabelSize(const wxString& label) wxClientDC dc(this); int tx, ty; - int text_width = 0, text_height = 0; + int textWidth = 0, textHeight = 0; dc.SetFont(m_font); // get the text height - dc.GetTextExtent(wxT("ABCDHgj"), &tx, &text_height); + dc.GetTextExtent(wxT("ABCDHgj"), &tx, &textHeight); // get the text width - dc.GetTextExtent(label, &text_width, &ty); + dc.GetTextExtent(label, &textWidth, &ty); - return wxSize(text_width, text_height); + return wxSize(textWidth, textHeight); } @@ -2169,10 +2138,10 @@ void wxAuiToolBar::DoIdleUpdate() { wxAuiToolBarItem& item = m_items.Item(i); - if (item.toolid == -1) + if (item.m_toolId == -1) continue; - wxUpdateUIEvent evt(item.toolid); + wxUpdateUIEvent evt(item.m_toolId); evt.SetEventObject(this); if (handler->ProcessEvent(evt)) @@ -2180,24 +2149,24 @@ void wxAuiToolBar::DoIdleUpdate() if (evt.GetSetEnabled()) { bool is_enabled; - if (item.window) - is_enabled = item.window->IsEnabled(); + if (item.m_window) + is_enabled = item.m_window->IsThisEnabled(); else - is_enabled = (item.state & wxAUI_BUTTON_STATE_DISABLED) ? false : true; + is_enabled = (item.m_state & wxAUI_BUTTON_STATE_DISABLED) ? false : true; bool new_enabled = evt.GetEnabled(); if (new_enabled != is_enabled) { - if (item.window) + if (item.m_window) { - item.window->Enable(new_enabled); + item.m_window->Enable(new_enabled); } else { if (new_enabled) - item.state &= ~wxAUI_BUTTON_STATE_DISABLED; + item.m_state &= ~wxAUI_BUTTON_STATE_DISABLED; else - item.state |= wxAUI_BUTTON_STATE_DISABLED; + item.m_state |= wxAUI_BUTTON_STATE_DISABLED; } need_refresh = true; } @@ -2206,18 +2175,18 @@ void wxAuiToolBar::DoIdleUpdate() if (evt.GetSetChecked()) { // make sure we aren't checking an item that can't be - if (item.kind != wxITEM_CHECK && item.kind != wxITEM_RADIO) + if (item.m_kind != wxITEM_CHECK && item.m_kind != wxITEM_RADIO) continue; - bool is_checked = (item.state & wxAUI_BUTTON_STATE_CHECKED) ? true : false; + bool is_checked = (item.m_state & wxAUI_BUTTON_STATE_CHECKED) ? true : false; bool new_checked = evt.GetChecked(); if (new_checked != is_checked) { if (new_checked) - item.state |= wxAUI_BUTTON_STATE_CHECKED; + item.m_state |= wxAUI_BUTTON_STATE_CHECKED; else - item.state &= ~wxAUI_BUTTON_STATE_CHECKED; + item.m_state &= ~wxAUI_BUTTON_STATE_CHECKED; need_refresh = true; } @@ -2239,18 +2208,18 @@ void wxAuiToolBar::OnSize(wxSizeEvent& WXUNUSED(evt)) int x, y; GetClientSize(&x, &y); - if (((x >= y) && m_absolute_min_size.x > x) || - ((y > x) && m_absolute_min_size.y > y)) + if (((x >= y) && m_absoluteMinSize.x > x) || + ((y > x) && m_absoluteMinSize.y > y)) { // hide all flexible items size_t i, count; for (i = 0, count = m_items.GetCount(); i < count; ++i) { wxAuiToolBarItem& item = m_items.Item(i); - if (item.sizer_item && item.proportion > 0 && item.sizer_item->IsShown()) + if (item.m_sizerItem && item.m_proportion > 0 && item.m_sizerItem->IsShown()) { - item.sizer_item->Show(false); - item.sizer_item->SetProportion(0); + item.m_sizerItem->Show(false); + item.m_sizerItem->SetProportion(0); } } } @@ -2261,10 +2230,10 @@ void wxAuiToolBar::OnSize(wxSizeEvent& WXUNUSED(evt)) for (i = 0, count = m_items.GetCount(); i < count; ++i) { wxAuiToolBarItem& item = m_items.Item(i); - if (item.sizer_item && item.proportion > 0 && !item.sizer_item->IsShown()) + if (item.m_sizerItem && item.m_proportion > 0 && !item.m_sizerItem->IsShown()) { - item.sizer_item->Show(true); - item.sizer_item->SetProportion(item.proportion); + item.m_sizerItem->Show(true); + item.m_sizerItem->SetProportion(item.m_proportion); } } } @@ -2369,11 +2338,19 @@ void wxAuiToolBar::OnIdle(wxIdleEvent& evt) } } } - - DoIdleUpdate(); evt.Skip(); } +void wxAuiToolBar::UpdateWindowUI(long flags) +{ + if ( flags & wxUPDATE_UI_FROMIDLE ) + { + DoIdleUpdate(); + } + + wxControl::UpdateWindowUI(flags); +} + void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt)) { wxAutoBufferedPaintDC dc(this); @@ -2385,17 +2362,17 @@ void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt)) m_art->DrawBackground(dc, this, cli_rect); - int gripper_size = m_art->GetElementSize(wxAUI_TBART_GRIPPER_SIZE); + int gripperSize = m_art->GetElementSize(wxAUI_TBART_GRIPPER_SIZE); int dropdown_size = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE); // paint the gripper - if (gripper_size > 0 && m_gripper_sizer_item) + if (gripperSize > 0 && m_gripperSizerItem) { - wxRect gripper_rect = m_gripper_sizer_item->GetRect(); + wxRect gripper_rect = m_gripperSizerItem->GetRect(); if (horizontal) - gripper_rect.width = gripper_size; + gripper_rect.width = gripperSize; else - gripper_rect.height = gripper_size; + gripper_rect.height = gripperSize; m_art->DrawGripper(dc, this, gripper_rect); } @@ -2405,7 +2382,7 @@ void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt)) last_extent = cli_rect.width; else last_extent = cli_rect.height; - if (m_overflow_visible) + if (m_overflowVisible) last_extent -= dropdown_size; // paint each individual tool @@ -2414,10 +2391,10 @@ void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt)) { wxAuiToolBarItem& item = m_items.Item(i); - if (!item.sizer_item) + if (!item.m_sizerItem) continue; - wxRect item_rect = item.sizer_item->GetRect(); + wxRect item_rect = item.m_sizerItem->GetRect(); if ((horizontal && item_rect.x + item_rect.width >= last_extent) || @@ -2426,35 +2403,38 @@ void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt)) break; } - if (item.kind == wxITEM_SEPARATOR) + if (item.m_kind == wxITEM_SEPARATOR) { // draw a separator m_art->DrawSeparator(dc, this, item_rect); } - else if (item.kind == wxITEM_LABEL) + else if (item.m_kind == wxITEM_LABEL) { // draw a text label only m_art->DrawLabel(dc, this, item, item_rect); } - else if (item.kind == wxITEM_NORMAL) + else if (item.m_kind == wxITEM_NORMAL) { // draw a regular button or dropdown button - if (!item.dropdown) + if (!item.m_dropDown) m_art->DrawButton(dc, this, item, item_rect); else m_art->DrawDropDownButton(dc, this, item, item_rect); } - else if (item.kind == wxITEM_CHECK) + else if (item.m_kind == wxITEM_CHECK) + { + // draw either a regular or dropdown toggle button + if (!item.m_dropDown) + m_art->DrawButton(dc, this, item, item_rect); + else + m_art->DrawDropDownButton(dc, this, item, item_rect); + } + else if (item.m_kind == wxITEM_RADIO) { // draw a toggle button m_art->DrawButton(dc, this, item, item_rect); } - else if (item.kind == wxITEM_RADIO) - { - // draw a toggle button - m_art->DrawButton(dc, this, item, item_rect); - } - else if (item.kind == wxITEM_CONTROL) + else if (item.m_kind == wxITEM_CONTROL) { // draw the control's label m_art->DrawControlLabel(dc, this, item, item_rect); @@ -2465,10 +2445,10 @@ void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt)) } // paint the overflow button - if (dropdown_size > 0 && m_overflow_sizer_item) + if (dropdown_size > 0 && m_overflowSizerItem) { - wxRect dropdown_rect = GetOverflowRect(); - m_art->DrawOverflowButton(dc, this, dropdown_rect, m_overflow_state); + wxRect dropDownRect = GetOverflowRect(); + m_art->DrawOverflowButton(dc, this, dropDownRect, m_overflowState); } } @@ -2481,9 +2461,9 @@ void wxAuiToolBar::OnLeftDown(wxMouseEvent& evt) { wxRect cli_rect(wxPoint(0,0), GetClientSize()); - if (m_gripper_sizer_item) + if (m_gripperSizerItem) { - wxRect gripper_rect = m_gripper_sizer_item->GetRect(); + wxRect gripper_rect = m_gripperSizerItem->GetRect(); if (gripper_rect.Contains(evt.GetX(), evt.GetY())) { // find aui manager @@ -2500,12 +2480,12 @@ void wxAuiToolBar::OnLeftDown(wxMouseEvent& evt) } } - if (m_overflow_sizer_item) + if (m_overflowSizerItem) { wxRect overflow_rect = GetOverflowRect(); if (m_art && - m_overflow_visible && + m_overflowVisible && overflow_rect.Contains(evt.m_x, evt.m_y)) { wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK, -1); @@ -2525,9 +2505,9 @@ void wxAuiToolBar::OnLeftDown(wxMouseEvent& evt) // add custom overflow prepend items, if any - count = m_custom_overflow_prepend.GetCount(); + count = m_customOverflowPrepend.GetCount(); for (i = 0; i < count; ++i) - overflow_items.Add(m_custom_overflow_prepend[i]); + overflow_items.Add(m_customOverflowPrepend[i]); // only show items that don't fit in the dropdown count = m_items.GetCount(); @@ -2538,12 +2518,12 @@ void wxAuiToolBar::OnLeftDown(wxMouseEvent& evt) } // add custom overflow append items, if any - count = m_custom_overflow_append.GetCount(); + count = m_customOverflowAppend.GetCount(); for (i = 0; i < count; ++i) - overflow_items.Add(m_custom_overflow_append[i]); + overflow_items.Add(m_customOverflowAppend[i]); int res = m_art->ShowDropDown(this, overflow_items); - m_overflow_state = 0; + m_overflowState = 0; Refresh(false); if (res != -1) { @@ -2558,28 +2538,28 @@ void wxAuiToolBar::OnLeftDown(wxMouseEvent& evt) } m_dragging = false; - m_action_pos = wxPoint(evt.GetX(), evt.GetY()); - m_action_item = FindToolByPosition(evt.GetX(), evt.GetY()); + m_actionPos = wxPoint(evt.GetX(), evt.GetY()); + m_actionItem = FindToolByPosition(evt.GetX(), evt.GetY()); - if (m_action_item) + if (m_actionItem) { - if (m_action_item->state & wxAUI_BUTTON_STATE_DISABLED) + if (m_actionItem->m_state & wxAUI_BUTTON_STATE_DISABLED) { - m_action_pos = wxPoint(-1,-1); - m_action_item = NULL; + m_actionPos = wxPoint(-1,-1); + m_actionItem = NULL; return; } UnsetToolTip(); // fire the tool dropdown event - wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, m_action_item->toolid); + wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, m_actionItem->m_toolId); e.SetEventObject(this); - e.SetToolId(m_action_item->toolid); + e.SetToolId(m_actionItem->m_toolId); int mouse_x = evt.GetX(); - wxRect rect = m_action_item->sizer_item->GetRect(); - const bool dropDownHit = m_action_item->dropdown && + wxRect rect = m_actionItem->m_sizerItem->GetRect(); + const bool dropDownHit = m_actionItem->m_dropDown && mouse_x >= (rect.x+rect.width-BUTTON_DROPDOWN_WIDTH-1) && mouse_x < (rect.x+rect.width); e.SetDropDownClicked(dropDownHit); @@ -2589,12 +2569,12 @@ void wxAuiToolBar::OnLeftDown(wxMouseEvent& evt) // we only set the 'pressed button' state if we hit the actual button // and not just the drop-down - SetPressedItem(dropDownHit ? 0 : m_action_item); + SetPressedItem(dropDownHit ? 0 : m_actionItem); if(dropDownHit) { - m_action_pos = wxPoint(-1,-1); - m_action_item = NULL; + m_actionPos = wxPoint(-1,-1); + m_actionItem = NULL; } if(!GetEventHandler()->ProcessEvent(e) || e.GetSkipped()) @@ -2611,10 +2591,10 @@ void wxAuiToolBar::OnLeftUp(wxMouseEvent& evt) SetPressedItem(NULL); - wxAuiToolBarItem* hit_item = FindToolByPosition(evt.GetX(), evt.GetY()); - if (hit_item && !(hit_item->state & wxAUI_BUTTON_STATE_DISABLED)) + wxAuiToolBarItem* hitItem = FindToolByPosition(evt.GetX(), evt.GetY()); + if (hitItem && !(hitItem->m_state & wxAUI_BUTTON_STATE_DISABLED)) { - SetHoverItem(hit_item); + SetHoverItem(hitItem); } if (m_dragging) @@ -2629,21 +2609,18 @@ void wxAuiToolBar::OnLeftUp(wxMouseEvent& evt) } else { - wxAuiToolBarItem* hit_item; - hit_item = FindToolByPosition(evt.GetX(), evt.GetY()); - - if (m_action_item && hit_item == m_action_item) + if (m_actionItem && hitItem == m_actionItem) { UnsetToolTip(); - wxCommandEvent e(wxEVT_COMMAND_MENU_SELECTED, m_action_item->toolid); + wxCommandEvent e(wxEVT_COMMAND_MENU_SELECTED, m_actionItem->m_toolId); e.SetEventObject(this); - if (hit_item->kind == wxITEM_CHECK || hit_item->kind == wxITEM_RADIO) + if (hitItem->m_kind == wxITEM_CHECK || hitItem->m_kind == wxITEM_RADIO) { - const bool toggle = !(m_action_item->state & wxAUI_BUTTON_STATE_CHECKED); + const bool toggle = !(m_actionItem->m_state & wxAUI_BUTTON_STATE_CHECKED); - ToggleTool(m_action_item->toolid, toggle); + ToggleTool(m_actionItem->m_toolId, toggle); // repaint immediately Refresh(false); @@ -2670,33 +2647,32 @@ void wxAuiToolBar::OnRightDown(wxMouseEvent& evt) { wxRect cli_rect(wxPoint(0,0), GetClientSize()); - if (m_gripper_sizer_item) + if (m_gripperSizerItem) { - wxRect gripper_rect = m_gripper_sizer_item->GetRect(); + wxRect gripper_rect = m_gripperSizerItem->GetRect(); if (gripper_rect.Contains(evt.GetX(), evt.GetY())) return; } - if (m_overflow_sizer_item) + if (m_overflowSizerItem && m_art) { int dropdown_size = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE); if (dropdown_size > 0 && evt.m_x > cli_rect.width - dropdown_size && evt.m_y >= 0 && - evt.m_y < cli_rect.height && - m_art) + evt.m_y < cli_rect.height) { return; } } - m_action_pos = wxPoint(evt.GetX(), evt.GetY()); - m_action_item = FindToolByPosition(evt.GetX(), evt.GetY()); + m_actionPos = wxPoint(evt.GetX(), evt.GetY()); + m_actionItem = FindToolByPosition(evt.GetX(), evt.GetY()); - if (m_action_item && m_action_item->state & wxAUI_BUTTON_STATE_DISABLED) + if (m_actionItem && m_actionItem->m_state & wxAUI_BUTTON_STATE_DISABLED) { - m_action_pos = wxPoint(-1,-1); - m_action_item = NULL; + m_actionPos = wxPoint(-1,-1); + m_actionItem = NULL; return; } @@ -2705,20 +2681,17 @@ void wxAuiToolBar::OnRightDown(wxMouseEvent& evt) void wxAuiToolBar::OnRightUp(wxMouseEvent& evt) { - wxAuiToolBarItem* hit_item; - hit_item = FindToolByPosition(evt.GetX(), evt.GetY()); + wxAuiToolBarItem* hitItem; + hitItem = FindToolByPosition(evt.GetX(), evt.GetY()); - if (m_action_item && hit_item == m_action_item) + if (m_actionItem && hitItem == m_actionItem) { - if (hit_item->kind == wxITEM_NORMAL) - { - wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, m_action_item->toolid); - e.SetEventObject(this); - e.SetToolId(m_action_item->toolid); - e.SetClickPoint(m_action_pos); - GetEventHandler()->ProcessEvent(e); - DoIdleUpdate(); - } + wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, m_actionItem->m_toolId); + e.SetEventObject(this); + e.SetToolId(m_actionItem->m_toolId); + e.SetClickPoint(m_actionPos); + GetEventHandler()->ProcessEvent(e); + DoIdleUpdate(); } else { @@ -2726,49 +2699,48 @@ void wxAuiToolBar::OnRightUp(wxMouseEvent& evt) wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, -1); e.SetEventObject(this); e.SetToolId(-1); - e.SetClickPoint(m_action_pos); + e.SetClickPoint(m_actionPos); GetEventHandler()->ProcessEvent(e); DoIdleUpdate(); } // reset member variables - m_action_pos = wxPoint(-1,-1); - m_action_item = NULL; + m_actionPos = wxPoint(-1,-1); + m_actionItem = NULL; } void wxAuiToolBar::OnMiddleDown(wxMouseEvent& evt) { wxRect cli_rect(wxPoint(0,0), GetClientSize()); - if (m_gripper_sizer_item) + if (m_gripperSizerItem) { - wxRect gripper_rect = m_gripper_sizer_item->GetRect(); + wxRect gripper_rect = m_gripperSizerItem->GetRect(); if (gripper_rect.Contains(evt.GetX(), evt.GetY())) return; } - if (m_overflow_sizer_item) + if (m_overflowSizerItem && m_art) { int dropdown_size = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE); if (dropdown_size > 0 && evt.m_x > cli_rect.width - dropdown_size && evt.m_y >= 0 && - evt.m_y < cli_rect.height && - m_art) + evt.m_y < cli_rect.height) { return; } } - m_action_pos = wxPoint(evt.GetX(), evt.GetY()); - m_action_item = FindToolByPosition(evt.GetX(), evt.GetY()); + m_actionPos = wxPoint(evt.GetX(), evt.GetY()); + m_actionItem = FindToolByPosition(evt.GetX(), evt.GetY()); - if (m_action_item) + if (m_actionItem) { - if (m_action_item->state & wxAUI_BUTTON_STATE_DISABLED) + if (m_actionItem->m_state & wxAUI_BUTTON_STATE_DISABLED) { - m_action_pos = wxPoint(-1,-1); - m_action_item = NULL; + m_actionPos = wxPoint(-1,-1); + m_actionItem = NULL; return; } } @@ -2778,25 +2750,25 @@ void wxAuiToolBar::OnMiddleDown(wxMouseEvent& evt) void wxAuiToolBar::OnMiddleUp(wxMouseEvent& evt) { - wxAuiToolBarItem* hit_item; - hit_item = FindToolByPosition(evt.GetX(), evt.GetY()); + wxAuiToolBarItem* hitItem; + hitItem = FindToolByPosition(evt.GetX(), evt.GetY()); - if (m_action_item && hit_item == m_action_item) + if (m_actionItem && hitItem == m_actionItem) { - if (hit_item->kind == wxITEM_NORMAL) + if (hitItem->m_kind == wxITEM_NORMAL) { - wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK, m_action_item->toolid); + wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK, m_actionItem->m_toolId); e.SetEventObject(this); - e.SetToolId(m_action_item->toolid); - e.SetClickPoint(m_action_pos); + e.SetToolId(m_actionItem->m_toolId); + e.SetClickPoint(m_actionPos); GetEventHandler()->ProcessEvent(e); DoIdleUpdate(); } } // reset member variables - m_action_pos = wxPoint(-1,-1); - m_action_item = NULL; + m_actionPos = wxPoint(-1,-1); + m_actionItem = NULL; } void wxAuiToolBar::OnMotion(wxMouseEvent& evt) @@ -2805,13 +2777,13 @@ void wxAuiToolBar::OnMotion(wxMouseEvent& evt) // start a drag event if (!m_dragging && button_pressed && - abs(evt.GetX() - m_action_pos.x) + abs(evt.GetY() - m_action_pos.y) > 5) + abs(evt.GetX() - m_actionPos.x) + abs(evt.GetY() - m_actionPos.y) > 5) { // TODO: sending this event only makes sense if there is an 'END_DRAG' // event sent sometime in the future (see OnLeftUp()) wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG, GetId()); e.SetEventObject(this); - e.SetToolId(m_action_item->toolid); + e.SetToolId(m_actionItem->m_toolId); m_dragging = GetEventHandler()->ProcessEvent(e) && !e.GetSkipped(); DoIdleUpdate(); @@ -2820,38 +2792,38 @@ void wxAuiToolBar::OnMotion(wxMouseEvent& evt) if(m_dragging) return; - wxAuiToolBarItem* hit_item = FindToolByPosition(evt.GetX(), evt.GetY()); + wxAuiToolBarItem* hitItem = FindToolByPosition(evt.GetX(), evt.GetY()); if(button_pressed) { // if we have a button pressed we want it to be shown in 'depressed' // state unless we move the mouse outside the button, then we want it // to show as just 'highlighted' - if (hit_item == m_action_item) - SetPressedItem(m_action_item); + if (hitItem == m_actionItem) + SetPressedItem(m_actionItem); else { SetPressedItem(NULL); - SetHoverItem(m_action_item); + SetHoverItem(m_actionItem); } } else { - if (hit_item && (hit_item->state & wxAUI_BUTTON_STATE_DISABLED)) + if (hitItem && (hitItem->m_state & wxAUI_BUTTON_STATE_DISABLED)) SetHoverItem(NULL); else - SetHoverItem(hit_item); + SetHoverItem(hitItem); // tooltips handling - wxAuiToolBarItem* packing_hit_item; - packing_hit_item = FindToolByPositionWithPacking(evt.GetX(), evt.GetY()); - if (packing_hit_item) + wxAuiToolBarItem* packingHitItem; + packingHitItem = FindToolByPositionWithPacking(evt.GetX(), evt.GetY()); + if (packingHitItem) { - if (packing_hit_item != m_tip_item) + if (packingHitItem != m_tipItem) { - m_tip_item = packing_hit_item; + m_tipItem = packingHitItem; - if ( !packing_hit_item->short_help.empty() ) - SetToolTip(packing_hit_item->short_help); + if ( !packingHitItem->m_shortHelp.empty() ) + SetToolTip(packingHitItem->m_shortHelp); else UnsetToolTip(); } @@ -2859,7 +2831,7 @@ void wxAuiToolBar::OnMotion(wxMouseEvent& evt) else { UnsetToolTip(); - m_tip_item = NULL; + m_tipItem = NULL; } // figure out the dropdown button state (are we hovering or pressing it?) @@ -2873,13 +2845,13 @@ void wxAuiToolBar::DoResetMouseState() SetHoverItem(NULL); SetPressedItem(NULL); - m_tip_item = NULL; + m_tipItem = NULL; // we have to reset those here, because the mouse-up handlers which do // it usually won't be called if we let go of a mouse button while we // are outside of the window - m_action_pos = wxPoint(-1,-1); - m_action_item = NULL; + m_actionPos = wxPoint(-1,-1); + m_actionItem = NULL; } void wxAuiToolBar::OnLeaveWindow(wxMouseEvent& evt) @@ -2904,9 +2876,9 @@ void wxAuiToolBar::OnSetCursor(wxSetCursorEvent& evt) { wxCursor cursor = wxNullCursor; - if (m_gripper_sizer_item) + if (m_gripperSizerItem) { - wxRect gripper_rect = m_gripper_sizer_item->GetRect(); + wxRect gripper_rect = m_gripperSizerItem->GetRect(); if (gripper_rect.Contains(evt.GetX(), evt.GetY())) { cursor = wxCursor(wxCURSOR_SIZING); diff --git a/Externals/wxWidgets3/src/aui/auibook.cpp b/Externals/wxWidgets3/src/aui/auibook.cpp index 5e6ef680ed..f299944023 100644 --- a/Externals/wxWidgets3/src/aui/auibook.cpp +++ b/Externals/wxWidgets3/src/aui/auibook.cpp @@ -48,6 +48,7 @@ wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEvent); wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, wxAuiNotebookEvent); wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, wxAuiNotebookEvent); wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, wxAuiNotebookEvent); +wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_CANCEL_DRAG, wxAuiNotebookEvent); wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, wxAuiNotebookEvent); wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, wxAuiNotebookEvent); wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, wxAuiNotebookEvent); @@ -59,7 +60,7 @@ wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, wxAuiNotebookEvent); IMPLEMENT_CLASS(wxAuiNotebook, wxControl) IMPLEMENT_CLASS(wxAuiTabCtrl, wxControl) -IMPLEMENT_DYNAMIC_CLASS(wxAuiNotebookEvent, wxEvent) +IMPLEMENT_DYNAMIC_CLASS(wxAuiNotebookEvent, wxBookCtrlEvent) @@ -118,14 +119,14 @@ class wxAuiCommandCapture : public wxEvtHandler { public: - wxAuiCommandCapture() { m_last_id = 0; } - int GetCommandId() const { return m_last_id; } + wxAuiCommandCapture() { m_lastId = 0; } + int GetCommandId() const { return m_lastId; } bool ProcessEvent(wxEvent& evt) { if (evt.GetEventType() == wxEVT_COMMAND_MENU_SELECTED) { - m_last_id = evt.GetId(); + m_lastId = evt.GetId(); return true; } @@ -136,7 +137,7 @@ public: } private: - int m_last_id; + int m_lastId; }; @@ -183,47 +184,48 @@ static const unsigned char list_bits[] = { wxAuiDefaultTabArt::wxAuiDefaultTabArt() { - m_normal_font = *wxNORMAL_FONT; - m_selected_font = *wxNORMAL_FONT; - m_selected_font.SetWeight(wxBOLD); - m_measuring_font = m_selected_font; + m_normalFont = *wxNORMAL_FONT; + m_selectedFont = *wxNORMAL_FONT; + m_selectedFont.SetWeight(wxBOLD); + m_measuringFont = m_selectedFont; - m_fixed_tab_width = 100; - m_tab_ctrl_height = 0; + m_fixedTabWidth = 100; + m_tabCtrlHeight = 0; #if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON - wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground)); + wxColor baseColour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground)); #else - wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); + wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); #endif - // the base_colour is too pale to use as our base colour, + // the baseColour is too pale to use as our base colour, // so darken it a bit -- - if ((255-base_colour.Red()) + - (255-base_colour.Green()) + - (255-base_colour.Blue()) < 60) + if ((255-baseColour.Red()) + + (255-baseColour.Green()) + + (255-baseColour.Blue()) < 60) { - base_colour = base_colour.ChangeLightness(92); + baseColour = baseColour.ChangeLightness(92); } - m_base_colour = base_colour; - wxColor border_colour = base_colour.ChangeLightness(75); + m_activeColour = baseColour; + m_baseColour = baseColour; + wxColor borderColour = baseColour.ChangeLightness(75); - m_border_pen = wxPen(border_colour); - m_base_colour_pen = wxPen(m_base_colour); - m_base_colour_brush = wxBrush(m_base_colour); + m_borderPen = wxPen(borderColour); + m_baseColourPen = wxPen(m_baseColour); + m_baseColourBrush = wxBrush(m_baseColour); - m_active_close_bmp = wxAuiBitmapFromBits(close_bits, 16, 16, *wxBLACK); - m_disabled_close_bmp = wxAuiBitmapFromBits(close_bits, 16, 16, wxColour(128,128,128)); + m_activeCloseBmp = wxAuiBitmapFromBits(close_bits, 16, 16, *wxBLACK); + m_disabledCloseBmp = wxAuiBitmapFromBits(close_bits, 16, 16, wxColour(128,128,128)); - m_active_left_bmp = wxAuiBitmapFromBits(left_bits, 16, 16, *wxBLACK); - m_disabled_left_bmp = wxAuiBitmapFromBits(left_bits, 16, 16, wxColour(128,128,128)); + m_activeLeftBmp = wxAuiBitmapFromBits(left_bits, 16, 16, *wxBLACK); + m_disabledLeftBmp = wxAuiBitmapFromBits(left_bits, 16, 16, wxColour(128,128,128)); - m_active_right_bmp = wxAuiBitmapFromBits(right_bits, 16, 16, *wxBLACK); - m_disabled_right_bmp = wxAuiBitmapFromBits(right_bits, 16, 16, wxColour(128,128,128)); + m_activeRightBmp = wxAuiBitmapFromBits(right_bits, 16, 16, *wxBLACK); + m_disabledRightBmp = wxAuiBitmapFromBits(right_bits, 16, 16, wxColour(128,128,128)); - m_active_windowlist_bmp = wxAuiBitmapFromBits(list_bits, 16, 16, *wxBLACK); - m_disabled_windowlist_bmp = wxAuiBitmapFromBits(list_bits, 16, 16, wxColour(128,128,128)); + m_activeWindowListBmp = wxAuiBitmapFromBits(list_bits, 16, 16, *wxBLACK); + m_disabledWindowListBmp = wxAuiBitmapFromBits(list_bits, 16, 16, wxColour(128,128,128)); m_flags = 0; } @@ -245,31 +247,31 @@ void wxAuiDefaultTabArt::SetFlags(unsigned int flags) void wxAuiDefaultTabArt::SetSizingInfo(const wxSize& tab_ctrl_size, size_t tab_count) { - m_fixed_tab_width = 100; + m_fixedTabWidth = 100; int tot_width = (int)tab_ctrl_size.x - GetIndentSize() - 4; if (m_flags & wxAUI_NB_CLOSE_BUTTON) - tot_width -= m_active_close_bmp.GetWidth(); + tot_width -= m_activeCloseBmp.GetWidth(); if (m_flags & wxAUI_NB_WINDOWLIST_BUTTON) - tot_width -= m_active_windowlist_bmp.GetWidth(); + tot_width -= m_activeWindowListBmp.GetWidth(); if (tab_count > 0) { - m_fixed_tab_width = tot_width/(int)tab_count; + m_fixedTabWidth = tot_width/(int)tab_count; } - if (m_fixed_tab_width < 100) - m_fixed_tab_width = 100; + if (m_fixedTabWidth < 100) + m_fixedTabWidth = 100; - if (m_fixed_tab_width > tot_width/2) - m_fixed_tab_width = tot_width/2; + if (m_fixedTabWidth > tot_width/2) + m_fixedTabWidth = tot_width/2; - if (m_fixed_tab_width > 220) - m_fixed_tab_width = 220; + if (m_fixedTabWidth > 220) + m_fixedTabWidth = 220; - m_tab_ctrl_height = tab_ctrl_size.y; + m_tabCtrlHeight = tab_ctrl_size.y; } @@ -279,8 +281,8 @@ void wxAuiDefaultTabArt::DrawBackground(wxDC& dc, { // draw background - wxColor top_color = m_base_colour.ChangeLightness(90); - wxColor bottom_color = m_base_colour.ChangeLightness(170); + wxColor top_color = m_baseColour.ChangeLightness(90); + wxColor bottom_color = m_baseColour.ChangeLightness(170); wxRect r; if (m_flags &wxAUI_NB_BOTTOM) @@ -295,7 +297,7 @@ void wxAuiDefaultTabArt::DrawBackground(wxDC& dc, // draw base lines - dc.SetPen(m_border_pen); + dc.SetPen(m_borderPen); int y = rect.GetHeight(); int w = rect.GetWidth(); @@ -308,7 +310,7 @@ void wxAuiDefaultTabArt::DrawBackground(wxDC& dc, // TODO: else if (m_flags &wxAUI_NB_RIGHT) {} else //for wxAUI_NB_TOP { - dc.SetBrush(m_base_colour_brush); + dc.SetBrush(m_baseColourBrush); dc.DrawRectangle(-1, y-4, w+2, 4); } } @@ -341,10 +343,10 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc, if (caption.empty()) caption = wxT("Xj"); - dc.SetFont(m_selected_font); + dc.SetFont(m_selectedFont); dc.GetTextExtent(caption, &selected_textx, &selected_texty); - dc.SetFont(m_normal_font); + dc.SetFont(m_normalFont); dc.GetTextExtent(caption, &normal_textx, &normal_texty); // figure out the size of the tab @@ -356,7 +358,7 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc, close_button_state, x_extent); - wxCoord tab_height = m_tab_ctrl_height - 3; + wxCoord tab_height = m_tabCtrlHeight - 3; wxCoord tab_width = tab_size.x; wxCoord tab_x = in_rect.x; wxCoord tab_y = in_rect.y + in_rect.height - tab_height; @@ -369,12 +371,12 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc, if (page.active) { - dc.SetFont(m_selected_font); + dc.SetFont(m_selectedFont); texty = selected_texty; } else { - dc.SetFont(m_normal_font); + dc.SetFont(m_normalFont); texty = normal_texty; } @@ -438,8 +440,8 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc, // draw base background color wxRect r(tab_x, tab_y, tab_width, tab_height); - dc.SetPen(m_base_colour_pen); - dc.SetBrush(m_base_colour_brush); + dc.SetPen(wxPen(m_activeColour)); + dc.SetBrush(wxBrush(m_activeColour)); dc.DrawRectangle(r.x+1, r.y+1, r.width-1, r.height-4); // this white helps fill out the gradient at the top of the tab @@ -448,20 +450,20 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc, dc.DrawRectangle(r.x+2, r.y+1, r.width-3, r.height-4); // these two points help the rounded corners appear more antialiased - dc.SetPen(m_base_colour_pen); + dc.SetPen(wxPen(m_activeColour)); dc.DrawPoint(r.x+2, r.y+1); dc.DrawPoint(r.x+r.width-2, r.y+1); // set rectangle down a bit for gradient drawing r.SetHeight(r.GetHeight()/2); r.x += 2; - r.width -= 2; + r.width -= 3; r.y += r.height; r.y -= 2; // draw gradient background wxColor top_color = *wxWHITE; - wxColor bottom_color = m_base_colour; + wxColor bottom_color = m_activeColour; dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH); } else @@ -480,7 +482,7 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc, r.height--; // -- draw top gradient fill for glossy look - wxColor top_color = m_base_colour; + wxColor top_color = m_baseColour; wxColor bottom_color = top_color.ChangeLightness(160); dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH); @@ -488,13 +490,13 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc, r.y--; // -- draw bottom fill for glossy look - top_color = m_base_colour; - bottom_color = m_base_colour; + top_color = m_baseColour; + bottom_color = m_baseColour; dc.GradientFillLinear(r, top_color, bottom_color, wxSOUTH); } // draw tab outline - dc.SetPen(m_border_pen); + dc.SetPen(m_borderPen); dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.DrawPolygon(WXSIZEOF(border_points), border_points); @@ -503,11 +505,11 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc, if (page.active) { if (m_flags &wxAUI_NB_BOTTOM) - dc.SetPen(wxPen(m_base_colour.ChangeLightness(170))); + dc.SetPen(wxPen(m_baseColour.ChangeLightness(170))); // TODO: else if (m_flags &wxAUI_NB_LEFT) {} // TODO: else if (m_flags &wxAUI_NB_RIGHT) {} else //for wxAUI_NB_TOP - dc.SetPen(m_base_colour_pen); + dc.SetPen(m_baseColourPen); dc.DrawLine(border_points[0].x+1, border_points[0].y, border_points[5].x, @@ -519,7 +521,7 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc, int close_button_width = 0; if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) { - close_button_width = m_active_close_bmp.GetWidth(); + close_button_width = m_activeCloseBmp.GetWidth(); } int bitmap_offset = 0; @@ -580,12 +582,12 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc, // draw close button if necessary if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) { - wxBitmap bmp = m_disabled_close_bmp; + wxBitmap bmp = m_disabledCloseBmp; if (close_button_state == wxAUI_BUTTON_STATE_HOVER || close_button_state == wxAUI_BUTTON_STATE_PRESSED) { - bmp = m_active_close_bmp; + bmp = m_activeCloseBmp; } int offsetY = tab_y-1; @@ -623,7 +625,7 @@ wxSize wxAuiDefaultTabArt::GetTabSize(wxDC& dc, { wxCoord measured_textx, measured_texty, tmp; - dc.SetFont(m_measuring_font); + dc.SetFont(m_measuringFont); dc.GetTextExtent(caption, &measured_textx, &measured_texty); dc.GetTextExtent(wxT("ABCDEFXj"), &tmp, &measured_texty); @@ -634,7 +636,7 @@ wxSize wxAuiDefaultTabArt::GetTabSize(wxDC& dc, // if the close button is showing, add space for it if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) - tab_width += m_active_close_bmp.GetWidth() + 3; + tab_width += m_activeCloseBmp.GetWidth() + 3; // if there's a bitmap, add space for it if (bitmap.IsOk()) @@ -650,7 +652,7 @@ wxSize wxAuiDefaultTabArt::GetTabSize(wxDC& dc, if (m_flags & wxAUI_NB_TAB_FIXED_WIDTH) { - tab_width = m_fixed_tab_width; + tab_width = m_fixedTabWidth; } *x_extent = tab_width; @@ -674,27 +676,27 @@ void wxAuiDefaultTabArt::DrawButton(wxDC& dc, { case wxAUI_BUTTON_CLOSE: if (button_state & wxAUI_BUTTON_STATE_DISABLED) - bmp = m_disabled_close_bmp; + bmp = m_disabledCloseBmp; else - bmp = m_active_close_bmp; + bmp = m_activeCloseBmp; break; case wxAUI_BUTTON_LEFT: if (button_state & wxAUI_BUTTON_STATE_DISABLED) - bmp = m_disabled_left_bmp; + bmp = m_disabledLeftBmp; else - bmp = m_active_left_bmp; + bmp = m_activeLeftBmp; break; case wxAUI_BUTTON_RIGHT: if (button_state & wxAUI_BUTTON_STATE_DISABLED) - bmp = m_disabled_right_bmp; + bmp = m_disabledRightBmp; else - bmp = m_active_right_bmp; + bmp = m_activeRightBmp; break; case wxAUI_BUTTON_WINDOWLIST: if (button_state & wxAUI_BUTTON_STATE_DISABLED) - bmp = m_disabled_windowlist_bmp; + bmp = m_disabledWindowListBmp; else - bmp = m_active_windowlist_bmp; + bmp = m_activeWindowListBmp; break; } @@ -769,19 +771,19 @@ int wxAuiDefaultTabArt::ShowDropDown(wxWindow* wnd, int wxAuiDefaultTabArt::GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages, - const wxSize& required_bmp_size) + const wxSize& requiredBmp_size) { wxClientDC dc(wnd); - dc.SetFont(m_measuring_font); + dc.SetFont(m_measuringFont); // sometimes a standard bitmap size needs to be enforced, especially // if some tabs have bitmaps and others don't. This is important because // it prevents the tab control from resizing when tabs are added. - wxBitmap measure_bmp; - if (required_bmp_size.IsFullySpecified()) + wxBitmap measureBmp; + if (requiredBmp_size.IsFullySpecified()) { - measure_bmp.Create(required_bmp_size.x, - required_bmp_size.y); + measureBmp.Create(requiredBmp_size.x, + requiredBmp_size.y); } @@ -792,8 +794,8 @@ int wxAuiDefaultTabArt::GetBestTabCtrlSize(wxWindow* wnd, wxAuiNotebookPage& page = pages.Item(i); wxBitmap bmp; - if (measure_bmp.IsOk()) - bmp = measure_bmp; + if (measureBmp.IsOk()) + bmp = measureBmp; else bmp = page.bitmap; @@ -818,55 +820,67 @@ int wxAuiDefaultTabArt::GetBestTabCtrlSize(wxWindow* wnd, void wxAuiDefaultTabArt::SetNormalFont(const wxFont& font) { - m_normal_font = font; + m_normalFont = font; } void wxAuiDefaultTabArt::SetSelectedFont(const wxFont& font) { - m_selected_font = font; + m_selectedFont = font; } void wxAuiDefaultTabArt::SetMeasuringFont(const wxFont& font) { - m_measuring_font = font; + m_measuringFont = font; } +void wxAuiDefaultTabArt::SetColour(const wxColour& colour) +{ + m_baseColour = colour; + m_borderPen = wxPen(m_baseColour.ChangeLightness(75)); + m_baseColourPen = wxPen(m_baseColour); + m_baseColourBrush = wxBrush(m_baseColour); +} + +void wxAuiDefaultTabArt::SetActiveColour(const wxColour& colour) +{ + m_activeColour = colour; +} // -- wxAuiSimpleTabArt class implementation -- wxAuiSimpleTabArt::wxAuiSimpleTabArt() { - m_normal_font = *wxNORMAL_FONT; - m_selected_font = *wxNORMAL_FONT; - m_selected_font.SetWeight(wxBOLD); - m_measuring_font = m_selected_font; + m_normalFont = *wxNORMAL_FONT; + m_selectedFont = *wxNORMAL_FONT; + m_selectedFont.SetWeight(wxBOLD); + m_measuringFont = m_selectedFont; m_flags = 0; - m_fixed_tab_width = 100; + m_fixedTabWidth = 100; - wxColour base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); + wxColour baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - wxColour background_colour = base_colour; - wxColour normaltab_colour = base_colour; - wxColour selectedtab_colour = *wxWHITE; + wxColour backgroundColour = baseColour; + wxColour normaltabColour = baseColour; + wxColour selectedtabColour = *wxWHITE; - m_bkbrush = wxBrush(background_colour); - m_normal_bkbrush = wxBrush(normaltab_colour); - m_normal_bkpen = wxPen(normaltab_colour); - m_selected_bkbrush = wxBrush(selectedtab_colour); - m_selected_bkpen = wxPen(selectedtab_colour); + m_bkBrush = wxBrush(backgroundColour); + m_normalBkBrush = wxBrush(normaltabColour); + m_normalBkPen = wxPen(normaltabColour); + m_selectedBkBrush = wxBrush(selectedtabColour); + m_selectedBkPen = wxPen(selectedtabColour); - m_active_close_bmp = wxAuiBitmapFromBits(close_bits, 16, 16, *wxBLACK); - m_disabled_close_bmp = wxAuiBitmapFromBits(close_bits, 16, 16, wxColour(128,128,128)); + m_activeCloseBmp = wxAuiBitmapFromBits(close_bits, 16, 16, *wxBLACK); + m_disabledCloseBmp = wxAuiBitmapFromBits(close_bits, 16, 16, wxColour(128,128,128)); - m_active_left_bmp = wxAuiBitmapFromBits(left_bits, 16, 16, *wxBLACK); - m_disabled_left_bmp = wxAuiBitmapFromBits(left_bits, 16, 16, wxColour(128,128,128)); + m_activeLeftBmp = wxAuiBitmapFromBits(left_bits, 16, 16, *wxBLACK); + m_disabledLeftBmp = wxAuiBitmapFromBits(left_bits, 16, 16, wxColour(128,128,128)); - m_active_right_bmp = wxAuiBitmapFromBits(right_bits, 16, 16, *wxBLACK); - m_disabled_right_bmp = wxAuiBitmapFromBits(right_bits, 16, 16, wxColour(128,128,128)); + m_activeRightBmp = wxAuiBitmapFromBits(right_bits, 16, 16, *wxBLACK); + m_disabledRightBmp = wxAuiBitmapFromBits(right_bits, 16, 16, wxColour(128,128,128)); - m_active_windowlist_bmp = wxAuiBitmapFromBits(list_bits, 16, 16, *wxBLACK); - m_disabled_windowlist_bmp = wxAuiBitmapFromBits(list_bits, 16, 16, wxColour(128,128,128)); + m_activeWindowListBmp = wxAuiBitmapFromBits(list_bits, 16, 16, *wxBLACK); + m_disabledWindowListBmp = wxAuiBitmapFromBits(list_bits, 16, 16, wxColour(128,128,128)); } @@ -876,10 +890,9 @@ wxAuiSimpleTabArt::~wxAuiSimpleTabArt() wxAuiTabArt* wxAuiSimpleTabArt::Clone() { - return static_cast(new wxAuiSimpleTabArt); + return new wxAuiSimpleTabArt(*this); } - void wxAuiSimpleTabArt::SetFlags(unsigned int flags) { m_flags = flags; @@ -888,29 +901,42 @@ void wxAuiSimpleTabArt::SetFlags(unsigned int flags) void wxAuiSimpleTabArt::SetSizingInfo(const wxSize& tab_ctrl_size, size_t tab_count) { - m_fixed_tab_width = 100; + m_fixedTabWidth = 100; int tot_width = (int)tab_ctrl_size.x - GetIndentSize() - 4; if (m_flags & wxAUI_NB_CLOSE_BUTTON) - tot_width -= m_active_close_bmp.GetWidth(); + tot_width -= m_activeCloseBmp.GetWidth(); if (m_flags & wxAUI_NB_WINDOWLIST_BUTTON) - tot_width -= m_active_windowlist_bmp.GetWidth(); + tot_width -= m_activeWindowListBmp.GetWidth(); if (tab_count > 0) { - m_fixed_tab_width = tot_width/(int)tab_count; + m_fixedTabWidth = tot_width/(int)tab_count; } - if (m_fixed_tab_width < 100) - m_fixed_tab_width = 100; + if (m_fixedTabWidth < 100) + m_fixedTabWidth = 100; - if (m_fixed_tab_width > tot_width/2) - m_fixed_tab_width = tot_width/2; + if (m_fixedTabWidth > tot_width/2) + m_fixedTabWidth = tot_width/2; - if (m_fixed_tab_width > 220) - m_fixed_tab_width = 220; + if (m_fixedTabWidth > 220) + m_fixedTabWidth = 220; +} + +void wxAuiSimpleTabArt::SetColour(const wxColour& colour) +{ + m_bkBrush = wxBrush(colour); + m_normalBkBrush = wxBrush(colour); + m_normalBkPen = wxPen(colour); +} + +void wxAuiSimpleTabArt::SetActiveColour(const wxColour& colour) +{ + m_selectedBkBrush = wxBrush(colour); + m_selectedBkPen = wxPen(colour); } void wxAuiSimpleTabArt::DrawBackground(wxDC& dc, @@ -918,7 +944,7 @@ void wxAuiSimpleTabArt::DrawBackground(wxDC& dc, const wxRect& rect) { // draw background - dc.SetBrush(m_bkbrush); + dc.SetBrush(m_bkBrush); dc.SetPen(*wxTRANSPARENT_PEN); dc.DrawRectangle(-1, -1, rect.GetWidth()+2, rect.GetHeight()+2); @@ -955,10 +981,10 @@ void wxAuiSimpleTabArt::DrawTab(wxDC& dc, if (caption.empty()) caption = wxT("Xj"); - dc.SetFont(m_selected_font); + dc.SetFont(m_selectedFont); dc.GetTextExtent(caption, &selected_textx, &selected_texty); - dc.SetFont(m_normal_font); + dc.SetFont(m_normalFont); dc.GetTextExtent(caption, &normal_textx, &normal_texty); // figure out the size of the tab @@ -981,17 +1007,17 @@ void wxAuiSimpleTabArt::DrawTab(wxDC& dc, if (page.active) { - dc.SetPen(m_selected_bkpen); - dc.SetBrush(m_selected_bkbrush); - dc.SetFont(m_selected_font); + dc.SetPen(m_selectedBkPen); + dc.SetBrush(m_selectedBkBrush); + dc.SetFont(m_selectedFont); textx = selected_textx; texty = selected_texty; } else { - dc.SetPen(m_normal_bkpen); - dc.SetBrush(m_normal_bkbrush); - dc.SetFont(m_normal_font); + dc.SetPen(m_normalBkPen); + dc.SetBrush(m_normalBkBrush); + dc.SetFont(m_normalFont); textx = normal_textx; texty = normal_texty; } @@ -1029,7 +1055,7 @@ void wxAuiSimpleTabArt::DrawTab(wxDC& dc, int close_button_width = 0; if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) { - close_button_width = m_active_close_bmp.GetWidth(); + close_button_width = m_activeCloseBmp.GetWidth(); text_offset = tab_x + (tab_height/2) + ((tab_width-close_button_width)/2) - (textx/2); } else @@ -1068,9 +1094,9 @@ void wxAuiSimpleTabArt::DrawTab(wxDC& dc, { wxBitmap bmp; if (page.active) - bmp = m_active_close_bmp; + bmp = m_activeCloseBmp; else - bmp = m_disabled_close_bmp; + bmp = m_disabledCloseBmp; wxRect rect(tab_x + tab_width - close_button_width - 1, tab_y + (tab_height/2) - (bmp.GetHeight()/2) + 1, @@ -1102,18 +1128,18 @@ wxSize wxAuiSimpleTabArt::GetTabSize(wxDC& dc, { wxCoord measured_textx, measured_texty; - dc.SetFont(m_measuring_font); + dc.SetFont(m_measuringFont); dc.GetTextExtent(caption, &measured_textx, &measured_texty); wxCoord tab_height = measured_texty + 4; wxCoord tab_width = measured_textx + tab_height + 5; if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) - tab_width += m_active_close_bmp.GetWidth(); + tab_width += m_activeCloseBmp.GetWidth(); if (m_flags & wxAUI_NB_TAB_FIXED_WIDTH) { - tab_width = m_fixed_tab_width; + tab_width = m_fixedTabWidth; } *x_extent = tab_width - (tab_height/2) - 1; @@ -1137,27 +1163,27 @@ void wxAuiSimpleTabArt::DrawButton(wxDC& dc, { case wxAUI_BUTTON_CLOSE: if (button_state & wxAUI_BUTTON_STATE_DISABLED) - bmp = m_disabled_close_bmp; + bmp = m_disabledCloseBmp; else - bmp = m_active_close_bmp; + bmp = m_activeCloseBmp; break; case wxAUI_BUTTON_LEFT: if (button_state & wxAUI_BUTTON_STATE_DISABLED) - bmp = m_disabled_left_bmp; + bmp = m_disabledLeftBmp; else - bmp = m_active_left_bmp; + bmp = m_activeLeftBmp; break; case wxAUI_BUTTON_RIGHT: if (button_state & wxAUI_BUTTON_STATE_DISABLED) - bmp = m_disabled_right_bmp; + bmp = m_disabledRightBmp; else - bmp = m_active_right_bmp; + bmp = m_activeRightBmp; break; case wxAUI_BUTTON_WINDOWLIST: if (button_state & wxAUI_BUTTON_STATE_DISABLED) - bmp = m_disabled_windowlist_bmp; + bmp = m_disabledWindowListBmp; else - bmp = m_active_windowlist_bmp; + bmp = m_activeWindowListBmp; break; } @@ -1232,10 +1258,10 @@ int wxAuiSimpleTabArt::ShowDropDown(wxWindow* wnd, int wxAuiSimpleTabArt::GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& WXUNUSED(pages), - const wxSize& WXUNUSED(required_bmp_size)) + const wxSize& WXUNUSED(requiredBmp_size)) { wxClientDC dc(wnd); - dc.SetFont(m_measuring_font); + dc.SetFont(m_measuringFont); int x_ext = 0; wxSize s = GetTabSize(dc, wnd, @@ -1249,17 +1275,17 @@ int wxAuiSimpleTabArt::GetBestTabCtrlSize(wxWindow* wnd, void wxAuiSimpleTabArt::SetNormalFont(const wxFont& font) { - m_normal_font = font; + m_normalFont = font; } void wxAuiSimpleTabArt::SetSelectedFont(const wxFont& font) { - m_selected_font = font; + m_selectedFont = font; } void wxAuiSimpleTabArt::SetMeasuringFont(const wxFont& font) { - m_measuring_font = font; + m_measuringFont = font; } @@ -1280,7 +1306,7 @@ void wxAuiSimpleTabArt::SetMeasuringFont(const wxFont& font) wxAuiTabContainer::wxAuiTabContainer() { - m_tab_offset = 0; + m_tabOffset = 0; m_flags = 0; m_art = new wxAuiDefaultTabArt; @@ -1365,6 +1391,16 @@ void wxAuiTabContainer::SetMeasuringFont(const wxFont& font) m_art->SetMeasuringFont(font); } +void wxAuiTabContainer::SetColour(const wxColour& colour) +{ + m_art->SetColour(colour); +} + +void wxAuiTabContainer::SetActiveColour(const wxColour& colour) +{ + m_art->SetActiveColour(colour); +} + void wxAuiTabContainer::SetRect(const wxRect& rect) { m_rect = rect; @@ -1556,15 +1592,15 @@ size_t wxAuiTabContainer::GetPageCount() const void wxAuiTabContainer::AddButton(int id, int location, - const wxBitmap& normal_bitmap, - const wxBitmap& disabled_bitmap) + const wxBitmap& normalBitmap, + const wxBitmap& disabledBitmap) { wxAuiTabContainerButton button; button.id = id; - button.bitmap = normal_bitmap; - button.dis_bitmap = disabled_bitmap; + button.bitmap = normalBitmap; + button.disBitmap = disabledBitmap; button.location = location; - button.cur_state = wxAUI_BUTTON_STATE_NORMAL; + button.curState = wxAUI_BUTTON_STATE_NORMAL; m_buttons.Add(button); } @@ -1587,12 +1623,12 @@ void wxAuiTabContainer::RemoveButton(int id) size_t wxAuiTabContainer::GetTabOffset() const { - return m_tab_offset; + return m_tabOffset; } void wxAuiTabContainer::SetTabOffset(size_t offset) { - m_tab_offset = offset; + m_tabOffset = offset; } @@ -1657,7 +1693,7 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) else total_width += size.x; - if (i >= m_tab_offset) + if (i >= m_tabOffset) { if (i+1 < page_count) visible_width += x_extent; @@ -1666,7 +1702,7 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) } } - if (total_width > m_rect.GetWidth() || m_tab_offset != 0) + if (total_width > m_rect.GetWidth() || m_tabOffset != 0) { // show left/right buttons for (i = 0; i < button_count; ++i) @@ -1675,7 +1711,7 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) if (button.id == wxAUI_BUTTON_LEFT || button.id == wxAUI_BUTTON_RIGHT) { - button.cur_state &= ~wxAUI_BUTTON_STATE_HIDDEN; + button.curState &= ~wxAUI_BUTTON_STATE_HIDDEN; } } } @@ -1688,7 +1724,7 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) if (button.id == wxAUI_BUTTON_LEFT || button.id == wxAUI_BUTTON_RIGHT) { - button.cur_state |= wxAUI_BUTTON_STATE_HIDDEN; + button.curState |= wxAUI_BUTTON_STATE_HIDDEN; } } } @@ -1699,17 +1735,17 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) wxAuiTabContainerButton& button = m_buttons.Item(i); if (button.id == wxAUI_BUTTON_LEFT) { - if (m_tab_offset == 0) - button.cur_state |= wxAUI_BUTTON_STATE_DISABLED; + if (m_tabOffset == 0) + button.curState |= wxAUI_BUTTON_STATE_DISABLED; else - button.cur_state &= ~wxAUI_BUTTON_STATE_DISABLED; + button.curState &= ~wxAUI_BUTTON_STATE_DISABLED; } if (button.id == wxAUI_BUTTON_RIGHT) { if (visible_width < m_rect.GetWidth() - ((int)button_count*16)) - button.cur_state |= wxAUI_BUTTON_STATE_DISABLED; + button.curState |= wxAUI_BUTTON_STATE_DISABLED; else - button.cur_state &= ~wxAUI_BUTTON_STATE_DISABLED; + button.curState &= ~wxAUI_BUTTON_STATE_DISABLED; } } @@ -1732,7 +1768,7 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) if (button.location != wxRIGHT) continue; - if (button.cur_state & wxAUI_BUTTON_STATE_HIDDEN) + if (button.curState & wxAUI_BUTTON_STATE_HIDDEN) continue; wxRect button_rect = m_rect; @@ -1743,7 +1779,7 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) wnd, button_rect, button.id, - button.cur_state, + button.curState, wxRIGHT, &button.rect); @@ -1763,7 +1799,7 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) if (button.location != wxLEFT) continue; - if (button.cur_state & wxAUI_BUTTON_STATE_HIDDEN) + if (button.curState & wxAUI_BUTTON_STATE_HIDDEN) continue; wxRect button_rect(offset, 1, 1000, m_rect.height); @@ -1772,7 +1808,7 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) wnd, button_rect, button.id, - button.cur_state, + button.curState, wxLEFT, &button.rect); @@ -1788,24 +1824,24 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) // prepare the tab-close-button array // make sure tab button entries which aren't used are marked as hidden - for (i = page_count; i < m_tab_close_buttons.GetCount(); ++i) - m_tab_close_buttons.Item(i).cur_state = wxAUI_BUTTON_STATE_HIDDEN; + for (i = page_count; i < m_tabCloseButtons.GetCount(); ++i) + m_tabCloseButtons.Item(i).curState = wxAUI_BUTTON_STATE_HIDDEN; // make sure there are enough tab button entries to accommodate all tabs - while (m_tab_close_buttons.GetCount() < page_count) + while (m_tabCloseButtons.GetCount() < page_count) { wxAuiTabContainerButton tempbtn; tempbtn.id = wxAUI_BUTTON_CLOSE; tempbtn.location = wxCENTER; - tempbtn.cur_state = wxAUI_BUTTON_STATE_HIDDEN; - m_tab_close_buttons.Add(tempbtn); + tempbtn.curState = wxAUI_BUTTON_STATE_HIDDEN; + m_tabCloseButtons.Add(tempbtn); } // buttons before the tab offset must be set to hidden - for (i = 0; i < m_tab_offset; ++i) + for (i = 0; i < m_tabOffset; ++i) { - m_tab_close_buttons.Item(i).cur_state = wxAUI_BUTTON_STATE_HIDDEN; + m_tabCloseButtons.Item(i).curState = wxAUI_BUTTON_STATE_HIDDEN; } @@ -1820,25 +1856,25 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) rect.y = 0; rect.height = m_rect.height; - for (i = m_tab_offset; i < page_count; ++i) + for (i = m_tabOffset; i < page_count; ++i) { wxAuiNotebookPage& page = m_pages.Item(i); - wxAuiTabContainerButton& tab_button = m_tab_close_buttons.Item(i); + wxAuiTabContainerButton& tab_button = m_tabCloseButtons.Item(i); // determine if a close button is on this tab if ((m_flags & wxAUI_NB_CLOSE_ON_ALL_TABS) != 0 || ((m_flags & wxAUI_NB_CLOSE_ON_ACTIVE_TAB) != 0 && page.active)) { - if (tab_button.cur_state == wxAUI_BUTTON_STATE_HIDDEN) + if (tab_button.curState == wxAUI_BUTTON_STATE_HIDDEN) { tab_button.id = wxAUI_BUTTON_CLOSE; - tab_button.cur_state = wxAUI_BUTTON_STATE_NORMAL; + tab_button.curState = wxAUI_BUTTON_STATE_NORMAL; tab_button.location = wxCENTER; } } else { - tab_button.cur_state = wxAUI_BUTTON_STATE_HIDDEN; + tab_button.curState = wxAUI_BUTTON_STATE_HIDDEN; } rect.x = offset; @@ -1851,7 +1887,7 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) wnd, page, rect, - tab_button.cur_state, + tab_button.curState, &page.rect, &tab_button.rect, &x_extent); @@ -1868,25 +1904,25 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) // make sure to deactivate buttons which are off the screen to the right - for (++i; i < m_tab_close_buttons.GetCount(); ++i) + for (++i; i < m_tabCloseButtons.GetCount(); ++i) { - m_tab_close_buttons.Item(i).cur_state = wxAUI_BUTTON_STATE_HIDDEN; + m_tabCloseButtons.Item(i).curState = wxAUI_BUTTON_STATE_HIDDEN; } // draw the active tab again so it stands in the foreground - if (active >= m_tab_offset && active < m_pages.GetCount()) + if (active >= m_tabOffset && active < m_pages.GetCount()) { wxAuiNotebookPage& page = m_pages.Item(active); - wxAuiTabContainerButton& tab_button = m_tab_close_buttons.Item(active); + wxAuiTabContainerButton& tab_button = m_tabCloseButtons.Item(active); rect.x = active_offset; m_art->DrawTab(dc, wnd, page, active_rect, - tab_button.cur_state, + tab_button.curState, &page.rect, &tab_button.rect, &x_extent); @@ -1909,7 +1945,7 @@ bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWin size_t button_count = m_buttons.GetCount(); // Hasn't been rendered yet; assume it's visible - if (m_tab_close_buttons.GetCount() < page_count) + if (m_tabCloseButtons.GetCount() < page_count) return true; // First check if both buttons are disabled - if so, there's no need to @@ -1921,7 +1957,7 @@ bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWin if (button.id == wxAUI_BUTTON_LEFT || button.id == wxAUI_BUTTON_RIGHT) { - if ((button.cur_state & wxAUI_BUTTON_STATE_HIDDEN) == 0) + if ((button.curState & wxAUI_BUTTON_STATE_HIDDEN) == 0) arrowButtonVisibleCount ++; } } @@ -1948,7 +1984,7 @@ bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWin if (button.location != wxRIGHT) continue; - if (button.cur_state & wxAUI_BUTTON_STATE_HIDDEN) + if (button.curState & wxAUI_BUTTON_STATE_HIDDEN) continue; offset -= button.rect.GetWidth(); @@ -1964,7 +2000,7 @@ bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWin if (button.location != wxLEFT) continue; - if (button.cur_state & wxAUI_BUTTON_STATE_HIDDEN) + if (button.curState & wxAUI_BUTTON_STATE_HIDDEN) continue; offset += button.rect.GetWidth(); @@ -1986,7 +2022,7 @@ bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWin for (i = tabOffset; i < page_count; ++i) { wxAuiNotebookPage& page = m_pages.Item(i); - wxAuiTabContainerButton& tab_button = m_tab_close_buttons.Item(i); + wxAuiTabContainerButton& tab_button = m_tabCloseButtons.Item(i); rect.x = offset; rect.width = m_rect.width - right_buttons_width - offset - 2; @@ -1995,12 +2031,12 @@ bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWin return false; // haven't found the tab, and we've run out of space, so return false int x_extent = 0; - wxSize size = m_art->GetTabSize(*dc, + m_art->GetTabSize(*dc, wnd, page.caption, page.bitmap, page.active, - tab_button.cur_state, + tab_button.curState, &x_extent); offset += x_extent; @@ -2049,7 +2085,7 @@ bool wxAuiTabContainer::TabHitTest(int x, int y, wxWindow** hit) const return false; wxAuiTabContainerButton* btn = NULL; - if (ButtonHitTest(x, y, &btn) && !(btn->cur_state & wxAUI_BUTTON_STATE_DISABLED)) + if (ButtonHitTest(x, y, &btn) && !(btn->curState & wxAUI_BUTTON_STATE_DISABLED)) { if (m_buttons.Index(*btn) != wxNOT_FOUND) return false; @@ -2057,7 +2093,7 @@ bool wxAuiTabContainer::TabHitTest(int x, int y, wxWindow** hit) const size_t i, page_count = m_pages.GetCount(); - for (i = m_tab_offset; i < page_count; ++i) + for (i = m_tabOffset; i < page_count; ++i) { wxAuiNotebookPage& page = m_pages.Item(i); if (page.rect.Contains(x,y)) @@ -2087,7 +2123,7 @@ bool wxAuiTabContainer::ButtonHitTest(int x, int y, { wxAuiTabContainerButton& button = m_buttons.Item(i); if (button.rect.Contains(x,y) && - !(button.cur_state & wxAUI_BUTTON_STATE_HIDDEN )) + !(button.curState & wxAUI_BUTTON_STATE_HIDDEN )) { if (hit) *hit = &button; @@ -2095,12 +2131,12 @@ bool wxAuiTabContainer::ButtonHitTest(int x, int y, } } - button_count = m_tab_close_buttons.GetCount(); + button_count = m_tabCloseButtons.GetCount(); for (i = 0; i < button_count; ++i) { - wxAuiTabContainerButton& button = m_tab_close_buttons.Item(i); + wxAuiTabContainerButton& button = m_tabCloseButtons.Item(i); if (button.rect.Contains(x,y) && - !(button.cur_state & (wxAUI_BUTTON_STATE_HIDDEN | + !(button.curState & (wxAUI_BUTTON_STATE_HIDDEN | wxAUI_BUTTON_STATE_DISABLED))) { if (hit) @@ -2197,10 +2233,10 @@ wxAuiTabCtrl::wxAuiTabCtrl(wxWindow* parent, long style) : wxControl(parent, id, pos, size, style) { SetName(wxT("wxAuiTabCtrl")); - m_click_pt = wxDefaultPosition; - m_is_dragging = false; - m_hover_button = NULL; - m_pressed_button = NULL; + m_clickPt = wxDefaultPosition; + m_isDragging = false; + m_hoverButton = NULL; + m_pressedButton = NULL; } wxAuiTabCtrl::~wxAuiTabCtrl() @@ -2231,10 +2267,10 @@ void wxAuiTabCtrl::OnSize(wxSizeEvent& evt) void wxAuiTabCtrl::OnLeftDown(wxMouseEvent& evt) { CaptureMouse(); - m_click_pt = wxDefaultPosition; - m_is_dragging = false; - m_click_tab = NULL; - m_pressed_button = NULL; + m_clickPt = wxDefaultPosition; + m_isDragging = false; + m_clickTab = NULL; + m_pressedButton = NULL; wxWindow* wnd; @@ -2255,15 +2291,15 @@ void wxAuiTabCtrl::OnLeftDown(wxMouseEvent& evt) GetEventHandler()->ProcessEvent(e); } - m_click_pt.x = evt.m_x; - m_click_pt.y = evt.m_y; - m_click_tab = wnd; + m_clickPt.x = evt.m_x; + m_clickPt.y = evt.m_y; + m_clickTab = wnd; } - if (m_hover_button) + if (m_hoverButton) { - m_pressed_button = m_hover_button; - m_pressed_button->cur_state = wxAUI_BUTTON_STATE_PRESSED; + m_pressedButton = m_hoverButton; + m_pressedButton->curState = wxAUI_BUTTON_STATE_PRESSED; Refresh(); Update(); } @@ -2271,6 +2307,16 @@ void wxAuiTabCtrl::OnLeftDown(wxMouseEvent& evt) void wxAuiTabCtrl::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) { + if (m_isDragging) + { + m_isDragging = false; + + wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_CANCEL_DRAG, m_windowId); + evt.SetSelection(GetIdxFromWindow(m_clickTab)); + evt.SetOldSelection(evt.GetSelection()); + evt.SetEventObject(this); + GetEventHandler()->ProcessEvent(evt); + } } void wxAuiTabCtrl::OnLeftUp(wxMouseEvent& evt) @@ -2278,12 +2324,12 @@ void wxAuiTabCtrl::OnLeftUp(wxMouseEvent& evt) if (GetCapture() == this) ReleaseMouse(); - if (m_is_dragging) + if (m_isDragging) { - m_is_dragging = false; + m_isDragging = false; wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, m_windowId); - evt.SetSelection(GetIdxFromWindow(m_click_tab)); + evt.SetSelection(GetIdxFromWindow(m_clickTab)); evt.SetOldSelection(evt.GetSelection()); evt.SetEventObject(this); GetEventHandler()->ProcessEvent(evt); @@ -2291,38 +2337,38 @@ void wxAuiTabCtrl::OnLeftUp(wxMouseEvent& evt) return; } - if (m_pressed_button) + if (m_pressedButton) { // make sure we're still clicking the button wxAuiTabContainerButton* button = NULL; if (!ButtonHitTest(evt.m_x, evt.m_y, &button) || - button->cur_state & wxAUI_BUTTON_STATE_DISABLED) + button->curState & wxAUI_BUTTON_STATE_DISABLED) return; - if (button != m_pressed_button) + if (button != m_pressedButton) { - m_pressed_button = NULL; + m_pressedButton = NULL; return; } Refresh(); Update(); - if (!(m_pressed_button->cur_state & wxAUI_BUTTON_STATE_DISABLED)) + if (!(m_pressedButton->curState & wxAUI_BUTTON_STATE_DISABLED)) { wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, m_windowId); - evt.SetSelection(GetIdxFromWindow(m_click_tab)); - evt.SetInt(m_pressed_button->id); + evt.SetSelection(GetIdxFromWindow(m_clickTab)); + evt.SetInt(m_pressedButton->id); evt.SetEventObject(this); GetEventHandler()->ProcessEvent(evt); } - m_pressed_button = NULL; + m_pressedButton = NULL; } - m_click_pt = wxDefaultPosition; - m_is_dragging = false; - m_click_tab = NULL; + m_clickPt = wxDefaultPosition; + m_isDragging = false; + m_clickTab = NULL; } void wxAuiTabCtrl::OnMiddleUp(wxMouseEvent& evt) @@ -2391,44 +2437,45 @@ void wxAuiTabCtrl::OnMotion(wxMouseEvent& evt) // check if the mouse is hovering above a button wxAuiTabContainerButton* button; - if (ButtonHitTest(pos.x, pos.y, &button) && !(button->cur_state & wxAUI_BUTTON_STATE_DISABLED)) + if (ButtonHitTest(pos.x, pos.y, &button) && !(button->curState & wxAUI_BUTTON_STATE_DISABLED)) { - if (m_hover_button && button != m_hover_button) + if (m_hoverButton && button != m_hoverButton) { - m_hover_button->cur_state = wxAUI_BUTTON_STATE_NORMAL; - m_hover_button = NULL; + m_hoverButton->curState = wxAUI_BUTTON_STATE_NORMAL; + m_hoverButton = NULL; Refresh(); Update(); } - if (button->cur_state != wxAUI_BUTTON_STATE_HOVER) + if (button->curState != wxAUI_BUTTON_STATE_HOVER) { - button->cur_state = wxAUI_BUTTON_STATE_HOVER; + button->curState = wxAUI_BUTTON_STATE_HOVER; Refresh(); Update(); - m_hover_button = button; + + m_hoverButton = button; return; } } else { - if (m_hover_button) + if (m_hoverButton) { - m_hover_button->cur_state = wxAUI_BUTTON_STATE_NORMAL; - m_hover_button = NULL; + m_hoverButton->curState = wxAUI_BUTTON_STATE_NORMAL; + m_hoverButton = NULL; Refresh(); Update(); } } - if (!evt.LeftIsDown() || m_click_pt == wxDefaultPosition) + if (!evt.LeftIsDown() || m_clickPt == wxDefaultPosition) return; - if (m_is_dragging) + if (m_isDragging) { wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, m_windowId); - evt.SetSelection(GetIdxFromWindow(m_click_tab)); + evt.SetSelection(GetIdxFromWindow(m_clickTab)); evt.SetOldSelection(evt.GetSelection()); evt.SetEventObject(this); GetEventHandler()->ProcessEvent(evt); @@ -2439,25 +2486,25 @@ void wxAuiTabCtrl::OnMotion(wxMouseEvent& evt) int drag_x_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_X); int drag_y_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_Y); - if (abs(pos.x - m_click_pt.x) > drag_x_threshold || - abs(pos.y - m_click_pt.y) > drag_y_threshold) + if (abs(pos.x - m_clickPt.x) > drag_x_threshold || + abs(pos.y - m_clickPt.y) > drag_y_threshold) { wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, m_windowId); - evt.SetSelection(GetIdxFromWindow(m_click_tab)); + evt.SetSelection(GetIdxFromWindow(m_clickTab)); evt.SetOldSelection(evt.GetSelection()); evt.SetEventObject(this); GetEventHandler()->ProcessEvent(evt); - m_is_dragging = true; + m_isDragging = true; } } void wxAuiTabCtrl::OnLeaveWindow(wxMouseEvent& WXUNUSED(event)) { - if (m_hover_button) + if (m_hoverButton) { - m_hover_button->cur_state = wxAUI_BUTTON_STATE_NORMAL; - m_hover_button = NULL; + m_hoverButton->curState = wxAUI_BUTTON_STATE_NORMAL; + m_hoverButton = NULL; Refresh(); Update(); } @@ -2653,7 +2700,7 @@ public: { m_tabs = NULL; m_rect = wxRect(0,0,200,200); - m_tab_ctrl_height = 20; + m_tabCtrlHeight = 20; } ~wxTabFrame() @@ -2663,7 +2710,7 @@ public: void SetTabCtrlHeight(int h) { - m_tab_ctrl_height = h; + m_tabCtrlHeight = h; } protected: @@ -2692,18 +2739,18 @@ public: if (m_tabs->IsFrozen() || m_tabs->GetParent()->IsFrozen()) return; - m_tab_rect = wxRect(m_rect.x, m_rect.y, m_rect.width, m_tab_ctrl_height); + m_tab_rect = wxRect(m_rect.x, m_rect.y, m_rect.width, m_tabCtrlHeight); if (m_tabs->GetFlags() & wxAUI_NB_BOTTOM) { - m_tab_rect = wxRect (m_rect.x, m_rect.y + m_rect.height - m_tab_ctrl_height, m_rect.width, m_tab_ctrl_height); - m_tabs->SetSize (m_rect.x, m_rect.y + m_rect.height - m_tab_ctrl_height, m_rect.width, m_tab_ctrl_height); - m_tabs->SetRect (wxRect(0, 0, m_rect.width, m_tab_ctrl_height)); + m_tab_rect = wxRect (m_rect.x, m_rect.y + m_rect.height - m_tabCtrlHeight, m_rect.width, m_tabCtrlHeight); + m_tabs->SetSize (m_rect.x, m_rect.y + m_rect.height - m_tabCtrlHeight, m_rect.width, m_tabCtrlHeight); + m_tabs->SetRect (wxRect(0, 0, m_rect.width, m_tabCtrlHeight)); } else //TODO: if (GetFlags() & wxAUI_NB_TOP) { - m_tab_rect = wxRect (m_rect.x, m_rect.y, m_rect.width, m_tab_ctrl_height); - m_tabs->SetSize (m_rect.x, m_rect.y, m_rect.width, m_tab_ctrl_height); - m_tabs->SetRect (wxRect(0, 0, m_rect.width, m_tab_ctrl_height)); + m_tab_rect = wxRect (m_rect.x, m_rect.y, m_rect.width, m_tabCtrlHeight); + m_tabs->SetSize (m_rect.x, m_rect.y, m_rect.width, m_tabCtrlHeight); + m_tabs->SetRect (wxRect(0, 0, m_rect.width, m_tabCtrlHeight)); } // TODO: else if (GetFlags() & wxAUI_NB_LEFT){} // TODO: else if (GetFlags() & wxAUI_NB_RIGHT){} @@ -2716,7 +2763,7 @@ public: for (i = 0; i < page_count; ++i) { - int height = m_rect.height - m_tab_ctrl_height; + int height = m_rect.height - m_tabCtrlHeight; if ( height < 0 ) { // avoid passing negative height to wxWindow::SetSize(), this @@ -2731,7 +2778,7 @@ public: } else //TODO: if (GetFlags() & wxAUI_NB_TOP) { - page.window->SetSize(m_rect.x, m_rect.y + m_tab_ctrl_height, + page.window->SetSize(m_rect.x, m_rect.y + m_tabCtrlHeight, m_rect.width, height); } // TODO: else if (GetFlags() & wxAUI_NB_LEFT){} @@ -2765,7 +2812,7 @@ public: wxRect m_rect; wxRect m_tab_rect; wxAuiTabCtrl* m_tabs; - int m_tab_ctrl_height; + int m_tabCtrlHeight; }; @@ -2789,6 +2836,9 @@ BEGIN_EVENT_TABLE(wxAuiNotebook, wxControl) EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, wxAuiNotebook::OnTabEndDrag) + EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, + wxEVT_COMMAND_AUINOTEBOOK_CANCEL_DRAG, + wxAuiNotebook::OnTabCancelDrag) EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, wxAuiNotebook::OnTabDragMotion) @@ -2811,37 +2861,16 @@ BEGIN_EVENT_TABLE(wxAuiNotebook, wxControl) wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, wxAuiNotebook::OnTabBgDClick) EVT_NAVIGATION_KEY(wxAuiNotebook::OnNavigationKeyNotebook) - -#ifdef wxHAS_NATIVE_TAB_TRAVERSAL - WX_EVENT_TABLE_CONTROL_CONTAINER(wxAuiNotebook) -#else - // Avoid clash with container event handler functions - EVT_SET_FOCUS(wxAuiNotebook::OnFocus) -#endif END_EVENT_TABLE() -WX_DELEGATE_TO_CONTROL_CONTAINER(wxAuiNotebook, wxControl) - -wxAuiNotebook::wxAuiNotebook() +void wxAuiNotebook::Init() { - m_curpage = -1; - m_tab_id_counter = wxAuiBaseTabCtrlId; - m_dummy_wnd = NULL; - m_tab_ctrl_height = 20; - m_requested_bmp_size = wxDefaultSize; - m_requested_tabctrl_height = -1; -} - -wxAuiNotebook::wxAuiNotebook(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style) : wxControl(parent, id, pos, size, style) -{ - m_dummy_wnd = NULL; - m_requested_bmp_size = wxDefaultSize; - m_requested_tabctrl_height = -1; - InitNotebook(style); + m_curPage = -1; + m_tabIdCounter = wxAuiBaseTabCtrlId; + m_dummyWnd = NULL; + m_tabCtrlHeight = 20; + m_requestedBmpSize = wxDefaultSize; + m_requestedTabCtrlHeight = -1; } bool wxAuiNotebook::Create(wxWindow* parent, @@ -2862,31 +2891,28 @@ bool wxAuiNotebook::Create(wxWindow* parent, // code called by all constructors void wxAuiNotebook::InitNotebook(long style) { - WX_INIT_CONTROL_CONTAINER(); - // SetCanFocus(false); - SetName(wxT("wxAuiNotebook")); - m_curpage = -1; - m_tab_id_counter = wxAuiBaseTabCtrlId; - m_dummy_wnd = NULL; + m_curPage = -1; + m_tabIdCounter = wxAuiBaseTabCtrlId; + m_dummyWnd = NULL; m_flags = (unsigned int)style; - m_tab_ctrl_height = 20; + m_tabCtrlHeight = 20; - m_normal_font = *wxNORMAL_FONT; - m_selected_font = *wxNORMAL_FONT; - m_selected_font.SetWeight(wxBOLD); + m_normalFont = *wxNORMAL_FONT; + m_selectedFont = *wxNORMAL_FONT; + m_selectedFont.SetWeight(wxBOLD); SetArtProvider(new wxAuiDefaultTabArt); - m_dummy_wnd = new wxWindow(this, wxID_ANY, wxPoint(0,0), wxSize(0,0)); - m_dummy_wnd->SetSize(200, 200); - m_dummy_wnd->Show(false); + m_dummyWnd = new wxWindow(this, wxID_ANY, wxPoint(0,0), wxSize(0,0)); + m_dummyWnd->SetSize(200, 200); + m_dummyWnd->Show(false); m_mgr.SetManagedWindow(this); m_mgr.SetFlags(wxAUI_MGR_DEFAULT); m_mgr.SetDockSizeConstraint(1.0, 1.0); // no dock size constraint - m_mgr.AddPane(m_dummy_wnd, + m_mgr.AddPane(m_dummyWnd, wxAuiPaneInfo().Name(wxT("dummy")).Bottom().CaptionVisible(false).Show(false)); m_mgr.Update(); @@ -2935,10 +2961,10 @@ void wxAuiNotebook::SetArtProvider(wxAuiTabArt* art) void wxAuiNotebook::SetTabCtrlHeight(int height) { - m_requested_tabctrl_height = height; + m_requestedTabCtrlHeight = height; // if window is already initialized, recalculate the tab height - if (m_dummy_wnd) + if (m_dummyWnd) { UpdateTabCtrlHeight(); } @@ -2954,10 +2980,10 @@ void wxAuiNotebook::SetTabCtrlHeight(int height) void wxAuiNotebook::SetUniformBitmapSize(const wxSize& size) { - m_requested_bmp_size = size; + m_requestedBmpSize = size; // if window is already initialized, recalculate the tab height - if (m_dummy_wnd) + if (m_dummyWnd) { UpdateTabCtrlHeight(); } @@ -2972,12 +2998,12 @@ bool wxAuiNotebook::UpdateTabCtrlHeight() // if the tab control height needs to change, update // all of our tab controls with the new height - if (m_tab_ctrl_height == height) + if (m_tabCtrlHeight == height) return false; wxAuiTabArt* art = m_tabs.GetArtProvider(); - m_tab_ctrl_height = height; + m_tabCtrlHeight = height; wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); size_t i, pane_count = all_panes.GetCount(); @@ -2988,7 +3014,7 @@ bool wxAuiNotebook::UpdateTabCtrlHeight() continue; wxTabFrame* tab_frame = (wxTabFrame*)pane.window; wxAuiTabCtrl* tabctrl = tab_frame->m_tabs; - tab_frame->SetTabCtrlHeight(m_tab_ctrl_height); + tab_frame->SetTabCtrlHeight(m_tabCtrlHeight); tabctrl->SetArtProvider(art->Clone()); tab_frame->DoSizing(); } @@ -3006,7 +3032,7 @@ void wxAuiNotebook::UpdateHintWindowSize() { info.MinSize(size); info.BestSize(size); - m_dummy_wnd->SetSize(size); + m_dummyWnd->SetSize(size); } } @@ -3051,15 +3077,15 @@ int wxAuiNotebook::CalculateTabCtrlHeight() // if a fixed tab ctrl height is specified, // just return that instead of calculating a // tab height - if (m_requested_tabctrl_height != -1) - return m_requested_tabctrl_height; + if (m_requestedTabCtrlHeight != -1) + return m_requestedTabCtrlHeight; // find out new best tab height wxAuiTabArt* art = m_tabs.GetArtProvider(); return art->GetBestTabCtrlSize(this, m_tabs.GetPages(), - m_requested_bmp_size); + m_requestedBmpSize); } @@ -3135,7 +3161,7 @@ bool wxAuiNotebook::InsertPage(size_t page_idx, // (though no select events will be fired) if (!select && m_tabs.GetPageCount() == 1) select = true; - //m_curpage = GetPageIndex(page); + //m_curPage = GetPageIndex(page); wxAuiTabCtrl* active_tabctrl = GetActiveTabCtrl(); if (page_idx >= active_tabctrl->GetPageCount()) @@ -3148,8 +3174,8 @@ bool wxAuiNotebook::InsertPage(size_t page_idx, active_tabctrl->DoShowHide(); // adjust selected index - if(m_curpage >= (int) page_idx) - m_curpage++; + if(m_curPage >= (int) page_idx) + m_curPage++; if (select) { @@ -3202,8 +3228,8 @@ bool wxAuiNotebook::RemovePage(size_t page_idx) { // save active window pointer wxWindow* active_wnd = NULL; - if (m_curpage >= 0) - active_wnd = m_tabs.GetWindowFromIdx(m_curpage); + if (m_curPage >= 0) + active_wnd = m_tabs.GetWindowFromIdx(m_curPage); // save pointer of window being deleted wxWindow* wnd = m_tabs.GetWindowFromIdx(page_idx); @@ -3219,7 +3245,7 @@ bool wxAuiNotebook::RemovePage(size_t page_idx) if (!FindTab(wnd, &ctrl, &ctrl_idx)) return false; - bool is_curpage = (m_curpage == (int)page_idx); + bool is_curpage = (m_curPage == (int)page_idx); bool is_active_in_split = ctrl->GetPage(ctrl_idx).active; @@ -3278,7 +3304,7 @@ bool wxAuiNotebook::RemovePage(size_t page_idx) RemoveEmptyTabFrames(); - m_curpage = wxNOT_FOUND; + m_curPage = wxNOT_FOUND; // set new active pane unless we're being destroyed anyhow if (new_active && !m_isBeingDeleted) @@ -3371,82 +3397,13 @@ wxBitmap wxAuiNotebook::GetPageBitmap(size_t page_idx) const // GetSelection() returns the index of the currently active page int wxAuiNotebook::GetSelection() const { - return m_curpage; + return m_curPage; } // SetSelection() sets the currently active page -size_t wxAuiNotebook::SetSelection(size_t new_page) +int wxAuiNotebook::SetSelection(size_t new_page) { - wxWindow* wnd = m_tabs.GetWindowFromIdx(new_page); - if (!wnd) - return m_curpage; - - // don't change the page unless necessary; - // however, clicking again on a tab should give it the focus. - if ((int)new_page == m_curpage) - { - wxAuiTabCtrl* ctrl; - int ctrl_idx; - if (FindTab(wnd, &ctrl, &ctrl_idx)) - { - if (FindFocus() != ctrl) - ctrl->SetFocus(); - } - return m_curpage; - } - - wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId); - evt.SetSelection(new_page); - evt.SetOldSelection(m_curpage); - evt.SetEventObject(this); - if (!GetEventHandler()->ProcessEvent(evt) || evt.IsAllowed()) - { - int old_curpage = m_curpage; - m_curpage = new_page; - - // program allows the page change - evt.SetEventType(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED); - (void)GetEventHandler()->ProcessEvent(evt); - - - wxAuiTabCtrl* ctrl; - int ctrl_idx; - if (FindTab(wnd, &ctrl, &ctrl_idx)) - { - m_tabs.SetActivePage(wnd); - - ctrl->SetActivePage(ctrl_idx); - DoSizing(); - ctrl->DoShowHide(); - - ctrl->MakeTabVisible(ctrl_idx, ctrl); - - // set fonts - wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); - size_t i, pane_count = all_panes.GetCount(); - for (i = 0; i < pane_count; ++i) - { - wxAuiPaneInfo& pane = all_panes.Item(i); - if (pane.name == wxT("dummy")) - continue; - wxAuiTabCtrl* tabctrl = ((wxTabFrame*)pane.window)->m_tabs; - if (tabctrl != ctrl) - tabctrl->SetSelectedFont(m_normal_font); - else - tabctrl->SetSelectedFont(m_selected_font); - tabctrl->Refresh(); - } - - // Set the focus to the page if we're not currently focused on the tab. - // This is Firefox-like behaviour. - if (wnd->IsShownOnScreen() && FindFocus() != ctrl) - wnd->SetFocus(); - - return old_curpage; - } - } - - return m_curpage; + return DoModifySelection(new_page, true); } void wxAuiNotebook::SetSelectionToWindow(wxWindow *win) @@ -3507,13 +3464,13 @@ void wxAuiNotebook::DoSizing() // called to determine which control gets new windows being added wxAuiTabCtrl* wxAuiNotebook::GetActiveTabCtrl() { - if (m_curpage >= 0 && m_curpage < (int)m_tabs.GetPageCount()) + if (m_curPage >= 0 && m_curPage < (int)m_tabs.GetPageCount()) { wxAuiTabCtrl* ctrl; int idx; // find the tab ctrl with the current page - if (FindTab(m_tabs.GetPage(m_curpage).window, + if (FindTab(m_tabs.GetPage(m_curPage).window, &ctrl, &idx)) { return ctrl; @@ -3534,9 +3491,9 @@ wxAuiTabCtrl* wxAuiNotebook::GetActiveTabCtrl() // If there is no tabframe at all, create one wxTabFrame* tabframe = new wxTabFrame; - tabframe->SetTabCtrlHeight(m_tab_ctrl_height); + tabframe->SetTabCtrlHeight(m_tabCtrlHeight); tabframe->m_tabs = new wxAuiTabCtrl(this, - m_tab_id_counter++, + m_tabIdCounter++, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxWANTS_CHARS); @@ -3617,9 +3574,9 @@ void wxAuiNotebook::Split(size_t page, int direction) // create a new tab frame wxTabFrame* new_tabs = new wxTabFrame; new_tabs->m_rect = wxRect(wxPoint(0,0), split_size); - new_tabs->SetTabCtrlHeight(m_tab_ctrl_height); + new_tabs->SetTabCtrlHeight(m_tabCtrlHeight); new_tabs->m_tabs = new wxAuiTabCtrl(this, - m_tab_id_counter++, + m_tabIdCounter++, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxWANTS_CHARS); @@ -3629,31 +3586,31 @@ void wxAuiNotebook::Split(size_t page, int direction) // create a pane info structure with the information // about where the pane should be added - wxAuiPaneInfo pane_info = wxAuiPaneInfo().Bottom().CaptionVisible(false); + wxAuiPaneInfo paneInfo = wxAuiPaneInfo().Bottom().CaptionVisible(false); wxPoint mouse_pt; if (direction == wxLEFT) { - pane_info.Left(); + paneInfo.Left(); mouse_pt = wxPoint(0, cli_size.y/2); } else if (direction == wxRIGHT) { - pane_info.Right(); + paneInfo.Right(); mouse_pt = wxPoint(cli_size.x, cli_size.y/2); } else if (direction == wxTOP) { - pane_info.Top(); + paneInfo.Top(); mouse_pt = wxPoint(cli_size.x/2, 0); } else if (direction == wxBOTTOM) { - pane_info.Bottom(); + paneInfo.Bottom(); mouse_pt = wxPoint(cli_size.x/2, cli_size.y); } - m_mgr.AddPane(new_tabs, pane_info, mouse_pt); + m_mgr.AddPane(new_tabs, paneInfo, mouse_pt); m_mgr.Update(); // remove the page from the source tabs @@ -3681,7 +3638,7 @@ void wxAuiNotebook::Split(size_t page, int direction) dest_tabs->Refresh(); // force the set selection function reset the selection - m_curpage = -1; + m_curPage = -1; // set the active page to the one we just split off SetSelectionToPage(page_info); @@ -3718,7 +3675,7 @@ void wxAuiNotebook::OnTabBgDClick(wxAuiNotebookEvent& WXUNUSED(evt)) void wxAuiNotebook::OnTabBeginDrag(wxAuiNotebookEvent&) { - m_last_drag_x = 0; + m_lastDragX = 0; } void wxAuiNotebook::OnTabDragMotion(wxAuiNotebookEvent& evt) @@ -3757,10 +3714,10 @@ void wxAuiNotebook::OnTabDragMotion(wxAuiNotebookEvent& evt) // prevent jumpy drag if ((src_idx == dest_idx) || dest_idx == -1 || - (src_idx > dest_idx && m_last_drag_x <= pt.x) || - (src_idx < dest_idx && m_last_drag_x >= pt.x)) + (src_idx > dest_idx && m_lastDragX <= pt.x) || + (src_idx < dest_idx && m_lastDragX >= pt.x)) { - m_last_drag_x = pt.x; + m_lastDragX = pt.x; return; } @@ -3770,7 +3727,7 @@ void wxAuiNotebook::OnTabDragMotion(wxAuiNotebookEvent& evt) dest_tabs->SetActivePage((size_t)dest_idx); dest_tabs->DoShowHide(); dest_tabs->Refresh(); - m_last_drag_x = pt.x; + m_lastDragX = pt.x; } @@ -3846,7 +3803,7 @@ void wxAuiNotebook::OnTabDragMotion(wxAuiNotebookEvent& evt) } else { - m_mgr.DrawHintRect(m_dummy_wnd, client_pt, zero); + m_mgr.DrawHintRect(m_dummyWnd, client_pt, zero); } } @@ -4003,7 +3960,7 @@ void wxAuiNotebook::OnTabEndDrag(wxAuiNotebookEvent& evt) else { wxPoint zero(0,0); - wxRect rect = m_mgr.CalculateHintRect(m_dummy_wnd, + wxRect rect = m_mgr.CalculateHintRect(m_dummyWnd, mouse_client_pt, zero); if (rect.IsEmpty()) @@ -4015,9 +3972,9 @@ void wxAuiNotebook::OnTabEndDrag(wxAuiNotebookEvent& evt) // If there is no tabframe at all, create one wxTabFrame* new_tabs = new wxTabFrame; new_tabs->m_rect = wxRect(wxPoint(0,0), CalculateNewSplitSize()); - new_tabs->SetTabCtrlHeight(m_tab_ctrl_height); + new_tabs->SetTabCtrlHeight(m_tabCtrlHeight); new_tabs->m_tabs = new wxAuiTabCtrl(this, - m_tab_id_counter++, + m_tabIdCounter++, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxWANTS_CHARS); @@ -4061,7 +4018,7 @@ void wxAuiNotebook::OnTabEndDrag(wxAuiNotebookEvent& evt) dest_tabs->Refresh(); // force the set selection function reset the selection - m_curpage = -1; + m_curPage = -1; // set the active page to the one we just split off SetSelectionToPage(page_info); @@ -4079,6 +4036,18 @@ void wxAuiNotebook::OnTabEndDrag(wxAuiNotebookEvent& evt) +void wxAuiNotebook::OnTabCancelDrag(wxAuiNotebookEvent& command_evt) +{ + wxAuiNotebookEvent& evt = (wxAuiNotebookEvent&)command_evt; + + m_mgr.HideHint(); + + wxAuiTabCtrl* src_tabs = (wxAuiTabCtrl*)evt.GetEventObject(); + wxCHECK_RET( src_tabs, wxT("no source object?") ); + + src_tabs->SetCursor(wxCursor(wxCURSOR_ARROW)); +} + wxAuiTabCtrl* wxAuiNotebook::GetTabCtrlFromPoint(const wxPoint& pt) { // if we've just removed the last tab from the source @@ -4198,7 +4167,7 @@ void wxAuiNotebook::OnChildFocusNotebook(wxChildFocusEvent& evt) // change the tab selection to the child // which was focused int idx = m_tabs.GetIdxFromWindow(evt.GetWindow()); - if (idx != -1 && idx != m_curpage) + if (idx != -1 && idx != m_curPage) { SetSelection(idx); } @@ -4402,14 +4371,14 @@ void wxAuiNotebook::OnTabRightUp(wxAuiNotebookEvent& evt) // Sets the normal font void wxAuiNotebook::SetNormalFont(const wxFont& font) { - m_normal_font = font; + m_normalFont = font; GetArtProvider()->SetNormalFont(font); } // Sets the selected tab font void wxAuiNotebook::SetSelectedFont(const wxFont& font) { - m_selected_font = font; + m_selectedFont = font; GetArtProvider()->SetSelectedFont(font); } @@ -4438,7 +4407,7 @@ bool wxAuiNotebook::SetFont(const wxFont& font) // Gets the tab control height int wxAuiNotebook::GetTabCtrlHeight() const { - return m_tab_ctrl_height; + return m_tabCtrlHeight; } // Gets the height of the notebook for a given page height @@ -4507,4 +4476,163 @@ void wxAuiNotebook::Thaw() wxControl::Thaw(); } +void wxAuiNotebook::SetPageSize (const wxSize& WXUNUSED(size)) +{ + wxFAIL_MSG("Not implemented for wxAuiNotebook"); +} + +int wxAuiNotebook::HitTest (const wxPoint& WXUNUSED(pt), long* WXUNUSED(flags)) const +{ + wxFAIL_MSG("Not implemented for wxAuiNotebook"); + return wxNOT_FOUND; +} + +int wxAuiNotebook::GetPageImage(size_t WXUNUSED(n)) const +{ + wxFAIL_MSG("Not implemented for wxAuiNotebook"); + return -1; +} + +bool wxAuiNotebook::SetPageImage(size_t n, int imageId) +{ + return SetPageBitmap(n, GetImageList()->GetBitmap(imageId)); +} + +wxWindow* wxAuiNotebook::GetCurrentPage () const +{ + const int sel = GetSelection(); + + return sel == wxNOT_FOUND ? NULL : GetPage(sel); +} + +int wxAuiNotebook::ChangeSelection(size_t n) +{ + return DoModifySelection(n, false); +} + +bool wxAuiNotebook::AddPage(wxWindow *page, const wxString &text, bool select, + int imageId) +{ + if(HasImageList()) + { + return AddPage(page, text, select, GetImageList()->GetBitmap(imageId)); + } + else + { + return AddPage(page, text, select, wxNullBitmap); + } +} + +bool wxAuiNotebook::DeleteAllPages() +{ + size_t count = GetPageCount(); + for(size_t i = 0; i < count; i++) + { + DeletePage(0); + } + return true; +} + +bool wxAuiNotebook::InsertPage(size_t index, wxWindow *page, + const wxString &text, bool select, + int imageId) +{ + if(HasImageList()) + { + return InsertPage(index, page, text, select, + GetImageList()->GetBitmap(imageId)); + } + else + { + return InsertPage(index, page, text, select, wxNullBitmap); + } +} + +int wxAuiNotebook::DoModifySelection(size_t n, bool events) +{ + wxWindow* wnd = m_tabs.GetWindowFromIdx(n); + if (!wnd) + return m_curPage; + + // don't change the page unless necessary; + // however, clicking again on a tab should give it the focus. + if ((int)n == m_curPage) + { + wxAuiTabCtrl* ctrl; + int ctrl_idx; + if (FindTab(wnd, &ctrl, &ctrl_idx)) + { + if (FindFocus() != ctrl) + ctrl->SetFocus(); + } + return m_curPage; + } + + bool vetoed = false; + + wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId); + + if(events) + { + evt.SetSelection(n); + evt.SetOldSelection(m_curPage); + evt.SetEventObject(this); + GetEventHandler()->ProcessEvent(evt); + vetoed = !evt.IsAllowed(); + } + + if (!vetoed) + { + int old_curpage = m_curPage; + m_curPage = n; + + // program allows the page change + if(events) + { + evt.SetEventType(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED); + (void)GetEventHandler()->ProcessEvent(evt); + } + + + wxAuiTabCtrl* ctrl; + int ctrl_idx; + if (FindTab(wnd, &ctrl, &ctrl_idx)) + { + m_tabs.SetActivePage(wnd); + + ctrl->SetActivePage(ctrl_idx); + DoSizing(); + ctrl->DoShowHide(); + + ctrl->MakeTabVisible(ctrl_idx, ctrl); + + // set fonts + wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); + size_t i, pane_count = all_panes.GetCount(); + for (i = 0; i < pane_count; ++i) + { + wxAuiPaneInfo& pane = all_panes.Item(i); + if (pane.name == wxT("dummy")) + continue; + wxAuiTabCtrl* tabctrl = ((wxTabFrame*)pane.window)->m_tabs; + if (tabctrl != ctrl) + tabctrl->SetSelectedFont(m_normalFont); + else + tabctrl->SetSelectedFont(m_selectedFont); + tabctrl->Refresh(); + } + + // Set the focus to the page if we're not currently focused on the tab. + // This is Firefox-like behaviour. + if (wnd->IsShownOnScreen() && FindFocus() != ctrl) + wnd->SetFocus(); + + return old_curpage; + } + } + + return m_curPage; +} + + #endif // wxUSE_AUI diff --git a/Externals/wxWidgets3/src/aui/dockart.cpp b/Externals/wxWidgets3/src/aui/dockart.cpp index b84d2bb325..74dac023ce 100644 --- a/Externals/wxWidgets3/src/aui/dockart.cpp +++ b/Externals/wxWidgets3/src/aui/dockart.cpp @@ -4,7 +4,7 @@ // Author: Benjamin I. Williams // Modified by: // Created: 2005-05-17 -// RCS-ID: $Id: dockart.cpp 66670 2011-01-12 13:39:36Z VZ $ +// RCS-ID: $Id: dockart.cpp 69590 2011-10-30 14:20:03Z VZ $ // Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved // Licence: wxWindows Library Licence, Version 3.1 /////////////////////////////////////////////////////////////////////////////// @@ -43,6 +43,11 @@ #ifdef __WXGTK__ #include #include "wx/renderer.h" +#if GTK_CHECK_VERSION(2,0,0) + #include "wx/gtk/private/gtk2-compat.h" +#else + #define gtk_widget_is_drawable GTK_WIDGET_DRAWABLE +#endif #endif @@ -147,64 +152,64 @@ wxString wxAuiChopText(wxDC& dc, const wxString& text, int max_size) wxAuiDefaultDockArt::wxAuiDefaultDockArt() { #if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON - wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground)); + wxColor baseColour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground)); #else - wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); + wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); #endif - // the base_colour is too pale to use as our base colour, + // the baseColour is too pale to use as our base colour, // so darken it a bit -- - if ((255-base_colour.Red()) + - (255-base_colour.Green()) + - (255-base_colour.Blue()) < 60) + if ((255-baseColour.Red()) + + (255-baseColour.Green()) + + (255-baseColour.Blue()) < 60) { - base_colour = base_colour.ChangeLightness(92); + baseColour = baseColour.ChangeLightness(92); } - m_base_colour = base_colour; - wxColor darker1_colour = base_colour.ChangeLightness(85); - wxColor darker2_colour = base_colour.ChangeLightness(75); - wxColor darker3_colour = base_colour.ChangeLightness(60); - //wxColor darker4_colour = base_colour.ChangeLightness(50); - wxColor darker5_colour = base_colour.ChangeLightness(40); + m_baseColour = baseColour; + wxColor darker1Colour = baseColour.ChangeLightness(85); + wxColor darker2Colour = baseColour.ChangeLightness(75); + wxColor darker3Colour = baseColour.ChangeLightness(60); + //wxColor darker4Colour = baseColour.ChangeLightness(50); + wxColor darker5Colour = baseColour.ChangeLightness(40); - m_active_caption_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); - m_active_caption_gradient_colour = wxAuiLightContrastColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT)); - m_active_caption_text_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); - m_inactive_caption_colour = darker1_colour; - m_inactive_caption_gradient_colour = base_colour.ChangeLightness(97); - m_inactive_caption_text_colour = *wxBLACK; + m_activeCaptionColour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); + m_activeCaptionGradientColour = wxAuiLightContrastColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT)); + m_activeCaptionTextColour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); + m_inactiveCaptionColour = darker1Colour; + m_inactiveCaptionGradientColour = baseColour.ChangeLightness(97); + m_inactiveCaptionTextColour = *wxBLACK; - m_sash_brush = wxBrush(base_colour); - m_background_brush = wxBrush(base_colour); - m_gripper_brush = wxBrush(base_colour); + m_sashBrush = wxBrush(baseColour); + m_backgroundBrush = wxBrush(baseColour); + m_gripperBrush = wxBrush(baseColour); - m_border_pen = wxPen(darker2_colour); - m_gripper_pen1 = wxPen(darker5_colour); - m_gripper_pen2 = wxPen(darker3_colour); - m_gripper_pen3 = *wxWHITE_PEN; + m_borderPen = wxPen(darker2Colour); + m_gripperPen1 = wxPen(darker5Colour); + m_gripperPen2 = wxPen(darker3Colour); + m_gripperPen3 = *wxWHITE_PEN; #ifdef __WXMAC__ - m_caption_font = *wxSMALL_FONT; + m_captionFont = *wxSMALL_FONT; #else - m_caption_font = wxFont(8, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE); + m_captionFont = wxFont(8, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE); #endif // default metric values #if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON SInt32 height; GetThemeMetric( kThemeMetricSmallPaneSplitterHeight , &height ); - m_sash_size = height; + m_sashSize = height; #elif defined(__WXGTK__) - m_sash_size = wxRendererNative::Get().GetSplitterParams(NULL).widthSash; + m_sashSize = wxRendererNative::Get().GetSplitterParams(NULL).widthSash; #else - m_sash_size = 4; + m_sashSize = 4; #endif - m_caption_size = 17; - m_border_size = 1; - m_button_size = 14; - m_gripper_size = 9; - m_gradient_type = wxAUI_GRADIENT_VERTICAL; + m_captionSize = 17; + m_borderSize = 1; + m_buttonSize = 14; + m_gripperSize = 9; + m_gradientType = wxAUI_GRADIENT_VERTICAL; InitBitmaps(); } @@ -253,43 +258,43 @@ wxAuiDefaultDockArt::InitBitmaps () 0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; #ifdef __WXMAC__ - m_inactive_close_bitmap = wxAuiBitmapFromBits(close_bits, 16, 16, *wxWHITE); - m_active_close_bitmap = wxAuiBitmapFromBits(close_bits, 16, 16, *wxWHITE ); + m_inactiveCloseBitmap = wxAuiBitmapFromBits(close_bits, 16, 16, *wxWHITE); + m_activeCloseBitmap = wxAuiBitmapFromBits(close_bits, 16, 16, *wxWHITE ); #else - m_inactive_close_bitmap = wxAuiBitmapFromBits(close_bits, 16, 16, m_inactive_caption_text_colour); - m_active_close_bitmap = wxAuiBitmapFromBits(close_bits, 16, 16, m_active_caption_text_colour); + m_inactiveCloseBitmap = wxAuiBitmapFromBits(close_bits, 16, 16, m_inactiveCaptionTextColour); + m_activeCloseBitmap = wxAuiBitmapFromBits(close_bits, 16, 16, m_activeCaptionTextColour); #endif #ifdef __WXMAC__ - m_inactive_maximize_bitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, *wxWHITE); - m_active_maximize_bitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, *wxWHITE ); + m_inactiveMaximizeBitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, *wxWHITE); + m_activeMaximizeBitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, *wxWHITE ); #else - m_inactive_maximize_bitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, m_inactive_caption_text_colour); - m_active_maximize_bitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, m_active_caption_text_colour); + m_inactiveMaximizeBitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, m_inactiveCaptionTextColour); + m_activeMaximizeBitmap = wxAuiBitmapFromBits(maximize_bits, 16, 16, m_activeCaptionTextColour); #endif #ifdef __WXMAC__ - m_inactive_restore_bitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, *wxWHITE); - m_active_restore_bitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, *wxWHITE ); + m_inactiveRestoreBitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, *wxWHITE); + m_activeRestoreBitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, *wxWHITE ); #else - m_inactive_restore_bitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, m_inactive_caption_text_colour); - m_active_restore_bitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, m_active_caption_text_colour); + m_inactiveRestoreBitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, m_inactiveCaptionTextColour); + m_activeRestoreBitmap = wxAuiBitmapFromBits(restore_bits, 16, 16, m_activeCaptionTextColour); #endif - m_inactive_pin_bitmap = wxAuiBitmapFromBits(pin_bits, 16, 16, m_inactive_caption_text_colour); - m_active_pin_bitmap = wxAuiBitmapFromBits(pin_bits, 16, 16, m_active_caption_text_colour); + m_inactivePinBitmap = wxAuiBitmapFromBits(pin_bits, 16, 16, m_inactiveCaptionTextColour); + m_activePinBitmap = wxAuiBitmapFromBits(pin_bits, 16, 16, m_activeCaptionTextColour); } int wxAuiDefaultDockArt::GetMetric(int id) { switch (id) { - case wxAUI_DOCKART_SASH_SIZE: return m_sash_size; - case wxAUI_DOCKART_CAPTION_SIZE: return m_caption_size; - case wxAUI_DOCKART_GRIPPER_SIZE: return m_gripper_size; - case wxAUI_DOCKART_PANE_BORDER_SIZE: return m_border_size; - case wxAUI_DOCKART_PANE_BUTTON_SIZE: return m_button_size; - case wxAUI_DOCKART_GRADIENT_TYPE: return m_gradient_type; + case wxAUI_DOCKART_SASH_SIZE: return m_sashSize; + case wxAUI_DOCKART_CAPTION_SIZE: return m_captionSize; + case wxAUI_DOCKART_GRIPPER_SIZE: return m_gripperSize; + case wxAUI_DOCKART_PANE_BORDER_SIZE: return m_borderSize; + case wxAUI_DOCKART_PANE_BUTTON_SIZE: return m_buttonSize; + case wxAUI_DOCKART_GRADIENT_TYPE: return m_gradientType; default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; } @@ -300,12 +305,12 @@ void wxAuiDefaultDockArt::SetMetric(int id, int new_val) { switch (id) { - case wxAUI_DOCKART_SASH_SIZE: m_sash_size = new_val; break; - case wxAUI_DOCKART_CAPTION_SIZE: m_caption_size = new_val; break; - case wxAUI_DOCKART_GRIPPER_SIZE: m_gripper_size = new_val; break; - case wxAUI_DOCKART_PANE_BORDER_SIZE: m_border_size = new_val; break; - case wxAUI_DOCKART_PANE_BUTTON_SIZE: m_button_size = new_val; break; - case wxAUI_DOCKART_GRADIENT_TYPE: m_gradient_type = new_val; break; + case wxAUI_DOCKART_SASH_SIZE: m_sashSize = new_val; break; + case wxAUI_DOCKART_CAPTION_SIZE: m_captionSize = new_val; break; + case wxAUI_DOCKART_GRIPPER_SIZE: m_gripperSize = new_val; break; + case wxAUI_DOCKART_PANE_BORDER_SIZE: m_borderSize = new_val; break; + case wxAUI_DOCKART_PANE_BUTTON_SIZE: m_buttonSize = new_val; break; + case wxAUI_DOCKART_GRADIENT_TYPE: m_gradientType = new_val; break; default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; } } @@ -314,16 +319,16 @@ wxColour wxAuiDefaultDockArt::GetColour(int id) { switch (id) { - case wxAUI_DOCKART_BACKGROUND_COLOUR: return m_background_brush.GetColour(); - case wxAUI_DOCKART_SASH_COLOUR: return m_sash_brush.GetColour(); - case wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR: return m_inactive_caption_colour; - case wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR: return m_inactive_caption_gradient_colour; - case wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR: return m_inactive_caption_text_colour; - case wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR: return m_active_caption_colour; - case wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR: return m_active_caption_gradient_colour; - case wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR: return m_active_caption_text_colour; - case wxAUI_DOCKART_BORDER_COLOUR: return m_border_pen.GetColour(); - case wxAUI_DOCKART_GRIPPER_COLOUR: return m_gripper_brush.GetColour(); + case wxAUI_DOCKART_BACKGROUND_COLOUR: return m_backgroundBrush.GetColour(); + case wxAUI_DOCKART_SASH_COLOUR: return m_sashBrush.GetColour(); + case wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR: return m_inactiveCaptionColour; + case wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR: return m_inactiveCaptionGradientColour; + case wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR: return m_inactiveCaptionTextColour; + case wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR: return m_activeCaptionColour; + case wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR: return m_activeCaptionGradientColour; + case wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR: return m_activeCaptionTextColour; + case wxAUI_DOCKART_BORDER_COLOUR: return m_borderPen.GetColour(); + case wxAUI_DOCKART_GRIPPER_COLOUR: return m_gripperBrush.GetColour(); default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; } @@ -334,19 +339,19 @@ void wxAuiDefaultDockArt::SetColour(int id, const wxColor& colour) { switch (id) { - case wxAUI_DOCKART_BACKGROUND_COLOUR: m_background_brush.SetColour(colour); break; - case wxAUI_DOCKART_SASH_COLOUR: m_sash_brush.SetColour(colour); break; - case wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR: m_inactive_caption_colour = colour; break; - case wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR: m_inactive_caption_gradient_colour = colour; break; - case wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR: m_inactive_caption_text_colour = colour; break; - case wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR: m_active_caption_colour = colour; break; - case wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR: m_active_caption_gradient_colour = colour; break; - case wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR: m_active_caption_text_colour = colour; break; - case wxAUI_DOCKART_BORDER_COLOUR: m_border_pen.SetColour(colour); break; + case wxAUI_DOCKART_BACKGROUND_COLOUR: m_backgroundBrush.SetColour(colour); break; + case wxAUI_DOCKART_SASH_COLOUR: m_sashBrush.SetColour(colour); break; + case wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR: m_inactiveCaptionColour = colour; break; + case wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR: m_inactiveCaptionGradientColour = colour; break; + case wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR: m_inactiveCaptionTextColour = colour; break; + case wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR: m_activeCaptionColour = colour; break; + case wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR: m_activeCaptionGradientColour = colour; break; + case wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR: m_activeCaptionTextColour = colour; break; + case wxAUI_DOCKART_BORDER_COLOUR: m_borderPen.SetColour(colour); break; case wxAUI_DOCKART_GRIPPER_COLOUR: - m_gripper_brush.SetColour(colour); - m_gripper_pen1.SetColour(colour.ChangeLightness(40)); - m_gripper_pen2.SetColour(colour.ChangeLightness(60)); + m_gripperBrush.SetColour(colour); + m_gripperPen1.SetColour(colour.ChangeLightness(40)); + m_gripperPen2.SetColour(colour.ChangeLightness(60)); break; default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; } @@ -357,13 +362,13 @@ void wxAuiDefaultDockArt::SetColour(int id, const wxColor& colour) void wxAuiDefaultDockArt::SetFont(int id, const wxFont& font) { if (id == wxAUI_DOCKART_CAPTION_FONT) - m_caption_font = font; + m_captionFont = font; } wxFont wxAuiDefaultDockArt::GetFont(int id) { if (id == wxAUI_DOCKART_CAPTION_FONT) - return m_caption_font; + return m_captionFont; return wxNullFont; } @@ -387,7 +392,7 @@ void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, #elif defined(__WXGTK__) // clear out the rectangle first dc.SetPen(*wxTRANSPARENT_PEN); - dc.SetBrush(m_sash_brush); + dc.SetBrush(m_sashBrush); dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); #if 0 @@ -396,7 +401,7 @@ void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, { gdk_rect.x = rect.x; gdk_rect.y = rect.y; - gdk_rect.width = m_sash_size; + gdk_rect.width = m_sashSize; gdk_rect.height = rect.height; } else @@ -404,17 +409,17 @@ void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, gdk_rect.x = rect.x; gdk_rect.y = rect.y; gdk_rect.width = rect.width; - gdk_rect.height = m_sash_size; + gdk_rect.height = m_sashSize; } #endif if (!window) return; if (!window->m_wxwindow) return; - if (!GTK_WIDGET_DRAWABLE(window->m_wxwindow)) return; + if (!gtk_widget_is_drawable(window->m_wxwindow)) return; gtk_paint_handle ( - window->m_wxwindow->style, + gtk_widget_get_style(window->m_wxwindow), window->GTKGetDrawingWindow(), // flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL, GTK_STATE_NORMAL, @@ -433,7 +438,7 @@ void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, wxUnusedVar(window); wxUnusedVar(orientation); dc.SetPen(*wxTRANSPARENT_PEN); - dc.SetBrush(m_sash_brush); + dc.SetBrush(m_sashBrush); dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); #endif } @@ -448,14 +453,14 @@ void wxAuiDefaultDockArt::DrawBackground(wxDC& dc, wxWindow *WXUNUSED(window), i dc.SetBrush(*wxWHITE_BRUSH) ; dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); #endif - dc.SetBrush(m_background_brush); + dc.SetBrush(m_backgroundBrush); dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); } void wxAuiDefaultDockArt::DrawBorder(wxDC& dc, wxWindow *WXUNUSED(window), const wxRect& _rect, wxAuiPaneInfo& pane) { - dc.SetPen(m_border_pen); + dc.SetPen(m_borderPen); dc.SetBrush(*wxTRANSPARENT_BRUSH); wxRect rect = _rect; @@ -468,7 +473,7 @@ void wxAuiDefaultDockArt::DrawBorder(wxDC& dc, wxWindow *WXUNUSED(window), const dc.SetPen(*wxWHITE_PEN); dc.DrawLine(rect.x, rect.y, rect.x+rect.width, rect.y); dc.DrawLine(rect.x, rect.y, rect.x, rect.y+rect.height); - dc.SetPen(m_border_pen); + dc.SetPen(m_borderPen); dc.DrawLine(rect.x, rect.y+rect.height-1, rect.x+rect.width, rect.y+rect.height-1); dc.DrawLine(rect.x+rect.width-1, rect.y, @@ -489,12 +494,12 @@ void wxAuiDefaultDockArt::DrawBorder(wxDC& dc, wxWindow *WXUNUSED(window), const void wxAuiDefaultDockArt::DrawCaptionBackground(wxDC& dc, const wxRect& rect, bool active) { - if (m_gradient_type == wxAUI_GRADIENT_NONE) + if (m_gradientType == wxAUI_GRADIENT_NONE) { if (active) - dc.SetBrush(wxBrush(m_active_caption_colour)); + dc.SetBrush(wxBrush(m_activeCaptionColour)); else - dc.SetBrush(wxBrush(m_inactive_caption_colour)); + dc.SetBrush(wxBrush(m_inactiveCaptionColour)); dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); } @@ -505,15 +510,15 @@ void wxAuiDefaultDockArt::DrawCaptionBackground(wxDC& dc, const wxRect& rect, bo // on mac the gradients are expected to become darker from the top #ifdef __WXMAC__ DrawGradientRectangle(dc, rect, - m_active_caption_colour, - m_active_caption_gradient_colour, - m_gradient_type); + m_activeCaptionColour, + m_activeCaptionGradientColour, + m_gradientType); #else // on other platforms, active gradients become lighter at the top DrawGradientRectangle(dc, rect, - m_active_caption_gradient_colour, - m_active_caption_colour, - m_gradient_type); + m_activeCaptionGradientColour, + m_activeCaptionColour, + m_gradientType); #endif } else @@ -521,15 +526,15 @@ void wxAuiDefaultDockArt::DrawCaptionBackground(wxDC& dc, const wxRect& rect, bo #ifdef __WXMAC__ // on mac the gradients are expected to become darker from the top DrawGradientRectangle(dc, rect, - m_inactive_caption_gradient_colour, - m_inactive_caption_colour, - m_gradient_type); + m_inactiveCaptionGradientColour, + m_inactiveCaptionColour, + m_gradientType); #else // on other platforms, inactive gradients become lighter at the bottom DrawGradientRectangle(dc, rect, - m_inactive_caption_colour, - m_inactive_caption_gradient_colour, - m_gradient_type); + m_inactiveCaptionColour, + m_inactiveCaptionGradientColour, + m_gradientType); #endif } } @@ -542,7 +547,7 @@ void wxAuiDefaultDockArt::DrawCaption(wxDC& dc, wxWindow *WXUNUSED(window), wxAuiPaneInfo& pane) { dc.SetPen(*wxTRANSPARENT_PEN); - dc.SetFont(m_caption_font); + dc.SetFont(m_captionFont); DrawCaptionBackground(dc, rect, (pane.state & wxAuiPaneInfo::optionActive)?true:false); @@ -556,9 +561,9 @@ void wxAuiDefaultDockArt::DrawCaption(wxDC& dc, wxWindow *WXUNUSED(window), } if (pane.state & wxAuiPaneInfo::optionActive) - dc.SetTextForeground(m_active_caption_text_colour); + dc.SetTextForeground(m_activeCaptionTextColour); else - dc.SetTextForeground(m_inactive_caption_text_colour); + dc.SetTextForeground(m_inactiveCaptionTextColour); wxCoord w,h; @@ -568,11 +573,11 @@ void wxAuiDefaultDockArt::DrawCaption(wxDC& dc, wxWindow *WXUNUSED(window), clip_rect.width -= 3; // text offset clip_rect.width -= 2; // button padding if (pane.HasCloseButton()) - clip_rect.width -= m_button_size; + clip_rect.width -= m_buttonSize; if (pane.HasPinButton()) - clip_rect.width -= m_button_size; + clip_rect.width -= m_buttonSize; if (pane.HasMaximizeButton()) - clip_rect.width -= m_button_size; + clip_rect.width -= m_buttonSize; wxString draw_text = wxAuiChopText(dc, text, clip_rect.width); @@ -595,7 +600,7 @@ void wxAuiDefaultDockArt::DrawGripper(wxDC& dc, wxWindow *WXUNUSED(window), wxAuiPaneInfo& pane) { dc.SetPen(*wxTRANSPARENT_PEN); - dc.SetBrush(m_gripper_brush); + dc.SetBrush(m_gripperBrush); dc.DrawRectangle(rect.x, rect.y, rect.width,rect.height); @@ -604,12 +609,12 @@ void wxAuiDefaultDockArt::DrawGripper(wxDC& dc, wxWindow *WXUNUSED(window), int y = 5; while (1) { - dc.SetPen(m_gripper_pen1); + dc.SetPen(m_gripperPen1); dc.DrawPoint(rect.x+3, rect.y+y); - dc.SetPen(m_gripper_pen2); + dc.SetPen(m_gripperPen2); dc.DrawPoint(rect.x+3, rect.y+y+1); dc.DrawPoint(rect.x+4, rect.y+y); - dc.SetPen(m_gripper_pen3); + dc.SetPen(m_gripperPen3); dc.DrawPoint(rect.x+5, rect.y+y+1); dc.DrawPoint(rect.x+5, rect.y+y+2); dc.DrawPoint(rect.x+4, rect.y+y+2); @@ -624,12 +629,12 @@ void wxAuiDefaultDockArt::DrawGripper(wxDC& dc, wxWindow *WXUNUSED(window), int x = 5; while (1) { - dc.SetPen(m_gripper_pen1); + dc.SetPen(m_gripperPen1); dc.DrawPoint(rect.x+x, rect.y+3); - dc.SetPen(m_gripper_pen2); + dc.SetPen(m_gripperPen2); dc.DrawPoint(rect.x+x+1, rect.y+3); dc.DrawPoint(rect.x+x, rect.y+4); - dc.SetPen(m_gripper_pen3); + dc.SetPen(m_gripperPen3); dc.DrawPoint(rect.x+x+1, rect.y+5); dc.DrawPoint(rect.x+x+2, rect.y+5); dc.DrawPoint(rect.x+x+2, rect.y+4); @@ -655,30 +660,30 @@ void wxAuiDefaultDockArt::DrawPaneButton(wxDC& dc, wxWindow *WXUNUSED(window), default: case wxAUI_BUTTON_CLOSE: if (pane.state & wxAuiPaneInfo::optionActive) - bmp = m_active_close_bitmap; + bmp = m_activeCloseBitmap; else - bmp = m_inactive_close_bitmap; + bmp = m_inactiveCloseBitmap; break; case wxAUI_BUTTON_PIN: if (pane.state & wxAuiPaneInfo::optionActive) - bmp = m_active_pin_bitmap; + bmp = m_activePinBitmap; else - bmp = m_inactive_pin_bitmap; + bmp = m_inactivePinBitmap; break; case wxAUI_BUTTON_MAXIMIZE_RESTORE: if (pane.IsMaximized()) { if (pane.state & wxAuiPaneInfo::optionActive) - bmp = m_active_restore_bitmap; + bmp = m_activeRestoreBitmap; else - bmp = m_inactive_restore_bitmap; + bmp = m_inactiveRestoreBitmap; } else { if (pane.state & wxAuiPaneInfo::optionActive) - bmp = m_active_maximize_bitmap; + bmp = m_activeMaximizeBitmap; else - bmp = m_inactive_maximize_bitmap; + bmp = m_inactiveMaximizeBitmap; } break; } @@ -702,13 +707,13 @@ void wxAuiDefaultDockArt::DrawPaneButton(wxDC& dc, wxWindow *WXUNUSED(window), { if (pane.state & wxAuiPaneInfo::optionActive) { - dc.SetBrush(wxBrush(m_active_caption_colour.ChangeLightness(120))); - dc.SetPen(wxPen(m_active_caption_colour.ChangeLightness(70))); + dc.SetBrush(wxBrush(m_activeCaptionColour.ChangeLightness(120))); + dc.SetPen(wxPen(m_activeCaptionColour.ChangeLightness(70))); } else { - dc.SetBrush(wxBrush(m_inactive_caption_colour.ChangeLightness(120))); - dc.SetPen(wxPen(m_inactive_caption_colour.ChangeLightness(70))); + dc.SetBrush(wxBrush(m_inactiveCaptionColour.ChangeLightness(120))); + dc.SetPen(wxPen(m_inactiveCaptionColour.ChangeLightness(70))); } // draw the background behind the button diff --git a/Externals/wxWidgets3/src/aui/floatpane.cpp b/Externals/wxWidgets3/src/aui/floatpane.cpp index f55082d56a..a4ce130fd8 100644 --- a/Externals/wxWidgets3/src/aui/floatpane.cpp +++ b/Externals/wxWidgets3/src/aui/floatpane.cpp @@ -4,7 +4,7 @@ // Author: Benjamin I. Williams // Modified by: // Created: 2005-05-17 -// RCS-ID: $Id: floatpane.cpp 64454 2010-05-31 14:59:18Z VZ $ +// RCS-ID: $Id: floatpane.cpp 69590 2011-10-30 14:20:03Z VZ $ // Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved // Licence: wxWindows Library Licence, Version 3.1 /////////////////////////////////////////////////////////////////////////////// @@ -54,17 +54,17 @@ wxAuiFloatingFrame::wxAuiFloatingFrame(wxWindow* parent, (pane.IsFixed()?0:wxRESIZE_BORDER) ) { - m_owner_mgr = owner_mgr; + m_ownerMgr = owner_mgr; m_moving = false; m_mgr.SetManagedWindow(this); - m_solid_drag = true; + m_solidDrag = true; // find out if the system supports solid window drag. // on non-msw systems, this is assumed to be the case #ifdef __WXMSW__ BOOL b = TRUE; SystemParametersInfo(38 /*SPI_GETDRAGFULLWINDOWS*/, 0, &b, 0); - m_solid_drag = b ? true : false; + m_solidDrag = b ? true : false; #endif SetExtraStyle(wxWS_EX_PROCESS_IDLE); @@ -73,9 +73,9 @@ wxAuiFloatingFrame::wxAuiFloatingFrame(wxWindow* parent, wxAuiFloatingFrame::~wxAuiFloatingFrame() { // if we do not do this, then we can crash... - if (m_owner_mgr && m_owner_mgr->m_action_window == this) + if (m_ownerMgr && m_ownerMgr->m_actionWindow == this) { - m_owner_mgr->m_action_window = NULL; + m_ownerMgr->m_actionWindow = NULL; } m_mgr.UnInit(); @@ -83,8 +83,8 @@ wxAuiFloatingFrame::~wxAuiFloatingFrame() void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane) { - m_pane_window = pane.window; - m_pane_window->Reparent(this); + m_paneWindow = pane.window; + m_paneWindow->Reparent(this); wxAuiPaneInfo contained_pane = pane; contained_pane.Dock().Center().Show(). @@ -108,7 +108,7 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane) SetMinSize(pane.window->GetMinSize()); - m_mgr.AddPane(m_pane_window, contained_pane); + m_mgr.AddPane(m_paneWindow, contained_pane); m_mgr.Update(); if (pane.min_size.IsFullySpecified()) @@ -123,7 +123,22 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane) SetTitle(pane.caption); - if (pane.floating_size != wxDefaultSize) + // This code is slightly awkward because we need to reset wxRESIZE_BORDER + // before calling SetClientSize() below as doing it after setting the + // client size would actually change it, at least under MSW, where the + // total window size doesn't change and hence, as the borders size changes, + // the client size does change. + // + // So we must call it first but doing it generates a size event and updates + // pane.floating_size from inside it so we must also record its original + // value before doing it. + const bool hasFloatingSize = pane.floating_size != wxDefaultSize; + if (pane.IsFixed()) + { + SetWindowStyleFlag(GetWindowStyleFlag() & ~wxRESIZE_BORDER); + } + + if ( hasFloatingSize ) { SetSize(pane.floating_size); } @@ -133,54 +148,49 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane) if (size == wxDefaultSize) size = pane.min_size; if (size == wxDefaultSize) - size = m_pane_window->GetSize(); - if (m_owner_mgr && pane.HasGripper()) + size = m_paneWindow->GetSize(); + if (m_ownerMgr && pane.HasGripper()) { if (pane.HasGripperTop()) - size.y += m_owner_mgr->m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE); + size.y += m_ownerMgr->m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE); else - size.x += m_owner_mgr->m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE); + size.x += m_ownerMgr->m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE); } SetClientSize(size); } - - if (pane.IsFixed()) - { - SetWindowStyleFlag(GetWindowStyleFlag() & ~wxRESIZE_BORDER); - } } wxAuiManager* wxAuiFloatingFrame::GetOwnerManager() const { - return m_owner_mgr; + return m_ownerMgr; } void wxAuiFloatingFrame::OnSize(wxSizeEvent& WXUNUSED(event)) { - if (m_owner_mgr) + if (m_ownerMgr) { - m_owner_mgr->OnFloatingPaneResized(m_pane_window, GetRect()); + m_ownerMgr->OnFloatingPaneResized(m_paneWindow, GetRect()); } } void wxAuiFloatingFrame::OnClose(wxCloseEvent& evt) { - if (m_owner_mgr) + if (m_ownerMgr) { - m_owner_mgr->OnFloatingPaneClosed(m_pane_window, evt); + m_ownerMgr->OnFloatingPaneClosed(m_paneWindow, evt); } if (!evt.GetVeto()) { - m_mgr.DetachPane(m_pane_window); + m_mgr.DetachPane(m_paneWindow); Destroy(); } } void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event) { - if (!m_solid_drag) + if (!m_solidDrag) { // systems without solid window dragging need to be // handled slightly differently, due to the lack of @@ -194,61 +204,70 @@ void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event) } - wxRect win_rect = GetRect(); + wxRect winRect = GetRect(); - if (win_rect == m_last_rect) + if (winRect == m_lastRect) return; // skip the first move event - if (m_last_rect.IsEmpty()) + if (m_lastRect.IsEmpty()) { - m_last_rect = win_rect; + m_lastRect = winRect; return; } // skip if moving too fast to avoid massive redraws and // jumping hint windows - if ((abs(win_rect.x - m_last_rect.x) > 3) || - (abs(win_rect.y - m_last_rect.y) > 3)) + if ((abs(winRect.x - m_lastRect.x) > 3) || + (abs(winRect.y - m_lastRect.y) > 3)) { - m_last3_rect = m_last2_rect; - m_last2_rect = m_last_rect; - m_last_rect = win_rect; + m_last3Rect = m_last2Rect; + m_last2Rect = m_lastRect; + m_lastRect = winRect; + + // However still update the internally stored position to avoid + // snapping back to the old one later. + if (m_ownerMgr) + { + m_ownerMgr->GetPane(m_paneWindow). + floating_pos = winRect.GetPosition(); + } + return; } // prevent frame redocking during resize - if (m_last_rect.GetSize() != win_rect.GetSize()) + if (m_lastRect.GetSize() != winRect.GetSize()) { - m_last3_rect = m_last2_rect; - m_last2_rect = m_last_rect; - m_last_rect = win_rect; + m_last3Rect = m_last2Rect; + m_last2Rect = m_lastRect; + m_lastRect = winRect; return; } wxDirection dir = wxALL; - int horiz_dist = abs(win_rect.x - m_last3_rect.x); - int vert_dist = abs(win_rect.y - m_last3_rect.y); + int horiz_dist = abs(winRect.x - m_last3Rect.x); + int vert_dist = abs(winRect.y - m_last3Rect.y); if (vert_dist >= horiz_dist) { - if (win_rect.y < m_last3_rect.y) + if (winRect.y < m_last3Rect.y) dir = wxNORTH; else dir = wxSOUTH; } else { - if (win_rect.x < m_last3_rect.x) + if (winRect.x < m_last3Rect.x) dir = wxWEST; else dir = wxEAST; } - m_last3_rect = m_last2_rect; - m_last2_rect = m_last_rect; - m_last_rect = win_rect; + m_last3Rect = m_last2Rect; + m_last2Rect = m_lastRect; + m_lastRect = winRect; if (!isMouseDown()) return; @@ -259,7 +278,7 @@ void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event) m_moving = true; } - if (m_last3_rect.IsEmpty()) + if (m_last3Rect.IsEmpty()) return; OnMoving(event.GetRect(), dir); @@ -284,18 +303,18 @@ void wxAuiFloatingFrame::OnIdle(wxIdleEvent& event) void wxAuiFloatingFrame::OnMoveStart() { // notify the owner manager that the pane has started to move - if (m_owner_mgr) + if (m_ownerMgr) { - m_owner_mgr->OnFloatingPaneMoveStart(m_pane_window); + m_ownerMgr->OnFloatingPaneMoveStart(m_paneWindow); } } void wxAuiFloatingFrame::OnMoving(const wxRect& WXUNUSED(window_rect), wxDirection dir) { // notify the owner manager that the pane is moving - if (m_owner_mgr) + if (m_ownerMgr) { - m_owner_mgr->OnFloatingPaneMoving(m_pane_window, dir); + m_ownerMgr->OnFloatingPaneMoving(m_paneWindow, dir); } m_lastDirection = dir; } @@ -303,17 +322,17 @@ void wxAuiFloatingFrame::OnMoving(const wxRect& WXUNUSED(window_rect), wxDirecti void wxAuiFloatingFrame::OnMoveFinished() { // notify the owner manager that the pane has finished moving - if (m_owner_mgr) + if (m_ownerMgr) { - m_owner_mgr->OnFloatingPaneMoved(m_pane_window, m_lastDirection); + m_ownerMgr->OnFloatingPaneMoved(m_paneWindow, m_lastDirection); } } void wxAuiFloatingFrame::OnActivate(wxActivateEvent& event) { - if (m_owner_mgr && event.GetActive()) + if (m_ownerMgr && event.GetActive()) { - m_owner_mgr->OnFloatingPaneActivated(m_pane_window); + m_ownerMgr->OnFloatingPaneActivated(m_paneWindow); } } diff --git a/Externals/wxWidgets3/src/aui/framemanager.cpp b/Externals/wxWidgets3/src/aui/framemanager.cpp index a44db9ccd0..1fee9e8ffa 100644 --- a/Externals/wxWidgets3/src/aui/framemanager.cpp +++ b/Externals/wxWidgets3/src/aui/framemanager.cpp @@ -4,7 +4,7 @@ // Author: Benjamin I. Williams // Modified by: // Created: 2005-05-17 -// RCS-ID: $Id: framemanager.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: framemanager.cpp 70807 2012-03-04 20:31:34Z VZ $ // Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved // Licence: wxWindows Library Licence, Version 3.1 /////////////////////////////////////////////////////////////////////////////// @@ -59,6 +59,7 @@ wxDEFINE_EVENT( wxEVT_AUI_PANE_BUTTON, wxAuiManagerEvent ); wxDEFINE_EVENT( wxEVT_AUI_PANE_CLOSE, wxAuiManagerEvent ); wxDEFINE_EVENT( wxEVT_AUI_PANE_MAXIMIZE, wxAuiManagerEvent ); wxDEFINE_EVENT( wxEVT_AUI_PANE_RESTORE, wxAuiManagerEvent ); +wxDEFINE_EVENT( wxEVT_AUI_PANE_ACTIVATED, wxAuiManagerEvent ); wxDEFINE_EVENT( wxEVT_AUI_RENDER, wxAuiManagerEvent ); wxDEFINE_EVENT( wxEVT_AUI_FIND_MANAGER, wxAuiManagerEvent ); @@ -98,44 +99,44 @@ public: : wxFrame(parent, id, title, pos, size, style | wxFRAME_SHAPED, name) { SetBackgroundStyle(wxBG_STYLE_CUSTOM); - m_Amount=0; - m_MaxWidth=0; - m_MaxHeight=0; + m_amount=0; + m_maxWidth=0; + m_maxHeight=0; m_lastWidth=0; m_lastHeight=0; #ifdef __WXGTK__ - m_CanSetShape = false; // have to wait for window create event on GTK + m_canSetShape = false; // have to wait for window create event on GTK #else - m_CanSetShape = true; + m_canSetShape = true; #endif - m_Region = wxRegion(0, 0, 0, 0); + m_region = wxRegion(0, 0, 0, 0); SetTransparent(0); } virtual bool SetTransparent(wxByte alpha) { - if (m_CanSetShape) + if (m_canSetShape) { int w=100; // some defaults int h=100; GetClientSize(&w, &h); - m_MaxWidth = w; - m_MaxHeight = h; - m_Amount = alpha; - m_Region.Clear(); -// m_Region.Union(0, 0, 1, m_MaxWidth); - if (m_Amount) + m_maxWidth = w; + m_maxHeight = h; + m_amount = alpha; + m_region.Clear(); +// m_region.Union(0, 0, 1, m_maxWidth); + if (m_amount) { - for (int y=0; y +#include "wx/gtk/private/gtk2-compat.h" static void gtk_pseudo_window_realized_callback( GtkWidget *m_widget, void *WXUNUSED(win) ) @@ -237,7 +239,7 @@ gtk_pseudo_window_realized_callback( GtkWidget *m_widget, void *WXUNUSED(win) ) if ((j*16+8)window, region.GetRegion(), 0, 0); + gdk_window_shape_combine_region(gtk_widget_get_window(m_widget), region.GetRegion(), 0, 0); } @@ -549,15 +551,28 @@ static void RenumberDockRows(wxAuiDockInfoPtrArray& docks) // SetActivePane() sets the active pane, as well as cycles through // every other pane and makes sure that all others' active flags // are turned off -static void SetActivePane(wxAuiPaneInfoArray& panes, wxWindow* active_pane) +void wxAuiManager::SetActivePane(wxWindow* active_pane) { int i, pane_count; - for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i) + wxAuiPaneInfo* active_paneinfo = NULL; + for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i) { - wxAuiPaneInfo& pane = panes.Item(i); + wxAuiPaneInfo& pane = m_panes.Item(i); pane.state &= ~wxAuiPaneInfo::optionActive; if (pane.window == active_pane) + { pane.state |= wxAuiPaneInfo::optionActive; + active_paneinfo = &pane; + } + } + + // send the 'activated' event after all panes have been updated + if ( active_paneinfo ) + { + wxAuiManagerEvent evt(wxEVT_AUI_PANE_ACTIVATED); + evt.SetManager(this); + evt.SetPane(active_paneinfo); + ProcessMgrEvent(evt); } } @@ -601,17 +616,17 @@ END_EVENT_TABLE() wxAuiManager::wxAuiManager(wxWindow* managed_wnd, unsigned int flags) { m_action = actionNone; - m_action_window = NULL; - m_last_mouse_move = wxPoint(); - m_hover_button = NULL; + m_actionWindow = NULL; + m_lastMouseMove = wxPoint(); + m_hoverButton = NULL; m_art = new wxAuiDefaultDockArt; - m_hint_wnd = NULL; + m_hintWnd = NULL; m_flags = flags; m_skipping = false; - m_has_maximized = false; + m_hasMaximized = false; m_frame = NULL; - m_dock_constraint_x = 0.3; - m_dock_constraint_y = 0.3; + m_dockConstraintX = 0.3; + m_dockConstraintY = 0.3; m_reserved = NULL; m_currentDragItem = -1; @@ -641,9 +656,9 @@ wxAuiManager::~wxAuiManager() // creates a floating frame for the windows wxAuiFloatingFrame* wxAuiManager::CreateFloatingFrame(wxWindow* parent, - const wxAuiPaneInfo& pane_info) + const wxAuiPaneInfo& paneInfo) { - return new wxAuiFloatingFrame(parent, this, pane_info); + return new wxAuiFloatingFrame(parent, this, paneInfo); } bool wxAuiManager::CanDockPanel(const wxAuiPaneInfo & WXUNUSED(p)) @@ -702,9 +717,9 @@ wxAuiDockUIPart* wxAuiManager::HitTest(int x, int y) wxAuiDockUIPart* result = NULL; int i, part_count; - for (i = 0, part_count = m_uiparts.GetCount(); i < part_count; ++i) + for (i = 0, part_count = m_uiParts.GetCount(); i < part_count; ++i) { - wxAuiDockUIPart* item = &m_uiparts.Item(i); + wxAuiDockUIPart* item = &m_uiParts.Item(i); // we are not interested in typeDock, because this space // isn't used to draw anything, just for measurements; @@ -819,39 +834,39 @@ void wxAuiManager::UpdateHintWindowConfig() } // if there is an existing hint window, delete it - if (m_hint_wnd) + if (m_hintWnd) { - m_hint_wnd->Destroy(); - m_hint_wnd = NULL; + m_hintWnd->Destroy(); + m_hintWnd = NULL; } - m_hint_fademax = 50; - m_hint_wnd = NULL; + m_hintFadeMax = 50; + m_hintWnd = NULL; if ((m_flags & wxAUI_MGR_TRANSPARENT_HINT) && can_do_transparent) { // Make a window to use for a transparent hint #if defined(__WXMSW__) || defined(__WXGTK__) - m_hint_wnd = new wxFrame(m_frame, wxID_ANY, wxEmptyString, + m_hintWnd = new wxFrame(m_frame, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(1,1), wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT | wxFRAME_NO_TASKBAR | wxNO_BORDER); - m_hint_wnd->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVECAPTION)); + m_hintWnd->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVECAPTION)); #elif defined(__WXMAC__) // Using a miniframe with float and tool styles keeps the parent // frame activated and highlighted as such... - m_hint_wnd = new wxMiniFrame(m_frame, wxID_ANY, wxEmptyString, + m_hintWnd = new wxMiniFrame(m_frame, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(1,1), wxFRAME_FLOAT_ON_PARENT | wxFRAME_TOOL_WINDOW ); - m_hint_wnd->Connect(wxEVT_ACTIVATE, + m_hintWnd->Connect(wxEVT_ACTIVATE, wxActivateEventHandler(wxAuiManager::OnHintActivate), NULL, this); // Can't set the bg colour of a Frame in wxMac - wxPanel* p = new wxPanel(m_hint_wnd); + wxPanel* p = new wxPanel(m_hintWnd); // The default wxSYS_COLOUR_ACTIVECAPTION colour is a light silver // color that is really hard to see, especially transparent. @@ -868,7 +883,7 @@ void wxAuiManager::UpdateHintWindowConfig() { // system can't support transparent fade, or the venetian // blinds effect was explicitly requested - m_hint_wnd = new wxPseudoTransparentFrame(m_frame, + m_hintWnd = new wxPseudoTransparentFrame(m_frame, wxID_ANY, wxEmptyString, wxDefaultPosition, @@ -877,7 +892,7 @@ void wxAuiManager::UpdateHintWindowConfig() wxFRAME_FLOAT_ON_PARENT | wxFRAME_NO_TASKBAR | wxNO_BORDER); - m_hint_fademax = 128; + m_hintFadeMax = 128; } } } @@ -975,7 +990,7 @@ void wxAuiManager::SetArtProvider(wxAuiDockArt* art_provider) } -bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info) +bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& paneInfo) { wxASSERT_MSG(window, wxT("NULL window ptrs are not allowed")); @@ -984,24 +999,24 @@ bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info) return false; // check if the window is already managed by us - if (GetPane(pane_info.window).IsOk()) + if (GetPane(paneInfo.window).IsOk()) return false; // check if the pane name already exists, this could reveal a // bug in the library user's application bool already_exists = false; - if (!pane_info.name.empty() && GetPane(pane_info.name).IsOk()) + if (!paneInfo.name.empty() && GetPane(paneInfo.name).IsOk()) { wxFAIL_MSG(wxT("A pane with that name already exists in the manager!")); already_exists = true; } // if the new pane is docked then we should undo maximize - if (pane_info.IsDocked()) + if (paneInfo.IsDocked()) RestoreMaximizedPane(); // special case: wxAuiToolBar style interacts with docking flags - wxAuiPaneInfo test(pane_info); + wxAuiPaneInfo test(paneInfo); wxAuiToolBar* toolbar = wxDynamicCast(window, wxAuiToolBar); if (toolbar) { @@ -1143,10 +1158,10 @@ bool wxAuiManager::AddPane(wxWindow* window, } bool wxAuiManager::AddPane(wxWindow* window, - const wxAuiPaneInfo& pane_info, + const wxAuiPaneInfo& paneInfo, const wxPoint& drop_pos) { - if (!AddPane(window, pane_info)) + if (!AddPane(window, paneInfo)) return false; wxAuiPaneInfo& pane = GetPane(window); @@ -1156,7 +1171,7 @@ bool wxAuiManager::AddPane(wxWindow* window, return true; } -bool wxAuiManager::InsertPane(wxWindow* window, const wxAuiPaneInfo& pane_info, +bool wxAuiManager::InsertPane(wxWindow* window, const wxAuiPaneInfo& paneInfo, int insert_level) { wxASSERT_MSG(window, wxT("NULL window ptrs are not allowed")); @@ -1166,21 +1181,21 @@ bool wxAuiManager::InsertPane(wxWindow* window, const wxAuiPaneInfo& pane_info, { case wxAUI_INSERT_PANE: DoInsertPane(m_panes, - pane_info.dock_direction, - pane_info.dock_layer, - pane_info.dock_row, - pane_info.dock_pos); + paneInfo.dock_direction, + paneInfo.dock_layer, + paneInfo.dock_row, + paneInfo.dock_pos); break; case wxAUI_INSERT_ROW: DoInsertDockRow(m_panes, - pane_info.dock_direction, - pane_info.dock_layer, - pane_info.dock_row); + paneInfo.dock_direction, + paneInfo.dock_layer, + paneInfo.dock_row); break; case wxAUI_INSERT_DOCK: DoInsertDockLayer(m_panes, - pane_info.dock_direction, - pane_info.dock_layer); + paneInfo.dock_direction, + paneInfo.dock_layer); break; } @@ -1189,27 +1204,27 @@ bool wxAuiManager::InsertPane(wxWindow* window, const wxAuiPaneInfo& pane_info, wxAuiPaneInfo& existing_pane = GetPane(window); if (!existing_pane.IsOk()) { - return AddPane(window, pane_info); + return AddPane(window, paneInfo); } else { - if (pane_info.IsFloating()) + if (paneInfo.IsFloating()) { existing_pane.Float(); - if (pane_info.floating_pos != wxDefaultPosition) - existing_pane.FloatingPosition(pane_info.floating_pos); - if (pane_info.floating_size != wxDefaultSize) - existing_pane.FloatingSize(pane_info.floating_size); + if (paneInfo.floating_pos != wxDefaultPosition) + existing_pane.FloatingPosition(paneInfo.floating_pos); + if (paneInfo.floating_size != wxDefaultSize) + existing_pane.FloatingSize(paneInfo.floating_size); } else { // if the new pane is docked then we should undo maximize RestoreMaximizedPane(); - existing_pane.Direction(pane_info.dock_direction); - existing_pane.Layer(pane_info.dock_layer); - existing_pane.Row(pane_info.dock_row); - existing_pane.Position(pane_info.dock_pos); + existing_pane.Direction(paneInfo.dock_direction); + existing_pane.Layer(paneInfo.dock_layer); + existing_pane.Row(paneInfo.dock_row); + existing_pane.Position(paneInfo.dock_pos); } } @@ -1241,9 +1256,9 @@ bool wxAuiManager::DetachPane(wxWindow* window) p.frame->Show(false); // reparent to m_frame and destroy the pane - if (m_action_window == p.frame) + if (m_actionWindow == p.frame) { - m_action_window = NULL; + m_actionWindow = NULL; } p.window->Reparent(m_frame); @@ -1257,12 +1272,12 @@ bool wxAuiManager::DetachPane(wxWindow* window) // the DetachPane() call. This prevets obscure crashes which would // happen at window repaint if the caller forgets to call Update() int pi, part_count; - for (pi = 0, part_count = (int)m_uiparts.GetCount(); pi < part_count; ++pi) + for (pi = 0, part_count = (int)m_uiParts.GetCount(); pi < part_count; ++pi) { - wxAuiDockUIPart& part = m_uiparts.Item(pi); + wxAuiDockUIPart& part = m_uiParts.Item(pi); if (part.pane == &p) { - m_uiparts.RemoveAt(pi); + m_uiParts.RemoveAt(pi); part_count--; pi--; continue; @@ -1277,37 +1292,37 @@ bool wxAuiManager::DetachPane(wxWindow* window) } // ClosePane() destroys or hides the pane depending on its flags -void wxAuiManager::ClosePane(wxAuiPaneInfo& pane_info) +void wxAuiManager::ClosePane(wxAuiPaneInfo& paneInfo) { // if we were maximized, restore - if (pane_info.IsMaximized()) + if (paneInfo.IsMaximized()) { - RestorePane(pane_info); + RestorePane(paneInfo); } // first, hide the window - if (pane_info.window && pane_info.window->IsShown()) + if (paneInfo.window && paneInfo.window->IsShown()) { - pane_info.window->Show(false); + paneInfo.window->Show(false); } // make sure that we are the parent of this window - if (pane_info.window && pane_info.window->GetParent() != m_frame) + if (paneInfo.window && paneInfo.window->GetParent() != m_frame) { - pane_info.window->Reparent(m_frame); + paneInfo.window->Reparent(m_frame); } // if we have a frame, destroy it - if (pane_info.frame) + if (paneInfo.frame) { - pane_info.frame->Destroy(); - pane_info.frame = NULL; + paneInfo.frame->Destroy(); + paneInfo.frame = NULL; } // now we need to either destroy or hide the pane - if (pane_info.IsDestroyOnClose()) + if (paneInfo.IsDestroyOnClose()) { - wxWindow * window = pane_info.window; + wxWindow * window = paneInfo.window; DetachPane(window); if (window) { @@ -1316,11 +1331,11 @@ void wxAuiManager::ClosePane(wxAuiPaneInfo& pane_info) } else { - pane_info.Hide(); + paneInfo.Hide(); } } -void wxAuiManager::MaximizePane(wxAuiPaneInfo& pane_info) +void wxAuiManager::MaximizePane(wxAuiPaneInfo& paneInfo) { int i, pane_count; @@ -1343,18 +1358,18 @@ void wxAuiManager::MaximizePane(wxAuiPaneInfo& pane_info) } // mark ourselves maximized - pane_info.Maximize(); - pane_info.Show(); - m_has_maximized = true; + paneInfo.Maximize(); + paneInfo.Show(); + m_hasMaximized = true; // last, show the window - if (pane_info.window && !pane_info.window->IsShown()) + if (paneInfo.window && !paneInfo.window->IsShown()) { - pane_info.window->Show(true); + paneInfo.window->Show(true); } } -void wxAuiManager::RestorePane(wxAuiPaneInfo& pane_info) +void wxAuiManager::RestorePane(wxAuiPaneInfo& paneInfo) { int i, pane_count; @@ -1370,13 +1385,13 @@ void wxAuiManager::RestorePane(wxAuiPaneInfo& pane_info) } // mark ourselves non-maximized - pane_info.Restore(); - m_has_maximized = false; + paneInfo.Restore(); + m_hasMaximized = false; // last, show the window - if (pane_info.window && !pane_info.window->IsShown()) + if (paneInfo.window && !paneInfo.window->IsShown()) { - pane_info.window->Show(true); + paneInfo.window->Show(true); } } @@ -1588,6 +1603,7 @@ bool wxAuiManager::LoadPerspective(const wxString& layout, bool update) input.Replace(wxT("\\|"), wxT("\a")); input.Replace(wxT("\\;"), wxT("\b")); + m_hasMaximized = false; while (1) { wxAuiPaneInfo pane; @@ -1630,6 +1646,9 @@ bool wxAuiManager::LoadPerspective(const wxString& layout, bool update) LoadPaneInfo(pane_part, pane); + if ( pane.IsMaximized() ) + m_hasMaximized = true; + wxAuiPaneInfo& p = GetPane(pane.name); if (!p.IsOk()) { @@ -1652,8 +1671,8 @@ void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock, wxArrayInt& sizes) { int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE); - int pane_border_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE); - int gripper_size = m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE); + int pane_borderSize = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE); + int gripperSize = m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE); positions.Empty(); sizes.Empty(); @@ -1683,18 +1702,18 @@ void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock, int size = 0; if (pane.HasBorder()) - size += (pane_border_size*2); + size += (pane_borderSize*2); if (dock.IsHorizontal()) { if (pane.HasGripper() && !pane.HasGripperTop()) - size += gripper_size; + size += gripperSize; size += pane.best_size.x; } else { if (pane.HasGripper() && pane.HasGripperTop()) - size += gripper_size; + size += gripperSize; if (pane.HasCaption()) size += caption_size; @@ -1748,8 +1767,8 @@ void wxAuiManager::LayoutAddPane(wxSizer* cont, wxSizerItem* sizer_item; int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE); - int gripper_size = m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE); - int pane_border_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE); + int gripperSize = m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE); + int pane_borderSize = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE); int pane_button_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BUTTON_SIZE); // find out the orientation of the item (orientation for panes @@ -1770,9 +1789,9 @@ void wxAuiManager::LayoutAddPane(wxSizer* cont, if (pane.HasGripper()) { if (pane.HasGripperTop()) - sizer_item = vert_pane_sizer ->Add(1, gripper_size, 0, wxEXPAND); + sizer_item = vert_pane_sizer ->Add(1, gripperSize, 0, wxEXPAND); else - sizer_item = horz_pane_sizer ->Add(gripper_size, 1, 0, wxEXPAND); + sizer_item = horz_pane_sizer ->Add(gripperSize, 1, 0, wxEXPAND); part.type = wxAuiDockUIPart::typeGripper; part.dock = &dock; @@ -1891,7 +1910,7 @@ void wxAuiManager::LayoutAddPane(wxSizer* cont, { // allowing space for the pane's border sizer_item = cont->Add(horz_pane_sizer, pane_proportion, - wxEXPAND | wxALL, pane_border_size); + wxEXPAND | wxALL, pane_borderSize); part.type = wxAuiDockUIPart::typePaneBorder; part.dock = &dock; @@ -1916,14 +1935,14 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont, wxSizerItem* sizer_item; wxAuiDockUIPart part; - int sash_size = m_art->GetMetric(wxAUI_DOCKART_SASH_SIZE); + int sashSize = m_art->GetMetric(wxAUI_DOCKART_SASH_SIZE); int orientation = dock.IsHorizontal() ? wxHORIZONTAL : wxVERTICAL; // resizable bottom and right docks have a sash before them - if (!m_has_maximized && !dock.fixed && (dock.dock_direction == wxAUI_DOCK_BOTTOM || + if (!m_hasMaximized && !dock.fixed && (dock.dock_direction == wxAUI_DOCK_BOTTOM || dock.dock_direction == wxAUI_DOCK_RIGHT)) { - sizer_item = cont->Add(sash_size, sash_size, 0, wxEXPAND); + sizer_item = cont->Add(sashSize, sashSize, 0, wxEXPAND); part.type = wxAuiDockUIPart::typeDockSizer; part.orientation = orientation; @@ -2008,9 +2027,9 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont, // if this is not the first pane being added, // we need to add a pane sizer - if (!m_has_maximized && pane_i > 0) + if (!m_hasMaximized && pane_i > 0) { - sizer_item = dock_sizer->Add(sash_size, sash_size, 0, wxEXPAND); + sizer_item = dock_sizer->Add(sashSize, sashSize, 0, wxEXPAND); part.type = wxAuiDockUIPart::typePaneSizer; part.dock = &dock; @@ -2046,12 +2065,12 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont, cont->SetItemMinSize(dock_sizer, dock.size, 0); // top and left docks have a sash after them - if (!m_has_maximized && + if (!m_hasMaximized && !dock.fixed && (dock.dock_direction == wxAUI_DOCK_TOP || dock.dock_direction == wxAUI_DOCK_LEFT)) { - sizer_item = cont->Add(sash_size, sash_size, 0, wxEXPAND); + sizer_item = cont->Add(sashSize, sashSize, 0, wxEXPAND); part.type = wxAuiDockUIPart::typeDockSizer; part.dock = &dock; @@ -2071,7 +2090,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, { wxBoxSizer* container = new wxBoxSizer(wxVERTICAL); - int pane_border_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE); + int pane_borderSize = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE); int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE); wxSize cli_size = m_frame->GetClientSize(); int i, dock_count, pane_count; @@ -2185,7 +2204,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, { if (dock.panes.Item(j)->HasBorder()) { - size += (pane_border_size*2); + size += (pane_borderSize*2); break; } } @@ -2208,8 +2227,8 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, // new dock's size may not be more than the dock constraint // parameter specifies. See SetDockSizeConstraint() - int max_dock_x_size = (int)(m_dock_constraint_x * ((double)cli_size.x)); - int max_dock_y_size = (int)(m_dock_constraint_y * ((double)cli_size.y)); + int max_dock_x_size = (int)(m_dockConstraintX * ((double)cli_size.x)); + int max_dock_y_size = (int)(m_dockConstraintY * ((double)cli_size.y)); if (dock.IsHorizontal()) size = wxMin(size, max_dock_y_size); @@ -2251,7 +2270,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, } if (plus_border) - dock_min_size += (pane_border_size*2); + dock_min_size += (pane_borderSize*2); if (plus_caption && dock.IsHorizontal()) dock_min_size += (caption_size); @@ -2388,7 +2407,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, for (row = 0,row_count = arr.GetCount(); rowAdd(1,1, 1, wxEXPAND); @@ -2459,17 +2478,17 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, void wxAuiManager::SetDockSizeConstraint(double width_pct, double height_pct) { - m_dock_constraint_x = wxMax(0.0, wxMin(1.0, width_pct)); - m_dock_constraint_y = wxMax(0.0, wxMin(1.0, height_pct)); + m_dockConstraintX = wxMax(0.0, wxMin(1.0, width_pct)); + m_dockConstraintY = wxMax(0.0, wxMin(1.0, height_pct)); } void wxAuiManager::GetDockSizeConstraint(double* width_pct, double* height_pct) const { if (width_pct) - *width_pct = m_dock_constraint_x; + *width_pct = m_dockConstraintX; if (height_pct) - *height_pct = m_dock_constraint_y; + *height_pct = m_dockConstraintY; } @@ -2480,8 +2499,8 @@ void wxAuiManager::GetDockSizeConstraint(double* width_pct, double* height_pct) void wxAuiManager::Update() { - m_hover_button = NULL; - m_action_part = NULL; + m_hoverButton = NULL; + m_actionPart = NULL; wxSizer* sizer; int i, pane_count = m_panes.GetCount(); @@ -2508,12 +2527,12 @@ void wxAuiManager::Update() // also gets fired. Because we may be dragging around // a pane, we need to cancel that action here to prevent // a spurious crash. - if (m_action_window == p.frame) + if (m_actionWindow == p.frame) { if (wxWindow::GetCapture() == m_frame) m_frame->ReleaseMouse(); m_action = actionNone; - m_action_window = NULL; + m_actionWindow = NULL; } // hide the frame @@ -2521,9 +2540,9 @@ void wxAuiManager::Update() p.frame->Show(false); // reparent to m_frame and destroy the pane - if (m_action_window == p.frame) + if (m_actionWindow == p.frame) { - m_action_window = NULL; + m_actionWindow = NULL; } p.window->Reparent(m_frame); @@ -2538,7 +2557,7 @@ void wxAuiManager::Update() m_frame->SetSizer(NULL); // create a layout for all of the panes - sizer = LayoutAll(m_panes, m_docks, m_uiparts, false); + sizer = LayoutAll(m_panes, m_docks, m_uiParts, false); // hide or show panes as necessary, // and float panes as necessary @@ -2691,9 +2710,9 @@ void wxAuiManager::DoFrameLayout() m_frame->Layout(); int i, part_count; - for (i = 0, part_count = m_uiparts.GetCount(); i < part_count; ++i) + for (i = 0, part_count = m_uiParts.GetCount(); i < part_count; ++i) { - wxAuiDockUIPart& part = m_uiparts.Item(i); + wxAuiDockUIPart& part = m_uiParts.Item(i); // get the rectangle of the UI part // originally, this code looked like this: @@ -2741,16 +2760,16 @@ void wxAuiManager::DoFrameLayout() wxAuiDockUIPart* wxAuiManager::GetPanePart(wxWindow* wnd) { int i, part_count; - for (i = 0, part_count = m_uiparts.GetCount(); i < part_count; ++i) + for (i = 0, part_count = m_uiParts.GetCount(); i < part_count; ++i) { - wxAuiDockUIPart& part = m_uiparts.Item(i); + wxAuiDockUIPart& part = m_uiParts.Item(i); if (part.type == wxAuiDockUIPart::typePaneBorder && part.pane && part.pane->window == wnd) return ∂ } - for (i = 0, part_count = m_uiparts.GetCount(); i < part_count; ++i) + for (i = 0, part_count = m_uiParts.GetCount(); i < part_count; ++i) { - wxAuiDockUIPart& part = m_uiparts.Item(i); + wxAuiDockUIPart& part = m_uiParts.Item(i); if (part.type == wxAuiDockUIPart::typePane && part.pane && part.pane->window == wnd) return ∂ @@ -2888,7 +2907,9 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, if (pt.x < layer_insert_offset && - pt.x > layer_insert_offset-auiLayerInsertPixels) + pt.x > layer_insert_offset-auiLayerInsertPixels && + pt.y > 0 && + pt.y < cli_size.y) { int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_LEFT), GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)), @@ -2904,7 +2925,9 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, return ProcessDockResult(target, drop); } else if (pt.y < layer_insert_offset && - pt.y > layer_insert_offset-auiLayerInsertPixels) + pt.y > layer_insert_offset-auiLayerInsertPixels && + pt.x > 0 && + pt.x < cli_size.x) { int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_TOP), GetMaxLayer(docks, wxAUI_DOCK_LEFT)), @@ -2920,7 +2943,9 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, return ProcessDockResult(target, drop); } else if (pt.x >= cli_size.x - layer_insert_offset && - pt.x < cli_size.x - layer_insert_offset + auiLayerInsertPixels) + pt.x < cli_size.x - layer_insert_offset + auiLayerInsertPixels && + pt.y > 0 && + pt.y < cli_size.y) { int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_RIGHT), GetMaxLayer(docks, wxAUI_DOCK_TOP)), @@ -2936,7 +2961,9 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, return ProcessDockResult(target, drop); } else if (pt.y >= cli_size.y - layer_insert_offset && - pt.y < cli_size.y - layer_insert_offset + auiLayerInsertPixels) + pt.y < cli_size.y - layer_insert_offset + auiLayerInsertPixels && + pt.x > 0 && + pt.x < cli_size.x) { int new_layer = wxMax( wxMax( GetMaxLayer(docks, wxAUI_DOCK_BOTTOM), GetMaxLayer(docks, wxAUI_DOCK_LEFT)), @@ -2976,7 +3003,7 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, if (!part->dock->fixed || part->dock->dock_direction == wxAUI_DOCK_CENTER || pt.x >= cli_size.x || pt.x <= 0 || pt.y >= cli_size.y || pt.y <= 0) { - if (m_last_rect.IsEmpty() || m_last_rect.Contains(pt.x, pt.y )) + if (m_lastRect.IsEmpty() || m_lastRect.Contains(pt.x, pt.y )) { m_skipping = true; } @@ -2999,8 +3026,8 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, m_skipping = false; - m_last_rect = part->dock->rect; - m_last_rect.Inflate( 15, 15 ); + m_lastRect = part->dock->rect; + m_lastRect.Inflate( 15, 15 ); drop.Dock(). Direction(part->dock->dock_direction). @@ -3262,55 +3289,55 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, void wxAuiManager::OnHintFadeTimer(wxTimerEvent& WXUNUSED(event)) { - if (!m_hint_wnd || m_hint_fadeamt >= m_hint_fademax) + if (!m_hintWnd || m_hintFadeAmt >= m_hintFadeMax) { - m_hint_fadetimer.Stop(); - Disconnect(m_hint_fadetimer.GetId(), wxEVT_TIMER, + m_hintFadeTimer.Stop(); + Disconnect(m_hintFadeTimer.GetId(), wxEVT_TIMER, wxTimerEventHandler(wxAuiManager::OnHintFadeTimer)); return; } - m_hint_fadeamt += 4; - m_hint_wnd->SetTransparent(m_hint_fadeamt); + m_hintFadeAmt += 4; + m_hintWnd->SetTransparent(m_hintFadeAmt); } void wxAuiManager::ShowHint(const wxRect& rect) { - if (m_hint_wnd) + if (m_hintWnd) { // if the hint rect is the same as last time, don't do anything - if (m_last_hint == rect) + if (m_lastHint == rect) return; - m_last_hint = rect; + m_lastHint = rect; - m_hint_fadeamt = m_hint_fademax; + m_hintFadeAmt = m_hintFadeMax; if ((m_flags & wxAUI_MGR_HINT_FADE) - && !((m_hint_wnd->IsKindOf(CLASSINFO(wxPseudoTransparentFrame))) && + && !((m_hintWnd->IsKindOf(CLASSINFO(wxPseudoTransparentFrame))) && (m_flags & wxAUI_MGR_NO_VENETIAN_BLINDS_FADE)) ) - m_hint_fadeamt = 0; + m_hintFadeAmt = 0; - m_hint_wnd->SetSize(rect); - m_hint_wnd->SetTransparent(m_hint_fadeamt); + m_hintWnd->SetSize(rect); + m_hintWnd->SetTransparent(m_hintFadeAmt); - if (!m_hint_wnd->IsShown()) - m_hint_wnd->Show(); + if (!m_hintWnd->IsShown()) + m_hintWnd->Show(); // if we are dragging a floating pane, set the focus // back to that floating pane (otherwise it becomes unfocused) - if (m_action == actionDragFloatingPane && m_action_window) - m_action_window->SetFocus(); + if (m_action == actionDragFloatingPane && m_actionWindow) + m_actionWindow->SetFocus(); - m_hint_wnd->Raise(); + m_hintWnd->Raise(); - if (m_hint_fadeamt != m_hint_fademax) // Only fade if we need to + if (m_hintFadeAmt != m_hintFadeMax) // Only fade if we need to { // start fade in timer - m_hint_fadetimer.SetOwner(this); - m_hint_fadetimer.Start(5); - Connect(m_hint_fadetimer.GetId(), wxEVT_TIMER, + m_hintFadeTimer.SetOwner(this); + m_hintFadeTimer.Start(5); + Connect(m_hintFadeTimer.GetId(), wxEVT_TIMER, wxTimerEventHandler(wxAuiManager::OnHintFadeTimer)); } } @@ -3319,10 +3346,10 @@ void wxAuiManager::ShowHint(const wxRect& rect) if (!(m_flags & wxAUI_MGR_RECTANGLE_HINT)) return; - if (m_last_hint != rect) + if (m_lastHint != rect) { // remove the last hint rectangle - m_last_hint = rect; + m_lastHint = rect; m_frame->Refresh(); m_frame->Update(); } @@ -3337,7 +3364,8 @@ void wxAuiManager::ShowHint(const wxRect& rect) wxAuiPaneInfo& pane = m_panes.Item(i); if (pane.IsFloating() && - pane.frame->IsShown()) + pane.frame && + pane.frame->IsShown()) { wxRect rect = pane.frame->GetRect(); #ifdef __WXGTK__ @@ -3373,26 +3401,26 @@ void wxAuiManager::ShowHint(const wxRect& rect) void wxAuiManager::HideHint() { // hides a transparent window hint, if there is one - if (m_hint_wnd) + if (m_hintWnd) { - if (m_hint_wnd->IsShown()) - m_hint_wnd->Show(false); - m_hint_wnd->SetTransparent(0); - m_hint_fadetimer.Stop(); + if (m_hintWnd->IsShown()) + m_hintWnd->Show(false); + m_hintWnd->SetTransparent(0); + m_hintFadeTimer.Stop(); // In case this is called while a hint fade is going, we need to // disconnect the event handler. - Disconnect(m_hint_fadetimer.GetId(), wxEVT_TIMER, + Disconnect(m_hintFadeTimer.GetId(), wxEVT_TIMER, wxTimerEventHandler(wxAuiManager::OnHintFadeTimer)); - m_last_hint = wxRect(); + m_lastHint = wxRect(); return; } // hides a painted hint by redrawing the frame window - if (!m_last_hint.IsEmpty()) + if (!m_lastHint.IsEmpty()) { m_frame->Refresh(); m_frame->Update(); - m_last_hint = wxRect(); + m_lastHint = wxRect(); } } @@ -3425,9 +3453,18 @@ void wxAuiManager::StartPaneDrag(wxWindow* pane_window, m_action = actionDragFloatingPane; } - m_action_window = pane_window; - m_action_offset = offset; + m_actionWindow = pane_window; + m_actionOffset = offset; m_frame->CaptureMouse(); + + if (pane.frame) + { + wxRect window_rect = pane.frame->GetRect(); + wxRect client_rect = pane.frame->GetClientRect(); + wxPoint client_pt = pane.frame->ClientToScreen(client_rect.GetTopLeft()); + wxPoint origin_pt = client_pt - window_rect.GetTopLeft(); + m_actionOffset += origin_pt; + } } @@ -3628,7 +3665,7 @@ void wxAuiManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir) pane = hint; m_action = actionDragToolbarPane; - m_action_window = pane.window; + m_actionWindow = pane.window; Update(); @@ -3730,7 +3767,7 @@ void wxAuiManager::OnFloatingPaneMoved(wxWindow* wnd, wxDirection dir) if (m_flags & wxAUI_MGR_TRANSPARENT_DRAG) pane.frame->SetTransparent(255); } - else if (m_has_maximized) + else if (m_hasMaximized) { RestoreMaximizedPane(); } @@ -3791,7 +3828,7 @@ void wxAuiManager::OnFloatingPaneActivated(wxWindow* wnd) { if ((GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE) && GetPane(wnd).IsOk()) { - SetActivePane(m_panes, wnd); + SetActivePane(wnd); Repaint(); } } @@ -3812,10 +3849,10 @@ void wxAuiManager::OnRender(wxAuiManagerEvent& evt) dc->Clear() ; #endif int i, part_count; - for (i = 0, part_count = m_uiparts.GetCount(); + for (i = 0, part_count = m_uiParts.GetCount(); i < part_count; ++i) { - wxAuiDockUIPart& part = m_uiparts.Item(i); + wxAuiDockUIPart& part = m_uiParts.Item(i); // don't draw hidden pane items or items that aren't windows if (part.sizer_item && ((!part.sizer_item->IsWindow() && !part.sizer_item->IsSpacer() && !part.sizer_item->IsSizer()) || !part.sizer_item->IsShown())) @@ -3864,7 +3901,7 @@ void wxAuiManager::Render(wxDC* dc) void wxAuiManager::Repaint(wxDC* dc) { -#ifdef __WXMAC__ +#ifdef __WXMAC__ if ( dc == NULL ) { m_frame->Refresh() ; @@ -4062,18 +4099,18 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event) return; m_action = actionResize; - m_action_part = part; - m_action_hintrect = wxRect(); - m_action_start = wxPoint(event.m_x, event.m_y); - m_action_offset = wxPoint(event.m_x - part->rect.x, + m_actionPart = part; + m_actionHintRect = wxRect(); + m_actionStart = wxPoint(event.m_x, event.m_y); + m_actionOffset = wxPoint(event.m_x - part->rect.x, event.m_y - part->rect.y); m_frame->CaptureMouse(); } else if (part->type == wxAuiDockUIPart::typePaneButton) { m_action = actionClickButton; - m_action_part = part; - m_action_start = wxPoint(event.m_x, event.m_y); + m_actionPart = part; + m_actionStart = wxPoint(event.m_x, event.m_y); m_frame->CaptureMouse(); UpdateButtonOnScreen(part, event); @@ -4104,7 +4141,7 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event) if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE) { // set the caption as active - SetActivePane(m_panes, part->pane->window); + SetActivePane(part->pane->window); Repaint(); } @@ -4112,9 +4149,9 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event) return; m_action = actionClickCaption; - m_action_part = part; - m_action_start = wxPoint(event.m_x, event.m_y); - m_action_offset = wxPoint(event.m_x - part->rect.x, + m_actionPart = part; + m_actionStart = wxPoint(event.m_x, event.m_y); + m_actionOffset = wxPoint(event.m_x - part->rect.x, event.m_y - part->rect.y); m_frame->CaptureMouse(); } @@ -4139,10 +4176,10 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event) bool wxAuiManager::DoEndResizeAction(wxMouseEvent& event) { // resize the dock or the pane - if (m_action_part && m_action_part->type==wxAuiDockUIPart::typeDockSizer) + if (m_actionPart && m_actionPart->type==wxAuiDockUIPart::typeDockSizer) { // first, we must calculate the maximum size the dock may be - int sash_size = m_art->GetMetric(wxAUI_DOCKART_SASH_SIZE); + int sashSize = m_art->GetMetric(wxAUI_DOCKART_SASH_SIZE); int used_width = 0, used_height = 0; @@ -4163,7 +4200,7 @@ bool wxAuiManager::DoEndResizeAction(wxMouseEvent& event) used_width += dock.size; } if (dock.resizable) - used_width += sash_size; + used_width += sashSize; } @@ -4186,61 +4223,61 @@ bool wxAuiManager::DoEndResizeAction(wxMouseEvent& event) } #endif - wxRect& rect = m_action_part->dock->rect; + wxRect& rect = m_actionPart->dock->rect; - wxPoint new_pos(event.m_x - m_action_offset.x, - event.m_y - m_action_offset.y); - int new_size, old_size = m_action_part->dock->size; + wxPoint new_pos(event.m_x - m_actionOffset.x, + event.m_y - m_actionOffset.y); + int new_size, old_size = m_actionPart->dock->size; - switch (m_action_part->dock->dock_direction) + switch (m_actionPart->dock->dock_direction) { case wxAUI_DOCK_LEFT: new_size = new_pos.x - rect.x; if (new_size-old_size > available_width) new_size = old_size+available_width; - m_action_part->dock->size = new_size; + m_actionPart->dock->size = new_size; break; case wxAUI_DOCK_TOP: new_size = new_pos.y - rect.y; if (new_size-old_size > available_height) new_size = old_size+available_height; - m_action_part->dock->size = new_size; + m_actionPart->dock->size = new_size; break; case wxAUI_DOCK_RIGHT: new_size = rect.x + rect.width - new_pos.x - - m_action_part->rect.GetWidth(); + m_actionPart->rect.GetWidth(); if (new_size-old_size > available_width) new_size = old_size+available_width; - m_action_part->dock->size = new_size; + m_actionPart->dock->size = new_size; break; case wxAUI_DOCK_BOTTOM: new_size = rect.y + rect.height - - new_pos.y - m_action_part->rect.GetHeight(); + new_pos.y - m_actionPart->rect.GetHeight(); if (new_size-old_size > available_height) new_size = old_size+available_height; - m_action_part->dock->size = new_size; + m_actionPart->dock->size = new_size; break; } Update(); Repaint(NULL); } - else if (m_action_part && - m_action_part->type == wxAuiDockUIPart::typePaneSizer) + else if (m_actionPart && + m_actionPart->type == wxAuiDockUIPart::typePaneSizer) { - wxAuiDockInfo& dock = *m_action_part->dock; - wxAuiPaneInfo& pane = *m_action_part->pane; + wxAuiDockInfo& dock = *m_actionPart->dock; + wxAuiPaneInfo& pane = *m_actionPart->pane; int total_proportion = 0; int dock_pixels = 0; int new_pixsize = 0; int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE); - int pane_border_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE); - int sash_size = m_art->GetMetric(wxAUI_DOCKART_SASH_SIZE); + int pane_borderSize = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE); + int sashSize = m_art->GetMetric(wxAUI_DOCKART_SASH_SIZE); - wxPoint new_pos(event.m_x - m_action_offset.x, - event.m_y - m_action_offset.y); + wxPoint new_pos(event.m_x - m_actionOffset.x, + event.m_y - m_actionOffset.y); // determine the pane rectangle by getting the pane part wxAuiDockUIPart* pane_part = GetPanePart(pane.window); @@ -4275,7 +4312,7 @@ bool wxAuiManager::DoEndResizeAction(wxMouseEvent& event) // width from the dock width, because this would // skew our proportion calculations if (i > 0) - dock_pixels -= sash_size; + dock_pixels -= sashSize; // also, the whole size (including decorations) of // all fixed panes must also be subtracted, because they @@ -4340,7 +4377,7 @@ bool wxAuiManager::DoEndResizeAction(wxMouseEvent& event) min_size = 0; if (pane.HasBorder()) - min_size += (pane_border_size*2); + min_size += (pane_borderSize*2); // calculate minimum size with decorations (border,caption) if (pane_part->orientation == wxVERTICAL) @@ -4410,10 +4447,10 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event) { // get rid of the hint rectangle wxScreenDC dc; - DrawResizeHint(dc, m_action_hintrect); + DrawResizeHint(dc, m_actionHintRect); } if (m_currentDragItem != -1 && wxAuiManager_HasLiveResize(*this)) - m_action_part = & (m_uiparts.Item(m_currentDragItem)); + m_actionPart = & (m_uiParts.Item(m_currentDragItem)); DoEndResizeAction(event); @@ -4422,21 +4459,21 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event) } else if (m_action == actionClickButton) { - m_hover_button = NULL; + m_hoverButton = NULL; m_frame->ReleaseMouse(); - if (m_action_part) + if (m_actionPart) { - UpdateButtonOnScreen(m_action_part, event); + UpdateButtonOnScreen(m_actionPart, event); // make sure we're still over the item that was originally clicked - if (m_action_part == HitTest(event.GetX(), event.GetY())) + if (m_actionPart == HitTest(event.GetX(), event.GetY())) { // fire button-click event wxAuiManagerEvent e(wxEVT_AUI_PANE_BUTTON); e.SetManager(this); - e.SetPane(m_action_part->pane); - e.SetButton(m_action_part->button->button_id); + e.SetPane(m_actionPart->pane); + e.SetButton(m_actionPart->button->button_id); ProcessMgrEvent(e); } } @@ -4453,7 +4490,7 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event) { m_frame->ReleaseMouse(); - wxAuiPaneInfo& pane = GetPane(m_action_window); + wxAuiPaneInfo& pane = GetPane(m_actionWindow); wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found")); // save the new positions @@ -4481,7 +4518,7 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event) } m_action = actionNone; - m_last_mouse_move = wxPoint(); // see comment in OnMotion() + m_lastMouseMove = wxPoint(); // see comment in OnMotion() } @@ -4494,27 +4531,27 @@ void wxAuiManager::OnMotion(wxMouseEvent& event) // mouse move event is being generated. only verified on MSW wxPoint mouse_pos = event.GetPosition(); - if (m_last_mouse_move == mouse_pos) + if (m_lastMouseMove == mouse_pos) return; - m_last_mouse_move = mouse_pos; + m_lastMouseMove = mouse_pos; if (m_action == actionResize) { - // It's necessary to reset m_action_part since it destroyed + // It's necessary to reset m_actionPart since it destroyed // by the Update within DoEndResizeAction. if (m_currentDragItem != -1) - m_action_part = & (m_uiparts.Item(m_currentDragItem)); + m_actionPart = & (m_uiParts.Item(m_currentDragItem)); else - m_currentDragItem = m_uiparts.Index(* m_action_part); + m_currentDragItem = m_uiParts.Index(* m_actionPart); - if (m_action_part) + if (m_actionPart) { - wxPoint pos = m_action_part->rect.GetPosition(); - if (m_action_part->orientation == wxHORIZONTAL) - pos.y = wxMax(0, event.m_y - m_action_offset.y); + wxPoint pos = m_actionPart->rect.GetPosition(); + if (m_actionPart->orientation == wxHORIZONTAL) + pos.y = wxMax(0, event.m_y - m_actionOffset.y); else - pos.x = wxMax(0, event.m_x - m_action_offset.x); + pos.x = wxMax(0, event.m_x - m_actionOffset.x); if (wxAuiManager_HasLiveResize(*this)) { @@ -4525,22 +4562,22 @@ void wxAuiManager::OnMotion(wxMouseEvent& event) else { wxRect rect(m_frame->ClientToScreen(pos), - m_action_part->rect.GetSize()); + m_actionPart->rect.GetSize()); wxScreenDC dc; - if (!m_action_hintrect.IsEmpty()) + if (!m_actionHintRect.IsEmpty()) { // remove old resize hint - DrawResizeHint(dc, m_action_hintrect); - m_action_hintrect = wxRect(); + DrawResizeHint(dc, m_actionHintRect); + m_actionHintRect = wxRect(); } // draw new resize hint, if it's inside the managed frame - wxRect frame_screen_rect = m_frame->GetScreenRect(); - if (frame_screen_rect.Contains(rect)) + wxRect frameScreenRect = m_frame->GetScreenRect(); + if (frameScreenRect.Contains(rect)) { DrawResizeHint(dc, rect); - m_action_hintrect = rect; + m_actionHintRect = rect; } } } @@ -4553,75 +4590,84 @@ void wxAuiManager::OnMotion(wxMouseEvent& event) // caption has been clicked. we need to check if the mouse // is now being dragged. if it is, we need to change the // mouse action to 'drag' - if (m_action_part && - (abs(event.m_x - m_action_start.x) > drag_x_threshold || - abs(event.m_y - m_action_start.y) > drag_y_threshold)) + if (m_actionPart && + (abs(event.m_x - m_actionStart.x) > drag_x_threshold || + abs(event.m_y - m_actionStart.y) > drag_y_threshold)) { - wxAuiPaneInfo* pane_info = m_action_part->pane; + wxAuiPaneInfo* paneInfo = m_actionPart->pane; - if (!pane_info->IsToolbar()) + if (!paneInfo->IsToolbar()) { if ((m_flags & wxAUI_MGR_ALLOW_FLOATING) && - pane_info->IsFloatable()) + paneInfo->IsFloatable()) { m_action = actionDragFloatingPane; // set initial float position wxPoint pt = m_frame->ClientToScreen(event.GetPosition()); - pane_info->floating_pos = wxPoint(pt.x - m_action_offset.x, - pt.y - m_action_offset.y); + paneInfo->floating_pos = wxPoint(pt.x - m_actionOffset.x, + pt.y - m_actionOffset.y); // float the window - if (pane_info->IsMaximized()) - RestorePane(*pane_info); - pane_info->Float(); + if (paneInfo->IsMaximized()) + RestorePane(*paneInfo); + paneInfo->Float(); Update(); - m_action_window = pane_info->frame; + m_actionWindow = paneInfo->frame; // action offset is used here to make it feel "natural" to the user // to drag a docked pane and suddenly have it become a floating frame. // Sometimes, however, the offset where the user clicked on the docked // caption is bigger than the width of the floating frame itself, so // in that case we need to set the action offset to a sensible value - wxSize frame_size = m_action_window->GetSize(); - if (frame_size.x <= m_action_offset.x) - m_action_offset.x = 30; + wxSize frame_size = m_actionWindow->GetSize(); + if (frame_size.x <= m_actionOffset.x) + m_actionOffset.x = 30; } } else { m_action = actionDragToolbarPane; - m_action_window = pane_info->window; + m_actionWindow = paneInfo->window; } } } else if (m_action == actionDragFloatingPane) { - if (m_action_window) + if (m_actionWindow) { + // We can't move the child window so we need to get the frame that + // we want to be really moving. This is probably not the best place + // to do this but at least it fixes the bug (#13177) for now. + if (!m_actionWindow->IsKindOf(CLASSINFO(wxAuiFloatingFrame))) + { + wxAuiPaneInfo& pane = GetPane(m_actionWindow); + m_actionWindow = pane.frame; + } + wxPoint pt = m_frame->ClientToScreen(event.GetPosition()); - m_action_window->Move(pt.x - m_action_offset.x, - pt.y - m_action_offset.y); + m_actionWindow->Move(pt.x - m_actionOffset.x, + pt.y - m_actionOffset.y); } } else if (m_action == actionDragToolbarPane) { - wxAuiPaneInfo& pane = GetPane(m_action_window); + wxAuiPaneInfo& pane = GetPane(m_actionWindow); wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found")); pane.SetFlag(wxAuiPaneInfo::actionPane, true); wxPoint pt = event.GetPosition(); - DoDrop(m_docks, m_panes, pane, pt, m_action_offset); + DoDrop(m_docks, m_panes, pane, pt, m_actionOffset); // if DoDrop() decided to float the pane, set up // the floating pane's initial position if (pane.IsFloating()) { wxPoint pt = m_frame->ClientToScreen(event.GetPosition()); - pane.floating_pos = wxPoint(pt.x - m_action_offset.x, - pt.y - m_action_offset.y); + pane.floating_pos = wxPoint(pt.x - m_actionOffset.x, + pt.y - m_actionOffset.y); } // this will do the actiual move operation; @@ -4637,7 +4683,7 @@ void wxAuiManager::OnMotion(wxMouseEvent& event) { pane.state &= ~wxAuiPaneInfo::actionPane; m_action = actionDragFloatingPane; - m_action_window = pane.frame; + m_actionWindow = pane.frame; } } else @@ -4645,27 +4691,27 @@ void wxAuiManager::OnMotion(wxMouseEvent& event) wxAuiDockUIPart* part = HitTest(event.GetX(), event.GetY()); if (part && part->type == wxAuiDockUIPart::typePaneButton) { - if (part != m_hover_button) + if (part != m_hoverButton) { // make the old button normal - if (m_hover_button) + if (m_hoverButton) { - UpdateButtonOnScreen(m_hover_button, event); + UpdateButtonOnScreen(m_hoverButton, event); Repaint(); } // mouse is over a button, so repaint the // button in hover mode UpdateButtonOnScreen(part, event); - m_hover_button = part; + m_hoverButton = part; } } else { - if (m_hover_button) + if (m_hoverButton) { - m_hover_button = NULL; + m_hoverButton = NULL; Repaint(); } else @@ -4678,9 +4724,9 @@ void wxAuiManager::OnMotion(wxMouseEvent& event) void wxAuiManager::OnLeaveWindow(wxMouseEvent& WXUNUSED(event)) { - if (m_hover_button) + if (m_hoverButton) { - m_hover_button = NULL; + m_hoverButton = NULL; Repaint(); } } @@ -4705,7 +4751,7 @@ void wxAuiManager::OnChildFocus(wxChildFocusEvent& event) wxAuiPaneInfo& pane = GetPane(event.GetWindow()); if (pane.IsOk() && (pane.state & wxAuiPaneInfo::optionActive) == 0) { - SetActivePane(m_panes, event.GetWindow()); + SetActivePane(event.GetWindow()); m_frame->Refresh(); } } diff --git a/Externals/wxWidgets3/src/aui/tabmdi.cpp b/Externals/wxWidgets3/src/aui/tabmdi.cpp index 152dba137a..413bfaf780 100644 --- a/Externals/wxWidgets3/src/aui/tabmdi.cpp +++ b/Externals/wxWidgets3/src/aui/tabmdi.cpp @@ -4,7 +4,7 @@ // Author: Hans Van Leemputten // Modified by: Benjamin I. Williams / Kirix Corporation // Created: 29/07/2002 -// RCS-ID: $Id: tabmdi.cpp 58227 2009-01-19 13:55:27Z VZ $ +// RCS-ID: $Id: tabmdi.cpp 70909 2012-03-15 13:49:54Z VZ $ // Copyright: (c) Hans Van Leemputten // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -56,6 +56,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxAuiMDIParentFrame, wxFrame) BEGIN_EVENT_TABLE(wxAuiMDIParentFrame, wxFrame) #if wxUSE_MENUS EVT_MENU (wxID_ANY, wxAuiMDIParentFrame::DoHandleMenu) + EVT_UPDATE_UI (wxID_ANY, wxAuiMDIParentFrame::DoHandleUpdateUI) #endif END_EVENT_TABLE() @@ -347,6 +348,35 @@ void wxAuiMDIParentFrame::DoHandleMenu(wxCommandEvent& event) event.Skip(); } } + +void wxAuiMDIParentFrame::DoHandleUpdateUI(wxUpdateUIEvent& event) +{ + switch (event.GetId()) + { + case wxWINDOWCLOSE: + case wxWINDOWCLOSEALL: + { + wxAuiMDIClientWindow* client_window = GetClientWindow(); + wxCHECK_RET(client_window, wxS("Missing MDI Client Window")); + size_t pages = client_window->GetPageCount(); + event.Enable(pages >= 1); + break; + } + + case wxWINDOWNEXT: + case wxWINDOWPREV: + { + wxAuiMDIClientWindow* client_window = GetClientWindow(); + wxCHECK_RET(client_window, wxS("Missing MDI Client Window")); + size_t pages = client_window->GetPageCount(); + event.Enable(pages >= 2); + break; + } + + default: + event.Skip(); + } +} #endif // wxUSE_MENUS void wxAuiMDIParentFrame::DoGetClientSize(int* width, int* height) const @@ -409,7 +439,7 @@ wxAuiMDIChildFrame::wxAuiMDIChildFrame(wxAuiMDIParentFrame *parent, // is, but those are the expected symantics. No style flag is passed // onto the panel underneath. if (style & wxMINIMIZE) - m_activate_on_create = false; + m_activateOnCreate = false; Create(parent, id, title, wxDefaultPosition, size, 0, name); } @@ -451,7 +481,7 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent, // see comment in constructor if (style & wxMINIMIZE) - m_activate_on_create = false; + m_activateOnCreate = false; wxSize cli_size = pClientWindow->GetClientSize(); @@ -471,7 +501,7 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent, m_title = title; - pClientWindow->AddPage(this, title, m_activate_on_create); + pClientWindow->AddPage(this, title, m_activateOnCreate); pClientWindow->Refresh(); return true; @@ -565,12 +595,12 @@ void wxAuiMDIChildFrame::SetIcons(const wxIconBundle& icons) { // get icon with the system icon size SetIcon(icons.GetIcon(-1)); - m_icon_bundle = icons; + m_iconBundle = icons; } const wxIconBundle& wxAuiMDIChildFrame::GetIcons() const { - return m_icon_bundle; + return m_iconBundle; } void wxAuiMDIChildFrame::SetIcon(const wxIcon& icon) @@ -658,7 +688,7 @@ wxAuiMDIParentFrame* wxAuiMDIChildFrame::GetMDIParentFrame() const void wxAuiMDIChildFrame::Init() { - m_activate_on_create = true; + m_activateOnCreate = true; m_pMDIParentFrame = NULL; #if wxUSE_MENUS m_pMenuBar = NULL; @@ -667,7 +697,7 @@ void wxAuiMDIChildFrame::Init() bool wxAuiMDIChildFrame::Show(bool show) { - m_activate_on_create = show; + m_activateOnCreate = show; // do nothing return true; @@ -680,7 +710,7 @@ void wxAuiMDIChildFrame::DoShow(bool show) void wxAuiMDIChildFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags) { - m_mdi_newrect = wxRect(x, y, width, height); + m_mdiNewRect = wxRect(x, y, width, height); #ifdef __WXGTK__ wxPanel::DoSetSize(x,y,width, height, sizeFlags); #else @@ -690,16 +720,16 @@ void wxAuiMDIChildFrame::DoSetSize(int x, int y, int width, int height, int size void wxAuiMDIChildFrame::DoMoveWindow(int x, int y, int width, int height) { - m_mdi_newrect = wxRect(x, y, width, height); + m_mdiNewRect = wxRect(x, y, width, height); } void wxAuiMDIChildFrame::ApplyMDIChildFrameRect() { - if (m_mdi_currect != m_mdi_newrect) + if (m_mdiCurRect != m_mdiNewRect) { - wxPanel::DoMoveWindow(m_mdi_newrect.x, m_mdi_newrect.y, - m_mdi_newrect.width, m_mdi_newrect.height); - m_mdi_currect = m_mdi_newrect; + wxPanel::DoMoveWindow(m_mdiNewRect.x, m_mdiNewRect.y, + m_mdiNewRect.width, m_mdiNewRect.height); + m_mdiCurRect = m_mdiNewRect; } } @@ -725,11 +755,6 @@ wxAuiMDIClientWindow::wxAuiMDIClientWindow(wxAuiMDIParentFrame* parent, long sty CreateClient(parent, style); } -wxAuiMDIClientWindow::~wxAuiMDIClientWindow() -{ - DestroyChildren(); -} - bool wxAuiMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style) { SetWindowStyleFlag(style); diff --git a/Externals/wxWidgets3/src/common/accelcmn.cpp b/Externals/wxWidgets3/src/common/accelcmn.cpp index b241d2e3a6..960c6ac7c3 100644 --- a/Externals/wxWidgets3/src/common/accelcmn.cpp +++ b/Externals/wxWidgets3/src/common/accelcmn.cpp @@ -3,7 +3,7 @@ // Purpose: implementation of platform-independent wxAcceleratorEntry parts // Author: Vadim Zeitlin // Created: 2007-05-05 -// RCS-ID: $Id: accelcmn.cpp 66592 2011-01-05 18:27:58Z PC $ +// RCS-ID: $Id: accelcmn.cpp 69853 2011-11-28 10:24:13Z SC $ // Copyright: (c) 2007 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -186,6 +186,8 @@ wxAcceleratorEntry::ParseAccel(const wxString& text, int *flagsOut, int *keyOut) accelFlags |= wxACCEL_ALT; else if ( CompareAccelString(current, wxTRANSLATE("shift")) ) accelFlags |= wxACCEL_SHIFT; + else if ( CompareAccelString(current, wxTRANSLATE("rawctrl")) ) + accelFlags |= wxACCEL_RAW_CTRL; else // not a recognized modifier name { // we may have "Ctrl-+", for example, but we still want to @@ -311,7 +313,11 @@ wxString wxAcceleratorEntry::ToString() const text += _("Ctrl+"); if ( flags & wxACCEL_SHIFT ) text += _("Shift+"); - +#if defined(__WXMAC__) || defined(__WXCOCOA__) + if ( flags & wxACCEL_RAW_CTRL ) + text += _("RawCtrl+"); +#endif + const int code = GetKeyCode(); if ( code >= WXK_F1 && code <= WXK_F12 ) @@ -342,7 +348,7 @@ wxString wxAcceleratorEntry::ToString() const // build as they're only defined for the ASCII range (or EOF) wxIsascii(code) && #endif // ANSI - wxIsalnum(code) ) + wxIsprint(code) ) { text << (wxChar)code; } diff --git a/Externals/wxWidgets3/src/common/affinematrix2d.cpp b/Externals/wxWidgets3/src/common/affinematrix2d.cpp new file mode 100644 index 0000000000..0b1b9207dc --- /dev/null +++ b/Externals/wxWidgets3/src/common/affinematrix2d.cpp @@ -0,0 +1,186 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: affinematrix2d.cpp +// Purpose: implementation of wxAffineMatrix2D +// Author: Based on wxTransformMatrix by Chris Breeze, Julian Smart +// Created: 2011-04-05 +// Copyright: (c) wxWidgets team +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#if wxUSE_GEOMETRY + +#include "wx/affinematrix2d.h" +#include "wx/math.h" + +// sets the matrix to the respective values +void wxAffineMatrix2D::Set(const wxMatrix2D &mat2D, const wxPoint2DDouble &tr) +{ + m_11 = mat2D.m_11; + m_12 = mat2D.m_12; + m_21 = mat2D.m_21; + m_22 = mat2D.m_22; + m_tx = tr.m_x; + m_ty = tr.m_y; +} + +// gets the component valuess of the matrix +void wxAffineMatrix2D::Get(wxMatrix2D *mat2D, wxPoint2DDouble *tr) const +{ + mat2D->m_11 = m_11; + mat2D->m_12 = m_12; + mat2D->m_21 = m_21; + mat2D->m_22 = m_22; + + if ( tr ) + { + tr->m_x = m_tx; + tr->m_y = m_ty; + } +} + +// concatenates the matrix +// | t.m_11 t.m_12 0 | | m_11 m_12 0 | +// | t.m_21 t.m_22 0 | x | m_21 m_22 0 | +// | t.m_tx t.m_ty 1 | | m_tx m_ty 1 | +void wxAffineMatrix2D::Concat(const wxAffineMatrix2DBase &t) +{ + wxMatrix2D mat; + wxPoint2DDouble tr; + t.Get(&mat, &tr); + + m_tx += tr.m_x*m_11 + tr.m_y*m_21; + m_ty += tr.m_x*m_12 + tr.m_y*m_22; + wxDouble e11 = mat.m_11*m_11 + mat.m_12*m_21; + wxDouble e12 = mat.m_11*m_12 + mat.m_12*m_22; + wxDouble e21 = mat.m_21*m_11 + mat.m_22*m_21; + m_22 = mat.m_21*m_12 + mat.m_22*m_22; + m_11 = e11; + m_12 = e12; + m_21 = e21; +} + +// makes this its inverse matrix. +// Invert +// | m_11 m_12 0 | +// | m_21 m_22 0 | +// | m_tx m_ty 1 | +bool wxAffineMatrix2D::Invert() +{ + const wxDouble det = m_11*m_22 - m_12*m_21; + + if ( !det ) + return false; + + wxDouble ex = (m_21*m_ty - m_22*m_tx) / det; + m_ty = (-m_11*m_ty + m_12*m_tx) / det; + m_tx = ex; + wxDouble e11 = m_22 / det; + m_12 = -m_12 / det; + m_21 = -m_21 / det; + m_22 = m_11 / det; + m_11 = e11; + + return true; +} + +// returns true if the elements of the transformation matrix are equal +bool wxAffineMatrix2D::IsEqual(const wxAffineMatrix2DBase& t) const +{ + wxMatrix2D mat; + wxPoint2DDouble tr; + t.Get(&mat, &tr); + + return m_11 == mat.m_11 && m_12 == mat.m_12 && + m_21 == mat.m_21 && m_22 == mat.m_22 && + m_tx == tr.m_x && m_ty == tr.m_y; +} + +// +// transformations +// + +// add the translation to this matrix +// | 1 0 0 | | m_11 m_12 0 | +// | 0 1 0 | x | m_21 m_22 0 | +// | dx dy 1 | | m_tx m_ty 1 | +void wxAffineMatrix2D::Translate(wxDouble dx, wxDouble dy) +{ + m_tx += m_11 * dx + m_21 * dy; + m_ty += m_12 * dx + m_22 * dy; +} + +// add the scale to this matrix +// | xScale 0 0 | | m_11 m_12 0 | +// | 0 yScale 0 | x | m_21 m_22 0 | +// | 0 0 1 | | m_tx m_ty 1 | +void wxAffineMatrix2D::Scale(wxDouble xScale, wxDouble yScale) +{ + m_11 *= xScale; + m_12 *= xScale; + m_21 *= yScale; + m_22 *= yScale; +} + +// add the rotation to this matrix (counter clockwise, radians) +// | cos -sin 0 | | m_11 m_12 0 | +// | sin cos 0 | x | m_21 m_22 0 | +// | 0 0 1 | | m_tx m_ty 1 | +void wxAffineMatrix2D::Rotate(wxDouble ccRadians) +{ + wxDouble c = cos(ccRadians); + wxDouble s = sin(ccRadians); + + wxDouble e11 = c*m_11 - s*m_21; + wxDouble e12 = c*m_12 - s*m_22; + m_21 = s*m_11 + c*m_21; + m_22 = s*m_12 + c*m_22; + m_11 = e11; + m_12 = e12; +} + +// +// apply the transforms +// + +// applies that matrix to the point +// | m_11 m_12 0 | +// | src.m_x src._my 1 | x | m_21 m_22 0 | +// | m_tx m_ty 1 | +wxPoint2DDouble +wxAffineMatrix2D::DoTransformPoint(const wxPoint2DDouble& src) const +{ + if ( IsIdentity() ) + return src; + + return wxPoint2DDouble(src.m_x * m_11 + src.m_y * m_21 + m_tx, + src.m_y * m_12 + src.m_y * m_22 + m_ty); +} + +// applies the matrix except for translations +// | m_11 m_12 0 | +// | src.m_x src._my 0 | x | m_21 m_22 0 | +// | m_tx m_ty 1 | +wxPoint2DDouble +wxAffineMatrix2D::DoTransformDistance(const wxPoint2DDouble& src) const +{ + if ( IsIdentity() ) + return src; + + return wxPoint2DDouble(src.m_x * m_11 + src.m_y * m_21, + src.m_y * m_12 + src.m_y * m_22); +} + +bool wxAffineMatrix2D::IsIdentity() const +{ + return m_11 == 1 && m_12 == 0 && + m_21 == 0 && m_22 == 1 && + m_tx == 0 && m_ty == 0; +} + +#endif // wxUSE_GEOMETRY diff --git a/Externals/wxWidgets3/src/common/anidecod.cpp b/Externals/wxWidgets3/src/common/anidecod.cpp index 917a048b7d..841d4d7483 100644 --- a/Externals/wxWidgets3/src/common/anidecod.cpp +++ b/Externals/wxWidgets3/src/common/anidecod.cpp @@ -2,7 +2,7 @@ // Name: src/common/anidecod.cpp // Purpose: wxANIDecoder, ANI reader for wxImage and wxAnimation // Author: Francesco Montorsi -// RCS-ID: $Id: anidecod.cpp 60852 2009-06-01 11:43:36Z FM $ +// RCS-ID: $Id: anidecod.cpp 67708 2011-05-05 23:52:07Z DS $ // Copyright: (c) Francesco Montorsi // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -127,6 +127,11 @@ bool wxANIDecoder::DoCanRead(wxInputStream& stream) const wxInt32 anih32; memcpy( &anih32, "anih", 4 ); + if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset ) + { + return false; + } + if ( !stream.Read(&FCC1, 4) ) return false; @@ -220,6 +225,11 @@ bool wxANIDecoder::Load( wxInputStream& stream ) wxInt32 seq32; memcpy( &seq32, "seq ", 4 ); + if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset ) + { + return false; + } + if ( !stream.Read(&FCC1, 4) ) return false; if ( FCC1 != riff32 ) diff --git a/Externals/wxWidgets3/src/common/appbase.cpp b/Externals/wxWidgets3/src/common/appbase.cpp index a5c65bcd2f..8cdf4e26fe 100644 --- a/Externals/wxWidgets3/src/common/appbase.cpp +++ b/Externals/wxWidgets3/src/common/appbase.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 19.06.2003 (extracted from common/appcmn.cpp) -// RCS-ID: $Id: appbase.cpp 66229 2010-11-22 01:22:56Z VZ $ +// RCS-ID: $Id: appbase.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -25,7 +25,7 @@ #endif #ifndef WX_PRECOMP - #ifdef __WXMSW__ + #ifdef __WINDOWS__ #include "wx/msw/wrapwin.h" // includes windows.h for MessageBox() #endif #include "wx/list.h" @@ -52,13 +52,11 @@ #include #endif -#ifndef __WXPALMOS5__ -#if !defined(__WXMSW__) || defined(__WXMICROWIN__) +#if !defined(__WINDOWS__) || defined(__WXMICROWIN__) #include // for SIGTRAP used by wxTrap() #endif //Win/Unix #include -#endif // ! __WXPALMOS5__ #if wxUSE_FONTMAP #include "wx/fontmap.h" @@ -67,7 +65,7 @@ #if wxDEBUG_LEVEL #if wxUSE_STACKWALKER #include "wx/stackwalk.h" - #ifdef __WXMSW__ + #ifdef __WINDOWS__ #include "wx/msw/debughlp.h" #endif #endif // wxUSE_STACKWALKER @@ -150,10 +148,14 @@ wxAppConsoleBase::wxAppConsoleBase() wxDELETE(m_traits); #endif #endif + + wxEvtHandler::AddFilter(this); } wxAppConsoleBase::~wxAppConsoleBase() { + wxEvtHandler::RemoveFilter(this); + // we're being destroyed and using this object from now on may not work or // even crash so don't leave dangling pointers to it ms_appInstance = NULL; @@ -177,7 +179,6 @@ bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **WXUNUSED(argv)) wxString wxAppConsoleBase::GetAppName() const { wxString name = m_appName; -#ifndef __WXPALMOS__ if ( name.empty() ) { if ( argv ) @@ -186,7 +187,6 @@ wxString wxAppConsoleBase::GetAppName() const wxFileName::SplitPath(argv[0], NULL, &name, NULL); } } -#endif // !__WXPALMOS__ return name; } @@ -345,8 +345,11 @@ bool wxAppConsoleBase::Dispatch() bool wxAppConsoleBase::Yield(bool onlyIfNeeded) { wxEventLoopBase * const loop = wxEventLoopBase::GetActive(); + if ( loop ) + return loop->Yield(onlyIfNeeded); - return loop && loop->Yield(onlyIfNeeded); + wxScopedPtr tmpLoop(CreateMainLoop()); + return tmpLoop->Yield(onlyIfNeeded); } void wxAppConsoleBase::WakeUpIdle() @@ -398,7 +401,7 @@ bool wxAppConsoleBase::IsMainLoopRunning() int wxAppConsoleBase::FilterEvent(wxEvent& WXUNUSED(event)) { // process the events normally by default - return -1; + return Event_Skip; } void wxAppConsoleBase::DelayPendingEventHandler(wxEvtHandler* toDelay) @@ -893,12 +896,12 @@ wxString wxAppTraitsBase::GetAssertStackTrace() { #if wxDEBUG_LEVEL -#if !defined(__WXMSW__) +#if !defined(__WINDOWS__) // on Unix stack frame generation may take some time, depending on the // size of the executable mainly... warn the user that we are working wxFprintf(stderr, "Collecting stack trace information, please wait..."); fflush(stderr); -#endif // !__WXMSW__ +#endif // !__WINDOWS__ wxString stackTrace; @@ -999,12 +1002,21 @@ bool wxAssertIsEqual(int x, int y) return x == y; } +void wxAbort() +{ +#ifdef __WXWINCE__ + ExitThread(3); +#else + abort(); +#endif +} + #if wxDEBUG_LEVEL // break into the debugger void wxTrap() { -#if defined(__WXMSW__) && !defined(__WXMICROWIN__) +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) DebugBreak(); #elif defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS Debugger(); @@ -1025,7 +1037,7 @@ wxDefaultAssertHandler(const wxString& file, { // If this option is set, we should abort immediately when assert happens. if ( wxSystemOptions::GetOptionInt("exit-on-assert") ) - abort(); + wxAbort(); // FIXME MT-unsafe static int s_bInAssert = 0; @@ -1167,8 +1179,8 @@ static void LINKAGEMODE SetTraceMasks() static bool DoShowAssertDialog(const wxString& msg) { - // under MSW we can show the dialog even in the console mode -#if defined(__WXMSW__) && !defined(__WXMICROWIN__) + // under Windows we can show the dialog even in the console mode +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) wxString msgDlg(msg); // this message is intentionally not translated -- it is for developers @@ -1191,9 +1203,9 @@ bool DoShowAssertDialog(const wxString& msg) //case IDNO: nothing to do } -#else // !__WXMSW__ +#else // !__WINDOWS__ wxUnusedVar(msg); -#endif // __WXMSW__/!__WXMSW__ +#endif // __WINDOWS__/!__WINDOWS__ // continue with the asserts by default return false; diff --git a/Externals/wxWidgets3/src/common/appcmn.cpp b/Externals/wxWidgets3/src/common/appcmn.cpp index bad98c12b0..6c7129139a 100644 --- a/Externals/wxWidgets3/src/common/appcmn.cpp +++ b/Externals/wxWidgets3/src/common/appcmn.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 18.10.99 -// RCS-ID: $Id: appcmn.cpp 66648 2011-01-08 06:42:41Z PC $ +// RCS-ID: $Id: appcmn.cpp 70353 2012-01-15 14:46:41Z VZ $ // Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -196,10 +196,10 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) }, #endif // __WXUNIVERSAL__ -#if defined(__WXMGL__) - // VS: this is not specific to wxMGL, all fullscreen (framebuffer) ports +#if defined(__WXDFB__) + // VS: this is not specific to wxDFB, all fullscreen (framebuffer) ports // should provide this option. That's why it is in common/appcmn.cpp - // and not mgl/app.cpp + // and not dfb/app.cpp { wxCMD_LINE_OPTION, NULL, @@ -208,7 +208,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) wxCMD_LINE_VAL_STRING, 0x0 }, -#endif // __WXMGL__ +#endif // __WXDFB__ // terminator wxCMD_LINE_DESC_END @@ -236,7 +236,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser) } #endif // __WXUNIVERSAL__ -#if defined(__WXMGL__) +#if defined(__WXDFB__) wxString modeDesc; if ( parser.Found(OPTION_MODE, &modeDesc) ) { @@ -250,7 +250,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser) if ( !SetDisplayMode(wxVideoMode(w, h, bpp)) ) return false; } -#endif // __WXMGL__ +#endif // __WXDFB__ return wxAppConsole::OnCmdLineParsed(parser); } @@ -349,7 +349,10 @@ bool wxAppBase::ProcessIdle() while (node) { wxWindow* win = node->GetData(); - if (win->SendIdleEvents(event)) + + // Don't send idle events to the windows that are about to be destroyed + // anyhow, this is wasteful and unexpected. + if ( !wxPendingDelete.Member(win) && win->SendIdleEvents(event) ) needMore = true; node = node->GetNext(); } diff --git a/Externals/wxWidgets3/src/common/arrstr.cpp b/Externals/wxWidgets3/src/common/arrstr.cpp index 9e9da5f35e..c186bb0da2 100644 --- a/Externals/wxWidgets3/src/common/arrstr.cpp +++ b/Externals/wxWidgets3/src/common/arrstr.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 29/01/98 -// RCS-ID: $Id: arrstr.cpp 61947 2009-09-16 23:18:48Z VZ $ +// RCS-ID: $Id: arrstr.cpp 67343 2011-03-30 14:16:04Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -33,7 +33,7 @@ wxArrayString::wxArrayString(size_t sz, const char** a) { -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS Init(false); #endif for (size_t i=0; i < sz; i++) @@ -42,7 +42,7 @@ wxArrayString::wxArrayString(size_t sz, const char** a) wxArrayString::wxArrayString(size_t sz, const wchar_t** a) { -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS Init(false); #endif for (size_t i=0; i < sz; i++) @@ -51,14 +51,14 @@ wxArrayString::wxArrayString(size_t sz, const wchar_t** a) wxArrayString::wxArrayString(size_t sz, const wxString* a) { -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS Init(false); #endif for (size_t i=0; i < sz; i++) Add(a[i]); } -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS // size increment = min(50% of current size, ARRAY_MAXSIZE_INCREMENT) #define ARRAY_MAXSIZE_INCREMENT 4096 @@ -462,7 +462,7 @@ bool wxArrayString::operator==(const wxArrayString& a) const return true; } -#endif // !wxUSE_STL +#endif // !wxUSE_STD_CONTAINERS // =========================================================================== // wxJoin and wxSplit diff --git a/Externals/wxWidgets3/src/common/artprov.cpp b/Externals/wxWidgets3/src/common/artprov.cpp index c56761f3bb..5377d3e560 100644 --- a/Externals/wxWidgets3/src/common/artprov.cpp +++ b/Externals/wxWidgets3/src/common/artprov.cpp @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // Modified by: // Created: 18/03/2002 -// RCS-ID: $Id: artprov.cpp 66506 2010-12-31 17:39:37Z VZ $ +// RCS-ID: $Id: artprov.cpp 70154 2011-12-28 13:51:29Z VZ $ // Copyright: (c) Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -231,12 +231,12 @@ wxArtProvider::~wxArtProvider() node; node = node->GetNext()) { bmp = node->GetData()->CreateBitmap(id, client, size); - if ( bmp.Ok() ) + if ( bmp.IsOk() ) break; } wxSize sizeNeeded = size; - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) { // no bitmap created -- as a fallback, try if we can find desired // icon in a bundle @@ -407,7 +407,7 @@ bool wxArtProvider::HasNativeProvider() /* static */ void wxArtProvider::InsertProvider(wxArtProvider *provider) { - Insert(provider); + PushBack(provider); } /* static */ bool wxArtProvider::PopProvider() @@ -440,13 +440,16 @@ class wxArtProviderModule: public wxModule public: bool OnInit() { -#if wxUSE_ARTPROVIDER_STD - wxArtProvider::InitStdProvider(); -#endif // wxUSE_ARTPROVIDER_STD + // The order here is such that the native provider will be used first + // and the standard one last as all these default providers add + // themselves to the bottom of the stack. + wxArtProvider::InitNativeProvider(); #if wxUSE_ARTPROVIDER_TANGO wxArtProvider::InitTangoProvider(); #endif // wxUSE_ARTPROVIDER_TANGO - wxArtProvider::InitNativeProvider(); +#if wxUSE_ARTPROVIDER_STD + wxArtProvider::InitStdProvider(); +#endif // wxUSE_ARTPROVIDER_STD return true; } void OnExit() diff --git a/Externals/wxWidgets3/src/common/artstd.cpp b/Externals/wxWidgets3/src/common/artstd.cpp index 5a86d0523f..fe65503986 100644 --- a/Externals/wxWidgets3/src/common/artstd.cpp +++ b/Externals/wxWidgets3/src/common/artstd.cpp @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // Modified by: // Created: 18/03/2002 -// RCS-ID: $Id: artstd.cpp 66506 2010-12-31 17:39:37Z VZ $ +// RCS-ID: $Id: artstd.cpp 70893 2012-03-13 17:23:58Z JS $ // Copyright: (c) Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -45,7 +45,7 @@ protected: /*static*/ void wxArtProvider::InitStdProvider() { - wxArtProvider::Push(new wxDefaultArtProvider); + wxArtProvider::PushBack(new wxDefaultArtProvider); } // ---------------------------------------------------------------------------- @@ -207,7 +207,7 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id, wxBitmap bmp = wxDefaultArtProvider_CreateBitmap(id); #if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB) - if (bmp.Ok()) + if (bmp.IsOk()) { // fit into transparent image with desired size hint from the client if (reqSize == wxDefaultSize) @@ -219,7 +219,12 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id, int bmp_w = bmp.GetWidth(); int bmp_h = bmp.GetHeight(); - if ((bmp_h < bestSize.x) && (bmp_w < bestSize.y)) + if (bmp_w == 16 && bmp_h == 15 && bestSize == wxSize(16, 16)) + { + // Do nothing in this special but quite common case, because scaling + // with only a pixel difference will look horrible. + } + else if ((bmp_h < bestSize.x) && (bmp_w < bestSize.y)) { // the caller wants default size, which is larger than // the image we have; to avoid degrading it visually by diff --git a/Externals/wxWidgets3/src/common/arttango.cpp b/Externals/wxWidgets3/src/common/arttango.cpp index 1bf02bd9ff..ae01e9e85a 100644 --- a/Externals/wxWidgets3/src/common/arttango.cpp +++ b/Externals/wxWidgets3/src/common/arttango.cpp @@ -3,7 +3,7 @@ // Purpose: art provider using embedded PNG versions of Tango icons // Author: Vadim Zeitlin // Created: 2010-12-27 -// RCS-ID: $Id: arttango.cpp 66510 2010-12-31 19:38:49Z VZ $ +// RCS-ID: $Id: arttango.cpp 70154 2011-12-28 13:51:29Z VZ $ // Copyright: (c) 2010 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -322,7 +322,7 @@ wxTangoArtProvider::CreateBitmap(const wxArtID& id, /* static */ void wxArtProvider::InitTangoProvider() { - wxArtProvider::Push(new wxTangoArtProvider); + wxArtProvider::PushBack(new wxTangoArtProvider); } #endif // wxUSE_ARTPROVIDER_TANGO diff --git a/Externals/wxWidgets3/src/common/bmpbase.cpp b/Externals/wxWidgets3/src/common/bmpbase.cpp index 60e1ea50c8..403470fe29 100644 --- a/Externals/wxWidgets3/src/common/bmpbase.cpp +++ b/Externals/wxWidgets3/src/common/bmpbase.cpp @@ -3,7 +3,7 @@ // Purpose: wxBitmapBase // Author: VaclavSlavik // Created: 2001/04/11 -// RCS-ID: $Id: bmpbase.cpp 66630 2011-01-07 17:49:18Z SC $ +// RCS-ID: $Id: bmpbase.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 2001, Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -156,7 +156,7 @@ wxBitmap::wxBitmap(const char* const* bits) #if wxUSE_IMAGE && wxUSE_XPM wxImage image(bits); - wxCHECK2_MSG(image.Ok(), return, wxT("invalid bitmap data")); + wxCHECK2_MSG(image.IsOk(), return, wxT("invalid bitmap data")); *this = wxBitmap(image); #else diff --git a/Externals/wxWidgets3/src/common/bookctrl.cpp b/Externals/wxWidgets3/src/common/bookctrl.cpp index 7cc2bceea5..c722822df5 100644 --- a/Externals/wxWidgets3/src/common/bookctrl.cpp +++ b/Externals/wxWidgets3/src/common/bookctrl.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 19.08.03 -// RCS-ID: $Id: bookctrl.cpp 65967 2010-10-31 13:33:34Z VZ $ +// RCS-ID: $Id: bookctrl.cpp 70153 2011-12-28 13:51:25Z VZ $ // Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -55,8 +55,6 @@ void wxBookCtrlBase::Init() { m_selection = wxNOT_FOUND; m_bookctrl = NULL; - m_imageList = NULL; - m_ownsImageList = false; m_fitToCurrentPage = false; #if defined(__WXWINCE__) @@ -89,39 +87,6 @@ wxBookCtrlBase::Create(wxWindow *parent, ); } -wxBookCtrlBase::~wxBookCtrlBase() -{ - if ( m_ownsImageList ) - { - // may be NULL, ok - delete m_imageList; - } -} - -// ---------------------------------------------------------------------------- -// image list -// ---------------------------------------------------------------------------- - -void wxBookCtrlBase::SetImageList(wxImageList *imageList) -{ - if ( m_ownsImageList ) - { - // may be NULL, ok - delete m_imageList; - - m_ownsImageList = false; - } - - m_imageList = imageList; -} - -void wxBookCtrlBase::AssignImageList(wxImageList* imageList) -{ - SetImageList(imageList); - - m_ownsImageList = true; -} - // ---------------------------------------------------------------------------- // geometry // ---------------------------------------------------------------------------- @@ -140,8 +105,13 @@ void wxBookCtrlBase::DoInvalidateBestSize() wxSize wxBookCtrlBase::CalcSizeFromPage(const wxSize& sizePage) const { - // we need to add the size of the choice control and the border between - const wxSize sizeController = GetControllerSize(); + // We need to add the size of the controller and the border between if it's + // shown. Notice that we don't use GetControllerSize() here as it returns + // the actual size while we want the best size here. + if ( !m_bookctrl || !m_bookctrl->IsShown() ) + return sizePage; + + const wxSize sizeController = m_bookctrl->GetBestSize(); wxSize size = sizePage; if ( IsVertical() ) diff --git a/Externals/wxWidgets3/src/common/btncmn.cpp b/Externals/wxWidgets3/src/common/btncmn.cpp index f8e14d750b..e59d7118ac 100644 --- a/Externals/wxWidgets3/src/common/btncmn.cpp +++ b/Externals/wxWidgets3/src/common/btncmn.cpp @@ -3,7 +3,7 @@ // Purpose: implementation of wxButtonBase // Author: Vadim Zeitlin // Created: 2007-04-08 -// RCS-ID: $Id: btncmn.cpp 66592 2011-01-05 18:27:58Z PC $ +// RCS-ID: $Id: btncmn.cpp 67931 2011-06-14 13:00:42Z VZ $ // Copyright: (c) 2007 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -107,7 +107,7 @@ wxWindow *wxButtonBase::SetDefault() return tlw->SetDefaultItem(this); } -void wxButtonBase::SetBitmapPosition(wxDirection dir) +void wxAnyButtonBase::SetBitmapPosition(wxDirection dir) { wxASSERT_MSG( !(dir & ~wxDIRECTION_MASK), "non-direction flag used" ); wxASSERT_MSG( !!(dir & wxLEFT) + diff --git a/Externals/wxWidgets3/src/common/cairo.cpp b/Externals/wxWidgets3/src/common/cairo.cpp index 724c816bce..7425bf2afa 100644 --- a/Externals/wxWidgets3/src/common/cairo.cpp +++ b/Externals/wxWidgets3/src/common/cairo.cpp @@ -3,7 +3,7 @@ // Purpose: Cairo library // Author: Anthony Betaudeau // Created: 2007-08-25 -// RCS-ID: $Id: cairo.cpp 65561 2010-09-17 11:17:55Z DS $ +// RCS-ID: $Id: cairo.cpp 69486 2011-10-20 04:58:00Z RD $ // Copyright: (c) Anthony Bretaudeau // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -16,31 +16,299 @@ #pragma hdrstop #endif +// keep cairo.h from defining dllimport as we're defining the symbols inside +// the wx dll in order to load them dynamically. +#define cairo_public + #include "wx/cairo.h" +#include "wx/dynlib.h" #if wxUSE_CAIRO +#ifdef __WXMAC__ +#include "wx/osx/private.h" +#include +#endif + #ifndef WX_PRECOMP #include "wx/module.h" #include "wx/log.h" #endif +#define wxCAIRO_METHOD_TYPE(name) \ + wxCairo##name##_t + +#define wxCAIRO_STATIC_METHOD_DEFINE(rettype, name, args, argnames, defret) \ + static wxCAIRO_METHOD_TYPE(name) name; -wxCairoLibrary *wxCairoLibrary::ms_lib = NULL; +#define wxCAIRO_STATIC_VOIDMETHOD_DEFINE(name, args, argnames) \ + wxCAIRO_STATIC_METHOD_DEFINE(void, name, args, argnames, NULL) + +#define wxFOR_ALL_CAIRO_VOIDMETHODS(m) \ + m( cairo_append_path, \ + (cairo_t *cr, const cairo_path_t *path), (cr, path) ) \ + m( cairo_arc, \ + (cairo_t *cr, double xc, double yc, double radius, double angle1, double angle2), (cr, xc, yc, radius, angle1, angle2) ) \ + m( cairo_arc_negative, \ + (cairo_t *cr, double xc, double yc, double radius, double angle1, double angle2), (cr, xc, yc, radius, angle1, angle2) ) \ + m( cairo_clip, \ + (cairo_t *cr), (cr) ) \ + m( cairo_close_path, \ + (cairo_t *cr), (cr) ) \ + m( cairo_curve_to, \ + (cairo_t *cr, double x1, double y1, double x2, double y2, double x3, double y3), (cr, x1, y1, x2, y2, x3, y3) ) \ + m( cairo_destroy, \ + (cairo_t *cr), (cr) ) \ + m( cairo_fill, \ + (cairo_t *cr), (cr) ) \ + m( cairo_fill_preserve, \ + (cairo_t *cr), (cr) ) \ + m( cairo_font_extents, \ + (cairo_t *cr, cairo_font_extents_t *extents), (cr, extents) ) \ + m( cairo_font_face_destroy, \ + (cairo_font_face_t *font_face), (font_face) ) \ + m( cairo_get_current_point, \ + (cairo_t *cr, double *x, double *y), (cr, x, y) ) \ + m( cairo_get_matrix, \ + (cairo_t *cr, cairo_matrix_t *matrix), (cr, matrix) ) \ + m( cairo_line_to, \ + (cairo_t *cr, double x, double y), (cr, x, y) ) \ + m( cairo_matrix_init, \ + (cairo_matrix_t *matrix, double xx, double yx, double xy, double yy, double x0, double y0), (matrix, xx, yx, xy, yy, x0, y0) ) \ + m( cairo_matrix_multiply, \ + (cairo_matrix_t *result, const cairo_matrix_t *a, const cairo_matrix_t *b), (result, a, b) ) \ + m( cairo_matrix_rotate, \ + (cairo_matrix_t *matrix, double radians), (matrix, radians) ) \ + m( cairo_matrix_scale, \ + (cairo_matrix_t *matrix, double sx, double sy), (matrix, sx, sy) ) \ + m( cairo_matrix_transform_distance, \ + (const cairo_matrix_t *matrix, double *dx, double *dy), (matrix, dx, dy) ) \ + m( cairo_matrix_transform_point, \ + (const cairo_matrix_t *matrix, double *x, double *y), (matrix, x, y) ) \ + m( cairo_matrix_translate, \ + (cairo_matrix_t *matrix, double tx, double ty), (matrix, tx, ty) ) \ + m( cairo_move_to, \ + (cairo_t *cr, double x, double y), (cr, x, y) ) \ + m( cairo_new_path, \ + (cairo_t *cr), (cr) ) \ + m( cairo_paint, \ + (cairo_t *cr), (cr) ) \ + m( cairo_paint_with_alpha, \ + (cairo_t *cr, double alpha), (cr, alpha) ) \ + m( cairo_path_destroy, \ + (cairo_path_t *path), (path) ) \ + m( cairo_pattern_add_color_stop_rgba, \ + (cairo_pattern_t *pattern, double offset, double red, double green, double blue, double alpha), (pattern, offset, red, green, blue, alpha) ) \ + m( cairo_pattern_destroy, \ + (cairo_pattern_t *pattern), (pattern) ) \ + m( cairo_pattern_set_extend, \ + (cairo_pattern_t *pattern, cairo_extend_t extend), (pattern, extend) ) \ + m( cairo_pattern_set_filter, \ + (cairo_pattern_t *pattern, cairo_filter_t filter), (pattern, filter) ) \ + m( cairo_pop_group_to_source, \ + (cairo_t *cr), (cr) ) \ + m( cairo_push_group, \ + (cairo_t *cr), (cr) ) \ + m( cairo_rectangle, \ + (cairo_t *cr, double x, double y, double width, double height), (cr, x, y, width, height) ) \ + m( cairo_reset_clip, \ + (cairo_t *cr), (cr) ) \ + m( cairo_restore, \ + (cairo_t *cr), (cr) ) \ + m( cairo_rotate, \ + (cairo_t *cr, double angle), (cr, angle) ) \ + m( cairo_save, \ + (cairo_t *cr), (cr) ) \ + m( cairo_scale, \ + (cairo_t *cr, double sx, double sy), (cr, sx, sy) ) \ + m( cairo_select_font_face, \ + (cairo_t *cr, const char *family, cairo_font_slant_t slant, cairo_font_weight_t weight), (cr, family, slant, weight) ) \ + m( cairo_set_antialias, \ + (cairo_t *cr, cairo_antialias_t antialias), (cr, antialias) ) \ + m( cairo_set_dash, \ + (cairo_t *cr, const double *dashes, int num_dashes, double offset), (cr, dashes, num_dashes, offset) ) \ + m( cairo_set_fill_rule, \ + (cairo_t *cr, cairo_fill_rule_t fill_rule), (cr, fill_rule) ) \ + m( cairo_set_font_face, \ + (cairo_t *cr, cairo_font_face_t *font_face), (cr, font_face) ) \ + m( cairo_set_font_size, \ + (cairo_t *cr, double size), (cr, size) ) \ + m( cairo_set_line_cap, \ + (cairo_t *cr, cairo_line_cap_t line_cap), (cr, line_cap) ) \ + m( cairo_set_line_join, \ + (cairo_t *cr, cairo_line_join_t line_join), (cr, line_join) ) \ + m( cairo_set_line_width, \ + (cairo_t *cr, double width), (cr, width) ) \ + m( cairo_set_matrix, \ + (cairo_t *cr, const cairo_matrix_t *matrix), (cr, matrix) ) \ + m( cairo_set_operator, \ + (cairo_t *cr, cairo_operator_t op), (cr, op) ) \ + m( cairo_set_source, \ + (cairo_t *cr, cairo_pattern_t *source), (cr, source) ) \ + m( cairo_set_source_rgba, \ + (cairo_t *cr, double red, double green, double blue, double alpha), (cr, red, green, blue, alpha) ) \ + m( cairo_show_text, \ + (cairo_t *cr, const char *utf8), (cr, utf8) ) \ + m( cairo_stroke, \ + (cairo_t *cr), (cr) ) \ + m( cairo_stroke_extents, \ + (cairo_t *cr, double *x1, double *y1, double *x2, double *y2), (cr, x1, y1, x2, y2) ) \ + m( cairo_stroke_preserve, \ + (cairo_t *cr), (cr) ) \ + m( cairo_surface_destroy, \ + (cairo_surface_t *surface), (surface) ) \ + m( cairo_text_extents, \ + (cairo_t *cr, const char *utf8, cairo_text_extents_t *extents), (cr, utf8, extents) ) \ + m( cairo_transform, \ + (cairo_t *cr, const cairo_matrix_t *matrix), (cr, matrix) ) \ + m( cairo_translate, \ + (cairo_t *cr, double tx, double ty), (cr, tx, ty) ) \ + +#ifdef __WXMAC__ +#define wxCAIRO_PLATFORM_METHODS(m) \ + m( cairo_font_face_t*, cairo_quartz_font_face_create_for_cgfont, \ + (CGFontRef font), (font), NULL ) \ + m( cairo_surface_t*, cairo_quartz_surface_create_for_cg_context, \ + (CGContextRef cgContext, unsigned int width, unsigned int height), (cgContext, width, height), NULL ) +#elif defined(__WXMSW__) +#define wxCAIRO_PLATFORM_METHODS(m) \ + m( cairo_surface_t*, cairo_win32_surface_create, \ + (HDC hdc), (hdc), NULL ) \ + m( cairo_surface_t*, cairo_win32_printing_surface_create, \ + (HDC hdc), (hdc), NULL ) +#else +#define wxCAIRO_PLATFORM_METHODS(m) +#endif + +#define wxFOR_ALL_CAIRO_METHODS(m) \ + m( cairo_path_t*, cairo_copy_path, \ + (cairo_t *cr), (cr), NULL ) \ + m( cairo_t*, cairo_create, \ + (cairo_surface_t *target), (target), NULL) \ + m( cairo_surface_t*, cairo_get_target, \ + (cairo_t *cr), (cr), NULL) \ + m( cairo_surface_t*, cairo_image_surface_create, \ + (cairo_format_t format, int width, int height), (format, width, height), NULL ) \ + m( cairo_surface_t*, cairo_image_surface_create_for_data, \ + (unsigned char *data, cairo_format_t format, int width, int height, int stride), (data, format, width, height, stride), NULL) \ + m( cairo_bool_t, cairo_in_fill, \ + (cairo_t *cr, double x, double y), (cr, x, y), false ) \ + m( cairo_status_t, cairo_matrix_invert, \ + (cairo_matrix_t *matrix), (matrix), NULL) \ + m( cairo_pattern_t*, cairo_pattern_create_for_surface, \ + (cairo_surface_t *surface), (surface), NULL) \ + m( cairo_pattern_t*, cairo_pattern_create_linear, \ + (double x0, double y0, double x1, double y1), (x0, y0, x1, y1), NULL) \ + m( cairo_pattern_t*, cairo_pattern_create_radial, \ + (double cx0, double cy0, double radius0, double cx1, double cy1, double radius1), (cx0, cy0, radius0, cx1, cy1, radius1), NULL) \ + m( cairo_status_t, cairo_pattern_status, \ + (cairo_pattern_t *pattern), (pattern), 4) \ + m( cairo_t*, cairo_reference, \ + (cairo_t *cr), (cr), NULL ) \ + m( cairo_surface_t*, cairo_surface_create_similar, \ + (cairo_surface_t *other, cairo_content_t content, int width, int height), (other, content, width, height), NULL) \ + m( int, cairo_format_stride_for_width, \ + (cairo_format_t format, int width), (format, width), 0) \ + m( int, cairo_version, \ + (), (), 0) \ + m( int, cairo_image_surface_get_stride, \ + (cairo_surface_t *surface), (surface), 0) \ + m( unsigned char *, cairo_image_surface_get_data, \ + (cairo_surface_t *surface), (surface), NULL) \ + m( cairo_format_t, cairo_image_surface_get_format, \ + (cairo_surface_t *surface), (surface), CAIRO_FORMAT_INVALID) \ + m( cairo_surface_type_t, cairo_surface_get_type, \ + (cairo_surface_t *surface), (surface), -1) \ + wxCAIRO_PLATFORM_METHODS(m) + + +#if wxUSE_PANGO +#define wxFOR_ALL_PANGO_CAIRO_VOIDMETHODS(m) \ + m( pango_cairo_update_layout, \ + (cairo_t *cr, PangoLayout *layout), (cr, layout) ) \ + m( pango_cairo_show_layout, \ + (cairo_t *cr, PangoLayout *layout), (cr, layout) ) +#endif + +#define wxCAIRO_DECLARE_TYPE(rettype, name, args, argnames, defret) \ + typedef rettype (*wxCAIRO_METHOD_TYPE(name)) args ; \ + wxCAIRO_METHOD_TYPE(name) wxDL_METHOD_NAME(name); + +#define wxCAIRO_DECLARE_VOIDTYPE(name, args, argnames) \ + wxCAIRO_DECLARE_TYPE(void, name, args, argnames, NULL) + +wxFOR_ALL_CAIRO_VOIDMETHODS(wxCAIRO_DECLARE_VOIDTYPE) +wxFOR_ALL_CAIRO_METHODS(wxCAIRO_DECLARE_TYPE) + + +class wxCairo +{ +public: + static bool Initialize(); + + // for internal use only + static void CleanUp(); + +private: + // the single wxCairo instance or NULL + static wxCairo *ms_lib; + + wxCairo(); + ~wxCairo(); + + bool IsOk(); + + wxDynamicLibrary m_libCairo; + wxDynamicLibrary m_libPangoCairo; + + // true if we successfully loaded the libraries and can use them + // + // note that this field must have this name as it's used by wxDL_XXX macros + bool m_ok; + +public: + + wxFOR_ALL_CAIRO_VOIDMETHODS(wxCAIRO_STATIC_VOIDMETHOD_DEFINE) + wxFOR_ALL_CAIRO_METHODS(wxCAIRO_STATIC_METHOD_DEFINE) +#if wxUSE_PANGO // untested, uncomment to test compilation. + //wxFOR_ALL_PANGO_METHODS(wxDL_STATIC_METHOD_DEFINE) +#endif + + wxDECLARE_NO_COPY_CLASS(wxCairo); +}; + +#define wxINIT_CAIRO_VOIDFUNC(name, params, args) \ + wxCAIRO_METHOD_TYPE(name) wxCairo::name = NULL; + +#define wxINIT_CAIRO_FUNC(rettype, name, params, args, defret) \ + wxCAIRO_METHOD_TYPE(name) wxCairo::name = NULL; + +wxFOR_ALL_CAIRO_VOIDMETHODS(wxINIT_CAIRO_VOIDFUNC) +wxFOR_ALL_CAIRO_METHODS(wxINIT_CAIRO_FUNC) + +#undef wxINIT_CAIRO_FUNC + +wxCairo *wxCairo::ms_lib = NULL; //---------------------------------------------------------------------------- // wxCairoLibrary //---------------------------------------------------------------------------- -wxCairoLibrary::wxCairoLibrary() +wxCairo::wxCairo() { wxLogNull log; - m_libCairo.Load("libcairo.so.2"); +#ifdef __WXMSW__ + wxString cairoDllStr("libcairo-2.dll"); +#else + wxString cairoDllStr("libcairo.so.2"); +#endif + m_libCairo.Load(cairoDllStr); m_ok = m_libCairo.IsLoaded(); if ( !m_ok ) return; +#if wxUSE_PANGO m_libPangoCairo.Load("libpangocairo-1.0.so.0"); m_ok = m_libPangoCairo.IsLoaded(); if ( !m_ok ) @@ -48,19 +316,37 @@ wxCairoLibrary::wxCairoLibrary() m_libCairo.Unload(); return; } +#endif - m_ok = InitializeMethods(); + +#define wxDO_LOAD_FUNC(name, nameStr) \ + name = (wxCAIRO_METHOD_TYPE(name))m_libCairo.RawGetSymbol(nameStr); \ + if ( !name ) \ + return; + +#define wxLOAD_CAIRO_VOIDFUNC(name, params, args) \ + wxDO_LOAD_FUNC(name, wxSTRINGIZE_T(name)) + +#define wxLOAD_CAIRO_FUNC(rettype, name, params, args, defret) \ + wxDO_LOAD_FUNC(name, wxSTRINGIZE_T(name)) + +wxFOR_ALL_CAIRO_VOIDMETHODS(wxLOAD_CAIRO_VOIDFUNC) +wxFOR_ALL_CAIRO_METHODS(wxLOAD_CAIRO_FUNC) + +#undef wxLOAD_CAIRO_FUNC + + m_ok = true; } -wxCairoLibrary::~wxCairoLibrary() +wxCairo::~wxCairo() { } -/* static */ wxCairoLibrary* wxCairoLibrary::Get() +/* static */ bool wxCairo::Initialize() { if ( !ms_lib ) { - ms_lib = new wxCairoLibrary(); + ms_lib = new wxCairo(); if ( !ms_lib->IsOk() ) { delete ms_lib; @@ -68,10 +354,10 @@ wxCairoLibrary::~wxCairoLibrary() } } - return ms_lib; + return ms_lib != NULL; } -/* static */ void wxCairoLibrary::CleanUp() +/* static */ void wxCairo::CleanUp() { if (ms_lib) { @@ -80,61 +366,48 @@ wxCairoLibrary::~wxCairoLibrary() } } -bool wxCairoLibrary::IsOk() +bool wxCairo::IsOk() { return m_ok; } -bool wxCairoLibrary::InitializeMethods() +// ============================================================================ +// implementation of the functions themselves +// ============================================================================ + +extern "C" { - wxDL_METHOD_LOAD(m_libCairo, cairo_arc); - wxDL_METHOD_LOAD(m_libCairo, cairo_arc_negative); - wxDL_METHOD_LOAD(m_libCairo, cairo_clip); - wxDL_METHOD_LOAD(m_libCairo, cairo_close_path); - wxDL_METHOD_LOAD(m_libCairo, cairo_create); - wxDL_METHOD_LOAD(m_libCairo, cairo_curve_to); - wxDL_METHOD_LOAD(m_libCairo, cairo_destroy); - wxDL_METHOD_LOAD(m_libCairo, cairo_fill); - wxDL_METHOD_LOAD(m_libCairo, cairo_fill_preserve); - wxDL_METHOD_LOAD(m_libCairo, cairo_get_target); - wxDL_METHOD_LOAD(m_libCairo, cairo_image_surface_create_for_data); - wxDL_METHOD_LOAD(m_libCairo, cairo_line_to); - wxDL_METHOD_LOAD(m_libCairo, cairo_move_to); - wxDL_METHOD_LOAD(m_libCairo, cairo_new_path); - wxDL_METHOD_LOAD(m_libCairo, cairo_paint); - wxDL_METHOD_LOAD(m_libCairo, cairo_pattern_add_color_stop_rgba); - wxDL_METHOD_LOAD(m_libCairo, cairo_pattern_create_for_surface); - wxDL_METHOD_LOAD(m_libCairo, cairo_pattern_create_linear); - wxDL_METHOD_LOAD(m_libCairo, cairo_pattern_create_radial); - wxDL_METHOD_LOAD(m_libCairo, cairo_pattern_destroy); - wxDL_METHOD_LOAD(m_libCairo, cairo_pattern_set_extend); - wxDL_METHOD_LOAD(m_libCairo, cairo_pattern_set_filter); - wxDL_METHOD_LOAD(m_libCairo, cairo_rectangle); - wxDL_METHOD_LOAD(m_libCairo, cairo_reset_clip); - wxDL_METHOD_LOAD(m_libCairo, cairo_restore); - wxDL_METHOD_LOAD(m_libCairo, cairo_rotate); - wxDL_METHOD_LOAD(m_libCairo, cairo_save); - wxDL_METHOD_LOAD(m_libCairo, cairo_scale); - wxDL_METHOD_LOAD(m_libCairo, cairo_set_dash); - wxDL_METHOD_LOAD(m_libCairo, cairo_set_fill_rule); - wxDL_METHOD_LOAD(m_libCairo, cairo_set_line_cap); - wxDL_METHOD_LOAD(m_libCairo, cairo_set_line_join); - wxDL_METHOD_LOAD(m_libCairo, cairo_set_line_width); - wxDL_METHOD_LOAD(m_libCairo, cairo_set_operator); - wxDL_METHOD_LOAD(m_libCairo, cairo_set_source); - wxDL_METHOD_LOAD(m_libCairo, cairo_set_source_rgba); - wxDL_METHOD_LOAD(m_libCairo, cairo_stroke); - wxDL_METHOD_LOAD(m_libCairo, cairo_stroke_preserve); - wxDL_METHOD_LOAD(m_libCairo, cairo_surface_create_similar); - wxDL_METHOD_LOAD(m_libCairo, cairo_surface_destroy); - wxDL_METHOD_LOAD(m_libCairo, cairo_translate); - wxDL_METHOD_LOAD(m_libPangoCairo, pango_cairo_update_layout); - wxDL_METHOD_LOAD(m_libPangoCairo, pango_cairo_show_layout); - - return true; +bool wxCairoInit() +{ + return wxCairo::Initialize(); } +void wxCairoCleanUp() +{ + wxCairo::CleanUp(); +} + +#define wxIMPL_CAIRO_FUNC(rettype, name, params, args, defret) \ + rettype name params \ + { \ + wxASSERT_MSG(wxCairo::Initialize(), "Cairo not initialized"); \ + return wxCairo::name args; \ + } + +#define wxIMPL_CAIRO_VOIDFUNC(name, params, args) \ + wxIMPL_CAIRO_FUNC(void, name, params, args, NULL) + +// we currently link directly to Cairo on GTK since it is usually available there, +// so don't use our cairo_xyz wrapper functions until the decision is made to +// always load Cairo dynamically there. +#ifndef __WXGTK__ +wxFOR_ALL_CAIRO_VOIDMETHODS(wxIMPL_CAIRO_VOIDFUNC) +wxFOR_ALL_CAIRO_METHODS(wxIMPL_CAIRO_FUNC) +#endif + +} // extern "C" + //---------------------------------------------------------------------------- // wxCairoModule //---------------------------------------------------------------------------- @@ -147,7 +420,7 @@ public: virtual void OnExit(); private: - DECLARE_DYNAMIC_CLASS(wxCairotModule) + DECLARE_DYNAMIC_CLASS(wxCairoModule) }; bool wxCairoModule::OnInit() @@ -157,7 +430,7 @@ bool wxCairoModule::OnInit() void wxCairoModule::OnExit() { - wxCairoLibrary::CleanUp(); + wxCairo::CleanUp(); } IMPLEMENT_DYNAMIC_CLASS(wxCairoModule, wxModule) diff --git a/Externals/wxWidgets3/src/common/calctrlcmn.cpp b/Externals/wxWidgets3/src/common/calctrlcmn.cpp index 4dde0060e0..93ac0dbc9f 100644 --- a/Externals/wxWidgets3/src/common/calctrlcmn.cpp +++ b/Externals/wxWidgets3/src/common/calctrlcmn.cpp @@ -2,7 +2,7 @@ // Name: src/common/calctrlcmn.cpp // Author: Marcin Wojdyr // Created: 2008-03-26 -// RCS-ID: $Id: calctrlcmn.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: calctrlcmn.cpp 69224 2011-09-29 13:43:15Z VZ $ // Copyright: (C) Marcin Wojdyr // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -16,13 +16,14 @@ #ifndef WX_PRECOMP #endif //WX_PRECOMP -#if wxUSE_CALENDARCTRL || wxUSE_DATEPICKCTRL +#if wxUSE_CALENDARCTRL || wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL #include "wx/dateevt.h" IMPLEMENT_DYNAMIC_CLASS(wxDateEvent, wxCommandEvent) wxDEFINE_EVENT(wxEVT_DATE_CHANGED, wxDateEvent); +wxDEFINE_EVENT(wxEVT_TIME_CHANGED, wxDateEvent); -#endif // wxUSE_CALENDARCTRL || wxUSE_DATEPICKCTRL +#endif // wxUSE_CALENDARCTRL || wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL #if wxUSE_CALENDARCTRL diff --git a/Externals/wxWidgets3/src/common/clrpickercmn.cpp b/Externals/wxWidgets3/src/common/clrpickercmn.cpp index a8df9d4837..1dc183a0af 100644 --- a/Externals/wxWidgets3/src/common/clrpickercmn.cpp +++ b/Externals/wxWidgets3/src/common/clrpickercmn.cpp @@ -4,7 +4,7 @@ // Author: Francesco Montorsi (readapted code written by Vadim Zeitlin) // Modified by: // Created: 15/04/2006 -// RCS-ID: $Id: clrpickercmn.cpp 58718 2009-02-07 18:59:25Z VZ $ +// RCS-ID: $Id: clrpickercmn.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) Vadim Zeitlin, Francesco Montorsi // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -84,7 +84,7 @@ void wxColourPickerCtrl::SetColour(const wxColour &col) bool wxColourPickerCtrl::SetColour(const wxString &text) { wxColour col(text); // smart wxString->wxColour conversion - if ( !col.Ok() ) + if ( !col.IsOk() ) return false; M_PICKER->SetColour(col); UpdateTextCtrlFromPicker(); @@ -105,7 +105,7 @@ void wxColourPickerCtrl::UpdatePickerFromTextCtrl() // wxString -> wxColour conversion wxColour col(m_text->GetValue()); - if ( !col.Ok() ) + if ( !col.IsOk() ) return; // invalid user input if (M_PICKER->GetColour() != col) diff --git a/Externals/wxWidgets3/src/common/cmdline.cpp b/Externals/wxWidgets3/src/common/cmdline.cpp index c02721ab6b..e270ade86f 100644 --- a/Externals/wxWidgets3/src/common/cmdline.cpp +++ b/Externals/wxWidgets3/src/common/cmdline.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 05.01.00 -// RCS-ID: $Id: cmdline.cpp 66253 2010-11-24 00:42:53Z VZ $ +// RCS-ID: $Id: cmdline.cpp 68316 2011-07-21 13:49:55Z VZ $ // Copyright: (c) 2000 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -106,8 +106,7 @@ struct wxCmdLineOption type = typ; flags = fl; - m_hasVal = false; - m_isNegated = false; + Reset(); } // can't use union easily here, so just store all possible data fields, we @@ -142,12 +141,19 @@ struct wxCmdLineOption { Check(wxCMD_LINE_VAL_DATE); m_dateVal = val; m_hasVal = true; } #endif // wxUSE_DATETIME - void SetHasValue(bool hasValue = true) { m_hasVal = hasValue; } + void SetHasValue() { m_hasVal = true; } bool HasValue() const { return m_hasVal; } void SetNegated() { m_isNegated = true; } bool IsNegated() const { return m_isNegated; } + // Reset to the initial state, called before parsing another command line. + void Reset() + { + m_hasVal = + m_isNegated = false; + } + public: wxCmdLineEntryType kind; wxString shortName, @@ -637,8 +643,7 @@ void wxCmdLineParser::Reset() { for ( size_t i = 0; i < m_data->m_options.GetCount(); i++ ) { - wxCmdLineOption& opt = m_data->m_options[i]; - opt.SetHasValue(false); + m_data->m_options[i].Reset(); } } @@ -702,11 +707,45 @@ int wxCmdLineParser::Parse(bool showUsage) if (longOptionsEnabled) { + wxString errorOpt; + optInd = m_data->FindOptionByLongName(name); if ( optInd == wxNOT_FOUND ) { - errorMsg << wxString::Format(_("Unknown long option '%s'"), name.c_str()) - << wxT('\n'); + // Check if this could be a negatable long option. + if ( name.Last() == '-' ) + { + name.RemoveLast(); + + optInd = m_data->FindOptionByLongName(name); + if ( optInd != wxNOT_FOUND ) + { + if ( !(m_data->m_options[optInd].flags & + wxCMD_LINE_SWITCH_NEGATABLE) ) + { + errorOpt.Printf + ( + _("Option '%s' can't be negated"), + name + ); + optInd = wxNOT_FOUND; + } + } + } + + if ( optInd == wxNOT_FOUND ) + { + if ( errorOpt.empty() ) + { + errorOpt.Printf + ( + _("Unknown long option '%s'"), + name + ); + } + + errorMsg << errorOpt << wxT('\n'); + } } } else @@ -1171,7 +1210,6 @@ wxString wxCmdLineParser::GetUsageString() const option << (!opt.longName ? wxT(':') : wxT('=')) << val; } - usage << negator; if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) ) { usage << wxT(']'); diff --git a/Externals/wxWidgets3/src/common/cmdproc.cpp b/Externals/wxWidgets3/src/common/cmdproc.cpp index 772097b6c3..75ef4d3166 100644 --- a/Externals/wxWidgets3/src/common/cmdproc.cpp +++ b/Externals/wxWidgets3/src/common/cmdproc.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart (extracted from docview.h by VZ) // Modified by: // Created: 05.11.00 -// RCS-ID: $Id: cmdproc.cpp 66287 2010-11-28 15:14:49Z VZ $ +// RCS-ID: $Id: cmdproc.cpp 70460 2012-01-25 00:05:12Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -172,9 +172,9 @@ bool wxCommandProcessor::Redo() { wxCommand *redoCommand = NULL; wxList::compatibility_iterator redoNode -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS = NULL // just to avoid warnings -#endif // !wxUSE_STL +#endif // !wxUSE_STD_CONTAINERS ; if ( m_currentCommand ) @@ -328,4 +328,28 @@ void wxCommandProcessor::ClearCommands() m_lastSavedCommand = wxList::compatibility_iterator(); } +bool wxCommandProcessor::IsDirty() const +{ + if ( m_commands.empty() ) + { + // If we have never been modified, we can't be dirty. + return false; + } + + if ( !m_lastSavedCommand ) + { + // If we have been modified but have never been saved, we're dirty. + return true; + } + + if ( !m_currentCommand ) + { + // This only happens if all commands were undone after saving the + // document: we're dirty then. + return true; + } + + // Finally if both iterators are valid, we may just compare them. + return m_currentCommand != m_lastSavedCommand; +} diff --git a/Externals/wxWidgets3/src/common/cmndata.cpp b/Externals/wxWidgets3/src/common/cmndata.cpp index d8b26aea46..95de654375 100644 --- a/Externals/wxWidgets3/src/common/cmndata.cpp +++ b/Externals/wxWidgets3/src/common/cmndata.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: cmndata.cpp 66615 2011-01-07 05:26:57Z PC $ +// RCS-ID: $Id: cmndata.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -170,7 +170,7 @@ bool wxPrintData::IsOk() const { m_nativeData->TransferFrom( *this ); - return m_nativeData->Ok(); + return m_nativeData->IsOk(); } // ---------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/src/common/colourcmn.cpp b/Externals/wxWidgets3/src/common/colourcmn.cpp index ed9315ae5d..d596deec62 100644 --- a/Externals/wxWidgets3/src/common/colourcmn.cpp +++ b/Externals/wxWidgets3/src/common/colourcmn.cpp @@ -4,7 +4,7 @@ // Author: Francesco Montorsi // Modified by: // Created: 20/4/2006 -// RCS-ID: $Id: colourcmn.cpp 66630 2011-01-07 17:49:18Z SC $ +// RCS-ID: $Id: colourcmn.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) Francesco Montorsi // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -101,10 +101,48 @@ bool wxColourBase::FromString(const wxString& str) alpha = wxALPHA_OPAQUE; if ( str.length() > 3 && (str[3] == wxT('a') || str[3] == wxT('A')) ) { - float a; - // TODO: use locale-independent function - if ( wxSscanf(str.wx_str() + 4, wxT("( %d , %d , %d , %f )"), - &red, &green, &blue, &a) != 4 ) + // We can't use sscanf() for the alpha value as sscanf() uses the + // current locale while the floating point numbers in CSS always + // use point as decimal separator, regardless of locale. So parse + // the tail of the string manually by putting it in a buffer and + // using wxString::ToCDouble() below. Notice that we can't use "%s" + // for this as it stops at white space and we need "%c" to avoid + // this and really get all the rest of the string into the buffer. + + const unsigned len = str.length(); // always big enough + wxCharBuffer alphaBuf(len); + char * const alphaPtr = alphaBuf.data(); + + for ( unsigned n = 0; n < len; n++ ) + alphaPtr[n] = '\0'; + + // Construct the format string which ensures that the last argument + // receives all the rest of the string. + wxString formatStr; + formatStr << wxS("( %d , %d , %d , %") << len << 'c'; + + // Notice that we use sscanf() here because if the string is not + // ASCII it can't represent a valid RGB colour specification anyhow + // and like this we can be sure that %c corresponds to "char *" + // while with wxSscanf() it depends on the type of the string + // passed as first argument: if it is a wide string, then %c + // expects "wchar_t *" matching parameter under MSW for example. + if ( sscanf(str.c_str() + 4, + formatStr.mb_str(), + &red, &green, &blue, alphaPtr) != 4 ) + return false; + + // Notice that we must explicitly specify the length to get rid of + // trailing NULs. + wxString alphaStr(alphaPtr, wxStrlen(alphaPtr)); + if ( alphaStr.empty() || alphaStr.Last() != ')' ) + return false; + + alphaStr.RemoveLast(); + alphaStr.Trim(); + + double a; + if ( !alphaStr.ToCDouble(&a) ) return false; alpha = wxRound(a * 255); @@ -139,13 +177,13 @@ bool wxColourBase::FromString(const wxString& str) // because this place can be called from constructor // and 'this' could not be available yet wxColour clr = wxTheColourDatabase->Find(str); - if (clr.Ok()) + if (clr.IsOk()) Set((unsigned char)clr.Red(), (unsigned char)clr.Green(), (unsigned char)clr.Blue()); } - if (Ok()) + if (IsOk()) return true; wxLogDebug(wxT("wxColour::Set - couldn't set to colour string '%s'"), str); @@ -181,9 +219,9 @@ wxString wxColourBase::GetAsString(long flags) const } else // use rgba() form { - // TODO: use locale-independent function - colName.Printf(wxT("rgba(%d, %d, %d, %.3f)"), - red, green, blue, Alpha() / 255.); + colName.Printf(wxT("rgba(%d, %d, %d, %s)"), + red, green, blue, + wxString::FromCDouble(Alpha() / 255., 3)); } } else if ( flags & wxC2S_HTML_SYNTAX ) diff --git a/Externals/wxWidgets3/src/common/combocmn.cpp b/Externals/wxWidgets3/src/common/combocmn.cpp index 70564bfbf3..de33d29646 100644 --- a/Externals/wxWidgets3/src/common/combocmn.cpp +++ b/Externals/wxWidgets3/src/common/combocmn.cpp @@ -4,7 +4,7 @@ // Author: Jaakko Salli // Modified by: // Created: Apr-30-2006 -// RCS-ID: $Id: combocmn.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: combocmn.cpp 69005 2011-09-05 20:08:04Z RD $ // Copyright: (c) 2005 Jaakko Salli // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -674,6 +674,34 @@ void wxComboPopup::Dismiss() m_combo->HidePopup(true); } +void wxComboPopup::DestroyPopup() +{ + // Here we make sure that the popup control's Destroy() gets called. + // This is necessary for the wxPersistentWindow to work properly. + wxWindow* popupCtrl = GetControl(); + if ( popupCtrl ) + { + // While all wxComboCtrl examples have m_popupInterface and + // popupCtrl as the same class (that will be deleted via the + // Destroy() call below), it is technically still possible to + // have implementations where they are in fact not same + // multiple-inherited class. Here we use C++ RTTI to check for + // this rare case. + #ifndef wxNO_RTTI + // It is probably better to delete m_popupInterface first, so + // that it retains access to its popup control window. + if ( dynamic_cast(this) != + dynamic_cast(popupCtrl) ) + delete this; + #endif + popupCtrl->Destroy(); + } + else + { + delete this; + } +} + // ---------------------------------------------------------------------------- // input handling // ---------------------------------------------------------------------------- @@ -932,7 +960,6 @@ public: BEGIN_EVENT_TABLE(wxComboCtrlBase, wxControl) - EVT_TEXT(wxID_ANY,wxComboCtrlBase::OnTextCtrlEvent) EVT_SIZE(wxComboCtrlBase::OnSizeEvent) EVT_SET_FOCUS(wxComboCtrlBase::OnFocusEvent) EVT_KILL_FOCUS(wxComboCtrlBase::OnFocusEvent) @@ -940,7 +967,6 @@ BEGIN_EVENT_TABLE(wxComboCtrlBase, wxControl) //EVT_BUTTON(wxID_ANY,wxComboCtrlBase::OnButtonClickEvent) EVT_KEY_DOWN(wxComboCtrlBase::OnKeyEvent) EVT_CHAR(wxComboCtrlBase::OnCharEvent) - EVT_TEXT_ENTER(wxID_ANY,wxComboCtrlBase::OnTextCtrlEvent) EVT_SYS_COLOUR_CHANGED(wxComboCtrlBase::OnSysColourChanged) END_EVENT_TABLE() @@ -1018,10 +1044,11 @@ bool wxComboCtrlBase::Create(wxWindow *parent, m_iFlags |= wxCC_IFLAG_CREATED; // If x and y indicate valid size, wxSizeEvent won't be - // emitted automatically, so we need to add artifical one. + // emitted automatically, so we need to add artificial one. if ( size.x > 0 && size.y > 0 ) { wxSizeEvent evt(size,GetId()); + evt.SetEventObject(this); GetEventHandler()->AddPendingEvent(evt); } @@ -1066,6 +1093,16 @@ wxComboCtrlBase::CreateTextCtrl(int style) m_text->Create(this, wxID_ANY, m_valueString, wxDefaultPosition, wxSize(10,-1), style); + + // Connecting the events is currently the most reliable way + wxWindowID id = m_text->GetId(); + m_text->Connect(id, wxEVT_COMMAND_TEXT_UPDATED, + wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent), + NULL, this); + m_text->Connect(id, wxEVT_COMMAND_TEXT_ENTER, + wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent), + NULL, this); + m_text->SetHint(m_hintText); } } @@ -1135,7 +1172,7 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth ) // its platform default or bitmap+pushbutton background is used, but not if // there is vertical size adjustment or horizontal spacing. if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) || - (m_bmpNormal.Ok() && m_blankButtonBg) ) && + (m_bmpNormal.IsOk() && m_blankButtonBg) ) && m_btnSpacingX == 0 && m_btnHei <= 0 ) { @@ -1143,7 +1180,7 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth ) btnBorder = 0; } else if ( (m_iFlags & wxCC_BUTTON_COVERS_BORDER) && - m_btnSpacingX == 0 && !m_bmpNormal.Ok() ) + m_btnSpacingX == 0 && !m_bmpNormal.IsOk() ) { m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE); btnBorder = 0; @@ -1200,7 +1237,7 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth ) // It is larger // OR // button width is set to default and blank button bg is not drawn - if ( m_bmpNormal.Ok() ) + if ( m_bmpNormal.IsOk() ) { int bmpReqWidth = m_bmpNormal.GetWidth(); int bmpReqHeight = m_bmpNormal.GetHeight(); @@ -1222,7 +1259,7 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth ) { int newY = butHeight+(customBorder*2); SetClientSize(wxDefaultCoord,newY); - if ( m_bmpNormal.Ok() || m_btnArea.width != butWidth || m_btnArea.height != butHeight ) + if ( m_bmpNormal.IsOk() || m_btnArea.width != butWidth || m_btnArea.height != butHeight ) m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON; else m_iFlags &= ~wxCC_IFLAG_HAS_NONSTANDARD_BUTTON; @@ -1331,16 +1368,16 @@ wxSize wxComboCtrlBase::DoGetBestSize() const // TODO: Better method to calculate close-to-native control height. int fhei; - if ( m_font.Ok() ) + if ( m_font.IsOk() ) fhei = (m_font.GetPointSize()*2) + 5; - else if ( wxNORMAL_FONT->Ok() ) + else if ( wxNORMAL_FONT->IsOk() ) fhei = (wxNORMAL_FONT->GetPointSize()*2) + 5; else fhei = sizeText.y + 4; // Need to force height to accomodate bitmap? int btnSizeY = m_btnSize.y; - if ( m_bmpNormal.Ok() && fhei < btnSizeY ) + if ( m_bmpNormal.IsOk() && fhei < btnSizeY ) fhei = btnSizeY; // Control height doesn't depend on border @@ -1665,7 +1702,7 @@ void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int flags ) dc.DrawRectangle(rect); } - if ( !m_bmpNormal.Ok() ) + if ( !m_bmpNormal.IsOk() ) { if ( flags & Button_BitmapOnly ) return; @@ -1715,6 +1752,7 @@ void wxComboCtrlBase::RecalcAndRefresh() if ( IsCreated() ) { wxSizeEvent evt(GetSize(),GetId()); + evt.SetEventObject(this); GetEventHandler()->ProcessEvent(evt); Refresh(); } @@ -1726,6 +1764,13 @@ void wxComboCtrlBase::RecalcAndRefresh() void wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event) { + // Avoid infinite recursion + if ( event.GetEventObject() == this ) + { + event.Skip(); + return; + } + if ( event.GetEventType() == wxEVT_COMMAND_TEXT_UPDATED ) { if ( m_ignoreEvtText > 0 ) @@ -1735,12 +1780,13 @@ void wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event) } } - // Change event id, object and string before relaying it forward - event.SetId(GetId()); - wxString s = event.GetString(); - event.SetEventObject(this); - event.SetString(s); - event.Skip(); + // For safety, completely re-create a new wxCommandEvent + wxCommandEvent evt2(event); + evt2.SetId(GetId()); + evt2.SetEventObject(this); + HandleWindowEvent(evt2); + + event.StopPropagation(); } // call if cursor is on button area or mouse is captured for the button @@ -1988,6 +2034,8 @@ void wxComboCtrlBase::OnCharEvent(wxKeyEvent& event) void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event ) { +// On Mac, this leads to infinite recursion and eventually a crash +#ifndef __WXMAC__ if ( event.GetEventType() == wxEVT_SET_FOCUS ) { wxWindow* tc = GetTextCtrl(); @@ -1998,6 +2046,7 @@ void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event ) } Refresh(); +#endif } void wxComboCtrlBase::OnIdleEvent( wxIdleEvent& WXUNUSED(event) ) @@ -2089,7 +2138,12 @@ void wxComboCtrlBase::DestroyPopup() wxDELETE(m_popupEvtHandler); - wxDELETE(m_popupInterface); + if ( m_popupInterface ) + { + // NB: DestroyPopup() performs 'delete this'. + m_popupInterface->DestroyPopup(); + m_popupInterface = NULL; + } if ( m_winPopup ) { @@ -2513,17 +2567,17 @@ void wxComboCtrlBase::SetButtonBitmaps( const wxBitmap& bmpNormal, m_bmpNormal = bmpNormal; m_blankButtonBg = blankButtonBg; - if ( bmpPressed.Ok() ) + if ( bmpPressed.IsOk() ) m_bmpPressed = bmpPressed; else m_bmpPressed = bmpNormal; - if ( bmpHover.Ok() ) + if ( bmpHover.IsOk() ) m_bmpHover = bmpHover; else m_bmpHover = bmpNormal; - if ( bmpDisabled.Ok() ) + if ( bmpDisabled.IsOk() ) m_bmpDisabled = bmpDisabled; else m_bmpDisabled = bmpNormal; diff --git a/Externals/wxWidgets3/src/common/config.cpp b/Externals/wxWidgets3/src/common/config.cpp index b806464a0c..e6916ff8d9 100644 --- a/Externals/wxWidgets3/src/common/config.cpp +++ b/Externals/wxWidgets3/src/common/config.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 07.04.98 -// RCS-ID: $Id: config.cpp 66140 2010-11-13 15:03:10Z VZ $ +// RCS-ID: $Id: config.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1997 Karsten Ballueder Ballueder@usa.net // Vadim Zeitlin // Licence: wxWindows licence @@ -63,10 +63,8 @@ bool wxConfigBase::ms_bAutoCreate = true; wxConfigBase *wxAppTraitsBase::CreateConfig() { return new - #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE + #if defined(__WINDOWS__) && wxUSE_CONFIG_NATIVE wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName()); - #elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE - wxPrefConfig(wxTheApp->GetAppName()); #else // either we're under Unix or wish to use files even under Windows wxFileConfig(wxTheApp->GetAppName()); #endif @@ -387,7 +385,7 @@ enum Bracket Bracket_None, Bracket_Normal = ')', Bracket_Curly = '}', -#ifdef __WXMSW__ +#ifdef __WINDOWS__ Bracket_Windows = '%', // yeah, Windows people are a bit strange ;-) #endif Bracket_Max @@ -401,17 +399,17 @@ wxString wxExpandEnvVars(const wxString& str) size_t m; for ( size_t n = 0; n < str.length(); n++ ) { switch ( str[n].GetValue() ) { -#ifdef __WXMSW__ +#ifdef __WINDOWS__ case wxT('%'): -#endif //WINDOWS +#endif // __WINDOWS__ case wxT('$'): { Bracket bracket; - #ifdef __WXMSW__ + #ifdef __WINDOWS__ if ( str[n] == wxT('%') ) bracket = Bracket_Windows; else - #endif //WINDOWS + #endif // __WINDOWS__ if ( n == str.length() - 1 ) { bracket = Bracket_None; } @@ -455,7 +453,7 @@ wxString wxExpandEnvVars(const wxString& str) #endif { // variable doesn't exist => don't change anything - #ifdef __WXMSW__ + #ifdef __WINDOWS__ if ( bracket != Bracket_Windows ) #endif if ( bracket != Bracket_None ) @@ -472,10 +470,10 @@ wxString wxExpandEnvVars(const wxString& str) // // under Unix, OTOH, this warning could be useful for the user to // understand why isn't the variable expanded as intended - #ifndef __WXMSW__ + #ifndef __WINDOWS__ wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %u in '%s'."), (char)bracket, (unsigned int) (m + 1), str.c_str()); - #endif // __WXMSW__ + #endif // __WINDOWS__ } else { // skip closing bracket unless the variables wasn't expanded diff --git a/Externals/wxWidgets3/src/common/containr.cpp b/Externals/wxWidgets3/src/common/containr.cpp index 8e595b273d..2b3e7d414e 100644 --- a/Externals/wxWidgets3/src/common/containr.cpp +++ b/Externals/wxWidgets3/src/common/containr.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 06.08.01 -// RCS-ID: $Id: containr.cpp 64940 2010-07-13 13:29:13Z VZ $ +// RCS-ID: $Id: containr.cpp 68502 2011-08-03 00:45:42Z VZ $ // Copyright: (c) 2001 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -472,18 +472,21 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) // looping inside this panel (normally, the focus will go to // the next/previous item after this panel in the parent // panel). - wxWindow *focussed_child_of_parent = m_winParent; + wxWindow *focusedParent = m_winParent; while ( parent ) { - // we don't want to tab into a different dialog or frame - if ( focussed_child_of_parent->IsTopLevel() ) + // We don't want to tab into a different dialog or frame or + // even an MDI child frame, so test for this explicitly + // (and in particular don't just use IsTopLevel() which + // would return false in the latter case). + if ( focusedParent->IsTopNavigationDomain() ) break; - event.SetCurrentFocus( focussed_child_of_parent ); + event.SetCurrentFocus( focusedParent ); if ( parent->GetEventHandler()->ProcessEvent( event ) ) return; - focussed_child_of_parent = parent; + focusedParent = parent; parent = parent->GetParent(); } @@ -650,14 +653,26 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused) // It might happen that the window got reparented if ( (*childLastFocused)->GetParent() == win ) { - wxLogTrace(TRACE_FOCUS, - wxT("SetFocusToChild() => last child (0x%p)."), - (*childLastFocused)->GetHandle()); + // And it also could have become hidden in the meanwhile, in this + // case focus its parent instead. + while ( !(*childLastFocused)->IsShown() ) + { + *childLastFocused = (*childLastFocused)->GetParent(); + if ( !*childLastFocused ) + break; + } - // not SetFocusFromKbd(): we're restoring focus back to the old - // window and not setting it as the result of a kbd action - (*childLastFocused)->SetFocus(); - return true; + if ( *childLastFocused ) + { + wxLogTrace(TRACE_FOCUS, + wxT("SetFocusToChild() => last child (0x%p)."), + (*childLastFocused)->GetHandle()); + + // not SetFocusFromKbd(): we're restoring focus back to the old + // window and not setting it as the result of a kbd action + (*childLastFocused)->SetFocus(); + return true; + } } else { diff --git a/Externals/wxWidgets3/src/common/convauto.cpp b/Externals/wxWidgets3/src/common/convauto.cpp index 62a470aa7d..83c1ec3d0f 100644 --- a/Externals/wxWidgets3/src/common/convauto.cpp +++ b/Externals/wxWidgets3/src/common/convauto.cpp @@ -3,7 +3,7 @@ // Purpose: implementation of wxConvAuto // Author: Vadim Zeitlin // Created: 2006-04-04 -// RCS-ID: $Id: convauto.cpp 66657 2011-01-08 18:05:33Z PC $ +// RCS-ID: $Id: convauto.cpp 69675 2011-11-05 11:23:41Z VZ $ // Copyright: (c) 2006 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -31,6 +31,17 @@ // seem to be a good idea and there is no other reasonable alternative wxFontEncoding wxConvAuto::ms_defaultMBEncoding = wxFONTENCODING_ISO8859_1; +namespace +{ + +const char BOM_UTF32BE[] = { '\x00', '\x00', '\xFE', '\xFF' }; +const char BOM_UTF32LE[] = { '\xFF', '\xFE', '\x00', '\x00' }; +const char BOM_UTF16BE[] = { '\xFE', '\xFF' }; +const char BOM_UTF16LE[] = { '\xFF', '\xFE' }; +const char BOM_UTF8[] = { '\xEF', '\xBB', '\xBF' }; + +} // anonymous namespace + // ============================================================================ // implementation // ============================================================================ @@ -45,7 +56,29 @@ void wxConvAuto::SetFallbackEncoding(wxFontEncoding enc) } /* static */ -wxConvAuto::BOMType wxConvAuto::DetectBOM(const char *src, size_t srcLen) +const char* wxConvAuto::GetBOMChars(wxBOM bom, size_t* count) +{ + wxCHECK_MSG( count , NULL, wxS("count pointer must be provided") ); + + switch ( bom ) + { + case wxBOM_UTF32BE: *count = WXSIZEOF(BOM_UTF32BE); return BOM_UTF32BE; + case wxBOM_UTF32LE: *count = WXSIZEOF(BOM_UTF32LE); return BOM_UTF32LE; + case wxBOM_UTF16BE: *count = WXSIZEOF(BOM_UTF16BE); return BOM_UTF16BE; + case wxBOM_UTF16LE: *count = WXSIZEOF(BOM_UTF16LE); return BOM_UTF16LE; + case wxBOM_UTF8 : *count = WXSIZEOF(BOM_UTF8 ); return BOM_UTF8; + case wxBOM_Unknown: + case wxBOM_None: + wxFAIL_MSG( wxS("Invalid BOM type") ); + return NULL; + } + + wxFAIL_MSG( wxS("Unknown BOM type") ); + return NULL; +} + +/* static */ +wxBOM wxConvAuto::DetectBOM(const char *src, size_t srcLen) { // examine the buffer for BOM presence // @@ -65,14 +98,14 @@ wxConvAuto::BOMType wxConvAuto::DetectBOM(const char *src, size_t srcLen) switch ( srcLen ) { case 0: - return BOM_Unknown; + return wxBOM_Unknown; case 1: if ( src[0] == '\x00' || src[0] == '\xFF' || src[0] == '\xFE' || src[0] == '\xEF') { // this could be a BOM but we don't know yet - return BOM_Unknown; + return wxBOM_Unknown; } break; @@ -81,22 +114,22 @@ wxConvAuto::BOMType wxConvAuto::DetectBOM(const char *src, size_t srcLen) if ( src[0] == '\xEF' && src[1] == '\xBB' ) { if ( srcLen == 3 ) - return src[2] == '\xBF' ? BOM_UTF8 : BOM_None; + return src[2] == '\xBF' ? wxBOM_UTF8 : wxBOM_None; - return BOM_Unknown; + return wxBOM_Unknown; } if ( src[0] == '\xFE' && src[1] == '\xFF' ) - return BOM_UTF16BE; + return wxBOM_UTF16BE; if ( src[0] == '\xFF' && src[1] == '\xFE' ) { // if the next byte is 0, it could be an UTF-32LE BOM but if it // isn't we can be sure it's UTF-16LE if ( srcLen == 3 && src[2] != '\x00' ) - return BOM_UTF16LE; + return wxBOM_UTF16LE; - return BOM_Unknown; + return wxBOM_Unknown; } if ( src[0] == '\x00' && src[1] == '\x00' ) @@ -104,9 +137,9 @@ wxConvAuto::BOMType wxConvAuto::DetectBOM(const char *src, size_t srcLen) // this could only be UTF-32BE, check that the data we have so // far allows for it if ( srcLen == 3 && src[2] != '\xFE' ) - return BOM_None; + return wxBOM_None; - return BOM_Unknown; + return wxBOM_Unknown; } break; @@ -114,61 +147,61 @@ wxConvAuto::BOMType wxConvAuto::DetectBOM(const char *src, size_t srcLen) // we have at least 4 characters so we may finally decide whether // we have a BOM or not if ( src[0] == '\xEF' && src[1] == '\xBB' && src[2] == '\xBF' ) - return BOM_UTF8; + return wxBOM_UTF8; if ( src[0] == '\x00' && src[1] == '\x00' && src[2] == '\xFE' && src[3] == '\xFF' ) - return BOM_UTF32BE; + return wxBOM_UTF32BE; if ( src[0] == '\xFF' && src[1] == '\xFE' && src[2] == '\x00' && src[3] == '\x00' ) - return BOM_UTF32LE; + return wxBOM_UTF32LE; if ( src[0] == '\xFE' && src[1] == '\xFF' ) - return BOM_UTF16BE; + return wxBOM_UTF16BE; if ( src[0] == '\xFF' && src[1] == '\xFE' ) - return BOM_UTF16LE; + return wxBOM_UTF16LE; } - return BOM_None; + return wxBOM_None; } -void wxConvAuto::InitFromBOM(BOMType bomType) +void wxConvAuto::InitFromBOM(wxBOM bomType) { m_consumedBOM = false; switch ( bomType ) { - case BOM_Unknown: + case wxBOM_Unknown: wxFAIL_MSG( "shouldn't be called for this BOM type" ); break; - case BOM_None: + case wxBOM_None: // use the default break; - case BOM_UTF32BE: + case wxBOM_UTF32BE: m_conv = new wxMBConvUTF32BE; m_ownsConv = true; break; - case BOM_UTF32LE: + case wxBOM_UTF32LE: m_conv = new wxMBConvUTF32LE; m_ownsConv = true; break; - case BOM_UTF16BE: + case wxBOM_UTF16BE: m_conv = new wxMBConvUTF16BE; m_ownsConv = true; break; - case BOM_UTF16LE: + case wxBOM_UTF16LE: m_conv = new wxMBConvUTF16LE; m_ownsConv = true; break; - case BOM_UTF8: + case wxBOM_UTF8: InitWithUTF8(); break; @@ -191,25 +224,25 @@ void wxConvAuto::SkipBOM(const char **src, size_t *len) const int ofs; switch ( m_bomType ) { - case BOM_Unknown: + case wxBOM_Unknown: wxFAIL_MSG( "shouldn't be called for this BOM type" ); return; - case BOM_None: + case wxBOM_None: ofs = 0; break; - case BOM_UTF32BE: - case BOM_UTF32LE: + case wxBOM_UTF32BE: + case wxBOM_UTF32LE: ofs = 4; break; - case BOM_UTF16BE: - case BOM_UTF16LE: + case wxBOM_UTF16BE: + case wxBOM_UTF16LE: ofs = 2; break; - case BOM_UTF8: + case wxBOM_UTF8: ofs = 3; break; @@ -226,7 +259,7 @@ void wxConvAuto::SkipBOM(const char **src, size_t *len) const bool wxConvAuto::InitFromInput(const char *src, size_t len) { m_bomType = DetectBOM(src, len == wxNO_LEN ? strlen(src) : len); - if ( m_bomType == BOM_Unknown ) + if ( m_bomType == wxBOM_Unknown ) return false; InitFromBOM(m_bomType); @@ -275,7 +308,7 @@ wxConvAuto::ToWChar(wchar_t *dst, size_t dstLen, // try to convert using the auto-detected encoding size_t rc = m_conv->ToWChar(dst, dstLen, src, srcLen); - if ( rc == wxCONV_FAILED && m_bomType == BOM_None ) + if ( rc == wxCONV_FAILED && m_bomType == wxBOM_None ) { // if the conversion failed but we didn't really detect anything and // simply tried UTF-8 by default, retry it using the fall-back diff --git a/Externals/wxWidgets3/src/common/cshelp.cpp b/Externals/wxWidgets3/src/common/cshelp.cpp index 69c48d46fd..d05bb9265d 100644 --- a/Externals/wxWidgets3/src/common/cshelp.cpp +++ b/Externals/wxWidgets3/src/common/cshelp.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart, Vadim Zeitlin // Modified by: // Created: 08/09/2000 -// RCS-ID: $Id: cshelp.cpp 61508 2009-07-23 20:30:22Z VZ $ +// RCS-ID: $Id: cshelp.cpp 68859 2011-08-23 04:55:46Z DS $ // Copyright: (c) 2000 Julian Smart, Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -284,7 +284,7 @@ wxContextHelpButton::wxContextHelpButton(wxWindow* parent, long style) #if defined(__WXPM__) : wxBitmapButton(parent, id, wxBitmap(wxCSQUERY_BITMAP - ,wxBITMAP_TYPE_RESOURCE + ,wxBITMAP_TYPE_BMP_RESOURCE ), pos, size, style) #else diff --git a/Externals/wxWidgets3/src/common/ctrlcmn.cpp b/Externals/wxWidgets3/src/common/ctrlcmn.cpp index 8798b1ad4a..3fc3cd64a3 100644 --- a/Externals/wxWidgets3/src/common/ctrlcmn.cpp +++ b/Externals/wxWidgets3/src/common/ctrlcmn.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 26.07.99 -// RCS-ID: $Id: ctrlcmn.cpp 67062 2011-02-27 12:48:07Z VZ $ +// RCS-ID: $Id: ctrlcmn.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -588,7 +588,7 @@ wxSize wxStaticBitmapBase::DoGetBestSize() const { wxSize best; wxBitmap bmp = GetBitmap(); - if ( bmp.Ok() ) + if ( bmp.IsOk() ) best = wxSize(bmp.GetWidth(), bmp.GetHeight()); else // this is completely arbitrary diff --git a/Externals/wxWidgets3/src/common/datavcmn.cpp b/Externals/wxWidgets3/src/common/datavcmn.cpp index 69894acbe5..2eb5731566 100644 --- a/Externals/wxWidgets3/src/common/datavcmn.cpp +++ b/Externals/wxWidgets3/src/common/datavcmn.cpp @@ -3,7 +3,7 @@ // Purpose: wxDataViewCtrl base classes and common parts // Author: Robert Roebling // Created: 2006/02/20 -// RCS-ID: $Id: datavcmn.cpp 66403 2010-12-19 15:02:56Z VZ $ +// RCS-ID: $Id: datavcmn.cpp 70377 2012-01-17 14:05:17Z VS $ // Copyright: (c) 2006, Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -26,6 +26,7 @@ #include "wx/crt.h" #endif +#include "wx/datectrl.h" #include "wx/spinctrl.h" #include "wx/choice.h" #include "wx/imaglist.h" @@ -40,7 +41,7 @@ namespace class wxDataViewEditorCtrlEvtHandler: public wxEvtHandler { public: - wxDataViewEditorCtrlEvtHandler(wxControl *editor, wxDataViewRenderer *owner) + wxDataViewEditorCtrlEvtHandler(wxWindow *editor, wxDataViewRenderer *owner) { m_editorCtrl = editor; m_owner = owner; @@ -59,7 +60,7 @@ protected: private: wxDataViewRenderer *m_owner; - wxControl *m_editorCtrl; + wxWindow *m_editorCtrl; bool m_finished; bool m_focusOnIdle; @@ -387,7 +388,7 @@ wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size ) // build initial index unsigned int i; for (i = 1; i < initial_size+1; i++) - m_hash.Add( wxUIntToPtr(i) ); + m_hash.Add( wxDataViewItem(wxUIntToPtr(i)) ); m_nextFreeID = initial_size + 1; } @@ -403,7 +404,7 @@ void wxDataViewIndexListModel::Reset( unsigned int new_size ) // build initial index unsigned int i; for (i = 1; i < new_size+1; i++) - m_hash.Add( wxUIntToPtr(i) ); + m_hash.Add( wxDataViewItem(wxUIntToPtr(i)) ); m_nextFreeID = new_size + 1; @@ -417,8 +418,8 @@ void wxDataViewIndexListModel::RowPrepended() unsigned int id = m_nextFreeID; m_nextFreeID++; - m_hash.Insert( wxUIntToPtr(id), 0 ); wxDataViewItem item( wxUIntToPtr(id) ); + m_hash.Insert( item, 0 ); ItemAdded( wxDataViewItem(0), item ); } @@ -430,8 +431,8 @@ void wxDataViewIndexListModel::RowInserted( unsigned int before ) unsigned int id = m_nextFreeID; m_nextFreeID++; - m_hash.Insert( wxUIntToPtr(id), before ); wxDataViewItem item( wxUIntToPtr(id) ); + m_hash.Insert( item, before ); ItemAdded( wxDataViewItem(0), item ); } @@ -440,8 +441,8 @@ void wxDataViewIndexListModel::RowAppended() unsigned int id = m_nextFreeID; m_nextFreeID++; - m_hash.Add( wxUIntToPtr(id) ); wxDataViewItem item( wxUIntToPtr(id) ); + m_hash.Add( item ); ItemAdded( wxDataViewItem(0), item ); } @@ -450,15 +451,12 @@ void wxDataViewIndexListModel::RowDeleted( unsigned int row ) m_ordered = false; wxDataViewItem item( m_hash[row] ); - /* wxDataViewModel:: */ ItemDeleted( wxDataViewItem(0), item ); m_hash.RemoveAt( row ); + /* wxDataViewModel:: */ ItemDeleted( wxDataViewItem(0), item ); } void wxDataViewIndexListModel::RowsDeleted( const wxArrayInt &rows ) { - wxArrayInt sorted = rows; - sorted.Sort( my_sort ); - m_ordered = false; wxDataViewItemArray array; @@ -468,10 +466,13 @@ void wxDataViewIndexListModel::RowsDeleted( const wxArrayInt &rows ) wxDataViewItem item( m_hash[rows[i]] ); array.Add( item ); } - /* wxDataViewModel:: */ ItemsDeleted( wxDataViewItem(0), array ); + wxArrayInt sorted = rows; + sorted.Sort( my_sort ); for (i = 0; i < sorted.GetCount(); i++) m_hash.RemoveAt( sorted[i] ); + + /* wxDataViewModel:: */ ItemsDeleted( wxDataViewItem(0), array ); } void wxDataViewIndexListModel::RowChanged( unsigned int row ) @@ -490,7 +491,7 @@ unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) cons return wxPtrToUInt(item.GetID())-1; // assert for not found - return (unsigned int) m_hash.Index( item.GetID() ); + return (unsigned int) m_hash.Index( item ); } wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const @@ -671,9 +672,11 @@ wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, wxDataViewRendererBase::~wxDataViewRendererBase() { + if ( m_editorCtrl ) + DestroyEditControl(); } -const wxDataViewCtrl* wxDataViewRendererBase::GetView() const +wxDataViewCtrl* wxDataViewRendererBase::GetView() const { return const_cast(this)->GetOwner()->GetOwner(); } @@ -728,12 +731,15 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la void wxDataViewRendererBase::DestroyEditControl() { + // Remove our event handler first to prevent it from (recursively) calling + // us again as it would do via a call to FinishEditing() when the editor + // loses focus when we hide it below. + wxEvtHandler * const handler = m_editorCtrl->PopEventHandler(); + // Hide the control immediately but don't delete it yet as there could be // some pending messages for it. m_editorCtrl->Hide(); - wxEvtHandler * const handler = m_editorCtrl->PopEventHandler(); - wxPendingDelete.Append(handler); wxPendingDelete.Append(m_editorCtrl); } @@ -743,8 +749,6 @@ void wxDataViewRendererBase::CancelEditing() if (!m_editorCtrl) return; - GetOwner()->GetOwner()->GetMainWindow()->SetFocus(); - DestroyEditControl(); } @@ -758,25 +762,31 @@ bool wxDataViewRendererBase::FinishEditing() wxDataViewCtrl* dv_ctrl = GetOwner()->GetOwner(); - dv_ctrl->GetMainWindow()->SetFocus(); - DestroyEditControl(); - if (!Validate(value)) - return false; + dv_ctrl->GetMainWindow()->SetFocus(); + bool isValid = Validate(value); unsigned int col = GetOwner()->GetModelColumn(); - dv_ctrl->GetModel()->ChangeValue(value, m_item, col); // Now we should send Editing Done event wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, dv_ctrl->GetId() ); event.SetDataViewColumn( GetOwner() ); event.SetModel( dv_ctrl->GetModel() ); event.SetItem( m_item ); + event.SetValue( value ); + event.SetColumn( col ); + event.SetEditCanceled( !isValid ); event.SetEventObject( dv_ctrl ); dv_ctrl->GetEventHandler()->ProcessEvent( event ); - return true; + if ( isValid && event.IsAllowed() ) + { + dv_ctrl->GetModel()->ChangeValue(value, m_item, col); + return true; + } + + return false; } void wxDataViewRendererBase::PrepareForItem(const wxDataViewModel *model, @@ -799,6 +809,31 @@ void wxDataViewRendererBase::PrepareForItem(const wxDataViewModel *model, // wxDataViewCustomRendererBase // ---------------------------------------------------------------------------- +bool wxDataViewCustomRendererBase::ActivateCell(const wxRect& cell, + wxDataViewModel *model, + const wxDataViewItem & item, + unsigned int col, + const wxMouseEvent* mouseEvent) +{ + // Compatibility code + if ( mouseEvent ) + return LeftClick(mouseEvent->GetPosition(), cell, model, item, col); + else + return Activate(cell, model, item, col); +} + +void wxDataViewCustomRendererBase::RenderBackground(wxDC* dc, const wxRect& rect) +{ + if ( !m_attr.HasBackgroundColour() ) + return; + + const wxColour& colour = m_attr.GetBackgroundColour(); + wxDCPenChanger changePen(*dc, colour); + wxDCBrushChanger changeBrush(*dc, colour); + + dc->DrawRectangle(rect); +} + void wxDataViewCustomRendererBase::WXCallRender(wxRect rectCell, wxDC *dc, int state) { @@ -1087,6 +1122,16 @@ void wxDataViewCtrlBase::SetCurrentItem(const wxDataViewItem& item) Select(item); } +wxDataViewItem wxDataViewCtrlBase::GetSelection() const +{ + if ( GetSelectedItemsCount() != 1 ) + return wxDataViewItem(); + + wxDataViewItemArray selections; + GetSelections(selections); + return selections[0]; +} + wxDataViewColumn * wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) @@ -1373,6 +1418,11 @@ wxDataViewCtrlBase::InsertColumn( unsigned int WXUNUSED(pos), wxDataViewColumn * return true; } +void wxDataViewCtrlBase::StartEditor(const wxDataViewItem& item, unsigned int column) +{ + EditItem(item, GetColumn(column)); +} + // --------------------------------------------------------- // wxDataViewEvent // --------------------------------------------------------- @@ -1417,7 +1467,7 @@ wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCell m_max = max; } -wxControl* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) +wxWindow* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) { long l = value; wxSize size = labelRect.GetSize(); @@ -1437,7 +1487,7 @@ wxControl* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect la return sc; } -bool wxDataViewSpinRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ) +bool wxDataViewSpinRenderer::GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) { wxSpinCtrl *sc = (wxSpinCtrl*) editor; long l = sc->GetValue(); @@ -1455,7 +1505,15 @@ bool wxDataViewSpinRenderer::Render( wxRect rect, wxDC *dc, int state ) wxSize wxDataViewSpinRenderer::GetSize() const { - return wxSize(80,16); + wxSize sz = GetTextExtent(wxString::Format("%d", (int)m_data)); + + // Allow some space for the spin buttons, which is approximately the size + // of a scrollbar (and getting pixel-exact value would be complicated). + // Also add some whitespace between the text and the button: + sz.x += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); + sz.x += GetTextExtent("M").x; + + return sz; } bool wxDataViewSpinRenderer::SetValue( const wxVariant &value ) @@ -1482,15 +1540,22 @@ wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString& choices m_choices = choices; } -wxControl* wxDataViewChoiceRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) +wxWindow* wxDataViewChoiceRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) { - wxChoice* c = new wxChoice(parent, wxID_ANY, labelRect.GetTopLeft(), wxDefaultSize, m_choices ); + wxChoice* c = new wxChoice + ( + parent, + wxID_ANY, + labelRect.GetTopLeft(), + wxSize(labelRect.GetWidth(), -1), + m_choices + ); c->Move(labelRect.GetRight() - c->GetRect().width, wxDefaultCoord); c->SetStringSelection( value.GetString() ); return c; } -bool wxDataViewChoiceRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ) +bool wxDataViewChoiceRenderer::GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) { wxChoice *c = (wxChoice*) editor; wxString s = c->GetStringSelection(); @@ -1506,7 +1571,18 @@ bool wxDataViewChoiceRenderer::Render( wxRect rect, wxDC *dc, int state ) wxSize wxDataViewChoiceRenderer::GetSize() const { - return wxSize(80,16); + wxSize sz; + + for ( wxArrayString::const_iterator i = m_choices.begin(); i != m_choices.end(); ++i ) + sz.IncTo(GetTextExtent(*i)); + + // Allow some space for the right-side button, which is approximately the + // size of a scrollbar (and getting pixel-exact value would be complicated). + // Also add some whitespace between the text and the button: + sz.x += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); + sz.x += GetTextExtent("M").x; + + return sz; } bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value ) @@ -1531,14 +1607,14 @@ wxDataViewChoiceByIndexRenderer::wxDataViewChoiceByIndexRenderer( const wxArrayS { } -wxControl* wxDataViewChoiceByIndexRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) +wxWindow* wxDataViewChoiceByIndexRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) { wxVariant string_value = GetChoice( value.GetLong() ); return wxDataViewChoiceRenderer::CreateEditorCtrl( parent, labelRect, string_value ); } -bool wxDataViewChoiceByIndexRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ) +bool wxDataViewChoiceByIndexRenderer::GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) { wxVariant string_value; if (!wxDataViewChoiceRenderer::GetValueFromEditorCtrl( editor, string_value )) @@ -1566,6 +1642,64 @@ bool wxDataViewChoiceByIndexRenderer::GetValue( wxVariant &value ) const #endif +// --------------------------------------------------------- +// wxDataViewDateRenderer +// --------------------------------------------------------- + +#if (defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXGTK__)) && wxUSE_DATEPICKCTRL + +wxDataViewDateRenderer::wxDataViewDateRenderer(const wxString& varianttype, + wxDataViewCellMode mode, int align) + : wxDataViewCustomRenderer(varianttype, mode, align) +{ +} + +wxWindow * +wxDataViewDateRenderer::CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant& value) +{ + return new wxDatePickerCtrl + ( + parent, + wxID_ANY, + value.GetDateTime(), + labelRect.GetTopLeft(), + labelRect.GetSize() + ); +} + +bool wxDataViewDateRenderer::GetValueFromEditorCtrl(wxWindow *editor, wxVariant& value) +{ + wxDatePickerCtrl *ctrl = static_cast(editor); + value = ctrl->GetValue(); + return true; +} + +bool wxDataViewDateRenderer::SetValue(const wxVariant& value) +{ + m_date = value.GetDateTime(); + return true; +} + +bool wxDataViewDateRenderer::GetValue(wxVariant& value) const +{ + value = m_date; + return true; +} + +bool wxDataViewDateRenderer::Render(wxRect cell, wxDC* dc, int state) +{ + wxString tmp = m_date.FormatDate(); + RenderText( tmp, 0, cell, dc, state ); + return true; +} + +wxSize wxDataViewDateRenderer::GetSize() const +{ + return GetTextExtent(m_date.FormatDate()); +} + +#endif // (defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXGTK__)) && wxUSE_DATEPICKCTRL + //----------------------------------------------------------------------------- // wxDataViewListStore //----------------------------------------------------------------------------- @@ -1972,7 +2106,7 @@ wxDataViewItem wxDataViewTreeStore::GetNthChild( const wxDataViewItem& parent, u wxDataViewTreeStoreNodeList::compatibility_iterator node = parent_node->GetChildren().Item( pos ); if (node) - return node->GetData(); + return wxDataViewItem(node->GetData()); return wxDataViewItem(0); } @@ -2078,7 +2212,7 @@ void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item ) void wxDataViewTreeStore::DeleteAllItems() { - DeleteChildren(m_root); + DeleteChildren(wxDataViewItem(m_root)); } void @@ -2215,11 +2349,6 @@ BEGIN_EVENT_TABLE(wxDataViewTreeCtrl,wxDataViewCtrl) EVT_SIZE( wxDataViewTreeCtrl::OnSize ) END_EVENT_TABLE() -wxDataViewTreeCtrl::~wxDataViewTreeCtrl() -{ - delete m_imageList; -} - bool wxDataViewTreeCtrl::Create( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator ) { @@ -2238,27 +2367,17 @@ bool wxDataViewTreeCtrl::Create( wxWindow *parent, wxWindowID id, wxDATAVIEW_CELL_EDITABLE, -1, // default width wxALIGN_NOT, // and alignment - 0 // not resizeable + 0 // not resizable ); return true; } -void wxDataViewTreeCtrl::SetImageList( wxImageList *imagelist ) -{ - delete m_imageList; - - m_imageList = imagelist; -} - wxDataViewItem wxDataViewTreeCtrl::AppendItem( const wxDataViewItem& parent, const wxString &text, int iconIndex, wxClientData *data ) { - wxIcon icon = wxNullIcon; - if (m_imageList && (iconIndex != -1)) - icon = m_imageList->GetIcon( iconIndex ); - - wxDataViewItem res = GetStore()->AppendItem( parent, text, icon, data ); + wxDataViewItem res = GetStore()-> + AppendItem( parent, text, GetImage(iconIndex), data ); GetStore()->ItemAdded( parent, res ); @@ -2268,11 +2387,8 @@ wxDataViewItem wxDataViewTreeCtrl::AppendItem( const wxDataViewItem& parent, wxDataViewItem wxDataViewTreeCtrl::PrependItem( const wxDataViewItem& parent, const wxString &text, int iconIndex, wxClientData *data ) { - wxIcon icon = wxNullIcon; - if (m_imageList && (iconIndex != -1)) - icon = m_imageList->GetIcon( iconIndex ); - - wxDataViewItem res = GetStore()->PrependItem( parent, text, icon, data ); + wxDataViewItem res = GetStore()-> + PrependItem( parent, text, GetImage(iconIndex), data ); GetStore()->ItemAdded( parent, res ); @@ -2282,11 +2398,8 @@ wxDataViewItem wxDataViewTreeCtrl::PrependItem( const wxDataViewItem& parent, wxDataViewItem wxDataViewTreeCtrl::InsertItem( const wxDataViewItem& parent, const wxDataViewItem& previous, const wxString &text, int iconIndex, wxClientData *data ) { - wxIcon icon = wxNullIcon; - if (m_imageList && (iconIndex != -1)) - icon = m_imageList->GetIcon( iconIndex ); - - wxDataViewItem res = GetStore()->InsertItem( parent, previous, text, icon, data ); + wxDataViewItem res = GetStore()-> + InsertItem( parent, previous, text, GetImage(iconIndex), data ); GetStore()->ItemAdded( parent, res ); @@ -2296,15 +2409,9 @@ wxDataViewItem wxDataViewTreeCtrl::InsertItem( const wxDataViewItem& parent, con wxDataViewItem wxDataViewTreeCtrl::PrependContainer( const wxDataViewItem& parent, const wxString &text, int iconIndex, int expandedIndex, wxClientData *data ) { - wxIcon icon = wxNullIcon; - if (m_imageList && (iconIndex != -1)) - icon = m_imageList->GetIcon( iconIndex ); - - wxIcon expanded = wxNullIcon; - if (m_imageList && (expandedIndex != -1)) - expanded = m_imageList->GetIcon( expandedIndex ); - - wxDataViewItem res = GetStore()->PrependContainer( parent, text, icon, expanded, data ); + wxDataViewItem res = GetStore()-> + PrependContainer( parent, text, + GetImage(iconIndex), GetImage(expandedIndex), data ); GetStore()->ItemAdded( parent, res ); @@ -2314,15 +2421,9 @@ wxDataViewItem wxDataViewTreeCtrl::PrependContainer( const wxDataViewItem& paren wxDataViewItem wxDataViewTreeCtrl::AppendContainer( const wxDataViewItem& parent, const wxString &text, int iconIndex, int expandedIndex, wxClientData *data ) { - wxIcon icon = wxNullIcon; - if (m_imageList && (iconIndex != -1)) - icon = m_imageList->GetIcon( iconIndex ); - - wxIcon expanded = wxNullIcon; - if (m_imageList && (expandedIndex != -1)) - expanded = m_imageList->GetIcon( expandedIndex ); - - wxDataViewItem res = GetStore()->AppendContainer( parent, text, icon, expanded, data ); + wxDataViewItem res = GetStore()-> + AppendContainer( parent, text, + GetImage(iconIndex), GetImage(expandedIndex), data ); GetStore()->ItemAdded( parent, res ); @@ -2332,15 +2433,9 @@ wxDataViewItem wxDataViewTreeCtrl::AppendContainer( const wxDataViewItem& parent wxDataViewItem wxDataViewTreeCtrl::InsertContainer( const wxDataViewItem& parent, const wxDataViewItem& previous, const wxString &text, int iconIndex, int expandedIndex, wxClientData *data ) { - wxIcon icon = wxNullIcon; - if (m_imageList && (iconIndex != -1)) - icon = m_imageList->GetIcon( iconIndex ); - - wxIcon expanded = wxNullIcon; - if (m_imageList && (expandedIndex != -1)) - expanded = m_imageList->GetIcon( expandedIndex ); - - wxDataViewItem res = GetStore()->InsertContainer( parent, previous, text, icon, expanded, data ); + wxDataViewItem res = GetStore()-> + InsertContainer( parent, previous, text, + GetImage(iconIndex), GetImage(expandedIndex), data ); GetStore()->ItemAdded( parent, res ); @@ -2409,7 +2504,7 @@ void wxDataViewTreeCtrl::DeleteAllItems() void wxDataViewTreeCtrl::OnExpanded( wxDataViewEvent &event ) { - if (m_imageList) return; + if (HasImageList()) return; wxDataViewTreeStoreContainerNode* container = GetStore()->FindContainerNode( event.GetItem() ); if (!container) return; @@ -2421,7 +2516,7 @@ void wxDataViewTreeCtrl::OnExpanded( wxDataViewEvent &event ) void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event ) { - if (m_imageList) return; + if (HasImageList()) return; wxDataViewTreeStoreContainerNode* container = GetStore()->FindContainerNode( event.GetItem() ); if (!container) return; diff --git a/Externals/wxWidgets3/src/common/datetime.cpp b/Externals/wxWidgets3/src/common/datetime.cpp index 19e3b3e291..e131abdbc8 100644 --- a/Externals/wxWidgets3/src/common/datetime.cpp +++ b/Externals/wxWidgets3/src/common/datetime.cpp @@ -5,7 +5,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 11.05.99 -// RCS-ID: $Id: datetime.cpp 66245 2010-11-23 13:11:10Z VZ $ +// RCS-ID: $Id: datetime.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1999 Vadim Zeitlin // parts of code taken from sndcal library by Scott E. Lee: // @@ -63,7 +63,7 @@ #if !defined(wxUSE_DATETIME) || wxUSE_DATETIME #ifndef WX_PRECOMP - #ifdef __WXMSW__ + #ifdef __WINDOWS__ #include "wx/msw/wrapwin.h" #endif #include "wx/string.h" @@ -75,6 +75,7 @@ #endif // WX_PRECOMP #include "wx/thread.h" +#include "wx/time.h" #include "wx/tokenzr.h" #include @@ -108,98 +109,6 @@ wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter , wxFromStringCon #endif // wxUSE_EXTENDED_RTTI - -// ---------------------------------------------------------------------------- -// conditional compilation -// ---------------------------------------------------------------------------- - -#if defined(__MWERKS__) && wxUSE_UNICODE - #include -#endif - -#if defined(__DJGPP__) || defined(__WINE__) - #include - #include -#endif - -#ifndef WX_GMTOFF_IN_TM - // Define it for some systems which don't (always) use configure but are - // known to have tm_gmtoff field. - #if defined(__WXPALMOS__) || defined(__DARWIN__) - #define WX_GMTOFF_IN_TM - #endif -#endif - -// NB: VC8 safe time functions could/should be used for wxMSW as well probably -#if defined(__WXWINCE__) && defined(__VISUALC8__) - -struct tm *wxLocaltime_r(const time_t *t, struct tm* tm) -{ - __time64_t t64 = *t; - return _localtime64_s(tm, &t64) == 0 ? tm : NULL; -} - -struct tm *wxGmtime_r(const time_t* t, struct tm* tm) -{ - __time64_t t64 = *t; - return _gmtime64_s(tm, &t64) == 0 ? tm : NULL; -} - -#else // !wxWinCE with VC8 - -#if (!defined(HAVE_LOCALTIME_R) || !defined(HAVE_GMTIME_R)) && wxUSE_THREADS && !defined(__WINDOWS__) -static wxMutex timeLock; -#endif - -#ifndef HAVE_LOCALTIME_R -struct tm *wxLocaltime_r(const time_t* ticks, struct tm* temp) -{ -#if wxUSE_THREADS && !defined(__WINDOWS__) - // No need to waste time with a mutex on windows since it's using - // thread local storage for localtime anyway. - wxMutexLocker locker(timeLock); -#endif - - // Borland CRT crashes when passed 0 ticks for some reason, see SF bug 1704438 -#ifdef __BORLANDC__ - if ( !*ticks ) - return NULL; -#endif - - const tm * const t = localtime(ticks); - if ( !t ) - return NULL; - - memcpy(temp, t, sizeof(struct tm)); - return temp; -} -#endif // !HAVE_LOCALTIME_R - -#ifndef HAVE_GMTIME_R -struct tm *wxGmtime_r(const time_t* ticks, struct tm* temp) -{ -#if wxUSE_THREADS && !defined(__WINDOWS__) - // No need to waste time with a mutex on windows since it's - // using thread local storage for gmtime anyway. - wxMutexLocker locker(timeLock); -#endif - -#ifdef __BORLANDC__ - if ( !*ticks ) - return NULL; -#endif - - const tm * const t = gmtime(ticks); - if ( !t ) - return NULL; - - memcpy(temp, gmtime(ticks), sizeof(struct tm)); - return temp; -} -#endif // !HAVE_GMTIME_R - -#endif // wxWinCE with VC8/other platforms - // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- @@ -327,63 +236,6 @@ wxDateTime::wxDateTime_t GetNumOfDaysInMonth(int year, wxDateTime::Month month) return daysInMonth[wxDateTime::IsLeapYear(year)][month]; } -// returns the time zone in the C sense, i.e. the difference UTC - local -// (in seconds) -// NOTE: not static because used by datetimefmt.cpp -int GetTimeZone() -{ -#ifdef WX_GMTOFF_IN_TM - // set to true when the timezone is set - static bool s_timezoneSet = false; - static long gmtoffset = LONG_MAX; // invalid timezone - - // ensure that the timezone variable is set by calling wxLocaltime_r - if ( !s_timezoneSet ) - { - // just call wxLocaltime_r() instead of figuring out whether this - // system supports tzset(), _tzset() or something else - time_t t = 0; - struct tm tm; - - wxLocaltime_r(&t, &tm); - s_timezoneSet = true; - - // note that GMT offset is the opposite of time zone and so to return - // consistent results in both WX_GMTOFF_IN_TM and !WX_GMTOFF_IN_TM - // cases we have to negate it - gmtoffset = -tm.tm_gmtoff; - } - return (int)gmtoffset; -#elif defined(__DJGPP__) || defined(__WINE__) - struct timeb tb; - ftime(&tb); - return tb.timezone*60; -#elif defined(__VISUALC__) - // We must initialize the time zone information before using it (this will - // be done only once internally). - _tzset(); - - // Starting with VC++ 8 timezone variable is deprecated and is not even - // available in some standard library version so use the new function for - // accessing it instead. - #if wxCHECK_VISUALC_VERSION(8) - long t; - _get_timezone(&t); - return t; - #else // VC++ < 8 - return timezone; - #endif -#elif defined(WX_TIMEZONE) // If WX_TIMEZONE was defined by configure, use it. - return WX_TIMEZONE; -#elif defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__) - return _timezone; -#elif defined(__MWERKS__) - return 28800; -#else // unknown platform -- assume it has timezone - return timezone; -#endif // WX_GMTOFF_IN_TM/!WX_GMTOFF_IN_TM -} - // return the integral part of the JDN for the midnight of the given date (to // get the real JDN you need to add 0.5, this is, in fact, JDN of the // noon of the previous day) @@ -437,8 +289,15 @@ wxString CallStrftime(const wxString& format, const tm* tm) if ( !wxStrftime(buf, WXSIZEOF(buf), format, tm) ) { - // if the format is valid, buffer must be too small? - wxFAIL_MSG(wxT("strftime() failed")); + // There is one special case in which strftime() can return 0 without + // indicating an error: "%p" may give empty string depending on the + // locale, so check for it explicitly. Apparently it's really the only + // exception. + if ( format != wxS("%p") ) + { + // if the format is valid, buffer must be too small? + wxFAIL_MSG(wxT("strftime() failed")); + } buf[0] = '\0'; } @@ -602,7 +461,7 @@ wxDateTime::TimeZone::TimeZone(wxDateTime::TZ tz) case wxDateTime::Local: // get the offset from C RTL: it returns the difference GMT-local // while we want to have the offset _from_ GMT, hence the '-' - m_offset = -GetTimeZone(); + m_offset = -wxGetTimeZone(); break; case wxDateTime::GMT_12: @@ -1243,7 +1102,7 @@ wxDateTime wxDateTime::GetEndDST(int year, Country country) // return the current time with ms precision /* static */ wxDateTime wxDateTime::UNow() { - return wxDateTime(wxGetLocalTimeMillis()); + return wxDateTime(wxGetUTCTimeMillis()); } // the values in the tm structure contain the local time @@ -1259,7 +1118,7 @@ wxDateTime& wxDateTime::Set(const struct tm& tm) if ( tm2.tm_year == 70 && tm2.tm_mon == 0 && tm2.tm_mday == 1 ) { return Set((time_t)( - GetTimeZone() + + wxGetTimeZone() + tm2.tm_hour * MIN_PER_HOUR * SEC_PER_MIN + tm2.tm_min * SEC_PER_MIN + tm2.tm_sec)); @@ -1373,7 +1232,7 @@ wxDateTime& wxDateTime::Set(wxDateTime_t day, m_time *= SECONDS_PER_DAY * TIME_T_FACTOR; // JDN corresponds to GMT, we take localtime - Add(wxTimeSpan(hour, minute, second + GetTimeZone(), millisec)); + Add(wxTimeSpan(hour, minute, second + wxGetTimeZone(), millisec)); } return *this; @@ -1512,7 +1371,7 @@ wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const // use C RTL functions struct tm tmstruct; tm *tm; - if ( tz.GetOffset() == -GetTimeZone() ) + if ( tz.GetOffset() == -wxGetTimeZone() ) { // we are working with local time tm = wxLocaltime_r(&time, &tmstruct); @@ -2146,7 +2005,7 @@ int wxDateTime::IsDST(wxDateTime::Country country) const wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST) { - long secDiff = GetTimeZone() + tz.GetOffset(); + long secDiff = wxGetTimeZone() + tz.GetOffset(); // we need to know whether DST is or not in effect for this date unless // the test disabled by the caller @@ -2161,7 +2020,7 @@ wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST) wxDateTime& wxDateTime::MakeFromTimezone(const TimeZone& tz, bool noDST) { - long secDiff = GetTimeZone() + tz.GetOffset(); + long secDiff = wxGetTimeZone() + tz.GetOffset(); // we need to know whether DST is or not in effect for this date unless // the test disabled by the caller @@ -2339,7 +2198,7 @@ WXDLLIMPEXP_BASE void wxPrevWDay(wxDateTime::WeekDay& wd) : (wxDateTime::WeekDay)(wd - 1); } -#ifdef __WXMSW__ +#ifdef __WINDOWS__ wxDateTime& wxDateTime::SetFromMSWSysTime(const SYSTEMTIME& st) { @@ -2387,6 +2246,6 @@ void wxDateTime::GetAsMSWSysDate(SYSTEMTIME* st) const st->wMilliseconds = 0; } -#endif // __WXMSW__ +#endif // __WINDOWS__ #endif // wxUSE_DATETIME diff --git a/Externals/wxWidgets3/src/common/datetimefmt.cpp b/Externals/wxWidgets3/src/common/datetimefmt.cpp index 7b9e61a5a9..a96f09e2ce 100644 --- a/Externals/wxWidgets3/src/common/datetimefmt.cpp +++ b/Externals/wxWidgets3/src/common/datetimefmt.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 11.05.99 -// RCS-ID: $Id: datetimefmt.cpp 66166 2010-11-16 22:37:52Z VZ $ +// RCS-ID: $Id: datetimefmt.cpp 70847 2012-03-09 01:09:25Z VZ $ // Copyright: (c) 1999 Vadim Zeitlin // parts of code taken from sndcal library by Scott E. Lee: // @@ -34,7 +34,7 @@ #if !defined(wxUSE_DATETIME) || wxUSE_DATETIME #ifndef WX_PRECOMP - #ifdef __WXMSW__ + #ifdef __WINDOWS__ #include "wx/msw/wrapwin.h" #endif #include "wx/string.h" @@ -57,6 +57,7 @@ #endif #include "wx/datetime.h" +#include "wx/time.h" // ============================================================================ // implementation of wxDateTime @@ -68,8 +69,6 @@ extern void InitTm(struct tm& tm); -extern int GetTimeZone(); - extern wxString CallStrftime(const wxString& format, const tm* tm); // ---------------------------------------------------------------------------- @@ -320,16 +319,22 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const format.Replace("%X",wxLocale::GetInfo(wxLOCALE_TIME_FMT)); #endif // we have to use our own implementation if the date is out of range of - // strftime() or if we use non standard specificators + // strftime() or if we use non standard specifiers (notice that "%z" is + // special because it is de facto standard under Unix but is not supported + // under Windows) #ifdef wxHAS_STRFTIME time_t time = GetTicks(); - if ( (time != (time_t)-1) && !wxStrstr(format, wxT("%l")) ) + if ( (time != (time_t)-1) && !wxStrstr(format, wxT("%l")) +#ifdef __WINDOWS__ + && !wxStrstr(format, wxT("%z")) +#endif + ) { // use strftime() struct tm tmstruct; struct tm *tm; - if ( tz.GetOffset() == -GetTimeZone() ) + if ( tz.GetOffset() == -wxGetTimeZone() ) { // we are working with local time tm = wxLocaltime_r(&time, &tmstruct); @@ -398,6 +403,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const switch ( (*++p).GetValue() ) { case wxT('Y'): // year has 4 digits + case wxT('z'): // time zone as well fmt = wxT("%04d"); break; @@ -640,6 +646,25 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const res += wxString::Format(fmt, tm.year); break; + case wxT('z'): // time zone as [-+]HHMM + { + int ofs = tz.GetOffset(); + if ( ofs < 0 ) + { + res += '-'; + ofs = -ofs; + } + else + { + res += '+'; + } + + // Converts seconds to HHMM representation. + res += wxString::Format(fmt, + 100*(ofs/3600) + (ofs/60)%60); + } + break; + case wxT('Z'): // timezone name #ifdef wxHAS_STRFTIME res += CallStrftime(wxT("%Z"), &tmTimeOnly); @@ -668,7 +693,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const } // no, it wasn't the width - wxFAIL_MSG(wxT("unknown format specificator")); + wxFAIL_MSG(wxT("unknown format specifier")); // fall through and just copy it nevertheless @@ -930,6 +955,8 @@ wxDateTime::ParseFormat(const wxString& date, bool hourIsIn12hFormat = false, // or in 24h one? isPM = false; // AM by default + bool haveTimeZone = false; + // and the value of the items we have (init them to get rid of warnings) wxDateTime_t msec = 0, sec = 0, @@ -940,6 +967,7 @@ wxDateTime::ParseFormat(const wxString& date, mday = 0; wxDateTime::Month mon = Inv_Month; int year = 0; + long timeZone = 0; // time zone in seconds as expected in Tm structure wxString::const_iterator input = date.begin(); const wxString::const_iterator end = date.end(); @@ -1378,6 +1406,41 @@ wxDateTime::ParseFormat(const wxString& date, year = (wxDateTime_t)num; break; + case wxT('z'): + { + // check that we have something here at all + if ( input == end ) + return false; + + // and then check that it's either plus or minus sign + bool minusFound; + if ( *input == wxT('-') ) + minusFound = true; + else if ( *input == wxT('+') ) + minusFound = false; + else + return false; // no match + + // here should follow 4 digits HHMM + ++input; + unsigned long tzHourMin; + if ( !GetNumericToken(4, input, end, &tzHourMin) ) + return false; // no match + + const unsigned hours = tzHourMin / 100; + const unsigned minutes = tzHourMin % 100; + + if ( hours > 12 || minutes > 59 ) + return false; // bad format + + timeZone = 3600*hours + 60*minutes; + if ( minusFound ) + timeZone = -timeZone; + + haveTimeZone = true; + } + break; + case wxT('Z'): // timezone name // FIXME: currently we just ignore everything that looks like a // time zone here @@ -1385,7 +1448,7 @@ wxDateTime::ParseFormat(const wxString& date, break; case wxT('%'): // a percent sign - if ( *input++ != wxT('%') ) + if ( input == end || *input++ != wxT('%') ) { // no match return false; @@ -1483,6 +1546,14 @@ wxDateTime::ParseFormat(const wxString& date, Set(tm); + // If a time zone was specified and it is not the local time zone, we need + // to shift the time accordingly. + // + // Note that avoiding the call to MakeFromTimeZone is necessary to avoid + // DST problems. + if ( haveTimeZone && timeZone != -wxGetTimeZone() ) + MakeFromTimezone(timeZone); + // finally check that the week day is consistent -- if we had it if ( haveWDay && GetWeekDay() != wday ) return false; diff --git a/Externals/wxWidgets3/src/common/dcbase.cpp b/Externals/wxWidgets3/src/common/dcbase.cpp index e181a3581c..5394c8af17 100644 --- a/Externals/wxWidgets3/src/common/dcbase.cpp +++ b/Externals/wxWidgets3/src/common/dcbase.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 05/25/99 -// RCS-ID: $Id: dcbase.cpp 67063 2011-02-27 12:48:13Z VZ $ +// RCS-ID: $Id: dcbase.cpp 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -35,6 +35,7 @@ #ifndef WX_PRECOMP #include "wx/math.h" #include "wx/module.h" + #include "wx/window.h" #endif #ifdef __WXMSW__ @@ -89,12 +90,6 @@ #include "wx/dfb/dcscreen.h" #endif -#ifdef __WXPALMOS__ - #include "wx/palmos/dcclient.h" - #include "wx/palmos/dcmemory.h" - #include "wx/palmos/dcscreen.h" -#endif - //---------------------------------------------------------------------------- // wxDCFactory //---------------------------------------------------------------------------- @@ -927,9 +922,9 @@ void wxDCImpl::DoDrawSpline( const wxPointList *points ) wx_spline_add_point(x1, y1); while ((node = node->GetNext()) -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS != NULL -#endif // !wxUSE_STL +#endif // !wxUSE_STD_CONTAINERS ) { p = node->GetData(); @@ -1182,7 +1177,7 @@ void wxDC::DrawLabel(const wxString& text, GetMultiLineTextExtent(text, &widthText, &heightText, &heightLine); wxCoord width, height; - if ( bitmap.Ok() ) + if ( bitmap.IsOk() ) { width = widthText + bitmap.GetWidth(); height = bitmap.GetHeight(); @@ -1224,7 +1219,7 @@ void wxDC::DrawLabel(const wxString& text, wxCoord x0 = x, y0 = y, width0 = width; - if ( bitmap.Ok() ) + if ( bitmap.IsOk() ) { DrawBitmap(bitmap, x, y, true /* use mask */); @@ -1602,7 +1597,7 @@ void wxDCImpl::CalculateEllipticPoints( wxPointList* points, y2 = y2-y-y+1; --y; } - // old y now to big: set point with old y, old x + // old y now too big: set point with old y, old x if( bNewPoint && x>1) { int x1 = x - 1; diff --git a/Externals/wxWidgets3/src/common/dcbufcmn.cpp b/Externals/wxWidgets3/src/common/dcbufcmn.cpp index 765a50b636..8b230ad299 100644 --- a/Externals/wxWidgets3/src/common/dcbufcmn.cpp +++ b/Externals/wxWidgets3/src/common/dcbufcmn.cpp @@ -4,7 +4,7 @@ // Author: Ron Lee, Jaakko Salli // Modified by: // Created: Sep-20-2006 -// RCS-ID: $Id: dcbufcmn.cpp 65680 2010-09-30 11:44:45Z VZ $ +// RCS-ID: $Id: dcbufcmn.cpp 67659 2011-05-01 15:47:46Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -105,6 +105,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxSharedDCBufferManager, wxModule) void wxBufferedDC::UseBuffer(wxCoord w, wxCoord h) { + wxCHECK_RET( w >= -1 && h >= -1, "Invalid buffer size" ); + if ( !m_buffer || !m_buffer->IsOk() ) { if ( w == -1 || h == -1 ) diff --git a/Externals/wxWidgets3/src/common/dcgraph.cpp b/Externals/wxWidgets3/src/common/dcgraph.cpp index 6d65764510..633c482240 100644 --- a/Externals/wxWidgets3/src/common/dcgraph.cpp +++ b/Externals/wxWidgets3/src/common/dcgraph.cpp @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: -// RCS-ID: $Id: dcgraph.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: dcgraph.cpp 70844 2012-03-08 17:06:06Z PC $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -53,27 +53,26 @@ static inline double DegToRad(double deg) return (deg * M_PI) / 180.0; } -static bool TranslateRasterOp(wxRasterOperationMode function, wxCompositionMode *op) +static wxCompositionMode TranslateRasterOp(wxRasterOperationMode function) { switch ( function ) { case wxCOPY: // src // since we are supporting alpha, _OVER is closer to the intention than _SOURCE - // since the latter would overwrite even when alpha is is not set to opaque - *op = wxCOMPOSITION_OVER; - break; + // since the latter would overwrite even when alpha is not set to opaque + return wxCOMPOSITION_OVER; + case wxOR: // src OR dst - *op = wxCOMPOSITION_ADD; - break; + return wxCOMPOSITION_ADD; + case wxNO_OP: // dst - *op = wxCOMPOSITION_DEST; // ignore the source - break; + return wxCOMPOSITION_DEST; // ignore the source + case wxCLEAR: // 0 - *op = wxCOMPOSITION_CLEAR;// clear dst - break; + return wxCOMPOSITION_CLEAR;// clear dst + case wxXOR: // src XOR dst - *op = wxCOMPOSITION_XOR; - break; + return wxCOMPOSITION_XOR; case wxAND: // src AND dst case wxAND_INVERT: // (NOT src) AND dst @@ -86,10 +85,10 @@ static bool TranslateRasterOp(wxRasterOperationMode function, wxCompositionMode case wxOR_REVERSE: // src OR (NOT dst) case wxSET: // 1 case wxSRC_INVERT: // NOT src - default: - return false; + break; } - return true; + + return wxCOMPOSITION_INVALID; } //----------------------------------------------------------------------------- @@ -115,6 +114,19 @@ wxGCDC::wxGCDC( const wxPrinterDC& dc) : } #endif +#if defined(__WXMSW__) && wxUSE_ENH_METAFILE +wxGCDC::wxGCDC(const wxEnhMetaFileDC& dc) + : wxDC(new wxGCDCImpl(this, dc)) +{ +} +#endif + +wxGCDC::wxGCDC(wxGraphicsContext* context) : + wxDC( new wxGCDCImpl( this ) ) +{ + SetGraphicsContext(context); +} + wxGCDC::wxGCDC() : wxDC( new wxGCDCImpl( this ) ) { @@ -124,7 +136,7 @@ wxGCDC::~wxGCDC() { } -wxGraphicsContext* wxGCDC::GetGraphicsContext() +wxGraphicsContext* wxGCDC::GetGraphicsContext() const { if (!m_pimpl) return NULL; wxGCDCImpl *gc_impl = (wxGCDCImpl*) m_pimpl; @@ -175,13 +187,7 @@ wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc ) : { Init(); wxGraphicsContext* context; -#if wxUSE_CAIRO - wxGraphicsRenderer* renderer = wxGraphicsRenderer::GetCairoRenderer(); - context = renderer->CreateContext(dc); -#else context = wxGraphicsContext::Create(dc); -#endif - SetGraphicsContext( context ); } @@ -194,6 +200,15 @@ wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ) : } #endif +#if defined(__WXMSW__) && wxUSE_ENH_METAFILE +wxGCDCImpl::wxGCDCImpl(wxDC *owner, const wxEnhMetaFileDC& dc) + : wxDCImpl(owner) +{ + Init(); + SetGraphicsContext(wxGraphicsContext::Create(dc)); +} +#endif + void wxGCDCImpl::Init() { m_ok = false; @@ -367,7 +382,10 @@ void wxGCDCImpl::SetTextForeground( const wxColour &col ) { wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::SetTextForeground - invalid DC") ); - if ( col != m_textForegroundColour ) + // don't set m_textForegroundColour to an invalid colour as we'd crash + // later then (we use m_textForegroundColour.GetColor() without checking + // in a few places) + if ( col.IsOk() && col != m_textForegroundColour ) { m_textForegroundColour = col; m_graphicContext->SetFont( m_font, m_textForegroundColour ); @@ -502,8 +520,8 @@ void wxGCDCImpl::SetLogicalFunction( wxRasterOperationMode function ) m_logicalFunction = function; - wxCompositionMode mode; - m_logicalFunctionSupported = TranslateRasterOp( function, &mode); + wxCompositionMode mode = TranslateRasterOp( function ); + m_logicalFunctionSupported = mode != wxCOMPOSITION_INVALID; if (m_logicalFunctionSupported) m_logicalFunctionSupported = m_graphicContext->SetCompositionMode(mode); @@ -696,13 +714,13 @@ void wxGCDCImpl::DoDrawSpline(const wxPointList *points) path.MoveToPoint( x1 , y1 ); path.AddLineToPoint( cx1 , cy1 ); -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS while ((node = node->GetNext()) != NULL) #else while ((node = node->GetNext())) -#endif // !wxUSE_STL +#endif // !wxUSE_STD_CONTAINERS { p = node->GetData(); @@ -874,13 +892,25 @@ bool wxGCDCImpl::DoStretchBlit( if ( logical_func == wxNO_OP ) return true; - wxCompositionMode mode; - if ( !TranslateRasterOp(logical_func, &mode) ) + wxCompositionMode mode = TranslateRasterOp(logical_func); + if ( mode == wxCOMPOSITION_INVALID ) { wxFAIL_MSG( wxT("Blitting is not supported with this logical operation.") ); return false; } + wxRect subrect(source->LogicalToDeviceX(xsrc), + source->LogicalToDeviceY(ysrc), + source->LogicalToDeviceXRel(srcWidth), + source->LogicalToDeviceYRel(srcHeight)); + const wxRect subrectOrig = subrect; + // clip the subrect down to the size of the source DC + wxRect clip; + source->GetSize(&clip.width, &clip.height); + subrect.Intersect(clip); + if (subrect.width == 0) + return true; + bool retval = true; wxCompositionMode formerMode = m_graphicContext->GetCompositionMode(); @@ -898,21 +928,6 @@ bool wxGCDCImpl::DoStretchBlit( ysrcMask = ysrc; } - wxRect subrect(source->LogicalToDeviceX(xsrc), - source->LogicalToDeviceY(ysrc), - source->LogicalToDeviceXRel(srcWidth), - source->LogicalToDeviceYRel(srcHeight)); - - // if needed clip the subrect down to the size of the source DC - wxCoord sw, sh; - source->GetSize(&sw, &sh); - sw = source->LogicalToDeviceXRel(sw); - sh = source->LogicalToDeviceYRel(sh); - if (subrect.x + subrect.width > sw) - subrect.width = sw - subrect.x; - if (subrect.y + subrect.height > sh) - subrect.height = sh - subrect.y; - wxBitmap blit = source->GetAsBitmap( &subrect ); if ( blit.IsOk() ) @@ -920,8 +935,19 @@ bool wxGCDCImpl::DoStretchBlit( if ( !useMask && blit.GetMask() ) blit.SetMask(NULL); - m_graphicContext->DrawBitmap( blit, xdest, ydest, - dstWidth, dstHeight); + double x = xdest; + double y = ydest; + double w = dstWidth; + double h = dstHeight; + // adjust dest rect if source rect is clipped + if (subrect.width != subrectOrig.width || subrect.height != subrectOrig.height) + { + x += (subrect.x - subrectOrig.x) / double(subrectOrig.width) * dstWidth; + y += (subrect.y - subrectOrig.y) / double(subrectOrig.height) * dstHeight; + w *= double(subrect.width) / subrectOrig.width; + h *= double(subrect.height) / subrectOrig.height; + } + m_graphicContext->DrawBitmap(blit, x, y, w, h); } else { @@ -958,6 +984,18 @@ void wxGCDCImpl::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, void wxGCDCImpl::DoDrawText(const wxString& str, wxCoord x, wxCoord y) { + // For compatibility with other ports (notably wxGTK) and because it's + // genuinely useful, we allow passing multiline strings to DrawText(). + // However there is no native OSX function to draw them directly so we + // instead reuse the generic DrawLabel() method to render them. Of course, + // DrawLabel() itself will call back to us but with single line strings + // only so there won't be any infinite recursion here. + if ( str.find('\n') != wxString::npos ) + { + GetOwner()->DrawLabel(str, wxRect(x, y, 0, 0)); + return; + } + wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawText - invalid DC") ); if ( str.empty() ) @@ -1145,4 +1183,21 @@ void wxGCDCImpl::DoDrawCheckMark(wxCoord x, wxCoord y, wxDCImpl::DoDrawCheckMark(x,y,width,height); } +#ifdef __WXMSW__ +wxRect wxGCDCImpl::MSWApplyGDIPlusTransform(const wxRect& r) const +{ + wxGraphicsContext* const gc = GetGraphicsContext(); + wxCHECK_MSG( gc, r, wxT("Invalid wxGCDC") ); + + double x = 0, + y = 0; + gc->GetTransform().TransformPoint(&x, &y); + + wxRect rect(r); + rect.Offset(x, y); + + return rect; +} +#endif // __WXMSW__ + #endif // wxUSE_GRAPHICS_CONTEXT diff --git a/Externals/wxWidgets3/src/common/dcsvg.cpp b/Externals/wxWidgets3/src/common/dcsvg.cpp index c161b8964e..5f4514e9bb 100644 --- a/Externals/wxWidgets3/src/common/dcsvg.cpp +++ b/Externals/wxWidgets3/src/common/dcsvg.cpp @@ -3,7 +3,7 @@ // Purpose: SVG sample // Author: Chris Elliott // Modified by: -// RCS-ID: $Id: dcsvg.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: dcsvg.cpp 67883 2011-06-07 22:27:35Z VZ $ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -28,9 +28,6 @@ #include "wx/wfstream.h" #include "wx/filename.h" -#define wxSVG_DEBUG false -// or true to see the calls being executed - // ---------------------------------------------------------- // Global utilities // ---------------------------------------------------------- @@ -40,26 +37,6 @@ namespace inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } -wxString wxBrushString ( wxColour c, int style ) -{ - wxString s = wxT("fill:") + c.GetAsString(wxC2S_HTML_SYNTAX) + wxT("; "); - switch ( style ) - { - case wxBRUSHSTYLE_SOLID : - s = s + wxT("fill-opacity:1.0; "); - break; - case wxBRUSHSTYLE_TRANSPARENT: - s = s + wxT("fill-opacity:0.0; "); - break; - - default : - wxASSERT_MSG(false, wxT("wxSVGFileDC::Requested Brush Style not available")); - - } - s = s + wxT("\n"); - return s; -} - // This function returns a string representation of a floating point number in // C locale (i.e. always using "." for the decimal separator) and with the // fixed precision (which is 2 for some unknown reason but this is what it was @@ -69,6 +46,66 @@ inline wxString NumStr(double f) return wxString::FromCDouble(f, 2); } +// Return the colour representation as HTML-like "#rrggbb" string and also +// returns its alpha as opacity number in 0..1 range. +wxString Col2SVG(wxColour c, float *opacity) +{ + if ( c.Alpha() != wxALPHA_OPAQUE ) + { + *opacity = c.Alpha()/255.; + + // Remove the alpha before using GetAsString(wxC2S_HTML_SYNTAX) as it + // doesn't support colours with alpha channel. + c = wxColour(c.GetRGB()); + } + else // No alpha. + { + *opacity = 1.; + } + + return c.GetAsString(wxC2S_HTML_SYNTAX); +} + +wxString wxPenString(wxColour c, int style = wxPENSTYLE_SOLID) +{ + float opacity; + wxString s = wxT("stroke:") + Col2SVG(c, &opacity) + wxT("; "); + + switch ( style ) + { + case wxPENSTYLE_SOLID: + s += wxString::Format(wxT("stroke-opacity:%s; "), NumStr(opacity)); + break; + case wxPENSTYLE_TRANSPARENT: + s += wxT("stroke-opacity:0.0; "); + break; + default : + wxASSERT_MSG(false, wxT("wxSVGFileDC::Requested Pen Style not available")); + } + + return s; +} + +wxString wxBrushString(wxColour c, int style = wxBRUSHSTYLE_SOLID) +{ + float opacity; + wxString s = wxT("fill:") + Col2SVG(c, &opacity) + wxT("; "); + + switch ( style ) + { + case wxBRUSHSTYLE_SOLID: + s += wxString::Format(wxT("fill-opacity:%s; "), NumStr(opacity)); + break; + case wxBRUSHSTYLE_TRANSPARENT: + s += wxT("fill-opacity:0.0; "); + break; + default : + wxASSERT_MSG(false, wxT("wxSVGFileDC::Requested Brush Style not available")); + } + + return s; +} + } // anonymous namespace // ---------------------------------------------------------- @@ -110,7 +147,7 @@ void wxSVGFileDCImpl::Init (const wxString &filename, int Width, int Height, dou ////////////////////code here m_outfile = new wxFileOutputStream(filename); - m_OK = m_outfile->Ok (); + m_OK = m_outfile->IsOk(); if (m_OK) { m_filename = filename; @@ -158,17 +195,15 @@ wxSize wxSVGFileDCImpl::GetPPI() const void wxSVGFileDCImpl::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) { - if (m_graphics_changed) NewGraphics (); + if (m_graphics_changed) NewGraphics(); wxString s; s.Printf ( wxT(" \n"), x1,y1,x2,y2 ); if (m_OK) { write(s); } - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DrawLine Call executed")); CalcBoundingBox(x1, y1); CalcBoundingBox(x2, y2); - return; } void wxSVGFileDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset , wxCoord yoffset ) @@ -183,7 +218,7 @@ void wxSVGFileDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset , wxC void wxSVGFileDCImpl::DoDrawPoint (wxCoord x1, wxCoord y1) { wxString s; - if (m_graphics_changed) NewGraphics (); + if (m_graphics_changed) NewGraphics(); s = wxT(" ") + wxString(wxT("\n")); write(s); DoDrawLine ( x1,y1,x1,y1 ); @@ -199,13 +234,12 @@ void wxSVGFileDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1, wxCoord width, wxC void wxSVGFileDCImpl::DoDrawText(const wxString& text, wxCoord x1, wxCoord y1) { DoDrawRotatedText(text, x1,y1,0.0); - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DrawText Call executed")); } void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y, double angle) { //known bug; if the font is drawn in a scaled DC, it will not behave exactly as wxMSW - if (m_graphics_changed) NewGraphics (); + if (m_graphics_changed) NewGraphics(); wxString s, sTmp; // calculate bounding box @@ -229,37 +263,36 @@ void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoor // draw background first // just like DoDrawRectangle except we pass the text color to it and set the border to a 1 pixel wide text background - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::Draw Rotated Text Call plotting text background")); - sTmp.Printf ( wxT(" "), NumStr(-angle), x,y ); - s = s + sTmp + wxT("\n"); + sTmp.Printf ( wxT(" "), NumStr(-angle), x,y ); + s += sTmp + wxT("\n"); write(s); } //now do the text itself s.Printf (wxT(" 0) s = s + wxT("style=\"font-family:") + sTmp + wxT("; "); - else s = s + wxT("style=\" "); + sTmp = m_font.GetFaceName(); + if (sTmp.Len() > 0) s += wxT("style=\"font-family:") + sTmp + wxT("; "); + else s += wxT("style=\" "); wxString fontweights [3] = { wxT("normal"), wxT("lighter"), wxT("bold") }; - s = s + wxT("font-weight:") + fontweights[m_font.GetWeight() - wxNORMAL] + wxT("; "); + s += wxT("font-weight:") + fontweights[m_font.GetWeight() - wxNORMAL] + wxT("; "); wxString fontstyles [5] = { wxT("normal"), wxT("style error"), wxT("style error"), wxT("italic"), wxT("oblique") }; - s = s + wxT("font-style:") + fontstyles[m_font.GetStyle() - wxNORMAL] + wxT("; "); + s += wxT("font-style:") + fontstyles[m_font.GetStyle() - wxNORMAL] + wxT("; "); - sTmp.Printf (wxT("font-size:%dpt; fill:"), m_font.GetPointSize () ); - s = s + sTmp; - s = s + m_textForegroundColour.GetAsString(wxC2S_HTML_SYNTAX) + wxT("; stroke:") + m_textForegroundColour.GetAsString(wxC2S_HTML_SYNTAX) + wxT("; "); + sTmp.Printf (wxT("font-size:%dpt; "), m_font.GetPointSize() ); + s += sTmp; + //text will be solid, unless alpha value isn't opaque in the foreground colour + s += wxBrushString(m_textForegroundColour) + wxPenString(m_textForegroundColour); sTmp.Printf ( wxT("stroke-width:0;\" transform=\"rotate( %s %d %d ) \" >"), NumStr(-angle), x,y ); - s = s + sTmp + sText + wxT(" ") + wxT("\n"); + s += sTmp + sText + wxT(" ") + wxT("\n"); if (m_OK) { write(s); } - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DrawRotatedText Call executed")); } void wxSVGFileDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) @@ -270,16 +303,15 @@ void wxSVGFileDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoo void wxSVGFileDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius ) { - if (m_graphics_changed) NewGraphics (); + if (m_graphics_changed) NewGraphics(); wxString s; s.Printf ( wxT(" ") + wxT("\n"); + s += wxT(" /> \n"); write(s); - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawRoundedRectangle Call executed")); CalcBoundingBox(x, y); CalcBoundingBox(x + width, y + height); } @@ -288,44 +320,40 @@ void wxSVGFileDCImpl::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle) { - if (m_graphics_changed) NewGraphics (); + if (m_graphics_changed) NewGraphics(); wxString s, sTmp; s = wxT(" "); - s = s + wxT("\n"); + s += wxT("\" /> \n"); write(s); - - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawPolygon Call executed")); } void wxSVGFileDCImpl::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - if (m_graphics_changed) NewGraphics (); + if (m_graphics_changed) NewGraphics(); int rh = height /2; int rw = width /2; wxString s; s.Printf ( wxT(" ") + wxT("\n"); + s += wxT(" /> \n"); write(s); - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawEllipse Call executed")); CalcBoundingBox(x, y); CalcBoundingBox(x + width, y + height); } @@ -341,7 +369,7 @@ void wxSVGFileDCImpl::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, Might be better described as Pie drawing */ - if (m_graphics_changed) NewGraphics (); + if (m_graphics_changed) NewGraphics(); wxString s; // we need the radius of the circle which has two estimates @@ -370,15 +398,13 @@ void wxSVGFileDCImpl::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, x1,y1, NumStr(r1), NumStr(r2), fArc, fSweep, x2, y2, xc, yc ); // the z means close the path and fill - s = s + wxT(" \" /> ") + wxT("\n"); + s += wxT(" \" /> \n"); if (m_OK) { write(s); } - - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawArc Call executed")); } void wxSVGFileDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) @@ -402,7 +428,7 @@ void wxSVGFileDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h, //known bug: SVG draws with the current pen along the radii, but this does not happen in wxMSW - if (m_graphics_changed) NewGraphics (); + if (m_graphics_changed) NewGraphics(); wxString s; //radius @@ -433,15 +459,12 @@ void wxSVGFileDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h, int(xs), int(ys), int(rx), int(ry), fArc, fSweep, int(xe), int(ye), int(xc), int(yc) ); - - s = s + wxT(" \" /> ") + wxT("\n"); + s += wxT(" \" /> \n"); if (m_OK) { write(s); } - - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawEllipticArc Call executed")); } void wxSVGFileDCImpl::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent , wxCoord *externalLeading , const wxFont *font) const @@ -452,17 +475,14 @@ void wxSVGFileDCImpl::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoor sDC.SetFont (m_font); if ( font != NULL ) sDC.SetFont ( *font ); sDC.GetTextExtent(string, w, h, descent, externalLeading ); - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::GetTextExtent Call executed")); } wxCoord wxSVGFileDCImpl::GetCharHeight() const - { wxScreenDC sDC; sDC.SetFont (m_font); - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::GetCharHeight Call executing")); - return ( sDC.GetCharHeight() ); + return sDC.GetCharHeight(); } @@ -471,9 +491,7 @@ wxCoord wxSVGFileDCImpl::GetCharWidth() const wxScreenDC sDC; sDC.SetFont (m_font); - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::GetCharWidth Call executing")); - return ( sDC.GetCharWidth() ); - + return sDC.GetCharWidth(); } @@ -483,16 +501,13 @@ wxCoord wxSVGFileDCImpl::GetCharWidth() const void wxSVGFileDCImpl::SetBackground( const wxBrush &brush ) { - m_backgroundBrush = brush; - return; } void wxSVGFileDCImpl::SetBackgroundMode( int mode ) { m_backgroundMode = mode; - return; } @@ -502,7 +517,6 @@ void wxSVGFileDCImpl::SetBrush(const wxBrush& brush) m_brush = brush; m_graphics_changed = true; - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetBrush Call executed")); } @@ -513,21 +527,16 @@ void wxSVGFileDCImpl::SetPen(const wxPen& pen) m_pen = pen; m_graphics_changed = true; - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetPen Call executed")); } -void wxSVGFileDCImpl::NewGraphics () +void wxSVGFileDCImpl::NewGraphics() { - - int w = m_pen.GetWidth (); - wxColour c = m_pen.GetColour (); - wxString s, sBrush, sPenCap, sPenJoin, sPenStyle, sLast, sWarn; - sBrush = wxT("\n\n \n"); } sLast.Printf( wxT("stroke-width:%d\" \n transform=\"translate(%s %s) scale(%s %s)\">"), - w, NumStr(m_logicalOriginX), NumStr(m_logicalOriginY), NumStr(m_scaleX), NumStr(m_scaleY) ); + m_pen.GetWidth(), NumStr(m_logicalOriginX), NumStr(m_logicalOriginY), NumStr(m_scaleX), NumStr(m_scaleY) ); s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + wxT("\n") + sWarn; write(s); m_graphics_changed = false; - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::NewGraphics Call executed")); } @@ -579,8 +575,6 @@ void wxSVGFileDCImpl::SetFont(const wxFont& font) { m_font = font; - - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetFont Call executed")); } // export a bitmap as a raster image in png @@ -605,7 +599,6 @@ bool wxSVGFileDCImpl::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoor memDC.Blit(0, 0, width, height, source, xsrc, ysrc); memDC.SelectObject( wxNullBitmap ); DoDrawBitmap(myBitmap, xdest, ydest); - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoBlit Call executed")); return false; } @@ -617,13 +610,11 @@ void wxSVGFileDCImpl::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord memDC.DrawIcon(myIcon,0,0); memDC.SelectObject( wxNullBitmap ); DoDrawBitmap(myBitmap, x, y); - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawIcon Call executed")); - return; } void wxSVGFileDCImpl::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool WXUNUSED(bTransparent) /*=0*/ ) { - if (m_graphics_changed) NewGraphics (); + if (m_graphics_changed) NewGraphics(); wxString sTmp, s, sPNG; if ( wxImage::FindHandler(wxBITMAP_TYPE_PNG) == NULL ) @@ -652,25 +643,22 @@ void wxSVGFileDCImpl::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoor int w = myBitmap.GetWidth(); int h = myBitmap.GetHeight(); sTmp.Printf ( wxT(" \n"), sPNG.c_str() ); - s = s + sTmp + wxT("Image from wxSVG ") + wxT("\n"); + s += sTmp + wxT("Image from wxSVG ") + wxT("\n"); if (m_OK && bPNG_OK) { write(s); } - m_OK = m_outfile->Ok () && bPNG_OK; - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawBitmap Call executed")); - - return; + m_OK = m_outfile->IsOk() && bPNG_OK; } void wxSVGFileDCImpl::write(const wxString &s) { const wxCharBuffer buf = s.utf8_str(); m_outfile->Write(buf, strlen((const char *)buf)); - m_OK = m_outfile->Ok(); + m_OK = m_outfile->IsOk(); } diff --git a/Externals/wxWidgets3/src/common/descrip.mms b/Externals/wxWidgets3/src/common/descrip.mms index b1141822d7..8273a164af 100644 --- a/Externals/wxWidgets3/src/common/descrip.mms +++ b/Externals/wxWidgets3/src/common/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 21 March 2011 * +# Date : 6 December 2011 * # * #***************************************************************************** .first @@ -209,8 +209,9 @@ OBJECTS2=tbarbase.obj,srchcmn.obj,\ clrpickercmn.obj,\ filepickercmn.obj,\ fontpickercmn.obj,\ - pickerbase.obj,\ - listctrlcmn.obj,socketiohandler.obj,fdiodispatcher.obj,\ + pickerbase.obj + +OBJECTS3=listctrlcmn.obj,socketiohandler.obj,fdiodispatcher.obj,\ selectdispatcher.obj,overlaycmn.obj,windowid.obj,sstream.obj,\ wrapsizer.obj,headerctrlcmn.obj,headercolcmn.obj,\ rearrangectrl.obj,spinctrlcmn.obj,datetimefmt.obj,xlocale.obj,\ @@ -222,7 +223,8 @@ OBJECTS2=tbarbase.obj,srchcmn.obj,\ statlinecmn.obj,radiobtncmn.obj,bmpbtncmn.obj,checklstcmn.obj,\ statbmpcmn.obj,dirctrlcmn.obj,gridcmn.obj,odcombocmn.obj,\ spinbtncmn.obj,scrolbarcmn.obj,colourdata.obj,fontdata.obj,\ - valnum.obj,numformatter.obj,markupparser.obj + valnum.obj,numformatter.obj,markupparser.obj,\ + affinematrix2d.obj,richtooltipcmn.obj,persist.obj,time.obj OBJECTS_MOTIF=radiocmn.obj,combocmn.obj @@ -425,17 +427,20 @@ SOURCES = \ statboxcmn.cpp,slidercmn.cpp,statlinecmn.cpp,radiobtncmn.cpp,\ bmpbtncmn.cpp,checklstcmn.cpp,statbmpcmn.cpp,dirctrlcmn.cpp,\ gridcmn.cpp,odcombocmn.cpp,spinbtncmn.cpp,scrolbarcmn.cpp,\ - colourdata.cpp,fontdata.cpp + colourdata.cpp,fontdata.cpp affinematrix2d.cpp\ + richtooltipcmn.cpp persist.cpp time.cpp all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) $(MMS)$(MMSQUALIFIERS) $(OBJECTS1) $(MMS)$(MMSQUALIFIERS) $(OBJECTS2) + $(MMS)$(MMSQUALIFIERS) $(OBJECTS3) .ifdef __WXMOTIF__ $(MMS)$(MMSQUALIFIERS) $(OBJECTS_MOTIF) library [--.lib]libwx_motif.olb $(OBJECTS) library [--.lib]libwx_motif.olb $(OBJECTS1) library [--.lib]libwx_motif.olb $(OBJECTS2) + library [--.lib]libwx_motif.olb $(OBJECTS3) library [--.lib]libwx_motif.olb $(OBJECTS_MOTIF) .else .ifdef __WXGTK__ @@ -443,6 +448,7 @@ all : $(SOURCES) library [--.lib]libwx_gtk.olb $(OBJECTS) library [--.lib]libwx_gtk.olb $(OBJECTS1) library [--.lib]libwx_gtk.olb $(OBJECTS2) + library [--.lib]libwx_gtk.olb $(OBJECTS3) library [--.lib]libwx_gtk.olb $(OBJECTS_X11) .else .ifdef __WXGTK2__ @@ -451,6 +457,7 @@ all : $(SOURCES) library [--.lib]libwx_gtk2.olb $(OBJECTS) library [--.lib]libwx_gtk2.olb $(OBJECTS1) library [--.lib]libwx_gtk2.olb $(OBJECTS2) + library [--.lib]libwx_gtk2.olb $(OBJECTS3) library [--.lib]libwx_gtk2.olb $(OBJECTS_X11) library [--.lib]libwx_gtk2.olb $(OBJECTS_GTK2) .else @@ -459,6 +466,7 @@ all : $(SOURCES) library [--.lib]libwx_x11_univ.olb $(OBJECTS) library [--.lib]libwx_x11_univ.olb $(OBJECTS1) library [--.lib]libwx_x11_univ.olb $(OBJECTS2) + library [--.lib]libwx_x11_univ.olb $(OBJECTS3) library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11) .endif .endif @@ -468,6 +476,7 @@ all : $(SOURCES) $(OBJECTS) : [--.include.wx]setup.h $(OBJECTS1) : [--.include.wx]setup.h $(OBJECTS2) : [--.include.wx]setup.h +$(OBJECTS3) : [--.include.wx]setup.h $(OBJECTS_X11) : [--.include.wx]setup.h $(OBJECTS_GTK2) : [--.include.wx]setup.h $(OBJECTS_MOTIF) : [--.include.wx]setup.h @@ -700,3 +709,7 @@ fontdata.obj : fontdata.cpp valnum.obj : valnum.cpp numformatter.obj : numformatter.cpp markupparser.obj : markupparser.cpp +affinematrix2d.obj : affinematrix2d.cpp +richtooltipcmn.obj : richtooltipcmn.cpp +persist.obj : persist.cpp +time.obj : time.cpp diff --git a/Externals/wxWidgets3/src/common/dlgcmn.cpp b/Externals/wxWidgets3/src/common/dlgcmn.cpp index d42c05e87f..1fb9b03f7d 100644 --- a/Externals/wxWidgets3/src/common/dlgcmn.cpp +++ b/Externals/wxWidgets3/src/common/dlgcmn.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 28.06.99 -// RCS-ID: $Id: dlgcmn.cpp 66592 2011-01-05 18:27:58Z PC $ +// RCS-ID: $Id: dlgcmn.cpp 69458 2011-10-18 21:56:36Z VZ $ // Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -224,13 +224,7 @@ wxSizer *wxDialogBase::CreateTextSizer(const wxString& message, widthMax = wxSystemSettings::GetMetric( wxSYS_SCREEN_X ) - 25; } - // '&' is used as accel mnemonic prefix in the wxWidgets controls but in - // the static messages created by CreateTextSizer() (used by wxMessageBox, - // for example), we don't want this special meaning, so we need to quote it - wxString text(message); - text.Replace(wxT("&"), wxT("&&")); - - return wrapper.CreateSizer(text, widthMax); + return wrapper.CreateSizer(message, widthMax); } #endif // wxUSE_STATTEXT diff --git a/Externals/wxWidgets3/src/common/dobjcmn.cpp b/Externals/wxWidgets3/src/common/dobjcmn.cpp index c160b7b79f..14f40b8ff1 100644 --- a/Externals/wxWidgets3/src/common/dobjcmn.cpp +++ b/Externals/wxWidgets3/src/common/dobjcmn.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin, Robert Roebling // Modified by: // Created: 19.10.99 -// RCS-ID: $Id: dobjcmn.cpp 65510 2010-09-10 19:28:52Z VZ $ +// RCS-ID: $Id: dobjcmn.cpp 70908 2012-03-15 13:49:49Z VZ $ // Copyright: (c) wxWidgets Team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -234,7 +234,12 @@ bool wxDataObjectComposite::SetData(const wxDataFormat& format, wxT("unsupported format in wxDataObjectComposite")); m_receivedFormat = format; - return dataObj->SetData( len, buf ); + + // Notice that we must pass "format" here as wxTextDataObject, that we can + // have as one of our "simple" sub-objects actually is not that simple and + // can support multiple formats (ASCII/UTF-8/UTF-16/...) and so needs to + // know which one it is given. + return dataObj->SetData( format, len, buf ); } // ---------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/src/common/docview.cpp b/Externals/wxWidgets3/src/common/docview.cpp index 168cba6422..94f6d8650a 100644 --- a/Externals/wxWidgets3/src/common/docview.cpp +++ b/Externals/wxWidgets3/src/common/docview.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: Vadim Zeitlin // Created: 01/02/97 -// RCS-ID: $Id: docview.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: docview.cpp 70790 2012-03-04 00:29:03Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -122,8 +122,12 @@ wxString FindExtension(const wxString& path) wxDocument::wxDocument(wxDocument *parent) { m_documentModified = false; - m_documentParent = parent; m_documentTemplate = NULL; + + m_documentParent = parent; + if ( parent ) + parent->m_childDocuments.push_back(this); + m_commandProcessor = NULL; m_savedYet = false; } @@ -140,6 +144,9 @@ wxDocument::~wxDocument() if (GetDocumentManager()) GetDocumentManager()->RemoveDocument(this); + if ( m_documentParent ) + m_documentParent->m_childDocuments.remove(this); + // Not safe to do here, since it'll invoke virtual view functions // expecting to see valid derived objects: and by the time we get here, // we've called destructors higher up. @@ -151,6 +158,40 @@ bool wxDocument::Close() if ( !OnSaveModified() ) return false; + // When the parent document closes, its children must be closed as well as + // they can't exist without the parent. + + // As usual, first check if all children can be closed. + DocsList::const_iterator it = m_childDocuments.begin(); + for ( DocsList::const_iterator end = m_childDocuments.end(); it != end; ++it ) + { + if ( !(*it)->OnSaveModified() ) + { + // Leave the parent document opened if a child can't close. + return false; + } + } + + // Now that they all did, do close them: as m_childDocuments is modified as + // we iterate over it, don't use the usual for-style iteration here. + while ( !m_childDocuments.empty() ) + { + wxDocument * const childDoc = m_childDocuments.front(); + + // This will call OnSaveModified() once again but it shouldn't do + // anything as the document was just saved or marked as not needing to + // be saved by the call to OnSaveModified() that returned true above. + if ( !childDoc->Close() ) + { + wxFAIL_MSG( "Closing the child document unexpectedly failed " + "after its OnSaveModified() returned true" ); + } + + // Delete the child document by deleting all its views. + childDoc->DeleteAllViews(); + } + + return OnCloseDocument(); } @@ -231,6 +272,12 @@ void wxDocument::Modify(bool mod) wxDocManager *wxDocument::GetDocumentManager() const { + // For child documents we use the same document manager as the parent, even + // though we don't have our own template (as children are not opened/saved + // directly). + if ( m_documentParent ) + return m_documentParent->GetDocumentManager(); + return m_documentTemplate ? m_documentTemplate->GetDocumentManager() : NULL; } @@ -350,6 +397,9 @@ bool wxDocument::OnSaveDocument(const wxString& file) if ( !DoSaveDocument(file) ) return false; + if ( m_commandProcessor ) + m_commandProcessor->MarkAsSaved(); + Modify(false); SetFilename(file); SetDocumentSaved(true); @@ -895,7 +945,7 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler) EVT_UPDATE_UI(wxID_REVERT, wxDocManager::OnUpdateFileRevert) EVT_UPDATE_UI(wxID_NEW, wxDocManager::OnUpdateFileNew) EVT_UPDATE_UI(wxID_SAVE, wxDocManager::OnUpdateFileSave) - EVT_UPDATE_UI(wxID_SAVEAS, wxDocManager::OnUpdateDisableIfNoDoc) + EVT_UPDATE_UI(wxID_SAVEAS, wxDocManager::OnUpdateFileSaveAs) EVT_UPDATE_UI(wxID_UNDO, wxDocManager::OnUpdateUndo) EVT_UPDATE_UI(wxID_REDO, wxDocManager::OnUpdateRedo) @@ -1106,26 +1156,27 @@ void wxDocManager::DoOpenMRUFile(unsigned n) wxString errMsg; // must contain exactly one "%s" if non-empty if ( wxFile::Exists(filename) ) { - // try to open it - if ( CreateDocument(filename, wxDOC_SILENT) ) - return; - - errMsg = _("The file '%s' couldn't be opened."); + // Try to open it but don't give an error if it failed: this could be + // normal, e.g. because the user cancelled opening it, and we don't + // have any useful information to put in the error message anyhow, so + // we assume that in case of an error the appropriate message had been + // already logged. + (void)CreateDocument(filename, wxDOC_SILENT); } else // file doesn't exist { - errMsg = _("The file '%s' doesn't exist and couldn't be opened."); + OnMRUFileNotExist(n, filename); } +} - - wxASSERT_MSG( !errMsg.empty(), "should have an error message" ); - +void wxDocManager::OnMRUFileNotExist(unsigned n, const wxString& filename) +{ // remove the file which we can't open from the MRU list RemoveFileFromHistory(n); // and tell the user about it - wxLogError(errMsg + '\n' + - _("It has been removed from the most recently used files list."), + wxLogError(_("The file '%s' doesn't exist and couldn't be opened.\n" + "It has been removed from the most recently used files list."), filename); } @@ -1181,7 +1232,7 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event)) preview = new wxPrintPreview(printout, view->OnCreatePrintout(), &printDialogData); - if ( !preview->Ok() ) + if ( !preview->IsOk() ) { delete preview; wxLogError(_("Print preview creation failed.")); @@ -1254,7 +1305,13 @@ void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event) void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event) { wxDocument * const doc = GetCurrentDocument(); - event.Enable( doc && !doc->AlreadySaved() ); + event.Enable( doc && !doc->IsChildDocument() && !doc->AlreadySaved() ); +} + +void wxDocManager::OnUpdateFileSaveAs(wxUpdateUIEvent& event) +{ + wxDocument * const doc = GetCurrentDocument(); + event.Enable( doc && !doc->IsChildDocument() ); } void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event) @@ -1262,10 +1319,14 @@ void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event) wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor(); if ( !cmdproc ) { - event.Enable(false); + // If we don't have any document at all, the menu item should really be + // disabled. + if ( !GetCurrentDocument() ) + event.Enable(false); + else // But if we do have it, it might handle wxID_UNDO on its own + event.Skip(); return; } - event.Enable(cmdproc->CanUndo()); cmdproc->SetMenuStrings(); } @@ -1275,10 +1336,13 @@ void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event) wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor(); if ( !cmdproc ) { - event.Enable(false); + // Use same logic as in OnUpdateUndo() above. + if ( !GetCurrentDocument() ) + event.Enable(false); + else + event.Skip(); return; } - event.Enable(cmdproc->CanRedo()); cmdproc->SetMenuStrings(); } @@ -1350,7 +1414,7 @@ void wxDocManager::ActivateDocument(wxDocument *doc) view->Activate(true); if ( wxWindow *win = view->GetFrame() ) - win->SetFocus(); + win->Raise(); } wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags) diff --git a/Externals/wxWidgets3/src/common/dummy.cpp b/Externals/wxWidgets3/src/common/dummy.cpp index db74ef7c68..98044d0f4d 100644 --- a/Externals/wxWidgets3/src/common/dummy.cpp +++ b/Externals/wxWidgets3/src/common/dummy.cpp @@ -23,7 +23,7 @@ #pragma hdrstop #endif -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #include "wx/msw/msvcrt.h" #endif diff --git a/Externals/wxWidgets3/src/common/dynarray.cpp b/Externals/wxWidgets3/src/common/dynarray.cpp index b9b3e5c934..7859e12ee2 100644 --- a/Externals/wxWidgets3/src/common/dynarray.cpp +++ b/Externals/wxWidgets3/src/common/dynarray.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 12.09.97 -// RCS-ID: $Id: dynarray.cpp 61279 2009-07-02 09:08:50Z VZ $ +// RCS-ID: $Id: dynarray.cpp 68470 2011-07-31 12:19:51Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -28,7 +28,7 @@ #include #include // for memmove -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS // we cast the value to long from which we cast it to void * in IndexForInsert: // this can't work if the pointers are not big enough @@ -358,6 +358,9 @@ void name::insert(iterator it, const_iterator first, const_iterator last) \ return; \ Grow(nInsert); \ \ + /* old iterator could have been invalidated by Grow(). */ \ + it = begin() + nIndex; \ + \ memmove(&m_pItems[nIndex + nInsert], &m_pItems[nIndex], \ (m_nCount - nIndex)*sizeof(T)); \ for (size_t i = 0; i < nInsert; ++i, ++it, ++first) \ @@ -383,7 +386,7 @@ _WX_DEFINE_BASEARRAY(double, wxBaseArrayDouble) #pragma warning(pop) #endif -#else // wxUSE_STL +#else // wxUSE_STD_CONTAINERS #include "wx/arrstr.h" @@ -491,4 +494,4 @@ int wxSortedArrayString::Index(const wxString& str, return it - begin(); } -#endif // !wxUSE_STL/wxUSE_STL +#endif // !wxUSE_STD_CONTAINERS/wxUSE_STD_CONTAINERS diff --git a/Externals/wxWidgets3/src/common/dynlib.cpp b/Externals/wxWidgets3/src/common/dynlib.cpp index ac87179c56..61fda2dcd5 100644 --- a/Externals/wxWidgets3/src/common/dynlib.cpp +++ b/Externals/wxWidgets3/src/common/dynlib.cpp @@ -4,7 +4,7 @@ // Author: Guilhem Lavaux // Modified by: // Created: 20/07/98 -// RCS-ID: $Id: dynlib.cpp 61508 2009-07-23 20:30:22Z VZ $ +// RCS-ID: $Id: dynlib.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998 Guilhem Lavaux // 2000-2005 Vadim Zeitlin // Licence: wxWindows licence @@ -59,7 +59,7 @@ WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray) #endif // for MSW/Unix it is defined in platform-specific file -#if !(defined(__WXMSW__) || defined(__UNIX__)) || defined(__EMX__) +#if !(defined(__WINDOWS__) || defined(__UNIX__)) || defined(__EMX__) wxDllType wxDynamicLibrary::GetProgramHandle() { @@ -67,7 +67,7 @@ wxDllType wxDynamicLibrary::GetProgramHandle() return 0; } -#endif // __WXMSW__ || __UNIX__ +#endif // __WINDOWS__ || __UNIX__ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags) @@ -112,7 +112,7 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags) // for MSW and Unix this is implemented in the platform-specific file // // TODO: move the rest to os2/dlpm.cpp and mac/dlmac.cpp! -#if (!defined(__WXMSW__) && !defined(__UNIX__)) || defined(__EMX__) +#if (!defined(__WINDOWS__) && !defined(__UNIX__)) || defined(__EMX__) /* static */ void wxDynamicLibrary::Unload(wxDllType handle) @@ -124,7 +124,7 @@ void wxDynamicLibrary::Unload(wxDllType handle) #endif } -#endif // !(__WXMSW__ || __UNIX__) +#endif // !(__WINDOWS__ || __UNIX__) void *wxDynamicLibrary::DoGetSymbol(const wxString &name, bool *success) const { diff --git a/Externals/wxWidgets3/src/common/encconv.cpp b/Externals/wxWidgets3/src/common/encconv.cpp index fdfa64eb6a..e666b9f245 100644 --- a/Externals/wxWidgets3/src/common/encconv.cpp +++ b/Externals/wxWidgets3/src/common/encconv.cpp @@ -444,7 +444,7 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e { if (platform == wxPLATFORM_CURRENT) { -#if defined(__WXMSW__) +#if defined(__WINDOWS__) platform = wxPLATFORM_WINDOWS; #elif defined(__WXGTK__) || defined(__WXMOTIF__) platform = wxPLATFORM_UNIX; diff --git a/Externals/wxWidgets3/src/common/event.cpp b/Externals/wxWidgets3/src/common/event.cpp index 496e2caa85..34c3c16dde 100644 --- a/Externals/wxWidgets3/src/common/event.cpp +++ b/Externals/wxWidgets3/src/common/event.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: event.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: event.cpp 69893 2011-12-02 00:50:25Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -25,6 +25,7 @@ #endif #include "wx/event.h" +#include "wx/eventfilter.h" #include "wx/evtloop.h" #ifndef WX_PRECOMP @@ -62,11 +63,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxThreadEvent, wxEvent) #endif // wxUSE_BASE #if wxUSE_GUI IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxThreadEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxScrollWinEvent, wxEvent) @@ -155,6 +156,9 @@ const wxEventType wxEVT_NULL = wxNewEventType(); wxDEFINE_EVENT( wxEVT_IDLE, wxIdleEvent ); +// Thread event +wxDEFINE_EVENT( wxEVT_THREAD, wxThreadEvent ); + #endif // wxUSE_BASE #if wxUSE_GUI @@ -206,6 +210,7 @@ wxDEFINE_EVENT( wxEVT_AUX2_DCLICK, wxMouseEvent ); // Character input event type wxDEFINE_EVENT( wxEVT_CHAR, wxKeyEvent ); +wxDEFINE_EVENT( wxEVT_AFTER_CHAR, wxKeyEvent ); wxDEFINE_EVENT( wxEVT_CHAR_HOOK, wxKeyEvent ); wxDEFINE_EVENT( wxEVT_NAVIGATION_KEY, wxNavigationKeyEvent ); wxDEFINE_EVENT( wxEVT_KEY_DOWN, wxKeyEvent ); @@ -311,9 +316,6 @@ wxDEFINE_EVENT( wxEVT_COMMAND_ENTER, wxCommandEvent ); wxDEFINE_EVENT( wxEVT_HELP, wxHelpEvent ); wxDEFINE_EVENT( wxEVT_DETAILED_HELP, wxHelpEvent ); -// Thread event -wxDEFINE_EVENT( wxEVT_COMMAND_THREAD, wxThreadEvent ); - #endif // wxUSE_GUI #if wxUSE_BASE @@ -411,28 +413,17 @@ wxEvent& wxEvent::operator=(const wxEvent& src) // wxCommandEvent // ---------------------------------------------------------------------------- -#ifdef __VISUALC__ - // 'this' : used in base member initializer list (for m_commandString) - #pragma warning(disable:4355) -#endif - wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId) : wxEvent(theId, commandType) { m_clientData = NULL; m_clientObject = NULL; - m_extraLong = 0; - m_commandInt = 0; m_isCommandEvent = true; // the command events are propagated upwards by default m_propagationLevel = wxEVENT_PROPAGATE_MAX; } -#ifdef __VISUALC__ - #pragma warning(default:4355) -#endif - wxString wxCommandEvent::GetString() const { if (m_eventType != wxEVT_COMMAND_TEXT_UPDATED || !m_eventObject) @@ -473,6 +464,13 @@ bool wxUpdateUIEvent::CanUpdate(wxWindowBase *win) ((win->GetExtraStyle() & wxWS_EX_PROCESS_UI_UPDATES) == 0))) return false; + // Don't update children of the hidden windows: this is useless as any + // change to their state won't be seen by the user anyhow. Notice that this + // argument doesn't apply to the hidden windows (with visible parent) + // themselves as they could be shown by their EVT_UPDATE_UI handler. + if ( win->GetParent() && !win->GetParent()->IsShownOnScreen() ) + return false; + if (sm_updateInterval == -1) return false; @@ -737,22 +735,28 @@ wxKeyEvent::wxKeyEvent(wxEventType type) #if wxUSE_UNICODE m_uniChar = WXK_NONE; #endif + + InitPropagation(); } wxKeyEvent::wxKeyEvent(const wxKeyEvent& evt) : wxEvent(evt), wxKeyboardState(evt) { - m_x = evt.m_x; - m_y = evt.m_y; + DoAssignMembers(evt); - m_keyCode = evt.m_keyCode; - m_rawCode = evt.m_rawCode; - m_rawFlags = evt.m_rawFlags; + InitPropagation(); +} -#if wxUSE_UNICODE - m_uniChar = evt.m_uniChar; -#endif +wxKeyEvent::wxKeyEvent(wxEventType eventType, const wxKeyEvent& evt) + : wxEvent(evt), + wxKeyboardState(evt) +{ + DoAssignMembers(evt); + + m_eventType = eventType; + + InitPropagation(); } bool wxKeyEvent::IsKeyInCategory(int category) const @@ -1126,6 +1130,43 @@ bool wxEvtHandler::IsUnlinked() const m_nextHandler == NULL; } +wxEventFilter* wxEvtHandler::ms_filterList = NULL; + +/* static */ void wxEvtHandler::AddFilter(wxEventFilter* filter) +{ + wxCHECK_RET( filter, "NULL filter" ); + + filter->m_next = ms_filterList; + ms_filterList = filter; +} + +/* static */ void wxEvtHandler::RemoveFilter(wxEventFilter* filter) +{ + wxEventFilter* prev = NULL; + for ( wxEventFilter* f = ms_filterList; f; f = f->m_next ) + { + if ( f == filter ) + { + // Set the previous list element or the list head to the next + // element. + if ( prev ) + prev->m_next = f->m_next; + else + ms_filterList = f->m_next; + + // Also reset the next pointer in the filter itself just to avoid + // having possibly dangling pointers, even though it's not strictly + // necessary. + f->m_next = NULL; + + // Skip the assert below. + return; + } + } + + wxFAIL_MSG( "Filter not found" ); +} + #if wxUSE_THREADS bool wxEvtHandler::ProcessThreadEvent(const wxEvent& event) @@ -1354,23 +1395,24 @@ bool wxEvtHandler::TryAfter(wxEvent& event) bool wxEvtHandler::ProcessEvent(wxEvent& event) { - // The very first thing we do is to allow the application to hook into - // event processing in order to globally pre-process all events. + // The very first thing we do is to allow any registered filters to hook + // into event processing in order to globally pre-process all events. // // Note that we should only do it if we're the first event handler called // to avoid calling FilterEvent() multiple times as the event goes through // the event handler chain and possibly upwards the window hierarchy. if ( !event.WasProcessed() ) { - if ( wxTheApp ) + for ( wxEventFilter* f = ms_filterList; f; f = f->m_next ) { - int rc = wxTheApp->FilterEvent(event); - if ( rc != -1 ) + int rc = f->FilterEvent(event); + if ( rc != wxEventFilter::Event_Skip ) { - wxASSERT_MSG( rc == 1 || rc == 0, - "unexpected wxApp::FilterEvent return value" ); + wxASSERT_MSG( rc == wxEventFilter::Event_Ignore || + rc == wxEventFilter::Event_Processed, + "unexpected FilterEvent() return value" ); - return rc != 0; + return rc != wxEventFilter::Event_Ignore; } //else: proceed normally } diff --git a/Externals/wxWidgets3/src/common/evtloopcmn.cpp b/Externals/wxWidgets3/src/common/evtloopcmn.cpp index f30b3e9998..a8abd2b297 100644 --- a/Externals/wxWidgets3/src/common/evtloopcmn.cpp +++ b/Externals/wxWidgets3/src/common/evtloopcmn.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 2006-01-12 -// RCS-ID: $Id: evtloopcmn.cpp 66229 2010-11-22 01:22:56Z VZ $ +// RCS-ID: $Id: evtloopcmn.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 2006 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -82,7 +82,7 @@ bool wxEventLoopBase::Yield(bool onlyIfNeeded) } // wxEventLoopManual is unused in the other ports -#if defined(__WXMSW__) || defined(__WXDFB__) || ( ( defined(__UNIX__) && !defined(__WXOSX__) ) && wxUSE_BASE) +#if defined(__WINDOWS__) || defined(__WXDFB__) || ( ( defined(__UNIX__) && !defined(__WXOSX__) ) && wxUSE_BASE) // ============================================================================ // wxEventLoopManual implementation @@ -213,5 +213,5 @@ void wxEventLoopManual::Exit(int rc) WakeUp(); } -#endif // __WXMSW__ || __WXMAC__ || __WXDFB__ +#endif // __WINDOWS__ || __WXMAC__ || __WXDFB__ diff --git a/Externals/wxWidgets3/src/common/file.cpp b/Externals/wxWidgets3/src/common/file.cpp index 3ddfcad6ac..77e14d443f 100644 --- a/Externals/wxWidgets3/src/common/file.cpp +++ b/Externals/wxWidgets3/src/common/file.cpp @@ -5,7 +5,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 29/01/98 -// RCS-ID: $Id: file.cpp 66150 2010-11-14 12:09:59Z VZ $ +// RCS-ID: $Id: file.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -24,7 +24,7 @@ #if wxUSE_FILE // standard -#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) +#if defined(__WINDOWS__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) #define WIN32_LEAN_AND_MEAN #define NOSERVICE @@ -47,7 +47,7 @@ #define NOCRYPT #define NOMCX -#elif defined(__WXMSW__) && defined(__WXWINCE__) +#elif defined(__WINDOWS__) && defined(__WXWINCE__) #include "wx/msw/missing.h" #elif (defined(__OS2__)) #include @@ -80,8 +80,6 @@ char* mktemp( char * path ) { return path ;} #include #include -#elif defined(__WXPALMOS__) - #include "wx/palmos/missing.h" #else #error "Please specify the header with file functions declarations." #endif //Win/UNIX @@ -121,7 +119,7 @@ #define O_BINARY (0) #endif //__UNIX__ -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #include "wx/msw/mslu.h" #endif diff --git a/Externals/wxWidgets3/src/common/fileconf.cpp b/Externals/wxWidgets3/src/common/fileconf.cpp index 1ad679ce70..3604443340 100644 --- a/Externals/wxWidgets3/src/common/fileconf.cpp +++ b/Externals/wxWidgets3/src/common/fileconf.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 07.04.98 (adapted from appconf.cpp) -// RCS-ID: $Id: fileconf.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: fileconf.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1997 Karsten Ballueder & Vadim Zeitlin // Ballueder@usa.net // Licence: wxWindows licence @@ -46,7 +46,7 @@ #include "wx/stdpaths.h" -#if defined(__WXMSW__) +#if defined(__WINDOWS__) #include "wx/msw/private.h" #endif //windows.h #if defined(__WXPM__) @@ -2111,7 +2111,7 @@ static wxString FilterOutEntryName(const wxString& str) #if !wxUSE_UNICODE ((unsigned char)c < 127) && #endif // ANSI - !wxIsalnum(c) && !wxStrchr(wxT("@_/-!.*%"), c) ) + !wxIsalnum(c) && !wxStrchr(wxT("@_/-!.*%()"), c) ) { strResult += wxT('\\'); } diff --git a/Externals/wxWidgets3/src/common/filefn.cpp b/Externals/wxWidgets3/src/common/filefn.cpp index eb4b401eb8..e0663b3085 100644 --- a/Externals/wxWidgets3/src/common/filefn.cpp +++ b/Externals/wxWidgets3/src/common/filefn.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 29/01/98 -// RCS-ID: $Id: filefn.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: filefn.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998 Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -367,7 +367,7 @@ template static CharType *wxDoRealPath (CharType *path) { static const CharType SEP = wxFILE_SEP_PATH; -#ifdef __WXMSW__ +#ifdef __WINDOWS__ wxUnix2DosFilename(path); #endif if (path[0] && path[1]) { @@ -398,7 +398,7 @@ static CharType *wxDoRealPath (CharType *path) path[0] = SEP; path[1] = wxT('\0'); } -#if defined(__WXMSW__) || defined(__OS2__) +#if defined(__WINDOWS__) || defined(__OS2__) /* Check that path[2] is NULL! */ else if (path[1] == wxT(':') && !path[2]) { @@ -447,7 +447,7 @@ wxChar *wxCopyAbsolutePath(const wxString& filename) { wxString buf = ::wxGetCwd(); wxChar ch = buf.Last(); -#ifdef __WXMSW__ +#ifdef __WINDOWS__ if (ch != wxT('\\') && ch != wxT('/')) buf << wxT("\\"); #else @@ -501,7 +501,7 @@ static CharType *wxDoExpandPath(CharType *buf, const wxString& name) trimchars[3] = 0; static const CharType SEP = wxFILE_SEP_PATH; -#ifdef __WXMSW__ +#ifdef __WINDOWS__ //wxUnix2DosFilename(path); #endif @@ -521,7 +521,7 @@ static CharType *wxDoExpandPath(CharType *buf, const wxString& name) s = nm; d = lnm; -#ifdef __WXMSW__ +#ifdef __WINDOWS__ q = FALSE; #else q = nm[0] == wxT('\\') && nm[1] == wxT('~'); @@ -546,7 +546,7 @@ static CharType *wxDoExpandPath(CharType *buf, const wxString& name) else #else while ((*d++ = *s) != 0) { -# ifndef __WXMSW__ +# ifndef __WINDOWS__ if (*s == wxT('\\')) { if ((*(d - 1) = *++s)!=0) { s++; @@ -558,7 +558,7 @@ static CharType *wxDoExpandPath(CharType *buf, const wxString& name) #endif // No env variables on WinCE #ifndef __WXWINCE__ -#ifdef __WXMSW__ +#ifdef __WINDOWS__ if (*s++ == wxT('$') && (*s == wxT('{') || *s == wxT(')'))) #else if (*s++ == wxT('$')) @@ -677,7 +677,7 @@ wxContractPath (const wxString& filename, return NULL; wxStrcpy (dest, filename); -#ifdef __WXMSW__ +#ifdef __WINDOWS__ wxUnix2DosFilename(dest); #endif @@ -767,7 +767,7 @@ wxPathOnly (wxChar *path) i --; } -#if defined(__WXMSW__) || defined(__OS2__) +#if defined(__WINDOWS__) || defined(__OS2__) // Try Drive specifier if (wxIsalpha (buf[0]) && buf[1] == wxT(':')) { @@ -816,7 +816,7 @@ wxString wxPathOnly (const wxString& path) i --; } -#if defined(__WXMSW__) || defined(__OS2__) +#if defined(__WINDOWS__) || defined(__OS2__) // Try Drive specifier if (wxIsalpha (buf[0]) && buf[1] == wxT(':')) { @@ -923,7 +923,7 @@ static void wxDoDos2UnixFilename(T *s) { if (*s == wxT('\\')) *s = wxT('/'); -#ifdef __WXMSW__ +#ifdef __WINDOWS__ else *s = wxTolower(*s); // Case INDEPENDENT #endif @@ -936,14 +936,14 @@ void wxDos2UnixFilename(wchar_t *s) { wxDoDos2UnixFilename(s); } template static void -#if defined(__WXMSW__) || defined(__OS2__) +#if defined(__WINDOWS__) || defined(__OS2__) wxDoUnix2DosFilename(T *s) #else wxDoUnix2DosFilename(T *WXUNUSED(s) ) #endif { // Yes, I really mean this to happen under DOS only! JACS -#if defined(__WXMSW__) || defined(__OS2__) +#if defined(__WINDOWS__) || defined(__OS2__) if (s) while (*s) { @@ -998,8 +998,7 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil } // helper of generic implementation of wxCopyFile() -#if !(defined(__WIN32__) || defined(__OS2__) || defined(__PALMOS__)) && \ - wxUSE_FILE +#if !(defined(__WIN32__) || defined(__OS2__)) && wxUSE_FILE static bool wxDoCopyFile(wxFile& fileIn, @@ -1061,9 +1060,6 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite) #elif defined(__OS2__) if ( ::DosCopy(file1.c_str(), file2.c_str(), overwrite ? DCPY_EXISTING : 0) != 0 ) return false; -#elif defined(__PALMOS__) - // TODO with http://www.palmos.com/dev/support/docs/protein_books/Memory_Databases_Files/ - return false; #elif wxUSE_FILE // !Win32 wxStructStat fbuf; @@ -1154,7 +1150,7 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite) wxUnusedVar(overwrite); return false; -#endif // __WXMSW__ && __WIN32__ +#endif // __WINDOWS__ && __WIN32__ return true; } @@ -1173,7 +1169,7 @@ wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite) return false; } -#if !defined(__WXWINCE__) && !defined(__WXPALMOS__) +#if !defined(__WXWINCE__) // Normal system call if ( wxRename (file1, file2) == 0 ) return true; @@ -1185,6 +1181,7 @@ wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite) return true; } // Give up + wxLogSysError(_("File '%s' couldn't be renamed '%s'"), file1, file2); return false; } @@ -1199,27 +1196,24 @@ bool wxRemoveFile(const wxString& file) int res = wxRemove(file); #elif defined(__WXMAC__) int res = unlink(file.fn_str()); -#elif defined(__WXPALMOS__) - int res = 1; - // TODO with VFSFileDelete() #else int res = unlink(file.fn_str()); #endif - + if ( res ) + { + wxLogSysError(_("File '%s' couldn't be removed"), file); + } return res == 0; } bool wxMkdir(const wxString& dir, int perm) { -#if defined(__WXPALMOS__) - return false; -#else #if defined(__WXMAC__) && !defined(__UNIX__) if ( mkdir(dir.fn_str(), 0) != 0 ) // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too // for the GNU compiler -#elif (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || \ +#elif (!(defined(__WINDOWS__) || defined(__OS2__) || defined(__DOS__))) || \ (defined(__GNUWIN32__) && !defined(__MINGW32__)) || \ defined(__WINE__) || defined(__WXMICROWIN__) const wxChar *dirname = dir.c_str(); @@ -1256,16 +1250,12 @@ bool wxMkdir(const wxString& dir, int perm) } return true; -#endif // PALMOS/!PALMOS } bool wxRmdir(const wxString& dir, int WXUNUSED(flags)) { #if defined(__VMS__) return false; //to be changed since rmdir exists in VMS7.x -#elif defined(__WXPALMOS__) - // TODO with VFSFileRename() - return false; #else #if defined(__OS2__) if ( ::DosDeleteDir(dir.c_str()) != 0 ) @@ -1280,7 +1270,7 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags)) } return true; -#endif // PALMOS/!PALMOS +#endif } // does the path exists? (may have or not '/' or '\\' at the end) @@ -1299,12 +1289,7 @@ wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf) return NULL; if ( buf ) -#ifdef _PACC_VER - // work around the PalmOS pacc compiler bug - wxStrcpy(buf, filename.data()); -#else wxStrcpy(buf, filename); -#endif else buf = MYcopystring(filename); @@ -1394,11 +1379,7 @@ wxString wxFindNextFile() wxChar *wxDoGetCwd(wxChar *buf, int sz) { -#if defined(__WXPALMOS__) - // TODO - if(buf && sz>0) buf[0] = wxT('\0'); - return buf; -#elif defined(__WXWINCE__) +#if defined(__WXWINCE__) // TODO if(buf && sz>0) buf[0] = wxT('\0'); return buf; @@ -1537,6 +1518,7 @@ wxString wxGetCwd() bool wxSetWorkingDirectory(const wxString& d) { + bool success = false; #if defined(__OS2__) if (d[1] == ':') { @@ -1546,18 +1528,17 @@ bool wxSetWorkingDirectory(const wxString& d) if (d.length() == 2) return true; } - return (::DosSetCurrentDir(d.c_str()) == 0); + success = (::DosSetCurrentDir(d.c_str()) == 0); #elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__) - return (chdir(wxFNSTRINGCAST d.fn_str()) == 0); + success = (chdir(wxFNSTRINGCAST d.fn_str()) == 0); #elif defined(__WINDOWS__) #ifdef __WIN32__ #ifdef __WXWINCE__ // No equivalent in WinCE wxUnusedVar(d); - return false; #else - return (bool)(SetCurrentDirectory(d.fn_str()) != 0); + success = (SetCurrentDirectory(d.fn_str()) != 0); #endif #else // Must change drive, too. @@ -1578,12 +1559,15 @@ bool wxSetWorkingDirectory(const wxString& d) _dos_setdrive(driveNo, &noDrives); } } - bool success = (chdir(WXSTRINGCAST d) == 0); + success = (chdir(WXSTRINGCAST d) == 0); +#endif +#endif + if ( !success ) + { + wxLogSysError(_("Could not set current working directory")); + } return success; -#endif - -#endif } // Get the OS directory if appropriate (such as the Windows directory). @@ -1879,7 +1863,7 @@ bool wxIsExecutable(const wxString &path) // wxFileKind wxGetFileKind(int fd) { -#if defined __WXMSW__ && !defined __WXWINCE__ && defined wxGetOSFHandle +#if defined __WINDOWS__ && !defined __WXWINCE__ && defined wxGetOSFHandle switch (::GetFileType(wxGetOSFHandle(fd)) & ~FILE_TYPE_REMOTE) { case FILE_TYPE_CHAR: diff --git a/Externals/wxWidgets3/src/common/filehistorycmn.cpp b/Externals/wxWidgets3/src/common/filehistorycmn.cpp index 0cc23ac338..0ce3bd6a58 100644 --- a/Externals/wxWidgets3/src/common/filehistorycmn.cpp +++ b/Externals/wxWidgets3/src/common/filehistorycmn.cpp @@ -3,7 +3,7 @@ // Purpose: wxFileHistory class // Author: Julian Smart, Vaclav Slavik, Vadim Zeitlin // Created: 2010-05-03 -// RCS-ID: $Id: filehistorycmn.cpp 64240 2010-05-07 06:45:48Z VS $ +// RCS-ID: $Id: filehistorycmn.cpp 70503 2012-02-03 17:27:13Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -68,15 +68,36 @@ wxFileHistoryBase::wxFileHistoryBase(size_t maxFiles, wxWindowID idBase) m_idBase = idBase; } +/* static */ +wxString wxFileHistoryBase::NormalizeFileName(const wxFileName& fn) +{ + // We specifically exclude wxPATH_NORM_LONG here as it can take a long time + // (several seconds) for network file paths under MSW, resulting in huge + // delays when opening a program using wxFileHistory. We also exclude + // wxPATH_NORM_ENV_VARS as the file names here are supposed to be "real" + // file names and not have any environment variables in them. + wxFileName fnNorm(fn); + fnNorm.Normalize(wxPATH_NORM_DOTS | + wxPATH_NORM_TILDE | + wxPATH_NORM_CASE | + wxPATH_NORM_ABSOLUTE); + return fnNorm.GetFullPath(); +} + void wxFileHistoryBase::AddFileToHistory(const wxString& file) { - // check if we don't already have this file + // Check if we don't already have this file. Notice that we avoid + // wxFileName::operator==(wxString) here as it converts the string to + // wxFileName and then normalizes it using all normalizations which is too + // slow (see the comment above), so we use our own quick normalization + // functions and a string comparison. const wxFileName fnNew(file); + const wxString newFile = NormalizeFileName(fnNew); size_t i, numFiles = m_fileHistory.size(); for ( i = 0; i < numFiles; i++ ) { - if ( fnNew == m_fileHistory[i] ) + if ( newFile == NormalizeFileName(m_fileHistory[i]) ) { // we do have it, move it to the top of the history RemoveFileFromHistory(i); diff --git a/Externals/wxWidgets3/src/common/filename.cpp b/Externals/wxWidgets3/src/common/filename.cpp index 539a8f68d9..0614b8047c 100644 --- a/Externals/wxWidgets3/src/common/filename.cpp +++ b/Externals/wxWidgets3/src/common/filename.cpp @@ -4,7 +4,7 @@ // Author: Robert Roebling, Vadim Zeitlin // Modified by: // Created: 28.12.2000 -// RCS-ID: $Id: filename.cpp 66996 2011-02-22 13:26:06Z VZ $ +// RCS-ID: $Id: filename.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 2000 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -77,7 +77,7 @@ #endif #ifndef WX_PRECOMP - #ifdef __WXMSW__ + #ifdef __WINDOWS__ #include "wx/msw/wrapwin.h" // For GetShort/LongPathName #endif #include "wx/dynarray.h" @@ -98,7 +98,7 @@ #include "wx/msw/gccpriv.h" #endif -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #include "wx/msw/private.h" #endif @@ -148,6 +148,12 @@ #define MAX_PATH _MAX_PATH #endif +#ifndef S_ISREG + #define S_ISREG(mode) ((mode) & S_IFREG) +#endif +#ifndef S_ISDIR + #define S_ISDIR(mode) ((mode) & S_IFDIR) +#endif #if wxUSE_LONGLONG extern const wxULongLong wxInvalidSize = (unsigned)-1; @@ -593,6 +599,117 @@ wxFileName wxFileName::DirName(const wxString& dir, wxPathFormat format) // existence tests // ---------------------------------------------------------------------------- +namespace +{ + +// Flags for wxFileSystemObjectExists() asking it to check for: +enum +{ + wxFileSystemObject_File = 1, // file existence + wxFileSystemObject_Dir = 2, // directory existence + wxFileSystemObject_Other = 4, // existence of something else, e.g. + // device, socket, FIFO under Unix + wxFileSystemObject_Any = 7 // existence of anything at all +}; + +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) + +void RemoveTrailingSeparatorsFromPath(wxString& strPath) +{ + // Windows fails to find directory named "c:\dir\" even if "c:\dir" exists, + // so remove all trailing backslashes from the path - but don't do this for + // the paths "d:\" (which are different from "d:"), for just "\" or for + // windows unique volume names ("\\?\Volume{GUID}\") + while ( wxEndsWithPathSeparator( strPath ) ) + { + size_t len = strPath.length(); + if ( len == 1 || (len == 3 && strPath[len - 2] == wxT(':')) || + (len == wxMSWUniqueVolumePrefixLength && + wxFileName::IsMSWUniqueVolumeNamePath(strPath))) + { + break; + } + + strPath.Truncate(len - 1); + } +} + +#endif // __WINDOWS__ || __OS2__ + +bool wxFileSystemObjectExists(const wxString& path, int flags) +{ + // Should the existence of file/directory with this name be accepted, i.e. + // result in the true return value from this function? + const bool acceptFile = (flags & wxFileSystemObject_File) != 0; + const bool acceptDir = (flags & wxFileSystemObject_Dir) != 0; + + wxString strPath(path); + +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) + if ( acceptDir ) + { + // Ensure that the path doesn't have any trailing separators when + // checking for directories. + RemoveTrailingSeparatorsFromPath(strPath); + } + + // we must use GetFileAttributes() instead of the ANSI C functions because + // it can cope with network (UNC) paths unlike them + DWORD ret = ::GetFileAttributes(path.t_str()); + + if ( ret == INVALID_FILE_ATTRIBUTES ) + return false; + + if ( ret & FILE_ATTRIBUTE_DIRECTORY ) + return acceptDir; + + // Anything else must be a file (perhaps we should check for + // FILE_ATTRIBUTE_REPARSE_POINT?) + return acceptFile; +#elif defined(__OS2__) + if ( acceptDir ) + { + // OS/2 can't handle "d:", it wants either "d:\" or "d:." + if (strPath.length() == 2 && strPath[1u] == wxT(':')) + strPath << wxT('.'); + } + + FILESTATUS3 Info = {{0}}; + APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD, + (void*) &Info, sizeof(FILESTATUS3)); + + if ( rc == NO_ERROR ) + { + if ( Info.attrFile & FILE_DIRECTORY ) + return acceptDir; + else + return acceptFile; + } + + // We consider that the path must exist if we get a sharing violation for + // it but we don't know what is it in this case. + if ( rc == ERROR_SHARING_VIOLATION ) + return flags & wxFileSystemObject_Other; + + // Any other error (usually ERROR_PATH_NOT_FOUND), means there is nothing + // there. + return false; +#else // Non-MSW, non-OS/2 + wxStructStat st; + if ( wxStat(strPath, &st) != 0 ) + return false; + + if ( S_ISREG(st.st_mode) ) + return acceptFile; + if ( S_ISDIR(st.st_mode) ) + return acceptDir; + + return flags & wxFileSystemObject_Other; +#endif // Platforms +} + +} // anonymous namespace + bool wxFileName::FileExists() const { return wxFileName::FileExists( GetFullPath() ); @@ -601,27 +718,7 @@ bool wxFileName::FileExists() const /* static */ bool wxFileName::FileExists( const wxString &filePath ) { -#if defined(__WXPALMOS__) - return false; -#elif defined(__WIN32__) && !defined(__WXMICROWIN__) - // we must use GetFileAttributes() instead of the ANSI C functions because - // it can cope with network (UNC) paths unlike them - DWORD ret = ::GetFileAttributes(filePath.t_str()); - - return (ret != INVALID_FILE_ATTRIBUTES) && !(ret & FILE_ATTRIBUTE_DIRECTORY); -#else // !__WIN32__ - #ifndef S_ISREG - #define S_ISREG(mode) ((mode) & S_IFREG) - #endif - wxStructStat st; - - return (wxStat( filePath, &st) == 0 && S_ISREG(st.st_mode)) -#ifdef __OS2__ - || (errno == EACCES) // if access is denied something with that name - // exists and is opened in exclusive mode. -#endif - ; -#endif // __WIN32__/!__WIN32__ + return wxFileSystemObjectExists(filePath, wxFileSystemObject_File); } bool wxFileName::DirExists() const @@ -632,59 +729,13 @@ bool wxFileName::DirExists() const /* static */ bool wxFileName::DirExists( const wxString &dirPath ) { - wxString strPath(dirPath); + return wxFileSystemObjectExists(dirPath, wxFileSystemObject_Dir); +} -#if defined(__WINDOWS__) || defined(__OS2__) - // Windows fails to find directory named "c:\dir\" even if "c:\dir" exists, - // so remove all trailing backslashes from the path - but don't do this for - // the paths "d:\" (which are different from "d:"), for just "\" or for - // windows unique volume names ("\\?\Volume{GUID}\") - while ( wxEndsWithPathSeparator(strPath) ) - { - size_t len = strPath.length(); - if ( len == 1 || (len == 3 && strPath[len - 2] == wxT(':')) || - (len == wxMSWUniqueVolumePrefixLength && - wxFileName::IsMSWUniqueVolumeNamePath(strPath))) - { - break; - } - - strPath.Truncate(len - 1); - } -#endif // __WINDOWS__ - -#ifdef __OS2__ - // OS/2 can't handle "d:", it wants either "d:\" or "d:." - if (strPath.length() == 2 && strPath[1u] == wxT(':')) - strPath << wxT('.'); -#endif - -#if defined(__WXPALMOS__) - return false; -#elif defined(__WIN32__) && !defined(__WXMICROWIN__) - // stat() can't cope with network paths - DWORD ret = ::GetFileAttributes(strPath.t_str()); - - return (ret != INVALID_FILE_ATTRIBUTES) && (ret & FILE_ATTRIBUTE_DIRECTORY); -#elif defined(__OS2__) - FILESTATUS3 Info = {{0}}; - APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD, - (void*) &Info, sizeof(FILESTATUS3)); - - return ((rc == NO_ERROR) && (Info.attrFile & FILE_DIRECTORY)) || - (rc == ERROR_SHARING_VIOLATION); - // If we got a sharing violation, there must be something with this name. -#else // !__WIN32__ - - wxStructStat st; -#ifndef __VISAGECPP__ - return wxStat(strPath, &st) == 0 && ((st.st_mode & S_IFMT) == S_IFDIR); -#else - // S_IFMT not supported in VA compilers.. st_mode is a 2byte value only - return wxStat(strPath, &st) == 0 && (st.st_mode == S_IFDIR); -#endif - -#endif // __WIN32__/!__WIN32__ +/* static */ +bool wxFileName::Exists(const wxString& path) +{ + return wxFileSystemObjectExists(path, wxFileSystemObject_Any); } // ---------------------------------------------------------------------------- @@ -809,7 +860,7 @@ static bool wxTempOpen(wxFFile *file, const wxString& path, bool *deleteOnClose) int fd = wxTempOpen(path, deleteOnClose); if (fd == -1) return false; - file->Attach(wx_fdopen(fd, "w+b")); + file->Attach(wx_fdopen(fd, "w+b"), path); return file->IsOpened(); #endif // wx_fdopen } @@ -920,7 +971,7 @@ static wxString wxCreateTempImpl( if ( ffileTemp ) { #ifdef wx_fdopen - ffileTemp->Attach(wx_fdopen(fdTemp, "r+b")); + ffileTemp->Attach(wx_fdopen(fdTemp, "r+b"), path); #else ffileTemp->Open(path, wxT("r+b")); close(fdTemp); @@ -950,7 +1001,7 @@ static wxString wxCreateTempImpl( } #else // !HAVE_MKTEMP (includes __DOS__) // generate the unique file name ourselves - #if !defined(__DOS__) && !defined(__PALMOS__) && (!defined(__MWERKS__) || defined(__DARWIN__) ) + #if !defined(__DOS__) && (!defined(__MWERKS__) || defined(__DARWIN__) ) path << (unsigned int)getpid(); #endif @@ -1267,7 +1318,7 @@ bool wxFileName::Rmdir(int flags) const bool wxFileName::Rmdir(const wxString& dir, int flags) { -#ifdef __WXMSW__ +#ifdef __WINDOWS__ if ( flags & wxPATH_RMDIR_RECURSIVE ) { // SHFileOperation needs double null termination string @@ -1303,9 +1354,9 @@ bool wxFileName::Rmdir(const wxString& dir, int flags) return true; } else if ( flags & wxPATH_RMDIR_FULL ) -#else // !__WXMSW__ +#else // !__WINDOWS__ if ( flags != 0 ) // wxPATH_RMDIR_FULL or wxPATH_RMDIR_RECURSIVE -#endif // !__WXMSW__ +#endif // !__WINDOWS__ { wxString path(dir); if ( path.Last() != wxFILE_SEP_PATH ) @@ -1326,7 +1377,7 @@ bool wxFileName::Rmdir(const wxString& dir, int flags) cont = d.GetNext(&filename); } -#ifndef __WXMSW__ +#ifndef __WINDOWS__ if ( flags & wxPATH_RMDIR_RECURSIVE ) { // delete all files too @@ -1337,7 +1388,7 @@ bool wxFileName::Rmdir(const wxString& dir, int flags) cont = d.GetNext(&filename); } } -#endif // !__WXMSW__ +#endif // !__WINDOWS__ } return ::wxRmdir(dir); @@ -1743,8 +1794,16 @@ bool wxFileName::SameAs(const wxFileName& filepath, wxPathFormat format) const if ( fn1.GetFullPath() == fn2.GetFullPath() ) return true; - // TODO: compare inodes for Unix, this works even when filenames are - // different but files are the same (symlinks) (VZ) +#if defined(__UNIX__) + wxStructStat st1, st2; + if ( wxStat(fn1.GetFullPath(), &st1) == 0 && + wxStat(fn2.GetFullPath(), &st2) == 0 ) + { + if ( st1.st_ino == st2.st_ino && st1.st_dev == st2.st_dev ) + return true; + } + //else: It's not an error if one or both files don't exist. +#endif // defined __UNIX__ return false; } @@ -2063,7 +2122,7 @@ wxString wxFileName::GetShortPath() const { wxString path(GetFullPath()); -#if defined(__WXMSW__) && defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) +#if defined(__WINDOWS__) && defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) DWORD sz = ::GetShortPathName(path.t_str(), NULL, 0); if ( sz != 0 ) { @@ -2213,7 +2272,7 @@ wxPathFormat wxFileName::GetFormat( wxPathFormat format ) { if (format == wxPATH_NATIVE) { -#if defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__) +#if defined(__WINDOWS__) || defined(__OS2__) || defined(__DOS__) format = wxPATH_DOS; #elif defined(__VMS) format = wxPATH_VMS; @@ -2607,12 +2666,14 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess, wxStructStat stBuf; if ( wxStat( GetFullPath(), &stBuf) == 0 ) { + // Android defines st_*time fields as unsigned long, but time_t as long, + // hence the static_casts. if ( dtAccess ) - dtAccess->Set(stBuf.st_atime); + dtAccess->Set(static_cast(stBuf.st_atime)); if ( dtMod ) - dtMod->Set(stBuf.st_mtime); + dtMod->Set(static_cast(stBuf.st_mtime)); if ( dtCreate ) - dtCreate->Set(stBuf.st_ctime); + dtCreate->Set(static_cast(stBuf.st_ctime)); return true; } @@ -2643,10 +2704,7 @@ wxULongLong wxFileName::GetSize(const wxString &filename) if (!wxFileExists(filename)) return wxInvalidSize; -#if defined(__WXPALMOS__) - // TODO - return wxInvalidSize; -#elif defined(__WIN32__) +#if defined(__WIN32__) wxFileHandle f(filename, wxFileHandle::ReadAttr); if (!f.IsOk()) return wxInvalidSize; diff --git a/Externals/wxWidgets3/src/common/filepickercmn.cpp b/Externals/wxWidgets3/src/common/filepickercmn.cpp index b57466283b..6044dffa6d 100644 --- a/Externals/wxWidgets3/src/common/filepickercmn.cpp +++ b/Externals/wxWidgets3/src/common/filepickercmn.cpp @@ -4,7 +4,7 @@ // Author: Francesco Montorsi (readapted code written by Vadim Zeitlin) // Modified by: // Created: 15/04/2006 -// RCS-ID: $Id: filepickercmn.cpp 61508 2009-07-23 20:30:22Z VZ $ +// RCS-ID: $Id: filepickercmn.cpp 68920 2011-08-27 14:11:20Z VZ $ // Copyright: (c) Vadim Zeitlin, Francesco Montorsi // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -183,6 +183,30 @@ void wxFileDirPickerCtrlBase::OnFileDirChange(wxFileDirPickerEvent &ev) IMPLEMENT_DYNAMIC_CLASS(wxFilePickerCtrl, wxPickerBase) +bool wxFilePickerCtrl::Create(wxWindow *parent, + wxWindowID id, + const wxString& path, + const wxString& message, + const wxString& wildcard, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) +{ + if ( !wxFileDirPickerCtrlBase::CreateBase + ( + parent, id, path, message, wildcard, + pos, size, style, validator, name + ) ) + return false; + + if ( HasTextCtrl() ) + GetTextCtrl()->AutoCompleteFileNames(); + + return true; +} + bool wxFilePickerCtrl::CheckPath(const wxString& path) const { // if wxFLP_SAVE was given or wxFLP_FILE_MUST_EXIST has NOT been given we @@ -207,6 +231,29 @@ wxString wxFilePickerCtrl::GetTextCtrlValue() const #if wxUSE_DIRPICKERCTRL IMPLEMENT_DYNAMIC_CLASS(wxDirPickerCtrl, wxPickerBase) +bool wxDirPickerCtrl::Create(wxWindow *parent, + wxWindowID id, + const wxString& path, + const wxString& message, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) +{ + if ( !wxFileDirPickerCtrlBase::CreateBase + ( + parent, id, path, message, wxString(), + pos, size, style, validator, name + ) ) + return false; + + if ( HasTextCtrl() ) + GetTextCtrl()->AutoCompleteDirectories(); + + return true; +} + bool wxDirPickerCtrl::CheckPath(const wxString& path) const { // if wxDIRP_DIR_MUST_EXIST has NOT been given we must accept any path diff --git a/Externals/wxWidgets3/src/common/filesys.cpp b/Externals/wxWidgets3/src/common/filesys.cpp index 1460be8b87..82e1ada6c4 100644 --- a/Externals/wxWidgets3/src/common/filesys.cpp +++ b/Externals/wxWidgets3/src/common/filesys.cpp @@ -3,7 +3,7 @@ // Purpose: wxFileSystem class - interface for opening files // Author: Vaclav Slavik // Copyright: (c) 1999 Vaclav Slavik -// CVS-ID: $Id: filesys.cpp 66728 2011-01-22 14:38:36Z DS $ +// CVS-ID: $Id: filesys.cpp 70796 2012-03-04 00:29:31Z VZ $ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -255,7 +255,7 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& #else #error One of wxUSE_FILE or wxUSE_FFILE must be set to 1 for wxFSHandler to work #endif - if ( !is->Ok() ) + if ( !is->IsOk() ) { delete is; return NULL; @@ -635,11 +635,11 @@ wxFileName wxFileSystem::URLToFileName(const wxString& url) path = wxURI::Unescape(path); -#ifdef __WXMSW__ +#ifdef __WINDOWS__ // file urls either start with a forward slash (local harddisk), // otherwise they have a servername/sharename notation, // which only exists on msw and corresponds to a unc - if ( path[0u] == wxT('/') && path [1u] != wxT('/')) + if ( path.length() > 1 && (path[0u] == wxT('/') && path [1u] != wxT('/')) ) { path = path.Mid(1); } diff --git a/Externals/wxWidgets3/src/common/fmapbase.cpp b/Externals/wxWidgets3/src/common/fmapbase.cpp index d75e991a17..56ce5f73a6 100644 --- a/Externals/wxWidgets3/src/common/fmapbase.cpp +++ b/Externals/wxWidgets3/src/common/fmapbase.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 21.06.2003 (extracted from common/fontmap.cpp) -// RCS-ID: $Id: fmapbase.cpp 65062 2010-07-23 23:33:16Z VZ $ +// RCS-ID: $Id: fmapbase.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1999-2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -34,7 +34,7 @@ #include "wx/wxcrtvararg.h" #endif //WX_PRECOMP -#if defined(__WXMSW__) +#if defined(__WINDOWS__) #include "wx/msw/private.h" // includes windows.h for LOGFONT #include "wx/msw/winundef.h" #endif @@ -97,9 +97,6 @@ static const wxFontEncoding gs_encodings[] = wxFONTENCODING_UTF32LE, wxFONTENCODING_EUC_JP, wxFONTENCODING_DEFAULT, - wxFONTENCODING_BIG5, - wxFONTENCODING_SHIFT_JIS, - wxFONTENCODING_GB2312, wxFONTENCODING_ISO2022_JP, wxFONTENCODING_MACROMAN, @@ -166,10 +163,10 @@ static const char* const gs_encodingDescs[] = wxTRANSLATE( "KOI8-U" ), wxTRANSLATE( "Windows/DOS OEM Cyrillic (CP 866)" ), wxTRANSLATE( "Windows Thai (CP 874)" ), - wxTRANSLATE( "Windows Japanese (CP 932)" ), - wxTRANSLATE( "Windows Chinese Simplified (CP 936)" ), + wxTRANSLATE( "Windows Japanese (CP 932) or Shift-JIS" ), + wxTRANSLATE( "Windows Chinese Simplified (CP 936) or GB-2312" ), wxTRANSLATE( "Windows Korean (CP 949)" ), - wxTRANSLATE( "Windows Chinese Traditional (CP 950)" ), + wxTRANSLATE( "Windows Chinese Traditional (CP 950) or Big-5" ), wxTRANSLATE( "Windows Central European (CP 1250)" ), wxTRANSLATE( "Windows Cyrillic (CP 1251)" ), wxTRANSLATE( "Windows Western European (CP 1252)" ), @@ -194,9 +191,6 @@ static const char* const gs_encodingDescs[] = #endif // WORDS_BIGENDIAN wxTRANSLATE( "Extended Unix Codepage for Japanese (EUC-JP)" ), wxTRANSLATE( "US-ASCII" ), - wxTRANSLATE( "BIG5" ), - wxTRANSLATE( "SHIFT-JIS" ), - wxTRANSLATE( "GB-2312" ), wxTRANSLATE( "ISO-2022-JP" ), wxTRANSLATE( "MacRoman" ), @@ -242,7 +236,7 @@ static const char* const gs_encodingDescs[] = }; // and the internal names (these are not translated on purpose!) -static const wxChar* const gs_encodingNames[WXSIZEOF(gs_encodingDescs)][9] = +static const wxChar* const gs_encodingNames[][9] = { // names from the columns correspond to these OS: // Linux Solaris and IRIX HP-UX AIX @@ -271,10 +265,10 @@ static const wxChar* const gs_encodingNames[WXSIZEOF(gs_encodingDescs)][9] = { wxT( "WINDOWS-866" ), wxT( "CP866" ), NULL }, { wxT( "WINDOWS-874" ), wxT( "CP874" ), wxT( "MS874" ), wxT( "IBM-874" ), NULL }, - { wxT( "WINDOWS-932" ), wxT( "CP932" ), wxT( "MS932" ), wxT( "IBM-932" ), NULL }, - { wxT( "WINDOWS-936" ), wxT( "CP936" ), wxT( "MS936" ), wxT( "IBM-936" ), NULL }, + { wxT( "WINDOWS-932" ), wxT( "CP932" ), wxT( "MS932" ), wxT( "IBM-932" ), wxT( "SJIS" ), wxT( "SHIFT-JIS" ), wxT( "SHIFT_JIS" ), NULL }, + { wxT( "WINDOWS-936" ), wxT( "CP936" ), wxT( "MS936" ), wxT( "IBM-936" ), wxT( "GB2312" ), NULL }, { wxT( "WINDOWS-949" ), wxT( "CP949" ), wxT( "MS949" ), wxT( "IBM-949" ), wxT( "EUC-KR" ), wxT( "eucKR" ), wxT( "euc_kr" ), NULL }, - { wxT( "WINDOWS-950" ), wxT( "CP950" ), wxT( "MS950" ), wxT( "IBM-950" ), NULL }, + { wxT( "WINDOWS-950" ), wxT( "CP950" ), wxT( "MS950" ), wxT( "IBM-950" ), wxT( "BIG5" ), wxT( "BIG-5" ), wxT( "BIG-FIVE" ), NULL }, { wxT( "WINDOWS-1250" ),wxT( "CP1250" ),wxT( "MS1250" ),wxT( "IBM-1250" ),NULL }, { wxT( "WINDOWS-1251" ),wxT( "CP1251" ),wxT( "MS1251" ),wxT( "IBM-1251" ),NULL }, { wxT( "WINDOWS-1252" ),wxT( "CP1252" ),wxT( "MS1252" ),wxT( "IBM-1252" ),NULL }, @@ -305,9 +299,6 @@ static const wxChar* const gs_encodingNames[WXSIZEOF(gs_encodingDescs)][9] = { wxT( "US-ASCII" ), wxT( "ASCII" ), wxT("C"), wxT("POSIX"), wxT("ANSI_X3.4-1968"), wxT("646"), wxT("roman8"), wxT( "" ), NULL }, - { wxT( "BIG5" ), wxT("big5"), NULL }, - { wxT( "SJIS" ), wxT( "SHIFT-JIS" ), wxT( "SHIFT_JIS" ), NULL }, - { wxT( "GB2312" ), NULL }, { wxT( "ISO-2022-JP" ), NULL }, diff --git a/Externals/wxWidgets3/src/common/fontcmn.cpp b/Externals/wxWidgets3/src/common/fontcmn.cpp index df3b3e8db0..0d27ca12f0 100644 --- a/Externals/wxWidgets3/src/common/fontcmn.cpp +++ b/Externals/wxWidgets3/src/common/fontcmn.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 20.09.99 -// RCS-ID: $Id: fontcmn.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: fontcmn.cpp 70564 2012-02-10 23:34:45Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -29,6 +29,7 @@ #ifndef WX_PRECOMP #include "wx/dc.h" #include "wx/intl.h" + #include "wx/math.h" #include "wx/dcscreen.h" #include "wx/log.h" #include "wx/gdicmn.h" @@ -112,6 +113,8 @@ wxPROPERTY( Weight, wxFontWeight, SetWeight, GetWeight, (wxFontWeight)wxNORMAL, wxT("Helpstring"), wxT("group")) // wxFontWeight wxPROPERTY( Underlined, bool, SetUnderlined, GetUnderlined, false, 0 /*flags*/, \ wxT("Helpstring"), wxT("group")) +wxPROPERTY( Strikethrough, bool, SetStrikethrough, GetStrikethrough, false, 0, \ + wxT("Helpstring"), wxT("group")) wxPROPERTY( Face, wxString, SetFaceName, GetFaceName, wxEMPTY_PARAMETER_VALUE, \ 0 /*flags*/, wxT("Helpstring"), wxT("group")) wxPROPERTY( Encoding, wxFontEncoding, SetEncoding, GetEncoding, \ @@ -127,33 +130,6 @@ wxEMPTY_HANDLERS_TABLE(wxFont) // implementation // ============================================================================ -// ---------------------------------------------------------------------------- -// helper functions -// ---------------------------------------------------------------------------- - -static inline int flags2Style(int flags) -{ - return flags & wxFONTFLAG_ITALIC - ? wxFONTSTYLE_ITALIC - : flags & wxFONTFLAG_SLANT - ? wxFONTSTYLE_SLANT - : wxFONTSTYLE_NORMAL; -} - -static inline int flags2Weight(int flags) -{ - return flags & wxFONTFLAG_LIGHT - ? wxFONTWEIGHT_LIGHT - : flags & wxFONTFLAG_BOLD - ? wxFONTWEIGHT_BOLD - : wxFONTWEIGHT_NORMAL; -} - -static inline bool flags2Underlined(int flags) -{ - return (flags & wxFONTFLAG_UNDERLINED) != 0; -} - // ---------------------------------------------------------------------------- // wxFontBase // ---------------------------------------------------------------------------- @@ -208,8 +184,11 @@ wxFont *wxFontBase::New(int pointSize, const wxString& face, wxFontEncoding encoding) { - return New(pointSize, family, flags2Style(flags), flags2Weight(flags), - flags2Underlined(flags), face, encoding); + return New(pointSize, family, + GetStyleFromFlags(flags), + GetWeightFromFlags(flags), + GetUnderlinedFromFlags(flags), + face, encoding); } /* static */ @@ -219,8 +198,11 @@ wxFont *wxFontBase::New(const wxSize& pixelSize, const wxString& face, wxFontEncoding encoding) { - return New(pixelSize, family, flags2Style(flags), flags2Weight(flags), - flags2Underlined(flags), face, encoding); + return New(pixelSize, family, + GetStyleFromFlags(flags), + GetWeightFromFlags(flags), + GetUnderlinedFromFlags(flags), + face, encoding); } /* static */ @@ -327,6 +309,7 @@ void wxFontBase::DoSetNativeFontInfo(const wxNativeFontInfo& info) SetStyle(info.style); SetWeight(info.weight); SetUnderlined(info.underlined); + SetStrikethrough(info.strikethrough); SetFaceName(info.faceName); SetEncoding(info.encoding); #else @@ -414,6 +397,7 @@ bool wxFontBase::operator==(const wxFont& font) const GetStyle() == font.GetStyle() && GetWeight() == font.GetWeight() && GetUnderlined() == font.GetUnderlined() && + GetStrikethrough() == font.GetStrikethrough() && GetFaceName().IsSameAs(font.GetFaceName(), false) && GetEncoding() == font.GetEncoding() ); @@ -511,7 +495,7 @@ int wxFontBase::AdjustToSymbolicSize(wxFontSymbolicSize size, int base) WrongFontSizeFactorsSize ); - return factors[size - wxFONTSIZE_XX_SMALL]*base; + return wxRound(factors[size - wxFONTSIZE_XX_SMALL]*base); } wxFont& wxFont::MakeBold() @@ -553,6 +537,19 @@ wxFont wxFont::Underlined() const return font; } +wxFont wxFont::Strikethrough() const +{ + wxFont font(*this); + font.MakeStrikethrough(); + return font; +} + +wxFont& wxFont::MakeStrikethrough() +{ + SetStrikethrough(true); + return *this; +} + wxFont& wxFont::Scale(float x) { SetPointSize(int(x*GetPointSize() + 0.5)); @@ -597,19 +594,22 @@ void wxNativeFontInfo::SetFaceName(const wxArrayString& facenames) // These are the generic forms of FromString()/ToString. // -// convert to/from the string representation: format is -// version;pointsize;family;style;weight;underlined;facename;encoding +// convert to/from the string representation: the general format is +// "version;the rest..." with currently defined versions being: +// +// 0;pointsize;family;style;weight;underlined;facename;encoding +// 1;pointsize;family;style;weight;underlined;strikethrough;facename;encoding bool wxNativeFontInfo::FromString(const wxString& s) { long l; + unsigned long version; wxStringTokenizer tokenizer(s, wxT(";")); wxString token = tokenizer.GetNextToken(); - // - // Ignore the version for now - // + if ( !token.ToULong(&version) || version > 1 ) + return false; token = tokenizer.GetNextToken(); if ( !token.ToLong(&l) ) @@ -636,6 +636,14 @@ bool wxNativeFontInfo::FromString(const wxString& s) return false; underlined = l != 0; + if ( version == 1 ) + { + token = tokenizer.GetNextToken(); + if ( !token.ToLong(&l) ) + return false; + strikethrough = l != 0; + } + faceName = tokenizer.GetNextToken(); #ifndef __WXMAC__ @@ -655,13 +663,14 @@ wxString wxNativeFontInfo::ToString() const { wxString s; - s.Printf(wxT("%d;%d;%d;%d;%d;%d;%s;%d"), - 0, // version + s.Printf(wxT("%d;%d;%d;%d;%d;%d;%d;%s;%d"), + 1, // version pointSize, family, (int)style, (int)weight, underlined, + strikethrough, faceName.GetData(), (int)encoding); @@ -675,6 +684,7 @@ void wxNativeFontInfo::Init() style = wxFONTSTYLE_NORMAL; weight = wxFONTWEIGHT_NORMAL; underlined = false; + strikethrough = false; faceName.clear(); encoding = wxFONTENCODING_DEFAULT; } @@ -699,6 +709,11 @@ bool wxNativeFontInfo::GetUnderlined() const return underlined; } +bool wxNativeFontInfo::GetStrikethrough() const +{ + return strikethrough; +} + wxString wxNativeFontInfo::GetFaceName() const { return faceName; @@ -734,6 +749,11 @@ void wxNativeFontInfo::SetUnderlined(bool underlined_) underlined = underlined_; } +void wxNativeFontInfo::SetStrikethrough(bool strikethrough_) +{ + strikethrough = strikethrough_; +} + bool wxNativeFontInfo::SetFaceName(const wxString& facename_) { faceName = facename_; @@ -770,6 +790,11 @@ wxString wxNativeFontInfo::ToUserString() const desc << _("underlined"); } + if ( GetStrikethrough() ) + { + desc << _("strikethrough"); + } + switch ( GetWeight() ) { default: @@ -942,6 +967,10 @@ bool wxNativeFontInfo::FromUserString(const wxString& s) { SetUnderlined(true); } + else if ( token == wxT("strikethrough") || token == _("strikethrough") ) + { + SetStrikethrough(true); + } else if ( token == wxT("light") || token == _("light") ) { SetWeight(wxFONTWEIGHT_LIGHT); diff --git a/Externals/wxWidgets3/src/common/fontmgrcmn.cpp b/Externals/wxWidgets3/src/common/fontmgrcmn.cpp index 1e89dde607..527352373c 100644 --- a/Externals/wxWidgets3/src/common/fontmgrcmn.cpp +++ b/Externals/wxWidgets3/src/common/fontmgrcmn.cpp @@ -3,7 +3,7 @@ // Purpose: font management for ports that don't have their own // Author: Vaclav Slavik // Created: 2006-11-18 -// RCS-ID: $Id: fontmgrcmn.cpp 62349 2009-10-09 13:04:59Z VZ $ +// RCS-ID: $Id: fontmgrcmn.cpp 70353 2012-01-15 14:46:41Z VZ $ // Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // (c) 2006 REA Elektronik GmbH // Licence: wxWindows licence @@ -123,8 +123,8 @@ wxFontBundleBase::GetFaceForFont(const wxFontMgrFontRefData& font) const type |= FaceType_Bold; // FIXME -- this should read "if ( font->GetStyle() == wxITALIC )", - // but since MGL neither DFB supports slant, we try to display it with - // italic face (better than nothing...) + // but since DFB doesn't support slant, we try to display it with italic + // face (better than nothing...) if ( font.GetStyle() == wxITALIC || font.GetStyle() == wxSLANT ) { if ( HasFace((FaceType)(type | FaceType_Italic)) ) diff --git a/Externals/wxWidgets3/src/common/fontpickercmn.cpp b/Externals/wxWidgets3/src/common/fontpickercmn.cpp index 673a6e6417..5d2c33c8a9 100644 --- a/Externals/wxWidgets3/src/common/fontpickercmn.cpp +++ b/Externals/wxWidgets3/src/common/fontpickercmn.cpp @@ -4,7 +4,7 @@ // Author: Francesco Montorsi // Modified by: // Created: 15/04/2006 -// RCS-ID: $Id: fontpickercmn.cpp 58718 2009-02-07 18:59:25Z VZ $ +// RCS-ID: $Id: fontpickercmn.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) Francesco Montorsi // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -137,7 +137,7 @@ void wxFontPickerCtrl::UpdatePickerFromTextCtrl() // string returned by wxFont::GetNativeFontInfoDesc() and not // the user-friendly one returned by wxFont::GetNativeFontInfoUserDesc() wxFont f = String2Font(m_text->GetValue()); - if (!f.Ok()) + if (!f.IsOk()) return; // invalid user input if (M_PICKER->GetSelectedFont() != f) diff --git a/Externals/wxWidgets3/src/common/framecmn.cpp b/Externals/wxWidgets3/src/common/framecmn.cpp index db2120b7fd..aab30e9c81 100644 --- a/Externals/wxWidgets3/src/common/framecmn.cpp +++ b/Externals/wxWidgets3/src/common/framecmn.cpp @@ -3,7 +3,7 @@ // Purpose: common (for all platforms) wxFrame functions // Author: Julian Smart, Vadim Zeitlin // Created: 01/02/97 -// Id: $Id: framecmn.cpp 66592 2011-01-05 18:27:58Z PC $ +// Id: $Id: framecmn.cpp 69101 2011-09-16 13:23:14Z VZ $ // Copyright: (c) 1998 Robert Roebling and Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -271,6 +271,10 @@ bool wxFrameBase::ProcessCommand(wxMenuItem *item) // use the new value commandEvent.SetInt(item->IsChecked()); } + else // Uncheckable item. + { + commandEvent.SetInt(-1); + } return HandleWindowEvent(commandEvent); } diff --git a/Externals/wxWidgets3/src/common/fs_mem.cpp b/Externals/wxWidgets3/src/common/fs_mem.cpp index e826765b79..b2d18134e3 100644 --- a/Externals/wxWidgets3/src/common/fs_mem.cpp +++ b/Externals/wxWidgets3/src/common/fs_mem.cpp @@ -2,7 +2,7 @@ // Name: src/common/fs_mem.cpp // Purpose: in-memory file system // Author: Vaclav Slavik -// RCS-ID: $Id: fs_mem.cpp 60774 2009-05-28 09:59:32Z SC $ +// RCS-ID: $Id: fs_mem.cpp 70392 2012-01-18 19:42:58Z VZ $ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -186,13 +186,9 @@ void wxMemoryFSHandlerBase::AddFileWithMimeType(const wxString& filename, const wxString& textdata, const wxString& mimetype) { - AddFileWithMimeType - ( - filename, - static_cast(textdata.To8BitData()), - wxStrlen(static_cast(textdata.To8BitData())), - mimetype - ); + const wxCharBuffer buf(textdata.To8BitData()); + + AddFileWithMimeType(filename, buf.data(), buf.length(), mimetype); } @@ -253,7 +249,7 @@ wxMemoryFSHandler::AddFile(const wxString& filename, return; wxMemoryOutputStream mems; - if ( image.Ok() && image.SaveFile(mems, type) ) + if ( image.IsOk() && image.SaveFile(mems, type) ) { m_Hash[filename] = new wxMemoryFSFile ( diff --git a/Externals/wxWidgets3/src/common/fswatchercmn.cpp b/Externals/wxWidgets3/src/common/fswatchercmn.cpp index 0a239790b0..eadf694d4d 100644 --- a/Externals/wxWidgets3/src/common/fswatchercmn.cpp +++ b/Externals/wxWidgets3/src/common/fswatchercmn.cpp @@ -3,7 +3,7 @@ // Purpose: wxMswFileSystemWatcher // Author: Bartosz Bekier // Created: 2009-05-26 -// RCS-ID: $Id: fswatchercmn.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: fswatchercmn.cpp 67693 2011-05-03 23:31:39Z VZ $ // Copyright: (c) 2009 Bartosz Bekier // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -79,10 +79,30 @@ wxFileSystemWatcherBase::~wxFileSystemWatcherBase() bool wxFileSystemWatcherBase::Add(const wxFileName& path, int events) { - // args validation & consistency checks - if (!path.FileExists() && !path.DirExists()) + wxFSWPathType type = wxFSWPath_None; + if ( path.FileExists() ) + { + type = wxFSWPath_File; + } + else if ( path.DirExists() ) + { + type = wxFSWPath_Dir; + } + else + { + wxLogError(_("Can't monitor non-existent path \"%s\" for changes."), + path.GetFullPath()); return false; + } + return DoAdd(path, events, type); +} + +bool +wxFileSystemWatcherBase::DoAdd(const wxFileName& path, + int events, + wxFSWPathType type) +{ wxString canonical = GetCanonicalPath(path); if (canonical.IsEmpty()) return false; @@ -91,7 +111,7 @@ bool wxFileSystemWatcherBase::Add(const wxFileName& path, int events) wxString::Format("Path '%s' is already watched", canonical)); // adding a path in a platform specific way - wxFSWatchInfo watch(canonical, events); + wxFSWatchInfo watch(canonical, events, type); if ( !m_service->Add(watch) ) return false; diff --git a/Externals/wxWidgets3/src/common/ftp.cpp b/Externals/wxWidgets3/src/common/ftp.cpp index 8bd4cb21eb..db7537a94a 100644 --- a/Externals/wxWidgets3/src/common/ftp.cpp +++ b/Externals/wxWidgets3/src/common/ftp.cpp @@ -9,7 +9,7 @@ // robust Abort(), support for arbitrary FTP commands, ...) // Randall Fox (support for active mode) // Created: 07/07/1997 -// RCS-ID: $Id: ftp.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: ftp.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 1997, 1998 Guilhem Lavaux // (c) 1998-2004 wxWidgets team // Licence: wxWindows licence @@ -587,9 +587,9 @@ wxSocketBase *wxFTP::GetActivePort() addrNew.Service(0); // pick an open port number. wxSocketServer *sockSrv = new wxSocketServer(addrNew); - if (!sockSrv->Ok()) + if (!sockSrv->IsOk()) { - // We use Ok() here to see if everything is ok + // We use IsOk() here to see if everything is ok m_lastError = wxPROTO_PROTERR; delete sockSrv; return NULL; diff --git a/Externals/wxWidgets3/src/common/gdicmn.cpp b/Externals/wxWidgets3/src/common/gdicmn.cpp index cc022e57c4..2854a7e6ee 100644 --- a/Externals/wxWidgets3/src/common/gdicmn.cpp +++ b/Externals/wxWidgets3/src/common/gdicmn.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: gdicmn.cpp 65680 2010-09-30 11:44:45Z VZ $ +// RCS-ID: $Id: gdicmn.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -499,7 +499,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& name) static wxColour s_col; s_col = Find(name); - if ( !s_col.Ok() ) + if ( !s_col.IsOk() ) return NULL; return new wxColour(s_col); @@ -655,7 +655,19 @@ const wxFont* wxStockGDI::GetFont(Item item) font = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); break; case FONT_SMALL: - font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize() - 2, wxSWISS, wxNORMAL, wxNORMAL); + font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize() + // Using the font 2 points smaller than the normal one + // results in font so small as to be unreadable under MSW. + // We might want to actually use -1 under the other + // platforms too but for now be conservative and keep -2 + // there for compatibility with the old behaviour as the + // small font seems to be readable enough there as it is. +#ifdef __WXMSW__ + - 1, +#else + - 2, +#endif + wxSWISS, wxNORMAL, wxNORMAL); break; case FONT_SWISS: font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(), wxSWISS, wxNORMAL, wxNORMAL); @@ -768,7 +780,7 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, wxPenStyle wxPen* pen = NULL; wxPen penTmp(colour, width, style); - if (penTmp.Ok()) + if (penTmp.IsOk()) { pen = new wxPen(penTmp); list.Append(pen); @@ -790,7 +802,7 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, wxBrushStyle st wxBrush* brush = NULL; wxBrush brushTmp(colour, style); - if (brushTmp.Ok()) + if (brushTmp.IsOk()) { brush = new wxBrush(brushTmp); list.Append(brush); @@ -860,7 +872,7 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize, // font not found, create the new one font = NULL; wxFont fontTmp(pointSize, family, style, weight, underline, facename, encoding); - if (fontTmp.Ok()) + if (fontTmp.IsOk()) { font = new wxFont(fontTmp); list.Append(font); diff --git a/Externals/wxWidgets3/src/common/gifdecod.cpp b/Externals/wxWidgets3/src/common/gifdecod.cpp index 343dba3d2b..c0a7b713da 100644 --- a/Externals/wxWidgets3/src/common/gifdecod.cpp +++ b/Externals/wxWidgets3/src/common/gifdecod.cpp @@ -3,7 +3,7 @@ // Purpose: wxGIFDecoder, GIF reader for wxImage and wxAnimation // Author: Guillermo Rodriguez Garcia // Version: 3.04 -// RCS-ID: $Id: gifdecod.cpp 66828 2011-02-02 11:19:30Z DS $ +// RCS-ID: $Id: gifdecod.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) Guillermo Rodriguez Garcia // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -138,7 +138,7 @@ bool wxGIFDecoder::ConvertToImage(unsigned int frame, wxImage *image) const image->Create(sz.GetWidth(), sz.GetHeight()); image->SetType(wxBITMAP_TYPE_GIF); - if (!image->Ok()) + if (!image->IsOk()) return false; pal = GetPalette(frame); diff --git a/Externals/wxWidgets3/src/common/glcmn.cpp b/Externals/wxWidgets3/src/common/glcmn.cpp index fa0457ad6f..35b022bd74 100644 --- a/Externals/wxWidgets3/src/common/glcmn.cpp +++ b/Externals/wxWidgets3/src/common/glcmn.cpp @@ -3,7 +3,7 @@ // Purpose: wxGLCanvasBase implementation // Author: Vadim Zeitlin // Created: 2007-04-09 -// RCS-ID: $Id: glcmn.cpp 65680 2010-09-30 11:44:45Z VZ $ +// RCS-ID: $Id: glcmn.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 2007 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -66,7 +66,7 @@ bool wxGLCanvasBase::SetCurrent(const wxGLContext& context) const bool wxGLCanvasBase::SetColour(const wxString& colour) { wxColour col = wxTheColourDatabase->Find(colour); - if ( !col.Ok() ) + if ( !col.IsOk() ) return false; #ifdef wxHAS_OPENGL_ES diff --git a/Externals/wxWidgets3/src/common/graphcmn.cpp b/Externals/wxWidgets3/src/common/graphcmn.cpp index 1cb561e3c3..c4331e464c 100644 --- a/Externals/wxWidgets3/src/common/graphcmn.cpp +++ b/Externals/wxWidgets3/src/common/graphcmn.cpp @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: -// RCS-ID: $Id: graphcmn.cpp 66514 2011-01-01 11:10:35Z SC $ +// RCS-ID: $Id: graphcmn.cpp 69360 2011-10-09 22:07:29Z VZ $ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -534,7 +534,8 @@ IMPLEMENT_ABSTRACT_CLASS(wxGraphicsContext, wxObject) wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) : wxGraphicsObject(renderer), m_antialias(wxANTIALIAS_DEFAULT), - m_composition(wxCOMPOSITION_OVER) + m_composition(wxCOMPOSITION_OVER), + m_enableOffset(false) { } @@ -564,6 +565,11 @@ void wxGraphicsContext::Flush() { } +void wxGraphicsContext::EnableOffset(bool enable) +{ + m_enableOffset = enable; +} + #if 0 void wxGraphicsContext::SetAlpha( wxDouble WXUNUSED(alpha) ) { @@ -575,12 +581,6 @@ wxDouble wxGraphicsContext::GetAlpha() const } #endif -void wxGraphicsContext::GetSize( wxDouble* width, wxDouble* height) -{ - *width = 10000.0; - *height = 10000.0; -} - void wxGraphicsContext::GetDPI( wxDouble* dpiX, wxDouble* dpiY) { *dpiX = 72.0; @@ -595,7 +595,7 @@ void wxGraphicsContext::SetPen( const wxGraphicsPen& pen ) void wxGraphicsContext::SetPen( const wxPen& pen ) { - if ( !pen.Ok() || pen.GetStyle() == wxPENSTYLE_TRANSPARENT ) + if ( !pen.IsOk() || pen.GetStyle() == wxPENSTYLE_TRANSPARENT ) SetPen( wxNullGraphicsPen ); else SetPen( CreatePen( pen ) ); @@ -609,7 +609,7 @@ void wxGraphicsContext::SetBrush( const wxGraphicsBrush& brush ) void wxGraphicsContext::SetBrush( const wxBrush& brush ) { - if ( !brush.Ok() || brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT ) + if ( !brush.IsOk() || brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT ) SetBrush( wxNullGraphicsBrush ); else SetBrush( CreateBrush( brush ) ); @@ -623,7 +623,7 @@ void wxGraphicsContext::SetFont( const wxGraphicsFont& font ) void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour ) { - if ( font.Ok() ) + if ( font.IsOk() ) SetFont( CreateFont( font, colour ) ); else SetFont( wxNullGraphicsFont ); @@ -665,9 +665,7 @@ wxGraphicsContext::DoDrawFilledText(const wxString &str, // to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape SetPen( wxNullGraphicsPen ); - wxGraphicsPath path = CreatePath(); - path.AddRectangle( x , y, width, height ); - FillPath( path ); + DrawRectangle(x , y, width, height); DrawText( str, x ,y); SetBrush( formerBrush ); @@ -839,17 +837,32 @@ wxGraphicsContext::CreateRadialGradientBrush( ); } -// sets the font wxGraphicsFont wxGraphicsContext::CreateFont( const wxFont &font , const wxColour &col ) const { return GetRenderer()->CreateFont(font,col); } +wxGraphicsFont +wxGraphicsContext::CreateFont(double size, + const wxString& facename, + int flags, + const wxColour& col) const +{ + return GetRenderer()->CreateFont(size, facename, flags, col); +} + wxGraphicsBitmap wxGraphicsContext::CreateBitmap( const wxBitmap& bmp ) const { return GetRenderer()->CreateBitmap(bmp); } +#if wxUSE_IMAGE +wxGraphicsBitmap wxGraphicsContext::CreateBitmapFromImage(const wxImage& image) const +{ + return GetRenderer()->CreateBitmapFromImage(image); +} +#endif // wxUSE_IMAGE + wxGraphicsBitmap wxGraphicsContext::CreateSubBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) const { return GetRenderer()->CreateSubBitmap(bmp,x,y,w,h); @@ -896,6 +909,13 @@ wxGraphicsContext* wxGraphicsContext::Create( wxWindow* window ) return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(window); } +#if wxUSE_IMAGE +/* static */ wxGraphicsContext* wxGraphicsContext::Create(wxImage& image) +{ + return wxGraphicsRenderer::GetDefaultRenderer()->CreateContextFromImage(image); +} +#endif // wxUSE_IMAGE + wxGraphicsContext* wxGraphicsContext::Create() { return wxGraphicsRenderer::GetDefaultRenderer()->CreateMeasuringContext(); diff --git a/Externals/wxWidgets3/src/common/headerctrlcmn.cpp b/Externals/wxWidgets3/src/common/headerctrlcmn.cpp index 8fd4afa408..74c195eb57 100644 --- a/Externals/wxWidgets3/src/common/headerctrlcmn.cpp +++ b/Externals/wxWidgets3/src/common/headerctrlcmn.cpp @@ -3,7 +3,7 @@ // Purpose: implementation of wxHeaderCtrlBase // Author: Vadim Zeitlin // Created: 2008-12-02 -// RCS-ID: $Id: headerctrlcmn.cpp 66740 2011-01-24 14:35:33Z VS $ +// RCS-ID: $Id: headerctrlcmn.cpp 70338 2012-01-14 16:51:57Z VS $ // Copyright: (c) 2008 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -31,6 +31,7 @@ #include "wx/headerctrl.h" #include "wx/rearrangectrl.h" +#include "wx/renderer.h" namespace { @@ -107,6 +108,21 @@ void wxHeaderCtrlBase::SetColumnCount(unsigned int count) DoSetCount(count); } +int wxHeaderCtrlBase::GetColumnTitleWidth(const wxHeaderColumn& col) +{ + int w = wxWindowBase::GetTextExtent(col.GetTitle()).x; + + // add some margin: + w += wxRendererNative::Get().GetHeaderButtonMargin(this); + + // if a bitmap is used, add space for it and 2px border: + wxBitmap bmp = col.GetBitmap(); + if ( bmp.IsOk() ) + w += bmp.GetWidth() + 2; + + return w; +} + // ---------------------------------------------------------------------------- // wxHeaderCtrlBase event handling // ---------------------------------------------------------------------------- @@ -122,8 +138,7 @@ void wxHeaderCtrlBase::OnSeparatorDClick(wxHeaderCtrlEvent& event) return; } - int w = wxWindowBase::GetTextExtent(column.GetTitle()).x; - w += 4*GetCharWidth(); // add some arbitrary margins around text + int w = GetColumnTitleWidth(column); if ( !UpdateColumnWidthToFit(col, w) ) event.Skip(); @@ -443,7 +458,7 @@ void wxHeaderCtrlSimple::DoShowSortIndicator(unsigned int idx, bool ascending) { RemoveSortIndicator(); - m_cols[idx].SetAsSortKey(ascending); + m_cols[idx].SetSortOrder(ascending); m_sortKey = idx; UpdateColumn(idx); diff --git a/Externals/wxWidgets3/src/common/http.cpp b/Externals/wxWidgets3/src/common/http.cpp index fdb2cf67ea..6a2ef68647 100644 --- a/Externals/wxWidgets3/src/common/http.cpp +++ b/Externals/wxWidgets3/src/common/http.cpp @@ -4,7 +4,7 @@ // Author: Guilhem Lavaux // Modified by: Simo Virokannas (authentication, Dec 2005) // Created: August 1997 -// RCS-ID: $Id: http.cpp 66728 2011-01-22 14:38:36Z DS $ +// RCS-ID: $Id: http.cpp 70485 2012-01-31 13:09:11Z VZ $ // Copyright: (c) 1997, 1998 Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -48,7 +48,6 @@ wxHTTP::wxHTTP() m_addr = NULL; m_read = false; m_proxy_mode = false; - m_post_buf = wxEmptyString; m_http_response = 0; SetNotify(wxSOCKET_LOST_FLAG); @@ -193,7 +192,49 @@ wxString wxHTTP::GenerateAuthString(const wxString& user, const wxString& pass) void wxHTTP::SetPostBuffer(const wxString& post_buf) { - m_post_buf = post_buf; + // Use To8BitData() for backwards compatibility in this deprecated method. + // The new code should use the other overload or SetPostText() and specify + // the encoding to use for the text explicitly. + wxScopedCharBuffer scb = post_buf.To8BitData(); + if ( scb.length() ) + { + m_postBuffer.Clear(); + m_postBuffer.AppendData(scb.data(), scb.length()); + } +} + +bool +wxHTTP::SetPostBuffer(const wxString& contentType, + const wxMemoryBuffer& data) +{ + m_postBuffer = data; + m_contentType = contentType; + + return !m_postBuffer.IsEmpty(); +} + +bool +wxHTTP::SetPostText(const wxString& contentType, + const wxString& data, + const wxMBConv& conv) +{ +#if wxUSE_UNICODE + wxScopedCharBuffer scb = data.mb_str(conv); + const size_t len = scb.length(); + const char* const buf = scb.data(); +#else // !wxUSE_UNICODE + const size_t len = data.length(); + const char* const buf = data.mb_str(conv); +#endif // wxUSE_UNICODE/!wxUSE_UNICODE + + if ( !len ) + return false; + + m_postBuffer.Clear(); + m_postBuffer.AppendData(buf, len); + m_contentType = contentType; + + return true; } void wxHTTP::SendHeaders() @@ -312,8 +353,21 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) case wxHTTP_POST: request = wxT("POST"); - if ( GetHeader( wxT("Content-Length") ).empty() ) - SetHeader( wxT("Content-Length"), wxString::Format( wxT("%lu"), (unsigned long)m_post_buf.Len() ) ); + // Content length must be correct, so always set, possibly + // overriding the value set explicitly by a previous call to + // SetHeader("Content-Length"). + if ( !m_postBuffer.IsEmpty() ) + { + wxString len; + len << m_postBuffer.GetDataLen(); + + SetHeader(wxS("Content-Length"), len); + } + + // However if the user had explicitly set the content type, don't + // override it with the content type passed to SetPostText(). + if ( !m_contentType.empty() && GetContentType().empty() ) + SetHeader(wxS("Content-Type"), m_contentType); break; default: @@ -346,18 +400,10 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) Write("\r\n", 2); if ( req == wxHTTP_POST ) { - // Post data can be arbitrary binary data when the "binary" content - // transfer encoding is used so don't assume it's ASCII only or - // NUL-terminated. - { - const wxScopedCharBuffer buf(m_post_buf.To8BitData()); - Write(buf, buf.length()); - } // delete the buffer before modifying the string it points to, it - // wouldn't really be a problem here even if we didn't do this - // because we won't use this buffer again but this will avoid any - // nasty surprises in the future if this code changes + if ( !m_postBuffer.IsEmpty() ) + Write(m_postBuffer.GetData(), m_postBuffer.GetDataLen()); - m_post_buf = wxEmptyString; + m_postBuffer.Clear(); } wxString tmp_str; @@ -483,7 +529,7 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path) return NULL; #endif - if (!BuildRequest(path, m_post_buf.empty() ? wxHTTP_GET : wxHTTP_POST)) + if (!BuildRequest(path, m_postBuffer.IsEmpty() ? wxHTTP_GET : wxHTTP_POST)) return NULL; inp_stream = new wxHTTPStream(this); diff --git a/Externals/wxWidgets3/src/common/iconbndl.cpp b/Externals/wxWidgets3/src/common/iconbndl.cpp index f3bf18a7af..d79aaf5479 100644 --- a/Externals/wxWidgets3/src/common/iconbndl.cpp +++ b/Externals/wxWidgets3/src/common/iconbndl.cpp @@ -3,7 +3,7 @@ // Purpose: wxIconBundle // Author: Mattia Barbon, Vadim Zeitlin // Created: 23.03.2002 -// RCS-ID: $Id: iconbndl.cpp 66374 2010-12-14 18:43:49Z VZ $ +// RCS-ID: $Id: iconbndl.cpp 70455 2012-01-24 22:17:47Z VZ $ // Copyright: (c) Mattia barbon // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -163,7 +163,7 @@ void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type) if ( type == wxBITMAP_TYPE_ICON_RESOURCE ) { wxIcon tmp(file, type); - if (tmp.Ok()) + if (tmp.IsOk()) { AddIcon(tmp); return; @@ -193,49 +193,91 @@ void wxIconBundle::AddIcon(wxInputStream& stream, wxBitmapType type) #endif // wxUSE_STREAMS && wxUSE_IMAGE -wxIcon wxIconBundle::GetIcon(const wxSize& size) const +wxIcon wxIconBundle::GetIcon(const wxSize& size, int flags) const { + wxASSERT( size == wxDefaultSize || (size.x >= 0 && size.y > 0) ); + + // We need the standard system icon size when using FALLBACK_SYSTEM. + wxCoord sysX = 0, + sysY = 0; + if ( flags & FALLBACK_SYSTEM ) + { + sysX = wxSystemSettings::GetMetric(wxSYS_ICON_X); + sysY = wxSystemSettings::GetMetric(wxSYS_ICON_Y); + } + + // If size == wxDefaultSize, we use system default icon size by convention. + wxCoord sizeX = size.x; + wxCoord sizeY = size.y; + if ( size == wxDefaultSize ) + { + wxASSERT_MSG( flags == FALLBACK_SYSTEM, + wxS("Must have valid size if not using FALLBACK_SYSTEM") ); + + sizeX = sysX; + sizeY = sysY; + } + + // Iterate over all icons searching for the exact match or the closest icon + // for FALLBACK_NEAREST_LARGER. + wxIcon iconBest; + int bestDiff = 0; + bool bestIsLarger = false; + bool bestIsSystem = false; + const size_t count = GetIconCount(); - // optimize for the common case of icon bundles containing one icon only - wxIcon iconBest; - switch ( count ) + const wxIconArray& iconArray = M_ICONBUNDLEDATA->m_icons; + for ( size_t i = 0; i < count; i++ ) { - case 0: - // nothing to do, iconBest is already invalid + const wxIcon& icon = iconArray[i]; + if ( !icon.IsOk() ) + continue; + wxCoord sx = icon.GetWidth(), + sy = icon.GetHeight(); + + // Exact match ends search immediately in any case. + if ( sx == sizeX && sy == sizeY ) + { + iconBest = icon; break; + } - case 1: - iconBest = M_ICONBUNDLEDATA->m_icons[0]; - break; - - default: - // there is more than one icon, find the best match: - wxCoord sysX = wxSystemSettings::GetMetric( wxSYS_ICON_X ), - sysY = wxSystemSettings::GetMetric( wxSYS_ICON_Y ); - - const wxIconArray& iconArray = M_ICONBUNDLEDATA->m_icons; - for ( size_t i = 0; i < count; i++ ) + if ( flags & FALLBACK_SYSTEM ) + { + if ( sx == sysX && sy == sysY ) { - const wxIcon& icon = iconArray[i]; - wxCoord sx = icon.GetWidth(), - sy = icon.GetHeight(); - - // if we got an icon of exactly the requested size, we're done - if ( sx == size.x && sy == size.y ) - { - iconBest = icon; - break; - } - - // the best icon is by default (arbitrarily) the first one but - // if we find a system-sized icon, take it instead - if ((sx == sysX && sy == sysY) || !iconBest.IsOk()) - iconBest = icon; + iconBest = icon; + bestIsSystem = true; + continue; } + } + + if ( !bestIsSystem && (flags & FALLBACK_NEAREST_LARGER) ) + { + bool iconLarger = (sx >= sizeX) && (sy >= sizeY); + int iconDiff = abs(sx - sizeX) + abs(sy - sizeY); + + // Use current icon as candidate for the best icon, if either: + // - we have no candidate yet + // - we have no candidate larger than desired size and current icon is + // - current icon is closer to desired size than candidate + if ( !iconBest.IsOk() || + (!bestIsLarger && iconLarger) || + (iconLarger && (iconDiff < bestDiff)) ) + { + iconBest = icon; + bestIsLarger = iconLarger; + bestDiff = iconDiff; + continue; + } + } } #if defined( __WXMAC__ ) && wxOSX_USE_CARBON + if (!iconBest.IsOk()) + return wxNullIcon; + return wxIcon(iconBest.GetHICON(), size); #else return iconBest; @@ -244,14 +286,7 @@ wxIcon wxIconBundle::GetIcon(const wxSize& size) const wxIcon wxIconBundle::GetIconOfExactSize(const wxSize& size) const { - wxIcon icon = GetIcon(size); - if ( icon.Ok() && - (icon.GetWidth() != size.x || icon.GetHeight() != size.y) ) - { - icon = wxNullIcon; - } - - return icon; + return GetIcon(size, FALLBACK_NONE); } void wxIconBundle::AddIcon(const wxIcon& icon) @@ -267,7 +302,7 @@ void wxIconBundle::AddIcon(const wxIcon& icon) for ( size_t i = 0; i < count; ++i ) { wxIcon& tmp = iconArray[i]; - if ( tmp.Ok() && + if ( tmp.IsOk() && tmp.GetWidth() == icon.GetWidth() && tmp.GetHeight() == icon.GetHeight() ) { diff --git a/Externals/wxWidgets3/src/common/imagbmp.cpp b/Externals/wxWidgets3/src/common/imagbmp.cpp index 70ecc97fed..eb232c216b 100644 --- a/Externals/wxWidgets3/src/common/imagbmp.cpp +++ b/Externals/wxWidgets3/src/common/imagbmp.cpp @@ -2,7 +2,7 @@ // Name: src/common/imagbmp.cpp // Purpose: wxImage BMP,ICO and CUR handlers // Author: Robert Roebling, Chris Elliott -// RCS-ID: $Id: imagbmp.cpp 66491 2010-12-29 12:31:37Z DS $ +// RCS-ID: $Id: imagbmp.cpp 68766 2011-08-17 21:01:09Z DS $ // Copyright: (c) Robert Roebling, Chris Elliott // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -91,7 +91,7 @@ bool wxBMPHandler::SaveDib(wxImage *image, { wxCHECK_MSG( image, false, wxT("invalid pointer in wxBMPHandler::SaveFile") ); - if ( !image->Ok() ) + if ( !image->IsOk() ) { if ( verbose ) { @@ -146,8 +146,8 @@ bool wxBMPHandler::SaveDib(wxImage *image, } unsigned width = image->GetWidth(); - unsigned row_padding = (4 - int(width*bpp/8.0) % 4) % 4; // # bytes to pad to dword - unsigned row_width = int(width * bpp/8.0) + row_padding; // # of bytes per row + unsigned row_padding = (4 - ((width * bpp + 7) / 8) % 4) % 4; // # bytes to pad to dword + unsigned row_width = (width * bpp + 7) / 8 + row_padding; // # of bytes per row struct { @@ -351,7 +351,7 @@ bool wxBMPHandler::SaveDib(wxImage *image, // pointer to the image data, use quantized if available wxUint8 *data = (wxUint8*) image->GetData(); - if (q_image) if (q_image->Ok()) data = (wxUint8*) q_image->GetData(); + if (q_image) if (q_image->IsOk()) data = (wxUint8*) q_image->GetData(); wxUint8 *buffer = new wxUint8[row_width]; memset(buffer, 0, row_width); @@ -533,6 +533,14 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, wxON_BLOCK_EXIT1(&BMPPalette::Free, cmap); + bool isUpsideDown = true; + + if (height < 0) + { + isUpsideDown = false; + height = -height; + } + // destroy existing here instead of: image->Destroy(); image->Create(width, height); @@ -702,9 +710,10 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, // this case (see #10915) bool hasValidAlpha = false; - /* BMPs are stored upside down */ - for ( int line = (height - 1); line >= 0; line-- ) + for ( int row = 0; row < height; row++ ) { + int line = isUpsideDown ? height - 1 - row : row; + int linepos = 0; for ( int column = 0; column < width ; ) { @@ -734,21 +743,24 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, { if ( aByte == 0 ) { - if ( column > 0 ) - column = width; + // end of scanline marker + column = width; + row--; } else if ( aByte == 1 ) { + // end of RLE data marker, stop decoding column = width; - line = -1; + row = height; } else if ( aByte == 2 ) { + // delta marker, move in image aByte = stream.GetC(); column += aByte; linepos = column * bpp / 4; aByte = stream.GetC(); - line -= aByte; // upside down + row += aByte; // upside down } else { @@ -817,20 +829,24 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, { if ( aByte == 0 ) { - /* column = width; */ + // end of scanline marker + column = width; + row--; } else if ( aByte == 1 ) { + // end of RLE data marker, stop decoding column = width; - line = -1; + row = height; } else if ( aByte == 2 ) { + // delta marker, move in image aByte = stream.GetC(); column += aByte; linepos = column * bpp / 8; aByte = stream.GetC(); - line += aByte; + row -= aByte; } else { @@ -1249,7 +1265,7 @@ bool wxICOHandler::SaveFile(wxImage *image, // wxCountingOutputStream::IsOk() always returns true for now and this // "if" provokes VC++ warnings in optimized build #if 0 - if ( !cStream.Ok() ) + if ( !cStream.IsOk() ) { if ( verbose ) { @@ -1335,6 +1351,11 @@ bool wxICOHandler::SaveFile(wxImage *image, bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose, int index) { + if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset ) + { + return false; + } + return DoLoadFile(image, stream, verbose, index); } @@ -1423,10 +1444,16 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream, int wxICOHandler::DoGetImageCount(wxInputStream& stream) { + // It's ok to modify the stream position in this function. + + if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset ) + { + return 0; + } + ICONDIR IconDir; if (stream.Read(&IconDir, sizeof(IconDir)).LastRead() != sizeof(IconDir)) - // it's ok to modify the stream position here return 0; return (int)wxUINT16_SWAP_ON_BE(IconDir.idCount); @@ -1492,8 +1519,15 @@ int wxANIHandler::DoGetImageCount(wxInputStream& stream) static bool CanReadICOOrCUR(wxInputStream *stream, wxUint16 resourceType) { + // It's ok to modify the stream position in this function. + + if ( stream->IsSeekable() && stream->SeekI(0) == wxInvalidOffset ) + { + return false; + } + ICONDIR iconDir; - if ( !stream->Read(&iconDir, sizeof(iconDir)) ) // it's ok to modify the stream position here + if ( !stream->Read(&iconDir, sizeof(iconDir)) ) { return false; } diff --git a/Externals/wxWidgets3/src/common/image.cpp b/Externals/wxWidgets3/src/common/image.cpp index 8eb6ac2c9b..637c93dcdb 100644 --- a/Externals/wxWidgets3/src/common/image.cpp +++ b/Externals/wxWidgets3/src/common/image.cpp @@ -2,7 +2,7 @@ // Name: src/common/image.cpp // Purpose: wxImage // Author: Robert Roebling -// RCS-ID: $Id: image.cpp 67203 2011-03-15 16:42:34Z DS $ +// RCS-ID: $Id: image.cpp 70656 2012-02-20 21:57:17Z VZ $ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -140,8 +140,9 @@ bool wxImage::Create(const char* const* xpmData) wxXPMDecoder decoder; (*this) = decoder.ReadData(xpmData); - return Ok(); + return IsOk(); #else + wxUnusedVar(xpmData); return false; #endif } @@ -258,7 +259,7 @@ wxImage wxImage::MakeEmptyClone(int flags) const { wxImage image; - wxCHECK_MSG( Ok(), image, wxS("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxS("invalid image") ); long height = M_IMGDATA->m_height; long width = M_IMGDATA->m_width; @@ -293,7 +294,7 @@ wxImage wxImage::Copy() const { wxImage image; - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); image.m_refData = CloneRefData(m_refData); @@ -307,7 +308,7 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const wxImage image; - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); // can't scale to/from 0 size wxCHECK_MSG( (xFactor > 0) && (yFactor > 0), image, @@ -426,7 +427,7 @@ wxImage::Scale( int width, int height, wxImageResizeQuality quality ) const { wxImage image; - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); // can't scale to/from 0 size wxCHECK_MSG( (width > 0) && (height > 0), image, @@ -856,7 +857,7 @@ wxImage wxImage::BlurHorizontal(int blurRadius) const { wxImage ret_image(MakeEmptyClone()); - wxCHECK( ret_image.Ok(), ret_image ); + wxCHECK( ret_image.IsOk(), ret_image ); const unsigned char* src_data = M_IMGDATA->m_data; unsigned char* dst_data = ret_image.GetData(); @@ -959,7 +960,7 @@ wxImage wxImage::BlurVertical(int blurRadius) const { wxImage ret_image(MakeEmptyClone()); - wxCHECK( ret_image.Ok(), ret_image ); + wxCHECK( ret_image.IsOk(), ret_image ); const unsigned char* src_data = M_IMGDATA->m_data; unsigned char* dst_data = ret_image.GetData(); @@ -1074,7 +1075,7 @@ wxImage wxImage::Rotate90( bool clockwise ) const { wxImage image(MakeEmptyClone(Clone_SwapOrientation)); - wxCHECK( image.Ok(), image ); + wxCHECK( image.IsOk(), image ); long height = M_IMGDATA->m_height; long width = M_IMGDATA->m_width; @@ -1099,7 +1100,7 @@ wxImage wxImage::Rotate90( bool clockwise ) const // we rotate the image in 21-pixel (63-byte) wide strips // to make better use of cpu cache - memory transfers // (note: while much better than single-pixel "strips", - // our vertical strips will still generally straddle cachelines) + // our vertical strips will still generally straddle 64-byte cachelines) for (long ii = 0; ii < width; ) { long next_ii = wxMin(ii + 21, width); @@ -1113,11 +1114,11 @@ wxImage wxImage::Rotate90( bool clockwise ) const { if ( clockwise ) { - target_data = data + (((i+1)*height) - j - 1)*3; + target_data = data + ((i + 1)*height - j - 1)*3; } else { - target_data = data + ((height*(width - 1 - i)) + j)*3; + target_data = data + (height*(width - 1 - i) + j)*3; } memcpy( target_data, source_data, 3 ); source_data += 3; @@ -1134,21 +1135,30 @@ wxImage wxImage::Rotate90( bool clockwise ) const unsigned char *alpha_data = image.GetAlpha(); unsigned char *target_alpha = 0 ; - for (long j = 0; j < height; j++) + for (long ii = 0; ii < width; ) { - for (long i = 0; i < width; i++) - { - if ( clockwise ) - { - target_alpha = alpha_data + (((i+1)*height) - j - 1); - } - else - { - target_alpha = alpha_data + ((height*(width-1)) + j - (i*height)); - } + long next_ii = wxMin(ii + 64, width); - *target_alpha = *source_alpha++; + for (long j = 0; j < height; j++) + { + source_alpha = M_IMGDATA->m_alpha + j*width + ii; + + for (long i = ii; i < next_ii; i++) + { + if ( clockwise ) + { + target_alpha = alpha_data + (i+1)*height - j - 1; + } + else + { + target_alpha = alpha_data + height*(width - i - 1) + j; + } + + *target_alpha = *source_alpha++; + } } + + ii = next_ii; } } @@ -1159,7 +1169,7 @@ wxImage wxImage::Rotate180() const { wxImage image(MakeEmptyClone()); - wxCHECK( image.Ok(), image ); + wxCHECK( image.IsOk(), image ); long height = M_IMGDATA->m_height; long width = M_IMGDATA->m_width; @@ -1212,7 +1222,7 @@ wxImage wxImage::Mirror( bool horizontally ) const { wxImage image(MakeEmptyClone()); - wxCHECK( image.Ok(), image ); + wxCHECK( image.IsOk(), image ); long height = M_IMGDATA->m_height; long width = M_IMGDATA->m_width; @@ -1289,7 +1299,7 @@ wxImage wxImage::GetSubImage( const wxRect &rect ) const { wxImage image; - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) && (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()), @@ -1342,7 +1352,7 @@ wxImage wxImage::Size( const wxSize& size, const wxPoint& pos, { wxImage image; - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); wxCHECK_MSG( (size.GetWidth() > 0) && (size.GetHeight() > 0), image, wxT("invalid size") ); int width = GetWidth(), height = GetHeight(); @@ -1390,8 +1400,8 @@ wxImage wxImage::Size( const wxSize& size, const wxPoint& pos, void wxImage::Paste( const wxImage &image, int x, int y ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); - wxCHECK_RET( image.Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); + wxCHECK_RET( image.IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -1419,12 +1429,15 @@ void wxImage::Paste( const wxImage &image, int x, int y ) if (width < 1) return; if (height < 1) return; - if ((!HasMask() && !image.HasMask()) || - (HasMask() && !image.HasMask()) || - ((HasMask() && image.HasMask() && + // If we can, copy the data using memcpy() as this is the fastest way. But + // for this the image being pasted must have "compatible" mask with this + // one meaning that either it must not have one at all or it must use the + // same masked colour. + if ( !image.HasMask() || + ((HasMask() && (GetMaskRed()==image.GetMaskRed()) && (GetMaskGreen()==image.GetMaskGreen()) && - (GetMaskBlue()==image.GetMaskBlue())))) + (GetMaskBlue()==image.GetMaskBlue()))) ) { const unsigned char* source_data = image.GetData() + 3*(xx + yy*image.GetWidth()); int source_step = image.GetWidth()*3; @@ -1491,7 +1504,7 @@ void wxImage::Paste( const wxImage &image, int x, int y ) void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1, unsigned char r2, unsigned char g2, unsigned char b2 ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -1522,7 +1535,7 @@ wxImage wxImage::ConvertToGreyscale(double weight_r, double weight_g, double wei { wxImage image(MakeEmptyClone()); - wxCHECK( image.Ok(), image ); + wxCHECK( image.IsOk(), image ); const unsigned char *src = M_IMGDATA->m_data; unsigned char *dest = image.GetData(); @@ -1556,7 +1569,7 @@ wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char { wxImage image; - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false ); @@ -1619,14 +1632,14 @@ wxImage wxImage::ConvertToDisabled(unsigned char brightness) const int wxImage::GetWidth() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); return M_IMGDATA->m_width; } int wxImage::GetHeight() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); return M_IMGDATA->m_height; } @@ -1650,7 +1663,7 @@ void wxImage::SetType(wxBitmapType type) long wxImage::XYToIndex(int x, int y) const { - if ( Ok() && + if ( IsOk() && x >= 0 && y >= 0 && x < M_IMGDATA->m_width && y < M_IMGDATA->m_height ) { @@ -1676,7 +1689,7 @@ void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned c void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, unsigned char b ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -1752,14 +1765,14 @@ bool wxImage::IsOk() const unsigned char *wxImage::GetData() const { - wxCHECK_MSG( Ok(), (unsigned char *)NULL, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), (unsigned char *)NULL, wxT("invalid image") ); return M_IMGDATA->m_data; } void wxImage::SetData( unsigned char *data, bool static_data ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); wxImageRefData *newRefData = new wxImageRefData(); @@ -1860,7 +1873,7 @@ wxImage::ConvertColourToAlpha(unsigned char r, unsigned char g, unsigned char b) void wxImage::SetAlpha( unsigned char *alpha, bool static_data ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -1878,7 +1891,7 @@ void wxImage::SetAlpha( unsigned char *alpha, bool static_data ) unsigned char *wxImage::GetAlpha() const { - wxCHECK_MSG( Ok(), (unsigned char *)NULL, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), (unsigned char *)NULL, wxT("invalid image") ); return M_IMGDATA->m_alpha; } @@ -1936,7 +1949,7 @@ void wxImage::ClearAlpha() void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -1948,7 +1961,7 @@ void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b ) bool wxImage::GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned char *b ) const { - wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); if (M_IMGDATA->m_hasMask) { @@ -1966,28 +1979,28 @@ bool wxImage::GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned unsigned char wxImage::GetMaskRed() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); return M_IMGDATA->m_maskRed; } unsigned char wxImage::GetMaskGreen() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); return M_IMGDATA->m_maskGreen; } unsigned char wxImage::GetMaskBlue() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); return M_IMGDATA->m_maskBlue; } void wxImage::SetMask( bool mask ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -1996,7 +2009,7 @@ void wxImage::SetMask( bool mask ) bool wxImage::HasMask() const { - wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); return M_IMGDATA->m_hasMask; } @@ -2143,22 +2156,22 @@ bool wxImage::ConvertAlphaToMask(unsigned char mr, bool wxImage::HasPalette() const { - if (!Ok()) + if (!IsOk()) return false; - return M_IMGDATA->m_palette.Ok(); + return M_IMGDATA->m_palette.IsOk(); } const wxPalette& wxImage::GetPalette() const { - wxCHECK_MSG( Ok(), wxNullPalette, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), wxNullPalette, wxT("invalid image") ); return M_IMGDATA->m_palette; } void wxImage::SetPalette(const wxPalette& palette) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -2280,7 +2293,7 @@ bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), wxBitmapType WXUNUSED_UNLESS_STREAMS(type) ) const { #if HAS_FILE_STREAMS - wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename); @@ -2300,7 +2313,7 @@ bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), const wxString& WXUNUSED_UNLESS_STREAMS(mimetype) ) const { #if HAS_FILE_STREAMS - wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename); @@ -2331,7 +2344,7 @@ int wxImage::GetImageCount( const wxString& WXUNUSED_UNLESS_STREAMS(name), { #if HAS_FILE_STREAMS wxImageFileInputStream stream(name); - if (stream.Ok()) + if (stream.IsOk()) return GetImageCount(stream, type); #endif @@ -2438,7 +2451,17 @@ bool wxImage::DoLoad(wxImageHandler& handler, wxInputStream& stream, int index) } if ( width != widthOrig || height != heightOrig ) + { + // get the original size if it was set by the image handler + // but also in order to restore it after Rescale + int widthOrigOption = GetOptionInt(wxIMAGE_OPTION_ORIGINAL_WIDTH), + heightOrigOption = GetOptionInt(wxIMAGE_OPTION_ORIGINAL_HEIGHT); + Rescale(width, height, wxIMAGE_QUALITY_HIGH); + + SetOption(wxIMAGE_OPTION_ORIGINAL_WIDTH, widthOrigOption ? widthOrigOption : widthOrig); + SetOption(wxIMAGE_OPTION_ORIGINAL_HEIGHT, heightOrigOption ? heightOrigOption : heightOrig); + } } // Set this after Rescale, which currently does not preserve it @@ -2533,7 +2556,7 @@ bool wxImage::DoSave(wxImageHandler& handler, wxOutputStream& stream) const bool wxImage::SaveFile( wxOutputStream& stream, wxBitmapType type ) const { - wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); wxImageHandler *handler = FindHandler(type); if ( !handler ) @@ -2547,12 +2570,13 @@ bool wxImage::SaveFile( wxOutputStream& stream, wxBitmapType type ) const bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const { - wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); wxImageHandler *handler = FindHandlerMime(mimetype); if ( !handler ) { wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() ); + return false; } return DoSave(*handler, stream); diff --git a/Externals/wxWidgets3/src/common/imagfill.cpp b/Externals/wxWidgets3/src/common/imagfill.cpp index c105bf2f26..c93229d14f 100644 --- a/Externals/wxWidgets3/src/common/imagfill.cpp +++ b/Externals/wxWidgets3/src/common/imagfill.cpp @@ -2,7 +2,7 @@ // Name: src/common/imagfill.cpp // Purpose: FloodFill for wxImage // Author: Julian Smart -// RCS-ID: $Id: imagfill.cpp 65820 2010-10-15 23:46:46Z VZ $ +// RCS-ID: $Id: imagfill.cpp 70868 2012-03-10 16:58:05Z PC $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -58,8 +58,7 @@ static bool LINKAGEMODE MatchBoundaryPixel(wxImage *img, int x, int y, int w, in static void LINKAGEMODE wxImageFloodFill(wxImage *image, wxCoord x, wxCoord y, const wxBrush & fillBrush, - const wxColour& testColour, int style, - int WXUNUSED(LogicalFunction)) + const wxColour& testColour, int style) { /* A diamond flood-fill using a circular queue system. Each pixel surrounding the current pixel is added to @@ -313,8 +312,7 @@ bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, memdc.SelectObject(wxNullBitmap); wxImage image = bitmap.ConvertToImage(); - wxImageFloodFill(&image, x_dev, y_dev, dc->GetBrush(), col, style, - dc->GetLogicalFunction()); + wxImageFloodFill(&image, x_dev, y_dev, dc->GetBrush(), col, style); bitmap = wxBitmap(image); memdc.SelectObject(bitmap); dc->Blit(x0_log, y0_log, w_log, h_log, &memdc, 0, 0); diff --git a/Externals/wxWidgets3/src/common/imaggif.cpp b/Externals/wxWidgets3/src/common/imaggif.cpp index d61fb53a5a..536aecf743 100644 --- a/Externals/wxWidgets3/src/common/imaggif.cpp +++ b/Externals/wxWidgets3/src/common/imaggif.cpp @@ -2,7 +2,7 @@ // Name: src/common/imaggif.cpp // Purpose: wxGIFHandler // Author: Vaclav Slavik, Guillermo Rodriguez Garcia, Gershon Elber, Troels K -// RCS-ID: $Id: imaggif.cpp 66803 2011-01-28 08:36:34Z DS $ +// RCS-ID: $Id: imaggif.cpp 67802 2011-05-27 12:25:25Z DS $ // Copyright: (c) 1999-2011 Vaclav Slavik, Guillermo Rodriguez Garcia, Gershon Elber, Troels K // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -643,7 +643,7 @@ bool wxGIFHandler_WriteWord(wxOutputStream *stream, wxUint16 word) buf[0] = word & 0xff; buf[1] = (word >> 8) & 0xff; - return wxGIFHandler_Write(stream, &word, sizeof(word)); + return wxGIFHandler_Write(stream, &buf, sizeof(buf)); } bool wxGIFHandler_WriteHeader(wxOutputStream *stream, int width, int height, diff --git a/Externals/wxWidgets3/src/common/imagiff.cpp b/Externals/wxWidgets3/src/common/imagiff.cpp index f7fe0360f5..2ac1595a93 100644 --- a/Externals/wxWidgets3/src/common/imagiff.cpp +++ b/Externals/wxWidgets3/src/common/imagiff.cpp @@ -2,7 +2,7 @@ // Name: src/common/imagiff.cpp // Purpose: wxImage handler for Amiga IFF images // Author: Steffen Gutmann, Thomas Meyer -// RCS-ID: $Id: imagiff.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: imagiff.cpp 69562 2011-10-27 21:10:38Z VZ $ // Copyright: (c) Steffen Gutmann, 2002 // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -81,7 +81,6 @@ private: IFFImage *m_image; // image data wxInputStream *m_f; // input stream unsigned char *databuf; - unsigned char *picptr; unsigned char *decomp_mem; void Destroy(); @@ -140,7 +139,7 @@ bool wxIFFDecoder::ConvertToImage(wxImage *image) const // create the image image->Create(GetWidth(), GetHeight()); - if (!image->Ok()) + if (!image->IsOk()) return false; unsigned char *pal = GetPalette(); @@ -546,7 +545,7 @@ int wxIFFDecoder::ReadIFF() } m_image->p = new byte[bmhd_width * bmhd_height * 3]; - byte *picptr = m_image->p; + byte *picptr = m_image->p; if (!picptr) { Destroy(); return wxIFF_MEMERR; diff --git a/Externals/wxWidgets3/src/common/imagjpeg.cpp b/Externals/wxWidgets3/src/common/imagjpeg.cpp index e048ac59f3..3c52b8e6f7 100644 --- a/Externals/wxWidgets3/src/common/imagjpeg.cpp +++ b/Externals/wxWidgets3/src/common/imagjpeg.cpp @@ -2,7 +2,7 @@ // Name: src/common/imagjpeg.cpp // Purpose: wxImage JPEG handler // Author: Vaclav Slavik -// RCS-ID: $Id: imagjpeg.cpp 66259 2010-11-25 00:53:44Z VZ $ +// RCS-ID: $Id: imagjpeg.cpp 69759 2011-11-14 13:35:48Z VZ $ // Copyright: (c) Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -257,7 +257,7 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos } (cinfo.src->term_source)(&cinfo); jpeg_destroy_decompress(&cinfo); - if (image->Ok()) image->Destroy(); + if (image->IsOk()) image->Destroy(); return false; } @@ -291,7 +291,7 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos jpeg_start_decompress( &cinfo ); image->Create( cinfo.output_width, cinfo.output_height ); - if (!image->Ok()) { + if (!image->IsOk()) { jpeg_finish_decompress( &cinfo ); jpeg_destroy_decompress( &cinfo ); return false; @@ -334,6 +334,13 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos image->SetOption(wxIMAGE_OPTION_RESOLUTIONUNIT, cinfo.density_unit); } + if ( cinfo.image_width != cinfo.output_width || cinfo.image_height != cinfo.output_height ) + { + // save the original image size + image->SetOption(wxIMAGE_OPTION_ORIGINAL_WIDTH, cinfo.image_width); + image->SetOption(wxIMAGE_OPTION_ORIGINAL_HEIGHT, cinfo.image_height); + } + jpeg_finish_decompress( &cinfo ); jpeg_destroy_decompress( &cinfo ); return true; diff --git a/Externals/wxWidgets3/src/common/imagpcx.cpp b/Externals/wxWidgets3/src/common/imagpcx.cpp index d18c1b412a..fcd4a1e6a4 100644 --- a/Externals/wxWidgets3/src/common/imagpcx.cpp +++ b/Externals/wxWidgets3/src/common/imagpcx.cpp @@ -3,7 +3,7 @@ // Purpose: wxImage PCX handler // Author: Guillermo Rodriguez Garcia // Version: 1.1 -// CVS-ID: $Id: imagpcx.cpp 61363 2009-07-09 20:26:34Z VZ $ +// CVS-ID: $Id: imagpcx.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 1999 Guillermo Rodriguez Garcia // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -214,7 +214,7 @@ int ReadPCX(wxImage *image, wxInputStream& stream) image->Create(width, height); - if (!image->Ok()) + if (!image->IsOk()) return wxPCX_MEMERR; if ((p = (unsigned char *) malloc(bytesperline * nplanes)) == NULL) @@ -331,7 +331,7 @@ int SavePCX(wxImage *image, wxOutputStream& stream) // according to PCX specs) and allocate space for one complete // scanline. - if (!image->Ok()) + if (!image->IsOk()) return wxPCX_INVFORMAT; width = image->GetWidth(); diff --git a/Externals/wxWidgets3/src/common/imagpng.cpp b/Externals/wxWidgets3/src/common/imagpng.cpp index 6a0c86b224..64bc0aa402 100644 --- a/Externals/wxWidgets3/src/common/imagpng.cpp +++ b/Externals/wxWidgets3/src/common/imagpng.cpp @@ -2,7 +2,7 @@ // Name: src/common/imagpng.cpp // Purpose: wxImage PNG handler // Author: Robert Roebling -// RCS-ID: $Id: imagpng.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: imagpng.cpp 70353 2012-01-15 14:46:41Z VZ $ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -116,11 +116,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler) // First, let me describe what's the problem: libpng uses jmp_buf in // its png_struct structure. Unfortunately, this structure is // compiler-specific and may vary in size, so if you use libpng compiled -// as DLL with another compiler than the main executable, it may not work -// (this is for example the case with wxMGL port and SciTech MGL library -// that provides custom runtime-loadable libpng implementation with jmpbuf -// disabled altogether). Luckily, it is still possible to use setjmp() & -// longjmp() as long as the structure is not part of png_struct. +// as DLL with another compiler than the main executable, it may not work. +// Luckily, it is still possible to use setjmp() & longjmp() as long as the +// structure is not part of png_struct. // // Sadly, there's no clean way to attach user-defined data to png_struct. // There is only one customizable place, png_struct.io_ptr, which is meant @@ -558,7 +556,7 @@ wxPNGHandler::LoadFile(wxImage *image, image->Create((int)width, (int)height, (bool) false /* no need to init pixels */); - if (!image->Ok()) + if (!image->IsOk()) goto error; // initialize all line pointers to NULL to ensure that they can be safely @@ -660,7 +658,7 @@ error: wxLogError(_("Couldn't load a PNG image - file is corrupted or not enough memory.")); } - if ( image->Ok() ) + if ( image->IsOk() ) { image->Destroy(); } @@ -795,15 +793,13 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos #endif ; - png_color_8 mask; + png_color_8 mask = { 0, 0, 0, 0, 0 }; if (bHasMask) { mask.red = image->GetMaskRed(); mask.green = image->GetMaskGreen(); mask.blue = image->GetMaskBlue(); - mask.alpha = 0; - mask.gray = 0; } PaletteMap palette; diff --git a/Externals/wxWidgets3/src/common/imagtga.cpp b/Externals/wxWidgets3/src/common/imagtga.cpp index 909eb5a4c8..2b0f27a2cd 100644 --- a/Externals/wxWidgets3/src/common/imagtga.cpp +++ b/Externals/wxWidgets3/src/common/imagtga.cpp @@ -2,7 +2,7 @@ // Name: src/common/imagtga.cpp // Purpose: wxImage TGA handler // Author: Seth Jackson -// CVS-ID: $Id: imagtga.cpp 67254 2011-03-20 00:14:35Z DS $ +// CVS-ID: $Id: imagtga.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 2005 Seth Jackson // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -227,7 +227,7 @@ int ReadTGA(wxImage* image, wxInputStream& stream) image->Create(width, height); - if (!image->Ok()) + if (!image->IsOk()) { return wxTGA_MEMERR; } @@ -846,7 +846,7 @@ bool wxTGAHandler::DoCanRead(wxInputStream& stream) unsigned char hdr[HDR_SIZE]; stream.Read(hdr, HDR_SIZE); // it's ok to modify the stream position here - // Check wether we can read the file or not. + // Check whether we can read the file or not. short colorType = hdr[HDR_COLORTYPE]; if ( colorType != wxTGA_UNMAPPED && colorType != wxTGA_MAPPED ) diff --git a/Externals/wxWidgets3/src/common/imagtiff.cpp b/Externals/wxWidgets3/src/common/imagtiff.cpp index 3f62a07948..bae7261404 100644 --- a/Externals/wxWidgets3/src/common/imagtiff.cpp +++ b/Externals/wxWidgets3/src/common/imagtiff.cpp @@ -2,7 +2,7 @@ // Name: src/common/imagtiff.cpp // Purpose: wxImage TIFF handler // Author: Robert Roebling -// RCS-ID: $Id: imagtiff.cpp 67264 2011-03-20 19:48:03Z DS $ +// RCS-ID: $Id: imagtiff.cpp 70353 2012-01-15 14:46:41Z VZ $ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -48,11 +48,7 @@ extern "C" #include "wx/wfstream.h" #ifndef TIFFLINKAGEMODE - #if defined(__WATCOMC__) && defined(__WXMGL__) - #define TIFFLINKAGEMODE cdecl - #else - #define TIFFLINKAGEMODE LINKAGEMODE - #endif + #define TIFFLINKAGEMODE LINKAGEMODE #endif // ============================================================================ @@ -110,7 +106,7 @@ wxTIFFHandler::wxTIFFHandler() m_name = wxT("TIFF file"); m_extension = wxT("tif"); m_altExtensions.Add(wxT("tiff")); - m_type = wxBITMAP_TYPE_TIF; + m_type = wxBITMAP_TYPE_TIFF; m_mime = wxT("image/tiff"); TIFFSetWarningHandler((TIFFErrorHandler) TIFFwxWarningHandler); TIFFSetErrorHandler((TIFFErrorHandler) TIFFwxErrorHandler); @@ -192,8 +188,42 @@ wxTIFFSeekOProc(thandle_t handle, toff_t off, int whence) { wxOutputStream *stream = (wxOutputStream*) handle; - return wxFileOffsetToTIFF(stream->SeekO((wxFileOffset)off, - wxSeekModeFromTIFF(whence))); + toff_t offset = wxFileOffsetToTIFF( + stream->SeekO((wxFileOffset)off, wxSeekModeFromTIFF(whence)) ); + + if (offset != (toff_t) -1 || whence != SEEK_SET) + { + return offset; + } + + + /* + Try to workaround problems with libtiff seeking past the end of streams. + + This occurs when libtiff is writing tag entries past the end of a + stream but hasn't written the directory yet (which will be placed + before the tags and contain offsets to the just written tags). + The behaviour for seeking past the end of a stream is not consistent + and doesn't work with for example wxMemoryOutputStream. When this type + of seeking fails (with SEEK_SET), fill in the gap with zeroes and try + again. + */ + + wxFileOffset streamLength = stream->GetLength(); + if (streamLength != wxInvalidOffset && (wxFileOffset) off > streamLength) + { + if (stream->SeekO(streamLength, wxFromStart) == wxInvalidOffset) + { + return (toff_t) -1; + } + + for (wxFileOffset i = 0; i < (wxFileOffset) off - streamLength; ++i) + { + stream->PutC(0); + } + } + + return wxFileOffsetToTIFF( stream->TellO() ); } int TIFFLINKAGEMODE @@ -296,19 +326,24 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w ); TIFFGetField( tif, TIFFTAG_IMAGELENGTH, &h ); - uint16 photometric; - uint16 samplesPerPixel; + uint16 samplesPerPixel = 0; + (void) TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLESPERPIXEL, &samplesPerPixel); + + uint16 bitsPerSample = 0; + (void) TIFFGetFieldDefaulted(tif, TIFFTAG_BITSPERSAMPLE, &bitsPerSample); + uint16 extraSamples; uint16* samplesInfo; - TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLESPERPIXEL, &samplesPerPixel); TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES, &extraSamples, &samplesInfo); + + uint16 photometric; if (!TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric)) { photometric = PHOTOMETRIC_MINISWHITE; } const bool hasAlpha = (extraSamples >= 1 - && ((samplesInfo[0] == EXTRASAMPLE_UNSPECIFIED && samplesPerPixel > 3) + && ((samplesInfo[0] == EXTRASAMPLE_UNSPECIFIED) || samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA || samplesInfo[0] == EXTRASAMPLE_UNASSALPHA)) || (extraSamples == 0 && samplesPerPixel == 4 @@ -344,7 +379,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos } image->Create( (int)w, (int)h ); - if (!image->Ok()) + if (!image->IsOk()) { if (verbose) { @@ -360,7 +395,77 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos if ( hasAlpha ) image->SetAlpha(); - if (!TIFFReadRGBAImage( tif, w, h, raster, 0 )) + uint16 planarConfig = PLANARCONFIG_CONTIG; + (void) TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &planarConfig); + + bool ok = true; + char msg[1024] = ""; + if + ( + (planarConfig == PLANARCONFIG_CONTIG && samplesPerPixel == 2 + && extraSamples == 1) + && + ( + ( !TIFFRGBAImageOK(tif, msg) ) + || (bitsPerSample == 8) + ) + ) + { + const bool isGreyScale = (bitsPerSample == 8); + unsigned char *buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(tif)); + uint32 pos = 0; + const bool minIsWhite = (photometric == PHOTOMETRIC_MINISWHITE); + const int minValue = minIsWhite ? 255 : 0; + const int maxValue = 255 - minValue; + + /* + Decode to ABGR format as that is what the code, that converts to + wxImage, later on expects (normally TIFFReadRGBAImageOriented is + used to decode which uses an ABGR layout). + */ + for (uint32 y = 0; y < h; ++y) + { + if (TIFFReadScanline(tif, buf, y, 0) != 1) + { + ok = false; + break; + } + + if (isGreyScale) + { + for (uint32 x = 0; x < w; ++x) + { + uint8 val = minIsWhite ? 255 - buf[x*2] : buf[x*2]; + uint8 alpha = minIsWhite ? 255 - buf[x*2+1] : buf[x*2+1]; + raster[pos] = val + (val << 8) + (val << 16) + + (alpha << 24); + pos++; + } + } + else + { + for (uint32 x = 0; x < w; ++x) + { + int mask = buf[x*2/8] << ((x*2)%8); + + uint8 val = mask & 128 ? maxValue : minValue; + raster[pos] = val + (val << 8) + (val << 16) + + ((mask & 64 ? maxValue : minValue) << 24); + pos++; + } + } + } + + _TIFFfree(buf); + } + else + { + ok = TIFFReadRGBAImageOriented( tif, w, h, raster, + ORIENTATION_TOPLEFT, 0 ) != 0; + } + + + if (!ok) { if (verbose) { @@ -375,11 +480,8 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos } unsigned char *ptr = image->GetData(); - ptr += w*3*(h-1); - unsigned char *alpha = hasAlpha ? image->GetAlpha() : NULL; - if ( hasAlpha ) - alpha += w*(h-1); + unsigned char *alpha = image->GetAlpha(); uint32 pos = 0; @@ -395,32 +497,29 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos pos++; } - - // subtract line we just added plus one line: - ptr -= 2*w*3; - if ( hasAlpha ) - alpha -= 2*w; } - uint16 spp, bpp, compression; + image->SetOption(wxIMAGE_OPTION_TIFF_PHOTOMETRIC, photometric); + + uint16 compression; /* - Read some baseline TIFF tags which helps when re-saving a TIFF + Copy some baseline TIFF tags which helps when re-saving a TIFF to be similar to the original image. */ - if ( TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLESPERPIXEL, &spp) ) + if (samplesPerPixel) { - image->SetOption(wxIMAGE_OPTION_SAMPLESPERPIXEL, spp); + image->SetOption(wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL, samplesPerPixel); } - if ( TIFFGetFieldDefaulted(tif, TIFFTAG_BITSPERSAMPLE, &bpp) ) + if (bitsPerSample) { - image->SetOption(wxIMAGE_OPTION_BITSPERSAMPLE, bpp); + image->SetOption(wxIMAGE_OPTION_TIFF_BITSPERSAMPLE, bitsPerSample); } if ( TIFFGetFieldDefaulted(tif, TIFFTAG_COMPRESSION, &compression) ) { - image->SetOption(wxIMAGE_OPTION_COMPRESSION, compression); + image->SetOption(wxIMAGE_OPTION_TIFF_COMPRESSION, compression); } // Set the resolution unit. @@ -516,8 +615,8 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo return false; } - TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); - TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, (uint32)image->GetWidth()); + const int imageWidth = image->GetWidth(); + TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, (uint32) imageWidth); TIFFSetField(tif, TIFFTAG_IMAGELENGTH, (uint32)image->GetHeight()); TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); @@ -553,39 +652,90 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo } - int spp = image->GetOptionInt(wxIMAGE_OPTION_SAMPLESPERPIXEL); + int spp = image->GetOptionInt(wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL); if ( !spp ) spp = 3; - int bpp = image->GetOptionInt(wxIMAGE_OPTION_BITSPERSAMPLE); - if ( !bpp ) - bpp = 8; - - int compression = image->GetOptionInt(wxIMAGE_OPTION_COMPRESSION); - if ( !compression ) + int bps = image->GetOptionInt(wxIMAGE_OPTION_TIFF_BITSPERSAMPLE); + if ( !bps ) { - // we can't use COMPRESSION_LZW because current version of libtiff + bps = 8; + } + else if (bps == 1) + { + // One bit per sample combined with 3 samples per pixel is + // not allowed and crashes libtiff. + spp = 1; + } + + int photometric = PHOTOMETRIC_RGB; + + if ( image->HasOption(wxIMAGE_OPTION_TIFF_PHOTOMETRIC) ) + { + photometric = image->GetOptionInt(wxIMAGE_OPTION_TIFF_PHOTOMETRIC); + if (photometric == PHOTOMETRIC_MINISWHITE + || photometric == PHOTOMETRIC_MINISBLACK) + { + // either b/w or greyscale + spp = 1; + } + } + else if (spp <= 2) + { + photometric = PHOTOMETRIC_MINISWHITE; + } + + const bool hasAlpha = image->HasAlpha(); + + int compression = image->GetOptionInt(wxIMAGE_OPTION_TIFF_COMPRESSION); + if ( !compression || (compression == COMPRESSION_JPEG && hasAlpha) ) + { + // We can't use COMPRESSION_LZW because current version of libtiff // doesn't implement it ("no longer implemented due to Unisys patent // enforcement") and other compression methods are lossy so we - // shouldn't use them by default -- and the only remaining one is none + // shouldn't use them by default -- and the only remaining one is none. + // Also JPEG compression for alpha images is not a good idea (viewers + // not opening the image properly). compression = COMPRESSION_NONE; } - TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, spp); - TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bpp); - TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, spp*bpp == 1 ? PHOTOMETRIC_MINISBLACK - : PHOTOMETRIC_RGB); + if + ( + (photometric == PHOTOMETRIC_RGB && spp == 4) + || (photometric <= PHOTOMETRIC_MINISBLACK && spp == 2) + ) + { + // Compensate for user passing a SamplesPerPixel that includes + // the alpha channel. + spp--; + } + + + int extraSamples = hasAlpha ? 1 : 0; + + TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, spp + extraSamples); + TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps); + TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, photometric); TIFFSetField(tif, TIFFTAG_COMPRESSION, compression); - // scanlinesize if determined by spp and bpp - tsize_t linebytes = (tsize_t)image->GetWidth() * spp * bpp / 8; + if (extraSamples) + { + uint16 extra[] = { EXTRASAMPLE_UNSPECIFIED }; + TIFFSetField(tif, TIFFTAG_EXTRASAMPLES, (long) 1, &extra); + } - if ( (image->GetWidth() % 8 > 0) && (spp * bpp < 8) ) - linebytes+=1; + // scanlinesize is determined by spp+extraSamples and bps + const tsize_t linebytes = + (tsize_t)((imageWidth * (spp + extraSamples) * bps + 7) / 8); unsigned char *buf; - if (TIFFScanlineSize(tif) > linebytes || (spp * bpp < 24)) + const bool isColouredImage = (spp > 1) + && (photometric != PHOTOMETRIC_MINISWHITE) + && (photometric != PHOTOMETRIC_MINISBLACK); + + + if (TIFFScanlineSize(tif) > linebytes || !isColouredImage || hasAlpha) { buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(tif)); if (!buf) @@ -607,27 +757,84 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP,TIFFDefaultStripSize(tif, (uint32) -1)); + const int bitsPerPixel = (spp + extraSamples) * bps; + const int bytesPerPixel = (bitsPerPixel + 7) / 8; + const int pixelsPerByte = 8 / bitsPerPixel; + int remainingPixelCount = 0; + + if (pixelsPerByte) + { + // How many pixels to write in the last byte column? + remainingPixelCount = imageWidth % pixelsPerByte; + if (!remainingPixelCount) remainingPixelCount = pixelsPerByte; + } + + const bool minIsWhite = (photometric == PHOTOMETRIC_MINISWHITE); unsigned char *ptr = image->GetData(); for ( int row = 0; row < image->GetHeight(); row++ ) { if ( buf ) { - if ( spp * bpp > 1 ) + if (isColouredImage) { - // color image - memcpy(buf, ptr, image->GetWidth()); + // colour image + if (hasAlpha) + { + for ( int column = 0; column < imageWidth; column++ ) + { + buf[column*4 ] = ptr[column*3 ]; + buf[column*4 + 1] = ptr[column*3 + 1]; + buf[column*4 + 2] = ptr[column*3 + 2]; + buf[column*4 + 3] = image->GetAlpha(column, row); + } + } + else + { + memcpy(buf, ptr, imageWidth * 3); + } + } + else if (spp * bps == 8) // greyscale image + { + for ( int column = 0; column < imageWidth; column++ ) + { + uint8 value = ptr[column*3 + 1]; + if (minIsWhite) + { + value = 255 - value; + } + + buf[column * bytesPerPixel] = value; + + if (hasAlpha) + { + value = image->GetAlpha(column, row); + buf[column*bytesPerPixel+1] + = minIsWhite ? 255 - value : value; + } + } } else // black and white image { for ( int column = 0; column < linebytes; column++ ) { uint8 reverse = 0; - for ( int bp = 0; bp < 8; bp++ ) + int pixelsPerByteCount = (column + 1 != linebytes) + ? pixelsPerByte + : remainingPixelCount; + for ( int bp = 0; bp < pixelsPerByteCount; bp++ ) { - if ( ptr[column*24 + bp*3] > 0 ) + if ( (ptr[column * 3 * pixelsPerByte + bp*3 + 1] <=127) + == minIsWhite ) { - // check only red as this is sufficient - reverse = (uint8)(reverse | 128 >> bp); + // check only green as this is sufficient + reverse |= (uint8) (128 >> (bp * bitsPerPixel)); + } + + if (hasAlpha + && (image->GetAlpha(column * pixelsPerByte + bp, + row) <= 127) == minIsWhite) + { + reverse |= (uint8) (64 >> (bp * bitsPerPixel)); } } @@ -650,7 +857,7 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo return false; } - ptr += image->GetWidth()*3; + ptr += imageWidth * 3; } (void) TIFFClose(tif); diff --git a/Externals/wxWidgets3/src/common/imagxpm.cpp b/Externals/wxWidgets3/src/common/imagxpm.cpp index 1b1fea5924..917b0aa157 100644 --- a/Externals/wxWidgets3/src/common/imagxpm.cpp +++ b/Externals/wxWidgets3/src/common/imagxpm.cpp @@ -2,7 +2,7 @@ // Name: src/common/imagxpm.cpp // Purpose: wxXPMHandler // Author: Vaclav Slavik, Robert Roebling -// RCS-ID: $Id: imagxpm.cpp 60852 2009-06-01 11:43:36Z FM $ +// RCS-ID: $Id: imagxpm.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 2001 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -97,7 +97,7 @@ bool wxXPMHandler::LoadFile(wxImage *image, wxXPMDecoder decoder; wxImage img = decoder.ReadFile(stream); - if ( !img.Ok() ) + if ( !img.IsOk() ) return false; *image = img; return true; diff --git a/Externals/wxWidgets3/src/common/init.cpp b/Externals/wxWidgets3/src/common/init.cpp index 654cb99976..fa8e2bef32 100644 --- a/Externals/wxWidgets3/src/common/init.cpp +++ b/Externals/wxWidgets3/src/common/init.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 04.10.99 -// RCS-ID: $Id: init.cpp 64656 2010-06-20 18:18:23Z VZ $ +// RCS-ID: $Id: init.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -37,7 +37,7 @@ #include "wx/scopedptr.h" #include "wx/except.h" -#if defined(__WXMSW__) +#if defined(__WINDOWS__) #include "wx/msw/private.h" #include "wx/msw/msvcrt.h" @@ -53,7 +53,7 @@ } } gs_enableLeakChecks; #endif // wxCrtSetDbgFlag -#endif // __WXMSW__ +#endif // __WINDOWS__ // ---------------------------------------------------------------------------- // private classes @@ -238,7 +238,7 @@ static bool DoCommonPreInit() wxLog::GetActiveTarget(); #endif // wxUSE_LOG -#ifdef __WXMSW__ +#ifdef __WINDOWS__ // GUI applications obtain HINSTANCE in their WinMain() but we also need to // initialize the global wxhInstance variable for the console programs as // they may need it too, so set it here if it wasn't done yet @@ -246,7 +246,7 @@ static bool DoCommonPreInit() { wxSetInstance(::GetModuleHandle(NULL)); } -#endif // __WXMSW__ +#endif // __WINDOWS__ return true; } @@ -432,9 +432,9 @@ void wxEntryCleanup() // ---------------------------------------------------------------------------- // for MSW the real wxEntry is defined in msw/main.cpp -#ifndef __WXMSW__ +#ifndef __WINDOWS__ #define wxEntryReal wxEntry -#endif // !__WXMSW__ +#endif // !__WINDOWS__ int wxEntryReal(int& argc, wxChar **argv) { diff --git a/Externals/wxWidgets3/src/common/intl.cpp b/Externals/wxWidgets3/src/common/intl.cpp index dc3d1ca154..2f1874f363 100644 --- a/Externals/wxWidgets3/src/common/intl.cpp +++ b/Externals/wxWidgets3/src/common/intl.cpp @@ -5,7 +5,7 @@ // Modified by: Michael N. Filippov // (2003/09/30 - PluralForms support) // Created: 29/01/98 -// RCS-ID: $Id: intl.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: intl.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -121,7 +121,7 @@ inline wxString ExtractNotLang(const wxString& langFull) // wxLanguageInfo // ---------------------------------------------------------------------------- -#ifdef __WXMSW__ +#ifdef __WINDOWS__ // helper used by wxLanguageInfo::GetLocaleName() and elsewhere to determine // whether the locale is Unicode-only (it is if this function returns empty @@ -177,7 +177,7 @@ wxString wxLanguageInfo::GetLocaleName() const return locale; } -#endif // __WXMSW__ +#endif // __WINDOWS__ // ---------------------------------------------------------------------------- // wxLocale @@ -1033,7 +1033,14 @@ wxLocale::~wxLocale() bool wxLocale::IsAvailable(int lang) { const wxLanguageInfo *info = wxLocale::GetLanguageInfo(lang); - wxCHECK_MSG( info, false, wxS("invalid language") ); + if ( !info ) + { + // The language is unknown (this normally only happens when we're + // passed wxLANGUAGE_DEFAULT), so we can't support it. + wxASSERT_MSG( lang == wxLANGUAGE_DEFAULT, + wxS("No info for a valid language?") ); + return false; + } #if defined(__WIN32__) if ( !info->WinLang ) @@ -1045,16 +1052,21 @@ bool wxLocale::IsAvailable(int lang) #elif defined(__UNIX__) // Test if setting the locale works, then set it back. - const char *oldLocale = wxSetlocaleTryUTF8(LC_ALL, info->CanonicalName); - if ( !oldLocale ) - { - // Some C libraries don't like xx_YY form and require xx only - oldLocale = wxSetlocaleTryUTF8(LC_ALL, ExtractLang(info->CanonicalName)); - if ( !oldLocale ) - return false; - } + char * const oldLocale = wxStrdupA(setlocale(LC_ALL, NULL)); + + // Some platforms don't like xx_YY form and require xx only so test for + // it too. + const bool + available = wxSetlocaleTryUTF8(LC_ALL, info->CanonicalName) || + wxSetlocaleTryUTF8(LC_ALL, ExtractLang(info->CanonicalName)); + // restore the original locale wxSetlocale(LC_ALL, oldLocale); + + free(oldLocale); + + if ( !available ) + return false; #endif return true; @@ -1114,7 +1126,7 @@ wxString wxLocale::GetHeaderValue(const wxString& header, // accessors for locale-dependent data // ---------------------------------------------------------------------------- -#if defined(__WXMSW__) || defined(__WXOSX__) +#if defined(__WINDOWS__) || defined(__WXOSX__) namespace { @@ -1136,7 +1148,7 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt) const char* formatchars = "dghHmMsSy" -#ifdef __WXMSW__ +#ifdef __WINDOWS__ "t" #else "EawD" @@ -1176,7 +1188,7 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt) // between 1 and 2 digits for days fmtWX += "%d"; break; -#ifdef __WXMSW__ +#ifdef __WINDOWS__ case 3: // ddd fmtWX += "%a"; break; @@ -1189,7 +1201,7 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt) wxFAIL_MSG( "too many 'd's" ); } break; -#ifndef __WXMSW__ +#ifndef __WINDOWS__ case 'D': switch ( lastCount ) { @@ -1332,12 +1344,12 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt) wxASSERT_MSG( lastCount <= 2, "too many 'g's" ); break; -#ifndef __WXMSW__ +#ifndef __WINDOWS__ case 'a': fmtWX += "%p"; break; #endif -#ifdef __WXMSW__ +#ifdef __WINDOWS__ case 't': switch ( lastCount ) { @@ -1377,9 +1389,9 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt) } // anonymous namespace -#endif // __WXMSW__ || __WXOSX__ +#endif // __WINDOWS__ || __WXOSX__ -#if defined(__WXMSW__) +#if defined(__WINDOWS__) namespace { @@ -1437,7 +1449,23 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat) : LOCALE_SDECIMAL, buf, WXSIZEOF(buf)) ) + { str = buf; + + // As we get our decimal point separator from Win32 and not the + // CRT there is a possibility of mismatch between them and this + // can easily happen if the user code called setlocale() + // instead of using wxLocale to change the locale. And this can + // result in very strange bugs elsewhere in the code as the + // assumptions that formatted strings do use the decimal + // separator actually fail, so check for it here. + wxASSERT_MSG + ( + wxString::Format("%.3f", 1.23).find(str) != wxString::npos, + "Decimal separator mismatch -- did you use setlocale()?" + "If so, use wxLocale to change the locale instead." + ); + } break; case wxLOCALE_SHORT_DATE_FMT: @@ -1554,7 +1582,7 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat)) return str.AsString(); } -#else // !__WXMSW__ && !__WXOSX__, assume generic POSIX +#else // !__WINDOWS__ && !__WXOSX__, assume generic POSIX namespace { diff --git a/Externals/wxWidgets3/src/common/languageinfo.cpp b/Externals/wxWidgets3/src/common/languageinfo.cpp index c476d3147e..a04c16e078 100644 --- a/Externals/wxWidgets3/src/common/languageinfo.cpp +++ b/Externals/wxWidgets3/src/common/languageinfo.cpp @@ -3,7 +3,7 @@ // Purpose: wxLocale::InitLanguagesDB() // Author: Vadim Zeitlin, Vaclav Slavik // Created: 2010-04-23 -// RCS-ID: $Id: languageinfo.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: languageinfo.cpp 67426 2011-04-10 15:35:56Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -663,7 +663,7 @@ void wxLocale::InitLanguagesDB() LNG(wxLANGUAGE_ITALIAN, "it_IT", LANG_ITALIAN , SUBLANG_ITALIAN , wxLayout_LeftToRight, "Italian") LNG(wxLANGUAGE_ITALIAN_SWISS, "it_CH", LANG_ITALIAN , SUBLANG_ITALIAN_SWISS , wxLayout_LeftToRight, "Italian (Swiss)") LNG(wxLANGUAGE_JAPANESE, "ja_JP", LANG_JAPANESE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Japanese") - LNG(wxLANGUAGE_JAVANESE, "jw" , 0 , 0 , wxLayout_LeftToRight, "Javanese") + LNG(wxLANGUAGE_JAVANESE, "jv" , 0 , 0 , wxLayout_LeftToRight, "Javanese") LNG(wxLANGUAGE_KANNADA, "kn" , LANG_KANNADA , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kannada") LNG(wxLANGUAGE_KASHMIRI, "ks" , LANG_KASHMIRI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kashmiri") LNG(wxLANGUAGE_KASHMIRI_INDIA, "ks_IN", LANG_KASHMIRI , SUBLANG_KASHMIRI_INDIA , wxLayout_LeftToRight, "Kashmiri (India)") diff --git a/Externals/wxWidgets3/src/common/list.cpp b/Externals/wxWidgets3/src/common/list.cpp index 4a397d04a6..6ad2926ac9 100644 --- a/Externals/wxWidgets3/src/common/list.cpp +++ b/Externals/wxWidgets3/src/common/list.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added // Created: 04/01/98 -// RCS-ID: $Id: list.cpp 61508 2009-07-23 20:30:22Z VZ $ +// RCS-ID: $Id: list.cpp 67769 2011-05-20 14:29:07Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence //////////////////////////////////////////////////////////////////////////////// @@ -33,7 +33,7 @@ #include "wx/crt.h" #endif -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS // ============================================================================= // implementation @@ -171,22 +171,18 @@ void wxListBase::DoCopy(const wxListBase& list) { case wxKEY_INTEGER: { - long key; for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() ) { - key = node->GetKeyInteger(); - Append(key, node->GetData()); + Append(node->GetKeyInteger(), node->GetData()); } break; } case wxKEY_STRING: { - const wxChar *key; for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() ) { - key = node->GetKeyString(); - Append(key, node->GetData()); + Append(node->GetKeyString(), node->GetData()); } break; } @@ -756,16 +752,16 @@ wxNode *wxStringList::Prepend(const wxChar *s) #endif // wxLIST_COMPATIBILITY -#else // wxUSE_STL = 1 +#else // wxUSE_STD_CONTAINERS = 1 #include "wx/listimpl.cpp" WX_DEFINE_LIST(wxObjectList) -// with wxUSE_STL wxStringList contains wxString objects, not pointers +// with wxUSE_STD_CONTAINERS wxStringList contains wxString objects, not pointers void _WX_LIST_HELPER_wxStringListBase::DeleteFunction( wxString WXUNUSED(X) ) { } wxStringListBase::BaseListType wxStringListBase::EmptyList; -#endif // !wxUSE_STL +#endif // !wxUSE_STD_CONTAINERS diff --git a/Externals/wxWidgets3/src/common/listctrlcmn.cpp b/Externals/wxWidgets3/src/common/listctrlcmn.cpp index 220eaa3f0e..dd7fc610b0 100644 --- a/Externals/wxWidgets3/src/common/listctrlcmn.cpp +++ b/Externals/wxWidgets3/src/common/listctrlcmn.cpp @@ -3,7 +3,7 @@ // Purpose: Common defines for wxListCtrl and wxListCtrl-based classes. // Author: Kevin Ollivier // Created: 09/15/06 -// RCS-ID: $Id: listctrlcmn.cpp 66555 2011-01-04 08:31:53Z SC $ +// RCS-ID: $Id: listctrlcmn.cpp 70284 2012-01-07 15:09:51Z VZ $ // Copyright: (c) Kevin Ollivier // Licence: wxWindows licence //////////////////////////////////////////////////////////////////////////////// @@ -27,6 +27,10 @@ #include "wx/listctrl.h" +#ifndef WX_PRECOMP + #include "wx/dcclient.h" +#endif + const char wxListCtrlNameStr[] = "listCtrl"; // ListCtrl events @@ -128,4 +132,83 @@ IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl) IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent) +// ---------------------------------------------------------------------------- +// wxListCtrlBase implementation +// ---------------------------------------------------------------------------- + +long +wxListCtrlBase::AppendColumn(const wxString& heading, + int format, + int width) +{ + return InsertColumn(GetColumnCount(), heading, format, width); +} + +long +wxListCtrlBase::InsertColumn(long col, + const wxString& heading, + int format, + int width) +{ + wxListItem item; + item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT; + item.m_text = heading; + if ( width >= 0 + || width == wxLIST_AUTOSIZE + || width == wxLIST_AUTOSIZE_USEHEADER ) + { + item.m_mask |= wxLIST_MASK_WIDTH; + item.m_width = width; + } + item.m_format = format; + + return InsertColumn(col, item); +} + +long wxListCtrlBase::InsertColumn(long col, const wxListItem& info) +{ + long rc = DoInsertColumn(col, info); + if ( rc != -1 ) + { + // As our best size calculation depends on the column headers, + // invalidate the previously cached best size when a column is added. + InvalidateBestSize(); + } + + return rc; +} + +wxSize wxListCtrlBase::DoGetBestClientSize() const +{ + // There is no obvious way to determine the best size in icon and list + // modes so just don't do it for now. + if ( !InReportView() ) + return wxControl::DoGetBestClientSize(); + + // In report mode, we use only the column headers, not items, to determine + // the best width. The reason for this is that it's easier (we can't just + // iterate over all items, especially not in a virtual control, so we'd + // have to do something relatively complicated such as checking the size of + // some items in the beginning and the end only) and also because the + // columns are usually static while the list contents is dynamic so it + // usually doesn't make much sense to adjust the control size to it anyhow. + // And finally, scrollbars can always be used with the items while the + // headers are just truncated if there is not enough place for them. + const int columns = GetColumnCount(); + if ( HasFlag(wxLC_NO_HEADER) || !columns ) + return wxControl::DoGetBestClientSize(); + + wxClientDC dc(const_cast(this)); + + // Total width of all headers determines the best control width. + int totalWidth = 0; + for ( int col = 0; col < columns; col++ ) + { + totalWidth += GetColumnWidth(col); + } + + // Use some arbitrary height, there is no good way to determine it. + return wxSize(totalWidth, 10*dc.GetCharHeight()); +} + #endif // wxUSE_LISTCTRL diff --git a/Externals/wxWidgets3/src/common/log.cpp b/Externals/wxWidgets3/src/common/log.cpp index 0a3ae3d03a..33a86d1763 100644 --- a/Externals/wxWidgets3/src/common/log.cpp +++ b/Externals/wxWidgets3/src/common/log.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 29/01/98 -// RCS-ID: $Id: log.cpp 67268 2011-03-21 10:59:59Z VZ $ +// RCS-ID: $Id: log.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -53,13 +53,11 @@ #include -#ifndef __WXPALMOS5__ #ifndef __WXWINCE__ #include #else #include "wx/msw/wince/time.h" #endif -#endif /* ! __WXPALMOS5__ */ #if defined(__WINDOWS__) #include "wx/msw/private.h" // includes windows.h @@ -204,6 +202,62 @@ void wxSafeShowMessage(const wxString& title, const wxString& text) #endif } +// ---------------------------------------------------------------------------- +// wxLogFormatter class implementation +// ---------------------------------------------------------------------------- + +wxString +wxLogFormatter::Format(wxLogLevel level, + const wxString& msg, + const wxLogRecordInfo& info) const +{ + wxString prefix; + + // don't time stamp debug messages under MSW as debug viewers usually + // already have an option to do it +#ifdef __WINDOWS__ + if ( level != wxLOG_Debug && level != wxLOG_Trace ) +#endif // __WINDOWS__ + prefix = FormatTime(info.timestamp); + + switch ( level ) + { + case wxLOG_Error: + prefix += _("Error: "); + break; + + case wxLOG_Warning: + prefix += _("Warning: "); + break; + + // don't prepend "debug/trace" prefix under MSW as it goes to the debug + // window anyhow and so can't be confused with something else +#ifndef __WINDOWS__ + case wxLOG_Debug: + // this prefix (as well as the one below) is intentionally not + // translated as nobody translates debug messages anyhow + prefix += "Debug: "; + break; + + case wxLOG_Trace: + prefix += "Trace: "; + break; +#endif // !__WINDOWS__ + } + + return prefix + msg; +} + +wxString +wxLogFormatter::FormatTime(time_t t) const +{ + wxString str; + wxLog::TimeStamp(&str, t); + + return str; +} + + // ---------------------------------------------------------------------------- // wxLog class implementation // ---------------------------------------------------------------------------- @@ -216,12 +270,24 @@ unsigned wxLog::LogLastRepeatIfNeeded() { wxString msg; #if wxUSE_INTL - msg.Printf(wxPLURAL("The previous message repeated once.", - "The previous message repeated %lu times.", - gs_prevLog.numRepeated), - gs_prevLog.numRepeated); + if ( gs_prevLog.numRepeated == 1 ) + { + // We use a separate message for this case as "repeated 1 time" + // looks somewhat strange. + msg = _("The previous message repeated once."); + } + else + { + // Notice that we still use wxPLURAL() to ensure that multiple + // numbers of times are correctly formatted, even though we never + // actually use the singular string. + msg.Printf(wxPLURAL("The previous message repeated %lu time.", + "The previous message repeated %lu times.", + gs_prevLog.numRepeated), + gs_prevLog.numRepeated); + } #else - msg.Printf(wxS("The previous message was repeated %lu times."), + msg.Printf(wxS("The previous message was repeated %lu time(s)."), gs_prevLog.numRepeated); #endif gs_prevLog.numRepeated = 0; @@ -240,11 +306,22 @@ wxLog::~wxLog() { wxMessageOutputDebug().Printf ( - wxS("Last repeated message (\"%s\", %lu times) wasn't output"), +#if wxUSE_INTL + wxPLURAL + ( + "Last repeated message (\"%s\", %lu time) wasn't output", + "Last repeated message (\"%s\", %lu times) wasn't output", + gs_prevLog.numRepeated + ), +#else + wxS("Last repeated message (\"%s\", %lu time(s)) wasn't output"), +#endif gs_prevLog.msg, gs_prevLog.numRepeated ); } + + delete m_formatter; } // ---------------------------------------------------------------------------- @@ -276,11 +353,7 @@ wxLog::OnLog(wxLogLevel level, { wxSafeShowMessage(wxS("Fatal Error"), msg); -#ifdef __WXWINCE__ - ExitThread(3); -#else - abort(); -#endif + wxAbort(); } wxLog *logger; @@ -383,47 +456,8 @@ void wxLog::DoLogRecord(wxLogLevel level, wxUnusedVar(info); #endif // WXWIN_COMPATIBILITY_2_8/!WXWIN_COMPATIBILITY_2_8 - - // TODO: it would be better to extract message formatting in a separate - // wxLogFormatter class but for now we hard code formatting here - - wxString prefix; - - // don't time stamp debug messages under MSW as debug viewers usually - // already have an option to do it -#ifdef __WXMSW__ - if ( level != wxLOG_Debug && level != wxLOG_Trace ) -#endif // __WXMSW__ - TimeStamp(&prefix); - - // TODO: use the other wxLogRecordInfo fields - - switch ( level ) - { - case wxLOG_Error: - prefix += _("Error: "); - break; - - case wxLOG_Warning: - prefix += _("Warning: "); - break; - - // don't prepend "debug/trace" prefix under MSW as it goes to the debug - // window anyhow and so can't be confused with something else -#ifndef __WXMSW__ - case wxLOG_Debug: - // this prefix (as well as the one below) is intentionally not - // translated as nobody translates debug messages anyhow - prefix += "Debug: "; - break; - - case wxLOG_Trace: - prefix += "Trace: "; - break; -#endif // !__WXMSW__ - } - - DoLogTextAtLevel(level, prefix + msg); + // Use wxLogFormatter to format the message + DoLogTextAtLevel(level, m_formatter->Format (level, msg, info)); } void wxLog::DoLogTextAtLevel(wxLogLevel level, const wxString& msg) @@ -671,17 +705,38 @@ void wxLog::ClearTraceMasks() // wxLog miscellaneous other methods // ---------------------------------------------------------------------------- +#if wxUSE_DATETIME + void wxLog::TimeStamp(wxString *str) { -#if wxUSE_DATETIME if ( !ms_timestamp.empty() ) { *str = wxDateTime::UNow().Format(ms_timestamp); *str += wxS(": "); } -#endif // wxUSE_DATETIME } +void wxLog::TimeStamp(wxString *str, time_t t) +{ + if ( !ms_timestamp.empty() ) + { + *str = wxDateTime(t).Format(ms_timestamp); + *str += wxS(": "); + } +} + +#else // !wxUSE_DATETIME + +void wxLog::TimeStamp(wxString*) +{ +} + +void wxLog::TimeStamp(wxString*, time_t) +{ +} + +#endif // wxUSE_DATETIME/!wxUSE_DATETIME + #if wxUSE_THREADS void wxLog::FlushThreadMessages() @@ -724,6 +779,14 @@ bool wxLog::EnableThreadLogging(bool enable) #endif // wxUSE_THREADS +wxLogFormatter *wxLog::SetFormatter(wxLogFormatter* formatter) +{ + wxLogFormatter* formatterOld = m_formatter; + m_formatter = formatter ? formatter : new wxLogFormatter; + + return formatterOld; +} + void wxLog::Flush() { LogLastRepeatIfNeeded(); @@ -985,7 +1048,7 @@ static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz) // get error code from syste unsigned long wxSysErrorCode() { -#if defined(__WXMSW__) && !defined(__WXMICROWIN__) +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) return ::GetLastError(); #else //Unix return errno; @@ -998,7 +1061,7 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode) if ( nErrCode == 0 ) nErrCode = wxSysErrorCode(); -#if defined(__WXMSW__) && !defined(__WXMICROWIN__) +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) static wxChar s_szBuf[1024]; // get error message from system @@ -1046,7 +1109,7 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode) } return s_szBuf; -#else // !__WXMSW__ +#else // !__WINDOWS__ #if wxUSE_UNICODE static wchar_t s_wzBuf[1024]; wxConvCurrent->MB2WC(s_wzBuf, strerror((int)nErrCode), @@ -1055,7 +1118,7 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode) #else return strerror((int)nErrCode); #endif -#endif // __WXMSW__/!__WXMSW__ +#endif // __WINDOWS__/!__WINDOWS__ } #endif // wxUSE_LOG diff --git a/Externals/wxWidgets3/src/common/longlong.cpp b/Externals/wxWidgets3/src/common/longlong.cpp index 4358a51220..b34d53373c 100644 --- a/Externals/wxWidgets3/src/common/longlong.cpp +++ b/Externals/wxWidgets3/src/common/longlong.cpp @@ -6,7 +6,7 @@ // not documented and is for private use only. // Modified by: // Created: 10.02.99 -// RCS-ID: $Id: longlong.cpp 61508 2009-07-23 20:30:22Z VZ $ +// RCS-ID: $Id: longlong.cpp 67643 2011-04-28 16:16:16Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -133,6 +133,22 @@ wxULongLongNative& wxULongLongNative::operator=(const class wxULongLongWx &ll) } #endif +#ifdef __VISUALC6__ +double wxULongLongNative::ToDouble() const +{ + // Work around the problem of casting unsigned __int64 to double in VC6 + // (which for unknown reasons only manifests itself in DLL builds, i.e. + // when using /MD). + static const __int64 int64_t_max = 9223372036854775807i64; + if ( m_ll <= int64_t_max ) + return wx_truncate_cast(double, (wxLongLong_t)m_ll); + + double d = wx_truncate_cast(double, int64_t_max); + d += (__int64)(m_ll - int64_t_max - 1); // The cast is safe because of -1 + return d + 1; +} +#endif // __VISUALC6__ + #endif // wxUSE_LONGLONG_NATIVE // ============================================================================ diff --git a/Externals/wxWidgets3/src/common/memory.cpp b/Externals/wxWidgets3/src/common/memory.cpp index b0001b1898..7eed146a4d 100644 --- a/Externals/wxWidgets3/src/common/memory.cpp +++ b/Externals/wxWidgets3/src/common/memory.cpp @@ -4,7 +4,7 @@ // Author: Arthur Seaton, Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: memory.cpp 66898 2011-02-16 05:13:00Z PC $ +// RCS-ID: $Id: memory.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -21,7 +21,7 @@ #include "wx/memory.h" #ifndef WX_PRECOMP - #ifdef __WXMSW__ + #ifdef __WINDOWS__ #include "wx/msw/wrapwin.h" #endif #include "wx/utils.h" @@ -888,7 +888,7 @@ static MemoryCriticalSection memLocker; #endif // USE_THREADSAFE_MEMORY_ALLOCATION -#if !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))) +#if !(defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))) #if wxUSE_GLOBAL_MEMORY_OPERATORS void * operator new (size_t size, wxChar * fileName, int lineNum) { @@ -922,7 +922,7 @@ void operator delete[] (void * buf) } #endif // wxUSE_ARRAY_MEMORY_OPERATORS #endif // wxUSE_GLOBAL_MEMORY_OPERATORS -#endif // !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))) +#endif // !(defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))) // TODO: store whether this is a vector or not. void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) ) @@ -1045,7 +1045,7 @@ void wxTrace(const wxChar * ...) va_start(ap, fmt); -#ifdef __WXMSW__ +#ifdef __WINDOWS__ wvsprintf(buffer,fmt,ap) ; #else vsprintf(buffer,fmt,ap) ; @@ -1059,7 +1059,7 @@ void wxTrace(const wxChar * ...) wxDebugContext::GetStream().flush(); } else -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #ifdef __WIN32__ OutputDebugString((LPCTSTR)buffer) ; #else @@ -1085,7 +1085,7 @@ void wxTraceLevel(int, const wxChar * ...) va_start(ap, fmt); -#ifdef __WXMSW__ +#ifdef __WINDOWS__ wxWvsprintf(buffer,fmt,ap) ; #else vsprintf(buffer,fmt,ap) ; @@ -1099,7 +1099,7 @@ void wxTraceLevel(int, const wxChar * ...) wxDebugContext::GetStream().flush(); } else -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #ifdef __WIN32__ OutputDebugString((LPCTSTR)buffer) ; #else diff --git a/Externals/wxWidgets3/src/common/menucmn.cpp b/Externals/wxWidgets3/src/common/menucmn.cpp index 0f7cd52ca7..78d78e0b08 100644 --- a/Externals/wxWidgets3/src/common/menucmn.cpp +++ b/Externals/wxWidgets3/src/common/menucmn.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 26.10.99 -// RCS-ID: $Id: menucmn.cpp 67210 2011-03-16 07:00:59Z SC $ +// RCS-ID: $Id: menucmn.cpp 70479 2012-01-30 16:05:03Z SC $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -597,17 +597,10 @@ wxMenuItem* wxMenuBase::FindItemByPosition(size_t position) const // window will be used. void wxMenuBase::UpdateUI(wxEvtHandler* source) { - if (GetInvokingWindow()) - { - // Don't update menus if the parent - // frame is about to get deleted - wxWindow *tlw = wxGetTopLevelParent( GetInvokingWindow() ); - if (tlw && wxPendingDelete.Member(tlw)) - return; - } + wxWindow * const win = GetWindow(); - if ( !source && GetInvokingWindow() ) - source = GetInvokingWindow()->GetEventHandler(); + if ( !source && win ) + source = win->GetEventHandler(); if ( !source ) source = GetEventHandler(); if ( !source ) @@ -1045,18 +1038,13 @@ wxString wxMenuBarBase::GetHelpString(int itemid) const void wxMenuBarBase::UpdateMenus() { - wxEvtHandler* source; wxMenu* menu; int nCount = GetMenuCount(); for (int n = 0; n < nCount; n++) { menu = GetMenu( n ); if (menu != NULL) - { - source = menu->GetEventHandler(); - if (source != NULL) - menu->UpdateUI( source ); - } + menu->UpdateUI( NULL ); } } diff --git a/Externals/wxWidgets3/src/common/mimecmn.cpp b/Externals/wxWidgets3/src/common/mimecmn.cpp index 52cfcf6afe..e8b7652175 100644 --- a/Externals/wxWidgets3/src/common/mimecmn.cpp +++ b/Externals/wxWidgets3/src/common/mimecmn.cpp @@ -5,7 +5,7 @@ // Modified by: // Chris Elliott (biol75@york.ac.uk) 5 Dec 00: write support for Win32 // Created: 23.09.98 -// RCS-ID: $Id: mimecmn.cpp 64671 2010-06-21 16:36:45Z SC $ +// RCS-ID: $Id: mimecmn.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence (part of wxExtra library) ///////////////////////////////////////////////////////////////////////////// @@ -46,7 +46,7 @@ #include // implementation classes: -#if defined(__WXMSW__) +#if defined(__WINDOWS__) #include "wx/msw/mimetype.h" #elif ( defined(__WXMAC__) ) #include "wx/osx/mimetype.h" @@ -346,9 +346,9 @@ bool wxFileType::GetIcon(wxIconLocation *iconLoc) const if ( iconLoc ) { iconLoc->SetFileName(m_info->GetIconFile()); -#ifdef __WXMSW__ +#ifdef __WINDOWS__ iconLoc->SetIndex(m_info->GetIconIndex()); -#endif // __WXMSW__ +#endif // __WINDOWS__ } return true; @@ -444,9 +444,9 @@ size_t wxFileType::GetAllCommands(wxArrayString *verbs, if ( commands ) commands->Clear(); -#if defined (__WXMSW__) || defined(__UNIX__) +#if defined (__WINDOWS__) || defined(__UNIX__) return m_impl->GetAllCommands(verbs, commands, params); -#else // !__WXMSW__ || Unix +#else // !__WINDOWS__ || __UNIX__ // we don't know how to retrieve all commands, so just try the 2 we know // about size_t count = 0; @@ -471,12 +471,12 @@ size_t wxFileType::GetAllCommands(wxArrayString *verbs, } return count; -#endif // __WXMSW__/| __UNIX__ +#endif // __WINDOWS__/| __UNIX__ } bool wxFileType::Unassociate() { -#if defined(__WXMSW__) +#if defined(__WINDOWS__) return m_impl->Unassociate(); #elif defined(__UNIX__) return m_impl->Unassociate(this); @@ -490,7 +490,7 @@ bool wxFileType::SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt) { -#if defined (__WXMSW__) || defined(__UNIX__) +#if defined (__WINDOWS__) || defined(__UNIX__) return m_impl->SetCommand(cmd, verb, overwriteprompt); #else wxUnusedVar(cmd); @@ -504,7 +504,7 @@ bool wxFileType::SetCommand(const wxString& cmd, bool wxFileType::SetDefaultIcon(const wxString& cmd, int index) { wxString sTmp = cmd; -#ifdef __WXMSW__ +#ifdef __WINDOWS__ // VZ: should we do this? // chris elliott : only makes sense in MS windows if ( sTmp.empty() ) @@ -512,7 +512,7 @@ bool wxFileType::SetDefaultIcon(const wxString& cmd, int index) #endif wxCHECK_MSG( !sTmp.empty(), false, wxT("need the icon file") ); -#if defined (__WXMSW__) || defined(__UNIX__) +#if defined (__WINDOWS__) || defined(__UNIX__) return m_impl->SetDefaultIcon (cmd, index); #else wxUnusedVar(index); @@ -610,7 +610,7 @@ wxMimeTypesManager::Associate(const wxFileTypeInfo& ftInfo) { EnsureImpl(); -#if defined(__WXMSW__) || defined(__UNIX__) +#if defined(__WINDOWS__) || defined(__UNIX__) return m_impl->Associate(ftInfo); #else // other platforms wxUnusedVar(ftInfo); diff --git a/Externals/wxWidgets3/src/common/msgout.cpp b/Externals/wxWidgets3/src/common/msgout.cpp index ae08c17a94..1b2a30e624 100644 --- a/Externals/wxWidgets3/src/common/msgout.cpp +++ b/Externals/wxWidgets3/src/common/msgout.cpp @@ -4,7 +4,7 @@ // Author: Mattia Barbon // Modified by: // Created: 17.07.02 -// RCS-ID: $Id: msgout.cpp 66592 2011-01-05 18:27:58Z PC $ +// RCS-ID: $Id: msgout.cpp 70808 2012-03-04 20:31:42Z VZ $ // Copyright: (c) the wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -163,7 +163,7 @@ void wxMessageOutputStderr::Output(const wxString& str) void wxMessageOutputDebug::Output(const wxString& str) { -#if defined(__WXMSW__) && !defined(__WXMICROWIN__) +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) wxString out(AppendLineFeedIfNeeded(str)); out.Replace(wxT("\t"), wxT(" ")); out.Replace(wxT("\n"), wxT("\r\n")); @@ -202,7 +202,7 @@ void wxMessageOutputMessageBox::Output(const wxString& str) wxString out(str); // the native MSW msg box understands the TABs, others don't -#ifndef __WXMSW__ +#ifndef __WINDOWS__ out.Replace(wxT("\t"), wxT(" ")); #endif diff --git a/Externals/wxWidgets3/src/common/nbkbase.cpp b/Externals/wxWidgets3/src/common/nbkbase.cpp index f491ec76e9..bbad0aa2ce 100644 --- a/Externals/wxWidgets3/src/common/nbkbase.cpp +++ b/Externals/wxWidgets3/src/common/nbkbase.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 02.07.01 -// RCS-ID: $Id: nbkbase.cpp 66643 2011-01-07 22:31:26Z SC $ +// RCS-ID: $Id: nbkbase.cpp 70814 2012-03-05 18:00:34Z JS $ // Copyright: (c) 2001 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -84,7 +84,7 @@ wxFLAGS_MEMBER(wxNB_NOPAGETHEME) wxFLAGS_MEMBER(wxNB_FLAT) wxEND_FLAGS( wxNotebookStyle ) -#if wxUSE_EXTENDED_RTTI +#if wxUSE_EXTENDED_RTTI WX_DEFINE_LIST( wxNotebookPageInfoList ) @@ -119,7 +119,7 @@ wxCONSTRUCTOR_4( wxNotebookPageInfo, wxNotebookPage*, Page, \ void wxNotebookBase::AddPageInfo( wxNotebookPageInfo* info ) { - AddPage( info->GetPage(), info->GetText(), info->GetSelected(), info->GetImageId() ); + AddPage( info->GetPage(), info->GetText(), info->GetSelected(), info->GetImageId() ); } const wxNotebookPageInfoList& wxNotebookBase::GetPageInfos() const @@ -138,7 +138,7 @@ const wxNotebookPageInfoList& wxNotebookBase::GetPageInfos() const #endif -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxControl, "wx/notebook.h") +wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxBookCtrlBase, "wx/notebook.h") wxBEGIN_PROPERTIES_TABLE(wxNotebook) wxEVENT_PROPERTY( PageChanging, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, wxNotebookEvent ) wxEVENT_PROPERTY( PageChanged, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEvent ) diff --git a/Externals/wxWidgets3/src/common/numformatter.cpp b/Externals/wxWidgets3/src/common/numformatter.cpp index ab990d4d59..eb4583b520 100644 --- a/Externals/wxWidgets3/src/common/numformatter.cpp +++ b/Externals/wxWidgets3/src/common/numformatter.cpp @@ -21,6 +21,8 @@ #include "wx/numformatter.h" #include "wx/intl.h" +#include // for setlocale and LC_ALL + // ---------------------------------------------------------------------------- // local helpers // ---------------------------------------------------------------------------- @@ -39,7 +41,9 @@ class LocaleId public: LocaleId() { +#if wxUSE_INTL m_wxloc = NULL; +#endif // wxUSE_INTL m_cloc = NULL; } @@ -48,6 +52,7 @@ public: Free(); } +#if wxUSE_INTL // Return true if this is the first time this function is called for this // object or if the program locale has changed since the last time it was // called. Otherwise just return false indicating that updating locale- @@ -70,15 +75,20 @@ public: return true; } +#endif // wxUSE_INTL private: void Free() { +#if wxUSE_INTL free(m_cloc); +#endif // wxUSE_INTL } +#if wxUSE_INTL // Non-owned pointer to wxLocale which was used. wxLocale *m_wxloc; +#endif // wxUSE_INTL // Owned pointer to the C locale string. char *m_cloc; @@ -98,6 +108,7 @@ private: wxChar wxNumberFormatter::GetDecimalSeparator() { +#if wxUSE_INTL // Notice that while using static variable here is not MT-safe, the worst // that can happen is that we redo the initialization if we're called // concurrently from more than one thread so it's not a real problem. @@ -128,10 +139,14 @@ wxChar wxNumberFormatter::GetDecimalSeparator() } return s_decimalSeparator; +#else // !wxUSE_INTL + return wxT('.'); +#endif // wxUSE_INTL/!wxUSE_INTL } bool wxNumberFormatter::GetThousandsSeparatorIfUsed(wxChar *sep) { +#if wxUSE_INTL static wxChar s_thousandsSeparator = 0; static LocaleId s_localeUsedForInit; @@ -157,6 +172,10 @@ bool wxNumberFormatter::GetThousandsSeparatorIfUsed(wxChar *sep) *sep = s_thousandsSeparator; return true; +#else // !wxUSE_INTL + wxUnusedVar(sep); + return false; +#endif // wxUSE_INTL/!wxUSE_INTL } // ---------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/src/common/overlaycmn.cpp b/Externals/wxWidgets3/src/common/overlaycmn.cpp index e0bf7fd57b..4704a3114f 100644 --- a/Externals/wxWidgets3/src/common/overlaycmn.cpp +++ b/Externals/wxWidgets3/src/common/overlaycmn.cpp @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 2006-10-20 -// RCS-ID: $Id: overlaycmn.cpp 59033 2009-02-19 17:45:09Z PC $ +// RCS-ID: $Id: overlaycmn.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -139,7 +139,7 @@ wxOverlayImpl::~wxOverlayImpl() bool wxOverlayImpl::IsOk() { - return m_bmpSaved.Ok() ; + return m_bmpSaved.IsOk() ; } void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height ) diff --git a/Externals/wxWidgets3/src/common/ownerdrwcmn.cpp b/Externals/wxWidgets3/src/common/ownerdrwcmn.cpp index 8cf566686d..24f8959814 100644 --- a/Externals/wxWidgets3/src/common/ownerdrwcmn.cpp +++ b/Externals/wxWidgets3/src/common/ownerdrwcmn.cpp @@ -4,7 +4,7 @@ // Author: Marcin Malich // Modified by: // Created: 2009-09-22 -// RCS-ID: $Id: ownerdrwcmn.cpp 63223 2010-01-23 13:21:36Z VZ $ +// RCS-ID: $Id: ownerdrwcmn.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 2009 Marcin Malich // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -93,11 +93,11 @@ void wxOwnerDrawnBase::GetColourToUse(wxODStatus stat, wxColour& colText, wxColo } else { - colText = m_colText.Ok() ? m_colText + colText = m_colText.IsOk() ? m_colText : wxSystemSettings::GetColour(wxSYS_COLOUR_MENUTEXT); } - colBack = m_colBack.Ok() ? m_colBack + colBack = m_colBack.IsOk() ? m_colBack : wxSystemSettings::GetColour(wxSYS_COLOUR_MENU); } } diff --git a/Externals/wxWidgets3/src/common/panelcmn.cpp b/Externals/wxWidgets3/src/common/panelcmn.cpp index a4659cbde0..e91b8c0f66 100644 --- a/Externals/wxWidgets3/src/common/panelcmn.cpp +++ b/Externals/wxWidgets3/src/common/panelcmn.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart, Robert Roebling, Vadim Zeitlin // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: panelcmn.cpp 67251 2011-03-20 00:00:38Z VZ $ +// RCS-ID: $Id: panelcmn.cpp 68366 2011-07-24 22:19:33Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -85,29 +85,14 @@ wxCONSTRUCTOR_6( wxPanel, wxWindow*, Parent, wxWindowID, Id, \ wxString, Name) -// ---------------------------------------------------------------------------- -// wxWin macros -// ---------------------------------------------------------------------------- - -BEGIN_EVENT_TABLE(wxPanelBase, wxWindow) - WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanelBase) -END_EVENT_TABLE() - // ============================================================================ // implementation // ============================================================================ -WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanelBase, wxWindow) - // ---------------------------------------------------------------------------- // wxPanelBase creation // ---------------------------------------------------------------------------- -wxPanelBase::wxPanelBase() -{ - WX_INIT_CONTROL_CONTAINER(); -} - bool wxPanelBase::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, diff --git a/Externals/wxWidgets3/src/common/persist.cpp b/Externals/wxWidgets3/src/common/persist.cpp index d2648cf653..84652a9e56 100644 --- a/Externals/wxWidgets3/src/common/persist.cpp +++ b/Externals/wxWidgets3/src/common/persist.cpp @@ -3,7 +3,7 @@ // Purpose: common persistence support classes // Author: Vadim Zeitlin // Created: 2009-01-20 -// RCS-ID: $Id: persist.cpp 61724 2009-08-21 10:41:26Z VZ $ +// RCS-ID: $Id: persist.cpp 69583 2011-10-30 10:08:18Z VZ $ // Copyright: (c) 2009 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -30,16 +30,34 @@ #include "wx/persist.h" +namespace +{ + +wxPersistenceManager* gs_manager = NULL; + +} // anonymous namespace + // ============================================================================ // wxPersistenceManager implementation // ============================================================================ +/* static */ +void wxPersistenceManager::Set(wxPersistenceManager& manager) +{ + gs_manager = &manager; +} + /* static */ wxPersistenceManager& wxPersistenceManager::Get() { - static wxPersistenceManager s_manager; + if ( !gs_manager ) + { + static wxPersistenceManager s_manager; - return s_manager; + gs_manager = &s_manager; + } + + return *gs_manager; } wxPersistenceManager::~wxPersistenceManager() diff --git a/Externals/wxWidgets3/src/common/pickerbase.cpp b/Externals/wxWidgets3/src/common/pickerbase.cpp index 4dbd470d8f..5da75191e7 100644 --- a/Externals/wxWidgets3/src/common/pickerbase.cpp +++ b/Externals/wxWidgets3/src/common/pickerbase.cpp @@ -4,7 +4,7 @@ // Author: Francesco Montorsi // Modified by: // Created: 15/04/2006 -// RCS-ID: $Id: pickerbase.cpp 61724 2009-08-21 10:41:26Z VZ $ +// RCS-ID: $Id: pickerbase.cpp 68921 2011-08-27 14:11:25Z VZ $ // Copyright: (c) Francesco Montorsi // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -43,13 +43,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxPickerBase, wxControl) -BEGIN_EVENT_TABLE(wxPickerBase, wxControl) - EVT_SIZE(wxPickerBase::OnSize) - WX_EVENT_TABLE_CONTROL_CONTAINER(wxPickerBase) -END_EVENT_TABLE() -WX_DELEGATE_TO_CONTROL_CONTAINER(wxPickerBase, wxControl) - - // ---------------------------------------------------------------------------- // wxPickerBase // ---------------------------------------------------------------------------- @@ -123,6 +116,21 @@ void wxPickerBase::PostCreation() // associated with it - in that case it defaults to 0 m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5); + // For aesthetic reasons, make sure the picker is at least as high as the + // associated text control and is always at least square, unless we are + // explicitly using wxPB_SMALL style to force it to take as little space as + // possible. + if ( !HasFlag(wxPB_SMALL) ) + { + const wxSize pickerBestSize(m_picker->GetBestSize()); + const wxSize textBestSize( HasTextCtrl() ? m_text->GetBestSize() : wxSize()); + wxSize pickerMinSize; + pickerMinSize.y = wxMax(pickerBestSize.y, textBestSize.y); + pickerMinSize.x = wxMax(pickerBestSize.x, pickerMinSize.y); + if ( pickerMinSize != pickerBestSize ) + m_picker->SetMinSize(pickerMinSize); + } + SetSizer(m_sizer); SetInitialSize( GetMinSize() ); @@ -169,11 +177,4 @@ void wxPickerBase::OnTextCtrlUpdate(wxCommandEvent &) UpdatePickerFromTextCtrl(); } -void wxPickerBase::OnSize(wxSizeEvent &event) -{ - if (GetAutoLayout()) - Layout(); - event.Skip(); -} - #endif // Any picker in use diff --git a/Externals/wxWidgets3/src/common/platinfo.cpp b/Externals/wxWidgets3/src/common/platinfo.cpp index 895d068b21..30ec0581ef 100644 --- a/Externals/wxWidgets3/src/common/platinfo.cpp +++ b/Externals/wxWidgets3/src/common/platinfo.cpp @@ -4,7 +4,7 @@ // Author: Francesco Montorsi // Modified by: // Created: 07.07.2006 (based on wxToolkitInfo) -// RCS-ID: $Id: platinfo.cpp 64940 2010-07-13 13:29:13Z VZ $ +// RCS-ID: $Id: platinfo.cpp 70353 2012-01-15 14:46:41Z VZ $ // Copyright: (c) 2006 Francesco Montorsi // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -67,9 +67,6 @@ static const wxChar* const wxOperatingSystemIdNames[] = wxT("DOS"), wxT("OS/2"), - - wxT("PalmOS"), - wxT("PalmOS(Over Linux)"), }; static const wxChar* const wxPortIdNames[] = @@ -78,14 +75,12 @@ static const wxChar* const wxPortIdNames[] = wxT("wxMSW"), wxT("wxMotif"), wxT("wxGTK"), - wxT("wxMGL"), + wxT("wxDFB"), wxT("wxX11"), wxT("wxOS2"), wxT("wxMac"), wxT("wxCocoa"), wxT("wxWinCE"), - wxT("wxPalmOS"), - wxT("wxDFB") }; static const wxChar* const wxArchitectureNames[] = diff --git a/Externals/wxWidgets3/src/common/popupcmn.cpp b/Externals/wxWidgets3/src/common/popupcmn.cpp index 2466863992..81dce737d4 100644 --- a/Externals/wxWidgets3/src/common/popupcmn.cpp +++ b/Externals/wxWidgets3/src/common/popupcmn.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 06.01.01 -// RCS-ID: $Id: popupcmn.cpp 64940 2010-07-13 13:29:13Z VZ $ +// RCS-ID: $Id: popupcmn.cpp 69966 2011-12-09 15:20:55Z VZ $ // Copyright: (c) 2001 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -44,6 +44,11 @@ #ifdef __WXGTK__ #include + #if GTK_CHECK_VERSION(2,0,0) + #include "wx/gtk/private/gtk2-compat.h" + #else + #define gtk_widget_get_window(x) x->window + #endif #elif defined(__WXMSW__) #include "wx/msw/private.h" #elif defined(__WXX11__) @@ -71,6 +76,7 @@ public: protected: // event handlers void OnLeftDown(wxMouseEvent& event); + void OnCaptureLost(wxMouseCaptureLostEvent& event); private: wxPopupTransientWindow *m_popup; @@ -101,6 +107,7 @@ private: BEGIN_EVENT_TABLE(wxPopupWindowHandler, wxEvtHandler) EVT_LEFT_DOWN(wxPopupWindowHandler::OnLeftDown) + EVT_MOUSE_CAPTURE_LOST(wxPopupWindowHandler::OnCaptureLost) END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler) @@ -109,7 +116,7 @@ BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler) END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow) -#if defined( __WXMSW__ ) || ( defined( __WXMAC__ ) && wxOSX_USE_CARBON ) +#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_CARBON) EVT_IDLE(wxPopupTransientWindow::OnIdle) #endif END_EVENT_TABLE() @@ -343,7 +350,7 @@ bool wxPopupTransientWindow::Show( bool show ) { gtk_grab_add( m_widget ); - gdk_pointer_grab( m_widget->window, TRUE, + gdk_pointer_grab( gtk_widget_get_window(m_widget), true, (GdkEventMask) (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | @@ -382,6 +389,20 @@ bool wxPopupTransientWindow::Show( bool show ) return ret; } +bool wxPopupTransientWindow::Destroy() +{ + // The popup window can be deleted at any moment, even while some events + // are still being processed for it, so delay its real destruction until + // the next idle time when we're sure that it's safe to really destroy it. + + wxCHECK_MSG( !wxPendingDelete.Member(this), false, + wxS("Shouldn't destroy the popup twice.") ); + + wxPendingDelete.Append(this); + + return true; +} + void wxPopupTransientWindow::Dismiss() { Hide(); @@ -405,7 +426,7 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event)) return false; } -#if defined( __WXMSW__ ) || ( defined( __WXMAC__ ) && wxOSX_USE_CARBON ) +#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_CARBON) void wxPopupTransientWindow::OnIdle(wxIdleEvent& event) { event.Skip(); @@ -431,7 +452,7 @@ void wxPopupTransientWindow::OnIdle(wxIdleEvent& event) } } } -#endif // __WXMSW__ +#endif // wxOSX/Carbon #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) @@ -581,6 +602,15 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) #endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR } +void +wxPopupWindowHandler::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) +{ + m_popup->DismissAndNotify(); + + // There is no need to skip the event here, normally we've already dealt + // with the focus loss. +} + // ---------------------------------------------------------------------------- // wxPopupFocusHandler // ---------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/src/common/powercmn.cpp b/Externals/wxWidgets3/src/common/powercmn.cpp index ffd7cde09d..c8af67061f 100644 --- a/Externals/wxWidgets3/src/common/powercmn.cpp +++ b/Externals/wxWidgets3/src/common/powercmn.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 2006-05-27 -// RCS-ID: $Id: powercmn.cpp 58718 2009-02-07 18:59:25Z VZ $ +// RCS-ID: $Id: powercmn.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 2006 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -43,7 +43,7 @@ #endif // provide stubs for the systems not implementing these functions -#if !defined(__WXPALMOS__) && !defined(__WXMSW__) +#if !defined(__WINDOWS__) wxPowerType wxGetPowerType() { diff --git a/Externals/wxWidgets3/src/common/prntbase.cpp b/Externals/wxWidgets3/src/common/prntbase.cpp index 068741712b..2dd209faf5 100644 --- a/Externals/wxWidgets3/src/common/prntbase.cpp +++ b/Externals/wxWidgets3/src/common/prntbase.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: prntbase.cpp 67186 2011-03-14 11:54:35Z VZ $ +// RCS-ID: $Id: prntbase.cpp 68026 2011-06-22 22:58:07Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -999,38 +999,90 @@ void wxPreviewCanvas::OnMouseWheel(wxMouseEvent& event) #endif // wxUSE_MOUSEWHEEL +namespace +{ + +// This is by the controls in the print preview as the maximal (and hence +// longest) page number we may have to display. +enum { MAX_PAGE_NUMBER = 99999 }; + +} // anonymous namespace + +// ---------------------------------------------------------------------------- +// wxPrintPageMaxCtrl +// ---------------------------------------------------------------------------- + +// A simple static control showing the maximal number of pages. +class wxPrintPageMaxCtrl : public wxStaticText +{ +public: + wxPrintPageMaxCtrl(wxWindow *parent) + : wxStaticText( + parent, + wxID_ANY, + wxString(), + wxDefaultPosition, + wxSize + ( + parent->GetTextExtent(MaxAsString(MAX_PAGE_NUMBER)).x, + wxDefaultCoord + ), + wxST_NO_AUTORESIZE | wxALIGN_CENTRE + ) + { + } + + // Set the maximal page to display once we really know what it is. + void SetMaxPage(int maxPage) + { + SetLabel(MaxAsString(maxPage)); + } + +private: + static wxString MaxAsString(int maxPage) + { + return wxString::Format("/ %d", maxPage); + } + + wxDECLARE_NO_COPY_CLASS(wxPrintPageMaxCtrl); +}; + // ---------------------------------------------------------------------------- // wxPrintPageTextCtrl // ---------------------------------------------------------------------------- -// This text control contains the page number in the interval specified during -// its construction. Invalid pages are not accepted and the control contents is -// validated when it loses focus. Conversely, if the user changes the page to -// another valid one or presses Enter, OnGotoPage() method of the preview object -// will be called. +// This text control contains the page number in the specified interval. +// +// Invalid pages are not accepted and the control contents is validated when it +// loses focus. Conversely, if the user changes the page to another valid one +// or presses Enter, OnGotoPage() method of the preview object will be called. class wxPrintPageTextCtrl : public wxTextCtrl { public: - wxPrintPageTextCtrl(wxPreviewControlBar *preview, int minPage, int maxPage) + wxPrintPageTextCtrl(wxPreviewControlBar *preview) : wxTextCtrl(preview, wxID_PREVIEW_GOTO, - PageAsString(minPage), + wxString(), wxDefaultPosition, - // We use hardcoded 99999 for the width instead of fitting - // it to the values we can show because the control looks - // uncomfortably narrow if the real page number is just - // one or two digits. - wxSize(preview->GetTextExtent("99999").x, wxDefaultCoord), + // We use hardcoded maximal page number for the width + // instead of fitting it to the values we can show because + // the control looks uncomfortably narrow if the real page + // number is just one or two digits. + wxSize + ( + preview->GetTextExtent(PageAsString(MAX_PAGE_NUMBER)).x, + wxDefaultCoord + ), wxTE_PROCESS_ENTER #if wxUSE_VALIDATORS , wxTextValidator(wxFILTER_DIGITS) #endif // wxUSE_VALIDATORS ), - m_preview(preview), - m_minPage(minPage), - m_maxPage(maxPage) + m_preview(preview) { - m_page = minPage; + m_minPage = + m_maxPage = + m_page = 1; Connect(wxEVT_KILL_FOCUS, wxFocusEventHandler(wxPrintPageTextCtrl::OnKillFocus)); @@ -1038,6 +1090,17 @@ public: wxCommandEventHandler(wxPrintPageTextCtrl::OnTextEnter)); } + // Update the pages range, must be called after OnPreparePrinting() as + // these values are not known before. + void SetPageInfo(int minPage, int maxPage) + { + m_minPage = minPage; + m_maxPage = maxPage; + + // Show the first page by default. + SetPageNumber(minPage); + } + // Helpers to conveniently set or get the current page number. Return value // is 0 if the current controls contents is invalid. void SetPageNumber(int page) @@ -1108,8 +1171,8 @@ private: wxPreviewControlBar * const m_preview; - const int m_minPage, - m_maxPage; + int m_minPage, + m_maxPage; // This is the last valid page value that we had, we revert to it if an // invalid page is entered. @@ -1155,6 +1218,7 @@ wxPanel(parent, wxID_ANY, pos, size, style, name) m_closeButton = NULL; m_zoomControl = NULL; m_currentPageText = NULL; + m_maxPageText = NULL; m_buttonFlags = buttons; } @@ -1436,18 +1500,11 @@ void wxPreviewControlBar::CreateButtons() if (m_buttonFlags & wxPREVIEW_GOTO) { - int minPage, maxPage, pageFrom, pageTo; - m_printPreview->GetPrintout()->GetPageInfo(&minPage, &maxPage, - &pageFrom, &pageTo); - - m_currentPageText = new wxPrintPageTextCtrl(this, minPage, maxPage); + m_currentPageText = new wxPrintPageTextCtrl(this); sizer.Add(m_currentPageText); - wxStaticText * - maxPageText = new wxStaticText(this, wxID_ANY, - wxString::Format("/ %d", maxPage)); - - sizer.Add(maxPageText); + m_maxPageText = new wxPrintPageMaxCtrl(this); + sizer.Add(m_maxPageText); } if (m_buttonFlags & wxPREVIEW_NEXT) @@ -1489,6 +1546,15 @@ void wxPreviewControlBar::CreateButtons() sizer.AddAtEnd(m_closeButton); } +void wxPreviewControlBar::SetPageInfo(int minPage, int maxPage) +{ + if ( m_currentPageText ) + m_currentPageText->SetPageInfo(minPage, maxPage); + + if ( m_maxPageText ) + m_maxPageText->SetMaxPage(maxPage); +} + void wxPreviewControlBar::SetZoomControl(int zoom) { if (m_zoomControl) @@ -1553,6 +1619,7 @@ wxFrame(parent, wxID_ANY, title, pos, size, style, name) m_controlBar = NULL; m_previewCanvas = NULL; m_windowDisabler = NULL; + m_modalityKind = wxPreviewFrame_NonModal; // Give the application icon #ifdef __WXMSW__ @@ -1564,14 +1631,6 @@ wxFrame(parent, wxID_ANY, title, pos, size, style, name) wxPreviewFrame::~wxPreviewFrame() { -} - -void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) -{ - if (m_windowDisabler) - delete m_windowDisabler; - - // Need to delete the printout and the print preview wxPrintout *printout = m_printPreview->GetPrintout(); if (printout) { @@ -1582,12 +1641,33 @@ void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) } m_previewCanvas->SetPreview(NULL); - wxDELETE(m_printPreview); + delete m_printPreview; +} + +void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) +{ + // Reenable any windows we disabled by undoing whatever we did in our + // Initialize(). + switch ( m_modalityKind ) + { + case wxPreviewFrame_AppModal: + delete m_windowDisabler; + m_windowDisabler = NULL; + break; + + case wxPreviewFrame_WindowModal: + if ( GetParent() ) + GetParent()->Enable(); + break; + + case wxPreviewFrame_NonModal: + break; + } Destroy(); } -void wxPreviewFrame::Initialize() +void wxPreviewFrame::InitializeWithModality(wxPreviewFrameModalityKind kind) { #if wxUSE_STATUSBAR CreateStatusBar(); @@ -1606,7 +1686,25 @@ void wxPreviewFrame::Initialize() SetAutoLayout( true ); SetSizer( item0 ); - m_windowDisabler = new wxWindowDisabler(this); + m_modalityKind = kind; + switch ( m_modalityKind ) + { + case wxPreviewFrame_AppModal: + // Disable everything. + m_windowDisabler = new wxWindowDisabler( this ); + break; + + case wxPreviewFrame_WindowModal: + // Disable our parent if we have one. + if ( GetParent() ) + GetParent()->Disable(); + break; + + case wxPreviewFrame_NonModal: + // Nothing to do, we don't need to disable any windows. + break; + } + Layout(); @@ -1829,13 +1927,23 @@ bool wxPrintPreviewBase::RenderPageIntoDC(wxDC& dc, int pageNum) m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight); // Need to delay OnPreparePrinting() until here, so we have enough - // information. + // information and a wxDC. if (!m_printingPrepared) { + m_printingPrepared = true; + m_previewPrintout->OnPreparePrinting(); int selFrom, selTo; m_previewPrintout->GetPageInfo(&m_minPage, &m_maxPage, &selFrom, &selTo); - m_printingPrepared = true; + + // Update the wxPreviewControlBar page range display. + if ( m_previewFrame ) + { + wxPreviewControlBar * const + controlBar = ((wxPreviewFrame*)m_previewFrame)->GetControlBar(); + if ( controlBar ) + controlBar->SetPageInfo(m_minPage, m_maxPage); + } } m_previewPrintout->OnBeginPrinting(); @@ -1881,7 +1989,7 @@ bool wxPrintPreviewBase::RenderPage(int pageNum) { m_previewBitmap = new wxBitmap(pageRect.width, pageRect.height); - if (!m_previewBitmap || !m_previewBitmap->Ok()) + if (!m_previewBitmap || !m_previewBitmap->IsOk()) { InvalidatePreviewBitmap(); wxMessageBox(_("Sorry, not enough memory to create a preview."), _("Print Preview Failure"), wxOK); @@ -2102,7 +2210,7 @@ int wxPrintPreview::GetMinPage() const bool wxPrintPreview::IsOk() const { - return m_pimpl->Ok(); + return m_pimpl->IsOk(); } void wxPrintPreview::SetOk(bool ok) diff --git a/Externals/wxWidgets3/src/common/quantize.cpp b/Externals/wxWidgets3/src/common/quantize.cpp index 2b740ec0f9..db58c9e677 100644 --- a/Externals/wxWidgets3/src/common/quantize.cpp +++ b/Externals/wxWidgets3/src/common/quantize.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 22/6/2000 -// RCS-ID: $Id: quantize.cpp 50694 2007-12-14 22:35:23Z VZ $ +// RCS-ID: $Id: quantize.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) Thomas G. Lane, Vaclav Slavik, Julian Smart // Licence: wxWindows licence + JPEG library licence ///////////////////////////////////////////////////////////////////////////// @@ -1546,7 +1546,7 @@ bool wxQuantize::Quantize(const wxImage& src, wxImage& dest, if (flags & wxQUANTIZE_FILL_DESTINATION_IMAGE) { - if (!dest.Ok()) + if (!dest.IsOk()) dest.Create(w, h); imgdt = dest.GetData(); diff --git a/Externals/wxWidgets3/src/common/richtooltipcmn.cpp b/Externals/wxWidgets3/src/common/richtooltipcmn.cpp new file mode 100644 index 0000000000..2d98ca758b --- /dev/null +++ b/Externals/wxWidgets3/src/common/richtooltipcmn.cpp @@ -0,0 +1,82 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: src/common/richtooltipcmn.cpp +// Purpose: wxRichToolTip implementation common to all platforms. +// Author: Vadim Zeitlin +// Created: 2011-10-18 +// RCS-ID: $Id: richtooltipcmn.cpp 69463 2011-10-18 21:57:02Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#if wxUSE_RICHTOOLTIP + +#ifndef WX_PRECOMP + #include "wx/icon.h" +#endif // WX_PRECOMP + +#include "wx/private/richtooltip.h" + +// ============================================================================ +// implementation +// ============================================================================ + +wxRichToolTip::wxRichToolTip(const wxString& title, + const wxString& message) : + m_impl(wxRichToolTipImpl::Create(title, message)) +{ +} + +void +wxRichToolTip::SetBackgroundColour(const wxColour& col, const wxColour& colEnd) +{ + m_impl->SetBackgroundColour(col, colEnd); +} + +void wxRichToolTip::SetIcon(int icon) +{ + m_impl->SetStandardIcon(icon); +} + +void wxRichToolTip::SetIcon(const wxIcon& icon) +{ + m_impl->SetCustomIcon(icon); +} + +void wxRichToolTip::SetTimeout(unsigned milliseconds) +{ + m_impl->SetTimeout(milliseconds); +} + +void wxRichToolTip::SetTipKind(wxTipKind tipKind) +{ + m_impl->SetTipKind(tipKind); +} + +void wxRichToolTip::ShowFor(wxWindow* win) +{ + wxCHECK_RET( win, wxS("Must have a valid window") ); + + m_impl->ShowFor(win); +} + +wxRichToolTip::~wxRichToolTip() +{ + delete m_impl; +} + +#endif // wxUSE_RICHTOOLTIP diff --git a/Externals/wxWidgets3/src/common/sckaddr.cpp b/Externals/wxWidgets3/src/common/sckaddr.cpp index 9dd6d3afb4..0992e09859 100644 --- a/Externals/wxWidgets3/src/common/sckaddr.cpp +++ b/Externals/wxWidgets3/src/common/sckaddr.cpp @@ -4,7 +4,7 @@ // Author: Guilhem Lavaux // Created: 26/04/97 // Modified by: Vadim Zeitlin to use wxSockAddressImpl on 2008-12-28 -// RCS-ID: $Id: sckaddr.cpp 65124 2010-07-28 11:26:14Z VZ $ +// RCS-ID: $Id: sckaddr.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1997, 1998 Guilhem Lavaux // (c) 2008 Vadim Zeitlin // Licence: wxWindows licence @@ -79,7 +79,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress) // TODO: use POSIX getaddrinfo() (also available in Winsock 2) for simplicity // and to use the same code for IPv4 and IPv6 support -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #define HAVE_INET_ADDR #ifndef HAVE_GETHOSTBYNAME @@ -109,7 +109,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress) #pragma warning(default:4706) #endif #endif -#endif // __WXMSW__ +#endif // __WINDOWS__ // we assume that we have gethostbyaddr_r() if and only if we have // gethostbyname_r() and that it uses the similar conventions to it (see @@ -144,7 +144,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress) #ifdef HAVE_FUNC_GETSERVBYNAME_R_4 struct wxGetservBuf : servent_data { - wxGethostBuf() + wxGetservBuf() { memset(this, 0, sizeof(servent_data)); } @@ -273,8 +273,9 @@ hostent *wxGethostbyname_r(const char *hostname, #elif defined(HAVE_FUNC_GETHOSTBYNAME_R_5) he = gethostbyname_r(hostname, h, buffer, size, err); #elif defined(HAVE_FUNC_GETHOSTBYNAME_R_3) - he = gethostbyname_r(hostname, h, &buffer); - *err = h_errno; + wxUnusedVar(var); + *err = gethostbyname_r(hostname, h, &buffer); + he = h; #elif defined(HAVE_GETHOSTBYNAME) wxLOCK_GETBY_MUTEX(name); @@ -304,8 +305,9 @@ hostent *wxGethostbyaddr_r(const char *addr_buf, #elif defined(HAVE_FUNC_GETHOSTBYADDR_R_5) he = gethostbyaddr_r(addr_buf, buf_size, proto, h, buffer, size, err); #elif defined(HAVE_FUNC_GETHOSTBYADDR_R_3) - he = gethostbyaddr_r(addr_buf, buf_size, proto, h, buffer); - *err = h_errno; + wxUnusedVar(size); + *err = gethostbyaddr_r(addr_buf, buf_size, proto, h, &buffer); + he = h; #elif defined(HAVE_GETHOSTBYADDR) wxLOCK_GETBY_MUTEX(addr); @@ -397,6 +399,7 @@ servent *wxGetservbyname_r(const char *port, #elif defined(HAVE_FUNC_GETSERVBYNAME_R_5) se = getservbyname_r(port, protocol, serv, buffer, size); #elif defined(HAVE_FUNC_GETSERVBYNAME_R_4) + wxUnusedVar(size); if ( getservbyname_r(port, protocol, serv, &buffer) != 0 ) return NULL; #elif defined(HAVE_GETSERVBYNAME) diff --git a/Externals/wxWidgets3/src/common/sckfile.cpp b/Externals/wxWidgets3/src/common/sckfile.cpp index 467c1500a1..b4104065b8 100644 --- a/Externals/wxWidgets3/src/common/sckfile.cpp +++ b/Externals/wxWidgets3/src/common/sckfile.cpp @@ -4,7 +4,7 @@ // Author: Guilhem Lavaux // Modified by: // Created: 20/07/97 -// RCS-ID: $Id: sckfile.cpp 58137 2009-01-16 15:08:13Z FM $ +// RCS-ID: $Id: sckfile.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 1997, 1998 Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -45,7 +45,7 @@ wxFileProto::~wxFileProto() wxInputStream *wxFileProto::GetInputStream(const wxString& path) { wxFileInputStream *retval = new wxFileInputStream(wxURI::Unescape(path)); - if ( retval->Ok() ) + if ( retval->IsOk() ) { m_lastError = wxPROTO_NOERR; return retval; diff --git a/Externals/wxWidgets3/src/common/sckipc.cpp b/Externals/wxWidgets3/src/common/sckipc.cpp index 1088c93dbd..c141d11b74 100644 --- a/Externals/wxWidgets3/src/common/sckipc.cpp +++ b/Externals/wxWidgets3/src/common/sckipc.cpp @@ -8,7 +8,7 @@ // Vadim Zeitlin (added support for Unix sockets) Apr 2002 // (use buffering, many fixes/cleanup) Oct 2008 // Created: 1993 -// RCS-ID: $Id: sckipc.cpp 61508 2009-07-23 20:30:22Z VZ $ +// RCS-ID: $Id: sckipc.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) Julian Smart 1993 // (c) Guilhem Lavaux 1997, 1998 // (c) 2000 Guillermo Rodriguez @@ -498,7 +498,7 @@ bool wxTCPServer::Create(const wxString& serverName) delete addr; - if (!m_server->Ok()) + if (!m_server->IsOk()) { m_server->Destroy(); m_server = NULL; @@ -877,7 +877,7 @@ void wxTCPEventHandler::Server_OnRequest(wxSocketEvent &event) wxSocketBase *sock = server->Accept(); if (!sock) return; - if (!sock->Ok()) + if (!sock->IsOk()) { sock->Destroy(); return; diff --git a/Externals/wxWidgets3/src/common/sizer.cpp b/Externals/wxWidgets3/src/common/sizer.cpp index 5858c1218f..06403167dd 100644 --- a/Externals/wxWidgets3/src/common/sizer.cpp +++ b/Externals/wxWidgets3/src/common/sizer.cpp @@ -5,7 +5,7 @@ // Dirk Holtwick, Ron Lee // Modified by: Ron Lee // Created: -// RCS-ID: $Id: sizer.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: sizer.cpp 69172 2011-09-21 15:07:37Z VZ $ // Copyright: (c) Robin Dunn, Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -909,6 +909,11 @@ wxSize wxSizer::ComputeFittingClientSize(wxWindow *window) sizeMax = wxDisplay(disp).GetClientArea().GetSize(); + // If determining the display size failed, skip the max size checks as + // we really don't want to create windows of (0, 0) size. + if ( !sizeMax.x || !sizeMax.y ) + return size; + // space for decorations and toolbars etc. sizeMax = tlw->WindowToClientSize(sizeMax); } diff --git a/Externals/wxWidgets3/src/common/socket.cpp b/Externals/wxWidgets3/src/common/socket.cpp index f99a0333bb..b3e07700b6 100644 --- a/Externals/wxWidgets3/src/common/socket.cpp +++ b/Externals/wxWidgets3/src/common/socket.cpp @@ -6,7 +6,7 @@ // Copyright: (C) 1999-1997, Guilhem Lavaux // (C) 1999-2000, Guillermo Rodriguez Garcia // (C) 2008 Vadim Zeitlin -// RCS_ID: $Id: socket.cpp 65378 2010-08-21 23:33:40Z VZ $ +// RCS_ID: $Id: socket.cpp 70808 2012-03-04 20:31:42Z VZ $ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -1297,17 +1297,31 @@ wxSocketEventFlags wxSocketImpl::Select(wxSocketEventFlags flags, exceptfds; // always want to know about errors if ( flags & wxSOCKET_INPUT_FLAG ) - { preadfds = &readfds; + + if ( flags & wxSOCKET_OUTPUT_FLAG ) + pwritefds = &writefds; + + // When using non-blocking connect() the client socket becomes connected + // (successfully or not) when it becomes writable but when using + // non-blocking accept() the server socket becomes connected when it + // becomes readable. + if ( flags & wxSOCKET_CONNECTION_FLAG ) + { + if ( m_server ) + preadfds = &readfds; + else + pwritefds = &writefds; + } + + if ( preadfds ) + { wxFD_ZERO(preadfds); wxFD_SET(m_fd, preadfds); } - // when using non-blocking connect() the socket becomes connected - // (successfully or not) when it becomes writable - if ( flags & (wxSOCKET_OUTPUT_FLAG | wxSOCKET_CONNECTION_FLAG) ) + if ( pwritefds ) { - pwritefds = &writefds; wxFD_ZERO(pwritefds); wxFD_SET(m_fd, pwritefds); } @@ -2097,7 +2111,7 @@ wxFORCE_LINK_MODULE( socketiohandler ) #endif // same for ManagerSetter in the MSW file -#ifdef __WXMSW__ +#ifdef __WINDOWS__ wxFORCE_LINK_MODULE( mswsocket ) #endif diff --git a/Externals/wxWidgets3/src/common/sstream.cpp b/Externals/wxWidgets3/src/common/sstream.cpp index edc38fd5ef..f7e1f9a647 100644 --- a/Externals/wxWidgets3/src/common/sstream.cpp +++ b/Externals/wxWidgets3/src/common/sstream.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: Ryan Norton (UTF8 UNICODE) // Created: 2004-09-19 -// RCS-ID: $Id: sstream.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: sstream.cpp 67968 2011-06-16 16:22:15Z VZ $ // Copyright: (c) 2004 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -146,7 +146,7 @@ size_t wxStringOutputStream::OnSysWrite(const void *buffer, size_t size) { const char *p = static_cast(buffer); -#if wxUSE_UNICODE_WCHAR +#if wxUSE_UNICODE // the part of the string we have here may be incomplete, i.e. it can stop // in the middle of an UTF-8 character and so converting it would fail; if // this is the case, accumulate the part which we failed to convert until @@ -188,11 +188,10 @@ size_t wxStringOutputStream::OnSysWrite(const void *buffer, size_t size) // not update m_pos as m_str hasn't changed return size; } -#else // !wxUSE_UNICODE_WCHAR - // no recoding necessary, the data is supposed to already be in UTF-8 (if - // supported) or ASCII otherwise +#else // !wxUSE_UNICODE + // no recoding necessary m_str->append(p, size); -#endif // wxUSE_UNICODE_WCHAR/!wxUSE_UNICODE_WCHAR +#endif // wxUSE_UNICODE/!wxUSE_UNICODE // update position m_pos += size; diff --git a/Externals/wxWidgets3/src/common/stockitem.cpp b/Externals/wxWidgets3/src/common/stockitem.cpp index 19aab1aa28..0c9ea2c496 100644 --- a/Externals/wxWidgets3/src/common/stockitem.cpp +++ b/Externals/wxWidgets3/src/common/stockitem.cpp @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // Modified by: // Created: 2004-08-15 -// RCS-ID: $Id: stockitem.cpp 63383 2010-02-04 01:33:32Z VZ $ +// RCS-ID: $Id: stockitem.cpp 70412 2012-01-20 16:51:09Z DS $ // Copyright: (c) Vaclav Slavik, 2004 // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -118,85 +118,97 @@ wxString wxGetStockLabel(wxWindowID id, long flags) { wxString stockLabel; - #define STOCKITEM(stockid, label) \ - case stockid: \ - stockLabel = label; \ - break; +#ifdef __WXMSW__ + // special case: the "Cancel" button shouldn't have a mnemonic under MSW + // for consistency with the native dialogs (which don't use any mnemonic + // for it because it is already bound to Esc implicitly) + if ( id == wxID_CANCEL ) + flags &= ~wxSTOCK_WITH_MNEMONIC; +#endif // __WXMSW__ + + + #define STOCKITEM(stockid, labelWithMnemonic, labelPlain) \ + case stockid: \ + if(flags & wxSTOCK_WITH_MNEMONIC) \ + stockLabel = labelWithMnemonic; \ + else \ + stockLabel = labelPlain; \ + break switch (id) { - STOCKITEM(wxID_ABOUT, _("&About...")) - STOCKITEM(wxID_ADD, _("Add")) - STOCKITEM(wxID_APPLY, _("&Apply")) - STOCKITEM(wxID_BACKWARD, _("&Back")) - STOCKITEM(wxID_BOLD, _("&Bold")) - STOCKITEM(wxID_BOTTOM, _("&Bottom")) - STOCKITEM(wxID_CANCEL, _("&Cancel")) - STOCKITEM(wxID_CDROM, _("&CD-Rom")) - STOCKITEM(wxID_CLEAR, _("&Clear")) - STOCKITEM(wxID_CLOSE, _("&Close")) - STOCKITEM(wxID_CONVERT, _("&Convert")) - STOCKITEM(wxID_COPY, _("&Copy")) - STOCKITEM(wxID_CUT, _("Cu&t")) - STOCKITEM(wxID_DELETE, _("&Delete")) - STOCKITEM(wxID_DOWN, _("&Down")) - STOCKITEM(wxID_EDIT, _("&Edit")) - STOCKITEM(wxID_EXECUTE, _("&Execute")) - STOCKITEM(wxID_EXIT, _("&Quit")) - STOCKITEM(wxID_FILE, _("&File")) - STOCKITEM(wxID_FIND, _("&Find")) - STOCKITEM(wxID_FIRST, _("&First")) - STOCKITEM(wxID_FLOPPY, _("&Floppy")) - STOCKITEM(wxID_FORWARD, _("&Forward")) - STOCKITEM(wxID_HARDDISK, _("&Harddisk")) - STOCKITEM(wxID_HELP, _("&Help")) - STOCKITEM(wxID_HOME, _("&Home")) - STOCKITEM(wxID_INDENT, _("Indent")) - STOCKITEM(wxID_INDEX, _("&Index")) - STOCKITEM(wxID_INFO, _("&Info")) - STOCKITEM(wxID_ITALIC, _("&Italic")) - STOCKITEM(wxID_JUMP_TO, _("&Jump to")) - STOCKITEM(wxID_JUSTIFY_CENTER, _("Centered")) - STOCKITEM(wxID_JUSTIFY_FILL, _("Justified")) - STOCKITEM(wxID_JUSTIFY_LEFT, _("Align Left")) - STOCKITEM(wxID_JUSTIFY_RIGHT, _("Align Right")) - STOCKITEM(wxID_LAST, _("&Last")) - STOCKITEM(wxID_NETWORK, _("&Network")) - STOCKITEM(wxID_NEW, _("&New")) - STOCKITEM(wxID_NO, _("&No")) - STOCKITEM(wxID_OK, _("&OK")) - STOCKITEM(wxID_OPEN, _("&Open...")) - STOCKITEM(wxID_PASTE, _("&Paste")) - STOCKITEM(wxID_PREFERENCES, _("&Preferences")) - STOCKITEM(wxID_PREVIEW, _("Print previe&w")) - STOCKITEM(wxID_PRINT, _("&Print...")) - STOCKITEM(wxID_PROPERTIES, _("&Properties")) - STOCKITEM(wxID_REDO, _("&Redo")) - STOCKITEM(wxID_REFRESH, _("Refresh")) - STOCKITEM(wxID_REMOVE, _("Remove")) - STOCKITEM(wxID_REPLACE, _("Rep&lace")) - STOCKITEM(wxID_REVERT_TO_SAVED, _("Revert to Saved")) - STOCKITEM(wxID_SAVE, _("&Save")) - STOCKITEM(wxID_SAVEAS, _("Save &As...")) - STOCKITEM(wxID_SELECTALL, _("Select &All")) - STOCKITEM(wxID_SELECT_COLOR, _("&Color")) - STOCKITEM(wxID_SELECT_FONT, _("&Font")) - STOCKITEM(wxID_SORT_ASCENDING, _("&Ascending")) - STOCKITEM(wxID_SORT_DESCENDING, _("&Descending")) - STOCKITEM(wxID_SPELL_CHECK, _("&Spell Check")) - STOCKITEM(wxID_STOP, _("&Stop")) - STOCKITEM(wxID_STRIKETHROUGH, _("&Strikethrough")) - STOCKITEM(wxID_TOP, _("&Top")) - STOCKITEM(wxID_UNDELETE, _("Undelete")) - STOCKITEM(wxID_UNDERLINE, _("&Underline")) - STOCKITEM(wxID_UNDO, _("&Undo")) - STOCKITEM(wxID_UNINDENT, _("&Unindent")) - STOCKITEM(wxID_UP, _("&Up")) - STOCKITEM(wxID_YES, _("&Yes")) - STOCKITEM(wxID_ZOOM_100, _("&Actual Size")) - STOCKITEM(wxID_ZOOM_FIT, _("Zoom to &Fit")) - STOCKITEM(wxID_ZOOM_IN, _("Zoom &In")) - STOCKITEM(wxID_ZOOM_OUT, _("Zoom &Out")) + STOCKITEM(wxID_ABOUT, _("&About"), _("About")); + STOCKITEM(wxID_ADD, _("Add"), _("Add")); + STOCKITEM(wxID_APPLY, _("&Apply"), _("Apply")); + STOCKITEM(wxID_BACKWARD, _("&Back"), _("Back")); + STOCKITEM(wxID_BOLD, _("&Bold"), _("Bold")); + STOCKITEM(wxID_BOTTOM, _("&Bottom"), _("Bottom")); + STOCKITEM(wxID_CANCEL, _("&Cancel"), _("Cancel")); + STOCKITEM(wxID_CDROM, _("&CD-Rom"), _("CD-Rom")); + STOCKITEM(wxID_CLEAR, _("&Clear"), _("Clear")); + STOCKITEM(wxID_CLOSE, _("&Close"), _("Close")); + STOCKITEM(wxID_CONVERT, _("&Convert"), _("Convert")); + STOCKITEM(wxID_COPY, _("&Copy"), _("Copy")); + STOCKITEM(wxID_CUT, _("Cu&t"), _("Cut")); + STOCKITEM(wxID_DELETE, _("&Delete"), _("Delete")); + STOCKITEM(wxID_DOWN, _("&Down"), _("Down")); + STOCKITEM(wxID_EDIT, _("&Edit"), _("Edit")); + STOCKITEM(wxID_EXECUTE, _("&Execute"), _("Execute")); + STOCKITEM(wxID_EXIT, _("&Quit"), _("Quit")); + STOCKITEM(wxID_FILE, _("&File"), _("File")); + STOCKITEM(wxID_FIND, _("&Find"), _("Find")); + STOCKITEM(wxID_FIRST, _("&First"), _("First")); + STOCKITEM(wxID_FLOPPY, _("&Floppy"), _("Floppy")); + STOCKITEM(wxID_FORWARD, _("&Forward"), _("Forward")); + STOCKITEM(wxID_HARDDISK, _("&Harddisk"), _("Harddisk")); + STOCKITEM(wxID_HELP, _("&Help"), _("Help")); + STOCKITEM(wxID_HOME, _("&Home"), _("Home")); + STOCKITEM(wxID_INDENT, _("Indent"), _("Indent")); + STOCKITEM(wxID_INDEX, _("&Index"), _("Index")); + STOCKITEM(wxID_INFO, _("&Info"), _("Info")); + STOCKITEM(wxID_ITALIC, _("&Italic"), _("Italic")); + STOCKITEM(wxID_JUMP_TO, _("&Jump to"), _("Jump to")); + STOCKITEM(wxID_JUSTIFY_CENTER, _("Centered"), _("Centered")); + STOCKITEM(wxID_JUSTIFY_FILL, _("Justified"), _("Justified")); + STOCKITEM(wxID_JUSTIFY_LEFT, _("Align Left"), _("Align Left")); + STOCKITEM(wxID_JUSTIFY_RIGHT, _("Align Right"), _("Align Right")); + STOCKITEM(wxID_LAST, _("&Last"), _("Last")); + STOCKITEM(wxID_NETWORK, _("&Network"), _("Network")); + STOCKITEM(wxID_NEW, _("&New"), _("New")); + STOCKITEM(wxID_NO, _("&No"), _("No")); + STOCKITEM(wxID_OK, _("&OK"), _("OK")); + STOCKITEM(wxID_OPEN, _("&Open..."), _("Open...")); + STOCKITEM(wxID_PASTE, _("&Paste"), _("Paste")); + STOCKITEM(wxID_PREFERENCES, _("&Preferences"), _("Preferences")); + STOCKITEM(wxID_PREVIEW, _("&Preview..."), _("Preview...")); + STOCKITEM(wxID_PRINT, _("&Print..."), _("Print...")); + STOCKITEM(wxID_PROPERTIES, _("&Properties"), _("Properties")); + STOCKITEM(wxID_REDO, _("&Redo"), _("Redo")); + STOCKITEM(wxID_REFRESH, _("Refresh"), _("Refresh")); + STOCKITEM(wxID_REMOVE, _("Remove"), _("Remove")); + STOCKITEM(wxID_REPLACE, _("Rep&lace"), _("Replace")); + STOCKITEM(wxID_REVERT_TO_SAVED, _("Revert to Saved"), _("Revert to Saved")); + STOCKITEM(wxID_SAVE, _("&Save"), _("Save")); + STOCKITEM(wxID_SAVEAS, _("&Save as"), _("Save as")); + STOCKITEM(wxID_SELECTALL, _("Select &All"), _("Select All")); + STOCKITEM(wxID_SELECT_COLOR, _("&Color"), _("Color")); + STOCKITEM(wxID_SELECT_FONT, _("&Font"), _("Font")); + STOCKITEM(wxID_SORT_ASCENDING, _("&Ascending"), _("Ascending")); + STOCKITEM(wxID_SORT_DESCENDING, _("&Descending"), _("Descending")); + STOCKITEM(wxID_SPELL_CHECK, _("&Spell Check"), _("Spell Check")); + STOCKITEM(wxID_STOP, _("&Stop"), _("Stop")); + STOCKITEM(wxID_STRIKETHROUGH, _("&Strikethrough"), _("Strikethrough")); + STOCKITEM(wxID_TOP, _("&Top"), _("Top")); + STOCKITEM(wxID_UNDELETE, _("Undelete"), _("Undelete")); + STOCKITEM(wxID_UNDERLINE, _("&Underline"), _("Underline")); + STOCKITEM(wxID_UNDO, _("&Undo"), _("Undo")); + STOCKITEM(wxID_UNINDENT, _("&Unindent"), _("Unindent")); + STOCKITEM(wxID_UP, _("&Up"), _("Up")); + STOCKITEM(wxID_YES, _("&Yes"), _("Yes")); + STOCKITEM(wxID_ZOOM_100, _("&Actual Size"), _("Actual Size")); + STOCKITEM(wxID_ZOOM_FIT, _("Zoom to &Fit"), _("Zoom to Fit")); + STOCKITEM(wxID_ZOOM_IN, _("Zoom &In"), _("Zoom In")); + STOCKITEM(wxID_ZOOM_OUT, _("Zoom &Out"), _("Zoom Out")); default: wxFAIL_MSG( wxT("invalid stock item ID") ); @@ -218,19 +230,6 @@ wxString wxGetStockLabel(wxWindowID id, long flags) "labels without ellipsis shouldn't use accelerators" ); } -#ifdef __WXMSW__ - // special case: the "Cancel" button shouldn't have a mnemonic under MSW - // for consistency with the native dialogs (which don't use any mnemonic - // for it because it is already bound to Esc implicitly) - if ( id == wxID_CANCEL ) - flags &= ~wxSTOCK_WITH_MNEMONIC; -#endif // __WXMSW__ - - if ( !(flags & wxSTOCK_WITH_MNEMONIC) ) - { - stockLabel = wxStripMenuCodes(stockLabel); - } - #if wxUSE_ACCEL if ( !stockLabel.empty() && (flags & wxSTOCK_WITH_ACCELERATOR) ) { @@ -292,17 +291,21 @@ wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id) switch (id) { - STOCKITEM(wxID_COPY, wxACCEL_CMD,'C') - STOCKITEM(wxID_CUT, wxACCEL_CMD,'X') - STOCKITEM(wxID_FIND, wxACCEL_CMD,'F') - STOCKITEM(wxID_HELP, wxACCEL_CMD,'H') - STOCKITEM(wxID_NEW, wxACCEL_CMD,'N') - STOCKITEM(wxID_OPEN, wxACCEL_CMD,'O') - STOCKITEM(wxID_PASTE, wxACCEL_CMD,'V') - STOCKITEM(wxID_REDO, wxACCEL_CMD | wxACCEL_SHIFT,'Z') - STOCKITEM(wxID_REPLACE, wxACCEL_CMD,'R') - STOCKITEM(wxID_SAVE, wxACCEL_CMD,'S') - STOCKITEM(wxID_UNDO, wxACCEL_CMD,'Z') + STOCKITEM(wxID_COPY, wxACCEL_CTRL,'C') + STOCKITEM(wxID_CUT, wxACCEL_CTRL,'X') + STOCKITEM(wxID_FIND, wxACCEL_CTRL,'F') + STOCKITEM(wxID_HELP, wxACCEL_CTRL,'H') + STOCKITEM(wxID_NEW, wxACCEL_CTRL,'N') + STOCKITEM(wxID_OPEN, wxACCEL_CTRL,'O') + STOCKITEM(wxID_PASTE, wxACCEL_CTRL,'V') + STOCKITEM(wxID_PRINT, wxACCEL_CTRL,'P') + STOCKITEM(wxID_REDO, wxACCEL_CTRL | wxACCEL_SHIFT,'Z') + STOCKITEM(wxID_REPLACE, wxACCEL_CTRL,'R') + STOCKITEM(wxID_SAVE, wxACCEL_CTRL,'S') + STOCKITEM(wxID_UNDO, wxACCEL_CTRL,'Z') +#ifdef __WXOSX__ + STOCKITEM(wxID_PREFERENCES, wxACCEL_CTRL,',') +#endif default: // set the wxAcceleratorEntry to return into an invalid state: diff --git a/Externals/wxWidgets3/src/common/stopwatch.cpp b/Externals/wxWidgets3/src/common/stopwatch.cpp index 246e778921..dc66848854 100644 --- a/Externals/wxWidgets3/src/common/stopwatch.cpp +++ b/Externals/wxWidgets3/src/common/stopwatch.cpp @@ -8,7 +8,7 @@ // Guillermo Rodriguez rewrote from scratch (Dic/99) // Modified by: // Created: 20.06.2003 (extracted from common/timercmn.cpp) -// RCS-ID: $Id: stopwatch.cpp 64940 2010-07-13 13:29:13Z VZ $ +// RCS-ID: $Id: stopwatch.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998-2003 wxWidgets Team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -30,61 +30,16 @@ #include "wx/stopwatch.h" +#if wxUSE_STOPWATCH + #ifndef WX_PRECOMP - #ifdef __WXMSW__ + #ifdef __WINDOWS__ #include "wx/msw/wrapwin.h" #endif - #include "wx/intl.h" #include "wx/log.h" + #include "wx/thread.h" #endif //WX_PRECOMP -// ---------------------------------------------------------------------------- -// System headers -// ---------------------------------------------------------------------------- - -#if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__) && !defined(__WXWINCE__) - #define HAVE_FTIME -#endif - -#if defined(__VISAGECPP__) && !defined(HAVE_FTIME) - #define HAVE_FTIME -# if __IBMCPP__ >= 400 - # define ftime(x) _ftime(x) -# endif -#endif - -#if defined(__MWERKS__) && defined(__WXMSW__) -# undef HAVE_FTIME -# undef HAVE_GETTIMEOFDAY -#endif - -#ifndef __WXPALMOS5__ -#ifndef __WXWINCE__ -#include -#else -#include "wx/msw/private.h" -#include "wx/msw/wince/time.h" -#endif -#endif // __WXPALMOS5__ - - -#if !defined(__WXMAC__) && !defined(__WXWINCE__) - #include // for time_t -#endif - -#if defined(HAVE_GETTIMEOFDAY) - #include - #include -#elif defined(HAVE_FTIME) - #include -#endif - -#ifdef __WXPALMOS__ - #include - #include - #include -#endif - // ============================================================================ // implementation // ============================================================================ @@ -93,57 +48,117 @@ // wxStopWatch // ---------------------------------------------------------------------------- -#if wxUSE_STOPWATCH - -void wxStopWatch::Start(long t) +namespace { -#if 0 -// __WXMSW__ - LARGE_INTEGER frequency_li; - ::QueryPerformanceFrequency( &frequency_li ); - m_frequency = frequency_li.QuadPart; - if (m_frequency == 0) + +#ifdef __WINDOWS__ + +struct PerfCounter +{ + PerfCounter() { - m_t0 = wxGetLocalTimeMillis() - t; + init = false; } - else + + bool CanBeUsed() const { - LARGE_INTEGER counter_li; - ::QueryPerformanceCounter( &counter_li ); - wxLongLong counter = counter_li.QuadPart; - m_t0 = (counter * 10000 / m_frequency) - t*10; + return freq.QuadPart != 0; } -#else - m_t0 = wxGetLocalTimeMillis() - t; -#endif - m_pause = 0; + + wxCRIT_SECT_DECLARE_MEMBER(cs); + LARGE_INTEGER freq; + bool init; +} gs_perfCounter; + +#endif // __WINDOWS__ + +const int MILLISECONDS_PER_SECOND = 1000; +const int MICROSECONDS_PER_MILLISECOND = 1000; +const int MICROSECONDS_PER_SECOND = 1000*1000; + +} // anonymous namespace + +void wxStopWatch::DoStart() +{ +#ifdef __WINDOWS__ + if ( !gs_perfCounter.init ) + { + wxCRIT_SECT_LOCKER(lock, gs_perfCounter.cs); + ::QueryPerformanceFrequency(&gs_perfCounter.freq); + + // Just a sanity check: it's not supposed to happen but verify that + // ::QueryPerformanceCounter() succeeds so that we can really use it. + LARGE_INTEGER counter; + if ( !::QueryPerformanceCounter(&counter) ) + { + wxLogDebug("QueryPerformanceCounter() unexpected failed (%s), " + "will not use it.", wxSysErrorMsg()); + + gs_perfCounter.freq.QuadPart = 0; + } + + gs_perfCounter.init = true; + } +#endif // __WINDOWS__ + + m_t0 = GetCurrentClockValue(); +} + +wxLongLong wxStopWatch::GetClockFreq() const +{ +#ifdef __WINDOWS__ + // Under MSW we use the high resolution performance counter timer which has + // its own frequency (usually related to the CPU clock speed). + if ( gs_perfCounter.CanBeUsed() ) + return gs_perfCounter.freq.QuadPart; +#endif // __WINDOWS__ + +#ifdef HAVE_GETTIMEOFDAY + // With gettimeofday() we can have nominally microsecond precision and + // while this is not the case in practice, it's still better than + // millisecond. + return MICROSECONDS_PER_SECOND; +#else // !HAVE_GETTIMEOFDAY + // Currently milliseconds are used everywhere else. + return MILLISECONDS_PER_SECOND; +#endif // HAVE_GETTIMEOFDAY/!HAVE_GETTIMEOFDAY +} + +void wxStopWatch::Start(long t0) +{ + // Calling Start() makes the stop watch run however many times it was + // paused before. m_pauseCount = 0; + + DoStart(); + + m_t0 -= (wxLongLong(t0)*GetClockFreq())/MILLISECONDS_PER_SECOND; } -long wxStopWatch::GetElapsedTime() const +wxLongLong wxStopWatch::GetCurrentClockValue() const { -#if 0 -//__WXMSW__ - if (m_frequency == 0) +#ifdef __WINDOWS__ + if ( gs_perfCounter.CanBeUsed() ) { - return (wxGetLocalTimeMillis() - m_t0).GetLo(); + LARGE_INTEGER counter; + ::QueryPerformanceCounter(&counter); + return counter.QuadPart; } - else - { - LARGE_INTEGER counter_li; - ::QueryPerformanceCounter( &counter_li ); - wxLongLong counter = counter_li.QuadPart; - wxLongLong res = (counter * 10000 / m_frequency) - m_t0; - return res.GetLo() / 10; - } -#else - return (wxGetLocalTimeMillis() - m_t0).GetLo(); -#endif +#endif // __WINDOWS__ + +#ifdef HAVE_GETTIMEOFDAY + return wxGetUTCTimeUSec(); +#else // !HAVE_GETTIMEOFDAY + return wxGetUTCTimeMillis(); +#endif // HAVE_GETTIMEOFDAY/!HAVE_GETTIMEOFDAY } -long wxStopWatch::Time() const +wxLongLong wxStopWatch::TimeInMicro() const { - return m_pauseCount ? m_pause : GetElapsedTime(); + const wxLongLong elapsed(m_pauseCount ? m_elapsedBeforePause + : GetCurrentClockValue() - m_t0); + + return (elapsed*MICROSECONDS_PER_SECOND)/GetClockFreq(); } #endif // wxUSE_STOPWATCH @@ -159,14 +174,14 @@ static wxLongLong wxStartTime = 0l; // starts the global timer void wxStartTimer() { - wxStartTime = wxGetLocalTimeMillis(); + wxStartTime = wxGetUTCTimeMillis(); } // Returns elapsed time in milliseconds long wxGetElapsedTime(bool resetTimer) { wxLongLong oldTime = wxStartTime; - wxLongLong newTime = wxGetLocalTimeMillis(); + wxLongLong newTime = wxGetUTCTimeMillis(); if ( resetTimer ) wxStartTime = newTime; @@ -175,157 +190,3 @@ long wxGetElapsedTime(bool resetTimer) } #endif // wxUSE_LONGLONG - -// ---------------------------------------------------------------------------- -// the functions to get the current time and timezone info -// ---------------------------------------------------------------------------- - -// Get local time as seconds since 00:00:00, Jan 1st 1970 -long wxGetLocalTime() -{ - struct tm tm; - time_t t0, t1; - - // This cannot be made static because mktime can overwrite it. - // - memset(&tm, 0, sizeof(tm)); - tm.tm_year = 70; - tm.tm_mon = 0; - tm.tm_mday = 5; // not Jan 1st 1970 due to mktime 'feature' - tm.tm_hour = 0; - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; // let mktime guess - - // Note that mktime assumes that the struct tm contains local time. - // - t1 = time(&t1); // now - t0 = mktime(&tm); // origin - - // Return the difference in seconds. - // - if (( t0 != (time_t)-1 ) && ( t1 != (time_t)-1 )) - return (long)difftime(t1, t0) + (60 * 60 * 24 * 4); - - wxLogSysError(_("Failed to get the local system time")); - return -1; -} - -// Get UTC time as seconds since 00:00:00, Jan 1st 1970 -long wxGetUTCTime() -{ - return (long)time(NULL); -} - -#if wxUSE_LONGLONG - -// Get local time as milliseconds since 00:00:00, Jan 1st 1970 -wxLongLong wxGetLocalTimeMillis() -{ - wxLongLong val = 1000l; - - // If possible, use a function which avoids conversions from - // broken-up time structures to milliseconds - -#if defined(__WXPALMOS__) - DateTimeType thenst; - thenst.second = 0; - thenst.minute = 0; - thenst.hour = 0; - thenst.day = 1; - thenst.month = 1; - thenst.year = 1970; - thenst.weekDay = 5; - uint32_t now = TimGetSeconds(); - uint32_t then = TimDateTimeToSeconds (&thenst); - return SysTimeToMilliSecs(SysTimeInSecs(now - then)); -#elif defined(__WXMSW__) && (defined(__WINE__) || defined(__MWERKS__)) - // This should probably be the way all WXMSW compilers should do it - // Go direct to the OS for time - - SYSTEMTIME thenst = { 1970, 1, 4, 1, 0, 0, 0, 0 }; // 00:00:00 Jan 1st 1970 - FILETIME thenft; - SystemTimeToFileTime( &thenst, &thenft ); - wxLongLong then( thenft.dwHighDateTime, thenft.dwLowDateTime ); // time in 100 nanoseconds - - SYSTEMTIME nowst; - GetLocalTime( &nowst ); - FILETIME nowft; - SystemTimeToFileTime( &nowst, &nowft ); - wxLongLong now( nowft.dwHighDateTime, nowft.dwLowDateTime ); // time in 100 nanoseconds - - return ( now - then ) / 10000.0; // time from 00:00:00 Jan 1st 1970 to now in milliseconds - -#elif defined(HAVE_GETTIMEOFDAY) - struct timeval tp; - if ( wxGetTimeOfDay(&tp) != -1 ) - { - val *= tp.tv_sec; - return (val + (tp.tv_usec / 1000)); - } - else - { - wxLogError(_("wxGetTimeOfDay failed.")); - return 0; - } -#elif defined(HAVE_FTIME) - struct timeb tp; - - // ftime() is void and not int in some mingw32 headers, so don't - // test the return code (well, it shouldn't fail anyhow...) - (void)::ftime(&tp); - val *= tp.time; - return (val + tp.millitm); -#else // no gettimeofday() nor ftime() - // We use wxGetLocalTime() to get the seconds since - // 00:00:00 Jan 1st 1970 and then whatever is available - // to get millisecond resolution. - // - // NOTE that this might lead to a problem if the clocks - // use different sources, so this approach should be - // avoided where possible. - - val *= wxGetLocalTime(); - -// GRG: This will go soon as all WIN32 seem to have ftime -// JACS: unfortunately not. WinCE doesn't have it. -#if defined (__WIN32__) - // If your platform/compiler needs to use two different functions - // to get ms resolution, please do NOT just shut off these warnings, - // drop me a line instead at - - // FIXME -#ifndef __WXWINCE__ - #warning "Possible clock skew bug in wxGetLocalTimeMillis()!" -#endif - - SYSTEMTIME st; - ::GetLocalTime(&st); - val += st.wMilliseconds; -#else // !Win32 - // If your platform/compiler does not support ms resolution please - // do NOT just shut off these warnings, drop me a line instead at - // - - #if defined(__VISUALC__) || defined (__WATCOMC__) - #pragma message("wxStopWatch will be up to second resolution!") - #elif defined(__BORLANDC__) - #pragma message "wxStopWatch will be up to second resolution!" - #else - #warning "wxStopWatch will be up to second resolution!" - #endif // compiler -#endif - - return val; - -#endif // time functions -} - -#else // !wxUSE_LONGLONG - -double wxGetLocalTimeMillis(void) -{ - return (double(clock()) / double(CLOCKS_PER_SEC)) * 1000.0; -} - -#endif // wxUSE_LONGLONG/!wxUSE_LONGLONG diff --git a/Externals/wxWidgets3/src/common/strconv.cpp b/Externals/wxWidgets3/src/common/strconv.cpp index 25c6051b24..eea3e7c71f 100644 --- a/Externals/wxWidgets3/src/common/strconv.cpp +++ b/Externals/wxWidgets3/src/common/strconv.cpp @@ -5,7 +5,7 @@ // Ryan Norton, Fredrik Roubert (UTF7) // Modified by: // Created: 29/01/98 -// RCS-ID: $Id: strconv.cpp 66523 2011-01-02 16:59:15Z PC $ +// RCS-ID: $Id: strconv.cpp 70462 2012-01-25 00:10:44Z VZ $ // Copyright: (c) 1999 Ove Kaaven, Robert Roebling, Vaclav Slavik // (c) 2000-2003 Vadim Zeitlin // (c) 2004 Ryan Norton, Fredrik Roubert @@ -995,7 +995,7 @@ wxMBConvStrictUTF8::ToWChar(wchar_t *dst, size_t dstLen, for ( const char *p = src; ; p++ ) { - if ( !(srcLen == wxNO_LEN ? *p : srcLen) ) + if ( (srcLen == wxNO_LEN ? !*p : !srcLen) ) { // all done successfully, just add the trailing NULL if we are not // using explicit length @@ -1115,7 +1115,7 @@ wxMBConvStrictUTF8::FromWChar(char *dst, size_t dstLen, for ( const wchar_t *wp = src; ; wp++ ) { - if ( !(srcLen == wxNO_LEN ? *wp : srcLen) ) + if ( (srcLen == wxNO_LEN ? !*wp : !srcLen) ) { // all done successfully, just add the trailing NULL if we are not // using explicit length @@ -1145,6 +1145,8 @@ wxMBConvStrictUTF8::FromWChar(char *dst, size_t dstLen, { // skip the next char too as we decoded a surrogate wp++; + if ( srcLen != wxNO_LEN ) + srcLen--; } #else // wchar_t is UTF-32 code = *wp & 0x7fffffff; @@ -1230,7 +1232,10 @@ size_t wxMBConvUTF8::ToWChar(wchar_t *buf, size_t n, size_t len = 0; - while ((srcLen == wxNO_LEN ? *psz : srcLen--) && ((!buf) || (len < n))) + // The length can be either given explicitly or computed implicitly for the + // NUL-terminated strings. + const bool isNulTerminated = srcLen == wxNO_LEN; + while ((isNulTerminated ? *psz : srcLen--) && ((!buf) || (len < n))) { const char *opsz = psz; bool invalid = false; @@ -1364,10 +1369,17 @@ size_t wxMBConvUTF8::ToWChar(wchar_t *buf, size_t n, } } - if (srcLen == wxNO_LEN && buf && (len < n)) - *buf = 0; + if ( isNulTerminated ) + { + // Add the trailing NUL in this case if we have a large enough buffer. + if ( buf && (len < n) ) + *buf = 0; - return len + 1; + // And count it in any case. + len++; + } + + return len; } static inline bool isoctal(wchar_t wch) @@ -1383,7 +1395,10 @@ size_t wxMBConvUTF8::FromWChar(char *buf, size_t n, size_t len = 0; - while ((srcLen == wxNO_LEN ? *psz : srcLen--) && ((!buf) || (len < n))) + // The length can be either given explicitly or computed implicitly for the + // NUL-terminated strings. + const bool isNulTerminated = srcLen == wxNO_LEN; + while ((isNulTerminated ? *psz : srcLen--) && ((!buf) || (len < n))) { wxUint32 cc; @@ -1451,10 +1466,17 @@ size_t wxMBConvUTF8::FromWChar(char *buf, size_t n, } } - if (srcLen == wxNO_LEN && buf && (len < n)) - *buf = 0; + if ( isNulTerminated ) + { + // Add the trailing NUL in this case if we have a large enough buffer. + if ( buf && (len < n) ) + *buf = 0; - return len + 1; + // And count it in any case. + len++; + } + + return len; } // ============================================================================ @@ -1645,7 +1667,7 @@ wxMBConvUTF16straight::FromWChar(char *dst, size_t dstLen, wxUint16 *outBuff = reinterpret_cast(dst); for ( size_t n = 0; n < srcLen; n++ ) { - wxUint16 cc[2]; + wxUint16 cc[2] = { 0 }; const size_t numChars = encode_utf16(*src++, cc); if ( numChars == wxCONV_FAILED ) return wxCONV_FAILED; @@ -1728,7 +1750,7 @@ wxMBConvUTF16swap::FromWChar(char *dst, size_t dstLen, wxUint16 *outBuff = reinterpret_cast(dst); for ( const wchar_t *srcEnd = src + srcLen; src < srcEnd; src++ ) { - wxUint16 cc[2]; + wxUint16 cc[2] = { 0 }; const size_t numChars = encode_utf16(*src, cc); if ( numChars == wxCONV_FAILED ) return wxCONV_FAILED; @@ -1812,7 +1834,7 @@ wxMBConvUTF32straight::ToWChar(wchar_t *dst, size_t dstLen, size_t outLen = 0; for ( size_t n = 0; n < inLen; n++ ) { - wxUint16 cc[2]; + wxUint16 cc[2] = { 0 }; const size_t numChars = encode_utf16(*inBuff++, cc); if ( numChars == wxCONV_FAILED ) return wxCONV_FAILED; @@ -1890,7 +1912,7 @@ wxMBConvUTF32swap::ToWChar(wchar_t *dst, size_t dstLen, size_t outLen = 0; for ( size_t n = 0; n < inLen; n++, inBuff++ ) { - wxUint16 cc[2]; + wxUint16 cc[2] = { 0 }; const size_t numChars = encode_utf16(wxUINT32_SWAP_ALWAYS(*inBuff), cc); if ( numChars == wxCONV_FAILED ) return wxCONV_FAILED; diff --git a/Externals/wxWidgets3/src/common/string.cpp b/Externals/wxWidgets3/src/common/string.cpp index f232d4aff4..7b95949c01 100644 --- a/Externals/wxWidgets3/src/common/string.cpp +++ b/Externals/wxWidgets3/src/common/string.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin, Ryan Norton // Modified by: // Created: 29/01/98 -// RCS-ID: $Id: string.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: string.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // (c) 2004 Ryan Norton // Licence: wxWindows licence @@ -41,9 +41,9 @@ #include "wx/vector.h" #include "wx/xlocale.h" -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #include "wx/msw/wrapwin.h" -#endif // __WXMSW__ +#endif // __WINDOWS__ #if wxUSE_STD_IOSTREAM #include diff --git a/Externals/wxWidgets3/src/common/stringimpl.cpp b/Externals/wxWidgets3/src/common/stringimpl.cpp index aa766c0bc1..830ace8284 100644 --- a/Externals/wxWidgets3/src/common/stringimpl.cpp +++ b/Externals/wxWidgets3/src/common/stringimpl.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin, Ryan Norton // Modified by: // Created: 29/01/98 -// RCS-ID: $Id: stringimpl.cpp 66728 2011-01-22 14:38:36Z DS $ +// RCS-ID: $Id: stringimpl.cpp 70150 2011-12-28 13:51:13Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // (c) 2004 Ryan Norton // Licence: wxWindows licence @@ -681,7 +681,11 @@ bool wxStringImpl::AssignCopy(size_t nSrcLen, // allocation failure handled by caller return false; } - memcpy(m_pchData, pszSrcData, nSrcLen*sizeof(wxStringCharType)); + + // use memmove() and not memcpy() here as we might be copying from our own + // buffer in case of assignment such as "s = s.c_str()" (see #11294) + memmove(m_pchData, pszSrcData, nSrcLen*sizeof(wxStringCharType)); + GetStringData()->nDataLength = nSrcLen; m_pchData[nSrcLen] = wxT('\0'); } diff --git a/Externals/wxWidgets3/src/common/strvararg.cpp b/Externals/wxWidgets3/src/common/strvararg.cpp index 6f1d678cc6..694a370d77 100644 --- a/Externals/wxWidgets3/src/common/strvararg.cpp +++ b/Externals/wxWidgets3/src/common/strvararg.cpp @@ -3,7 +3,7 @@ // Purpose: macros for implementing type-safe vararg passing of strings // Author: Vaclav Slavik // Created: 2007-02-19 -// RCS-ID: $Id: strvararg.cpp 65057 2010-07-23 23:32:46Z VZ $ +// RCS-ID: $Id: strvararg.cpp 70523 2012-02-06 13:28:34Z VZ $ // Copyright: (c) 2007 REA Elektronik GmbH // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -161,6 +161,19 @@ public: { if ( CopyFmtChar(*format++) == wxT('%') ) { +#if wxUSE_PRINTF_POS_PARAMS + if ( *format >= '0' && *format <= '9' ) + { + SkipDigits(&format); + if ( *format == '$' ) + { + // It was a positional argument specification. + CopyFmtChar(*format++); + } + //else: it was a width specification, nothing else to do. + } +#endif // wxUSE_PRINTF_POS_PARAMS + // skip any flags while ( IsFlagChar(*format) ) CopyFmtChar(*format++); diff --git a/Externals/wxWidgets3/src/common/sysopt.cpp b/Externals/wxWidgets3/src/common/sysopt.cpp index b7f14a1659..e16ff8256a 100644 --- a/Externals/wxWidgets3/src/common/sysopt.cpp +++ b/Externals/wxWidgets3/src/common/sysopt.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 2001-07-10 -// RCS-ID: $Id: sysopt.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: sysopt.cpp 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -101,12 +101,7 @@ wxString wxSystemOptions::GetOption(const wxString& name) int wxSystemOptions::GetOptionInt(const wxString& name) { -#ifdef _PACC_VER - // work around the PalmOS pacc compiler bug - return wxAtoi (GetOption(name).data()); -#else return wxAtoi (GetOption(name)); -#endif } bool wxSystemOptions::HasOption(const wxString& name) diff --git a/Externals/wxWidgets3/src/common/tbarbase.cpp b/Externals/wxWidgets3/src/common/tbarbase.cpp index f198708da8..0baf8c4d79 100644 --- a/Externals/wxWidgets3/src/common/tbarbase.cpp +++ b/Externals/wxWidgets3/src/common/tbarbase.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: VZ at 11.12.99 (wxScrollableToolBar split off) // Created: 04/01/98 -// RCS-ID: $Id: tbarbase.cpp 67206 2011-03-16 06:36:43Z SC $ +// RCS-ID: $Id: tbarbase.cpp 70179 2011-12-29 22:05:31Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -701,12 +701,6 @@ void wxToolBarBase::UpdateWindowUI(long flags) if ( !IsShown() ) return; - // There is no sense in updating the toolbar UI - // if the parent window is about to get destroyed - wxWindow *tlw = wxGetTopLevelParent( this ); - if (tlw && wxPendingDelete.Member( tlw )) - return; - wxEvtHandler* evtHandler = GetEventHandler() ; for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); @@ -757,7 +751,7 @@ bool wxCreateGreyedImage(const wxImage& in, wxImage& out) { #if wxUSE_IMAGE out = in.ConvertToGreyscale(); - if ( out.Ok() ) + if ( out.IsOk() ) return true; #endif // wxUSE_IMAGE return false; diff --git a/Externals/wxWidgets3/src/common/textbuf.cpp b/Externals/wxWidgets3/src/common/textbuf.cpp index cd46aa9464..28d1e7477c 100644 --- a/Externals/wxWidgets3/src/common/textbuf.cpp +++ b/Externals/wxWidgets3/src/common/textbuf.cpp @@ -3,7 +3,7 @@ // Purpose: implementation of wxTextBuffer class // Created: 14.11.01 // Author: Morten Hanssen, Vadim Zeitlin -// RCS-ID: $Id: textbuf.cpp 61508 2009-07-23 20:30:22Z VZ $ +// RCS-ID: $Id: textbuf.cpp 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) 1998-2001 wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -40,7 +40,7 @@ // - Mac when compiling with CodeWarrior (__WXMAC__) const wxTextFileType wxTextBuffer::typeDefault = -#if defined(__WINDOWS__) || defined(__DOS__) || defined(__PALMOS__) +#if defined(__WINDOWS__) || defined(__DOS__) wxTextFileType_Dos; #elif defined(__UNIX__) wxTextFileType_Unix; diff --git a/Externals/wxWidgets3/src/common/textcmn.cpp b/Externals/wxWidgets3/src/common/textcmn.cpp index e590bdd9a0..68dfc96258 100644 --- a/Externals/wxWidgets3/src/common/textcmn.cpp +++ b/Externals/wxWidgets3/src/common/textcmn.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 13.07.99 -// RCS-ID: $Id: textcmn.cpp 66592 2011-01-05 18:27:58Z PC $ +// RCS-ID: $Id: textcmn.cpp 70448 2012-01-23 12:33:03Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -143,8 +143,8 @@ wxTextAttr::wxTextAttr(const wxColour& colText, { Init(); - if (m_colText.Ok()) m_flags |= wxTEXT_ATTR_TEXT_COLOUR; - if (m_colBack.Ok()) m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR; + if (m_colText.IsOk()) m_flags |= wxTEXT_ATTR_TEXT_COLOUR; + if (m_colBack.IsOk()) m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR; if (alignment != wxTEXT_ALIGNMENT_DEFAULT) m_flags |= wxTEXT_ATTR_ALIGNMENT; @@ -164,6 +164,7 @@ void wxTextAttr::Init() m_fontStyle = wxFONTSTYLE_NORMAL; m_fontWeight = wxFONTWEIGHT_NORMAL; m_fontUnderlined = false; + m_fontStrikethrough = false; m_fontEncoding = wxFONTENCODING_DEFAULT; m_fontFamily = wxFONTFAMILY_DEFAULT; @@ -193,6 +194,7 @@ void wxTextAttr::Copy(const wxTextAttr& attr) m_fontStyle = attr.m_fontStyle; m_fontWeight = attr.m_fontWeight; m_fontUnderlined = attr.m_fontUnderlined; + m_fontStrikethrough = attr.m_fontStrikethrough; m_fontFaceName = attr.m_fontFaceName; m_fontEncoding = attr.m_fontEncoding; m_fontFamily = attr.m_fontFamily; @@ -403,6 +405,10 @@ wxFont wxTextAttr::GetFont() const if (HasFontUnderlined()) underlined = GetFontUnderlined(); + bool strikethrough = false; + if ( HasFontStrikethrough() ) + strikethrough = GetFontStrikethrough(); + wxString fontFaceName; if (HasFontFaceName()) fontFaceName = GetFontFaceName(); @@ -416,13 +422,15 @@ wxFont wxTextAttr::GetFont() const fontFamily = GetFontFamily(); wxFont font(fontSize, fontFamily, fontStyle, fontWeight, underlined, fontFaceName, encoding); + if ( strikethrough ) + font.SetStrikethrough( true ); return font; } // Get attributes from font. bool wxTextAttr::GetFontAttributes(const wxFont& font, int flags) { - if (!font.Ok()) + if (!font.IsOk()) return false; if (flags & wxTEXT_ATTR_FONT_SIZE) @@ -437,6 +445,9 @@ bool wxTextAttr::GetFontAttributes(const wxFont& font, int flags) if (flags & wxTEXT_ATTR_FONT_UNDERLINE) m_fontUnderlined = font.GetUnderlined(); + if (flags & wxTEXT_ATTR_FONT_STRIKETHROUGH) + m_fontStrikethrough = font.GetStrikethrough(); + if (flags & wxTEXT_ATTR_FONT_FACE) m_fontFaceName = font.GetFaceName(); @@ -500,6 +511,12 @@ bool wxTextAttr::Apply(const wxTextAttr& style, const wxTextAttr* compareWith) destStyle.SetFontUnderlined(style.GetFontUnderlined()); } + if (style.HasFontStrikethrough()) + { + if (!(compareWith && compareWith->HasFontStrikethrough() && compareWith->GetFontStrikethrough() == style.GetFontStrikethrough())) + destStyle.SetFontStrikethrough(style.GetFontStrikethrough()); + } + if (style.HasFontFaceName()) { if (!(compareWith && compareWith->HasFontFaceName() && compareWith->GetFontFaceName() == style.GetFontFaceName())) @@ -518,13 +535,13 @@ bool wxTextAttr::Apply(const wxTextAttr& style, const wxTextAttr* compareWith) destStyle.SetFontFamily(style.GetFontFamily()); } - if (style.GetTextColour().Ok() && style.HasTextColour()) + if (style.GetTextColour().IsOk() && style.HasTextColour()) { if (!(compareWith && compareWith->HasTextColour() && compareWith->GetTextColour() == style.GetTextColour())) destStyle.SetTextColour(style.GetTextColour()); } - if (style.GetBackgroundColour().Ok() && style.HasBackgroundColour()) + if (style.GetBackgroundColour().IsOk() && style.HasBackgroundColour()) { if (!(compareWith && compareWith->HasBackgroundColour() && compareWith->GetBackgroundColour() == style.GetBackgroundColour())) destStyle.SetBackgroundColour(style.GetBackgroundColour()); @@ -670,30 +687,30 @@ wxTextAttr wxTextAttr::Combine(const wxTextAttr& attr, if (attr.HasFont()) font = attr.GetFont(); - if ( !font.Ok() ) + if ( !font.IsOk() ) { if (attrDef.HasFont()) font = attrDef.GetFont(); - if ( text && !font.Ok() ) + if ( text && !font.IsOk() ) font = text->GetFont(); } wxColour colFg = attr.GetTextColour(); - if ( !colFg.Ok() ) + if ( !colFg.IsOk() ) { colFg = attrDef.GetTextColour(); - if ( text && !colFg.Ok() ) + if ( text && !colFg.IsOk() ) colFg = text->GetForegroundColour(); } wxColour colBg = attr.GetBackgroundColour(); - if ( !colBg.Ok() ) + if ( !colBg.IsOk() ) { colBg = attrDef.GetBackgroundColour(); - if ( text && !colBg.Ok() ) + if ( text && !colBg.IsOk() ) colBg = text->GetBackgroundColour(); } @@ -773,7 +790,7 @@ bool wxTextAttr::BitlistsEqPartial(int valueA, int valueB, int flags) { int relevantBitsA = valueA & flags; int relevantBitsB = valueB & flags; - return (relevantBitsA != relevantBitsB); + return relevantBitsA == relevantBitsB; } /// Split into paragraph and character styles @@ -940,12 +957,47 @@ int wxTextCtrlBase::overflow(int c) bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event) { + bool handled = false; // we have a native implementation for Win32 and so don't need this one #ifndef __WIN32__ wxChar ch = 0; int keycode = event.GetKeyCode(); + + long from, to; + GetSelection(&from,&to); + long insert = GetInsertionPoint(); + long last = GetLastPosition(); + + // catch arrow left and right + switch ( keycode ) { + case WXK_LEFT: + if ( event.ShiftDown() ) + SetSelection( (from > 0 ? from - 1 : 0) , to ); + else + { + if ( from != to ) + insert = from; + else if ( insert > 0 ) + insert -= 1; + SetInsertionPoint( insert ); + } + handled = true; + break; + case WXK_RIGHT: + if ( event.ShiftDown() ) + SetSelection( from, (to < last ? to + 1 : last) ); + else + { + if ( from != to ) + insert = to; + else if ( insert < last ) + insert += 1; + SetInsertionPoint( insert ); + } + handled = true; + break; case WXK_NUMPAD0: case WXK_NUMPAD1: case WXK_NUMPAD2: @@ -991,6 +1043,7 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event) const long pos = GetInsertionPoint(); if ( pos < GetLastPosition() ) Remove(pos, pos + 1); + handled = true; } break; @@ -1000,6 +1053,7 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event) const long pos = GetInsertionPoint(); if ( pos > 0 ) Remove(pos - 1, pos); + handled = true; } break; @@ -1031,13 +1085,13 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event) { WriteText(ch); - return true; + handled = true; } #else // __WIN32__ wxUnusedVar(event); #endif // !__WIN32__/__WIN32__ - return false; + return handled; } // do the window-specific processing after processing the update event @@ -1084,6 +1138,19 @@ wxTextAreaBase::HitTest(const wxPoint& WXUNUSED(pt), long * WXUNUSED(pos)) const return wxTE_HT_UNKNOWN; } +wxPoint wxTextAreaBase::PositionToCoords(long pos) const +{ + wxCHECK_MSG( IsValidPosition(pos), wxDefaultPosition, + wxS("Position argument out of range.") ); + + return DoPositionToCoords(pos); +} + +wxPoint wxTextAreaBase::DoPositionToCoords(long WXUNUSED(pos)) const +{ + return wxDefaultPosition; +} + #else // !wxUSE_TEXTCTRL // define this one even if !wxUSE_TEXTCTRL because it is also used by other diff --git a/Externals/wxWidgets3/src/common/textentrycmn.cpp b/Externals/wxWidgets3/src/common/textentrycmn.cpp index 281086db98..a344f8319d 100644 --- a/Externals/wxWidgets3/src/common/textentrycmn.cpp +++ b/Externals/wxWidgets3/src/common/textentrycmn.cpp @@ -3,7 +3,7 @@ // Purpose: wxTextEntryBase implementation // Author: Vadim Zeitlin // Created: 2007-09-26 -// RCS-ID: $Id: textentrycmn.cpp 65552 2010-09-15 22:10:20Z VZ $ +// RCS-ID: $Id: textentrycmn.cpp 67515 2011-04-16 17:27:34Z VZ $ // Copyright: (c) 2007 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -31,6 +31,7 @@ #endif //WX_PRECOMP #include "wx/textentry.h" +#include "wx/textcompleter.h" #include "wx/clipbrd.h" // ---------------------------------------------------------------------------- @@ -368,4 +369,39 @@ bool wxTextEntryBase::SendTextUpdatedEvent(wxWindow *win) return win->HandleWindowEvent(event); } +// ---------------------------------------------------------------------------- +// auto-completion stubs +// ---------------------------------------------------------------------------- + +wxTextCompleter::~wxTextCompleter() +{ +} + +bool wxTextCompleterSimple::Start(const wxString& prefix) +{ + m_index = 0; + m_completions.clear(); + GetCompletions(prefix, m_completions); + + return !m_completions.empty(); +} + +wxString wxTextCompleterSimple::GetNext() +{ + if ( m_index == m_completions.size() ) + return wxString(); + + return m_completions[m_index++]; +} + +bool wxTextEntryBase::DoAutoCompleteCustom(wxTextCompleter *completer) +{ + // We don't do anything here but we still need to delete the completer for + // consistency with the ports that do implement this method and take + // ownership of the pointer. + delete completer; + + return false; +} + #endif // wxUSE_TEXTCTRL || wxUSE_COMBOBOX diff --git a/Externals/wxWidgets3/src/common/time.cpp b/Externals/wxWidgets3/src/common/time.cpp new file mode 100644 index 0000000000..0be9306a0b --- /dev/null +++ b/Externals/wxWidgets3/src/common/time.cpp @@ -0,0 +1,372 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: src/common/time.cpp +// Purpose: Implementation of time-related functions. +// Author: Vadim Zeitlin +// Created: 2011-11-26 +// RCS-ID: $Id: time.cpp 70796 2012-03-04 00:29:31Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#include "wx/time.h" + +#ifndef WX_PRECOMP + #ifdef __WINDOWS__ + #include "wx/msw/wrapwin.h" + #endif + #include "wx/intl.h" + #include "wx/log.h" +#endif + +#ifndef WX_GMTOFF_IN_TM + // Define it for some systems which don't (always) use configure but are + // known to have tm_gmtoff field. + #if defined(__DARWIN__) + #define WX_GMTOFF_IN_TM + #endif +#endif + +#if defined(__VISAGECPP__) && !defined(HAVE_FTIME) + #define HAVE_FTIME +# if __IBMCPP__ >= 400 + # define ftime(x) _ftime(x) +# endif +#endif + +#if defined(__MWERKS__) && defined(__WINDOWS__) +# undef HAVE_FTIME +# undef HAVE_GETTIMEOFDAY +#endif + +#ifndef __WXWINCE__ +#include +#else +#include "wx/msw/private.h" +#include "wx/msw/wince/time.h" +#endif + + +#if !defined(__WXMAC__) && !defined(__WXWINCE__) + #include // for time_t +#endif + +#if defined(HAVE_GETTIMEOFDAY) + #include + #include +#elif defined(HAVE_FTIME) + #include +#endif + +#if defined(__MWERKS__) && wxUSE_UNICODE + #include +#endif + +#if defined(__DJGPP__) || defined(__WINE__) + #include + #include +#endif + +namespace +{ + +const int MILLISECONDS_PER_SECOND = 1000; +const int MICROSECONDS_PER_MILLISECOND = 1000; +const int MICROSECONDS_PER_SECOND = 1000*1000; + +} // anonymous namespace + +// ============================================================================ +// implementation +// ============================================================================ + +// NB: VC8 safe time functions could/should be used for wxMSW as well probably +#if defined(__WXWINCE__) && defined(__VISUALC8__) + +struct tm *wxLocaltime_r(const time_t *t, struct tm* tm) +{ + __time64_t t64 = *t; + return _localtime64_s(tm, &t64) == 0 ? tm : NULL; +} + +struct tm *wxGmtime_r(const time_t* t, struct tm* tm) +{ + __time64_t t64 = *t; + return _gmtime64_s(tm, &t64) == 0 ? tm : NULL; +} + +#else // !wxWinCE with VC8 + +#if (!defined(HAVE_LOCALTIME_R) || !defined(HAVE_GMTIME_R)) && wxUSE_THREADS && !defined(__WINDOWS__) +static wxMutex timeLock; +#endif + +#ifndef HAVE_LOCALTIME_R +struct tm *wxLocaltime_r(const time_t* ticks, struct tm* temp) +{ +#if wxUSE_THREADS && !defined(__WINDOWS__) + // No need to waste time with a mutex on windows since it's using + // thread local storage for localtime anyway. + wxMutexLocker locker(timeLock); +#endif + + // Borland CRT crashes when passed 0 ticks for some reason, see SF bug 1704438 +#ifdef __BORLANDC__ + if ( !*ticks ) + return NULL; +#endif + + const tm * const t = localtime(ticks); + if ( !t ) + return NULL; + + memcpy(temp, t, sizeof(struct tm)); + return temp; +} +#endif // !HAVE_LOCALTIME_R + +#ifndef HAVE_GMTIME_R +struct tm *wxGmtime_r(const time_t* ticks, struct tm* temp) +{ +#if wxUSE_THREADS && !defined(__WINDOWS__) + // No need to waste time with a mutex on windows since it's + // using thread local storage for gmtime anyway. + wxMutexLocker locker(timeLock); +#endif + +#ifdef __BORLANDC__ + if ( !*ticks ) + return NULL; +#endif + + const tm * const t = gmtime(ticks); + if ( !t ) + return NULL; + + memcpy(temp, gmtime(ticks), sizeof(struct tm)); + return temp; +} +#endif // !HAVE_GMTIME_R + +#endif // wxWinCE with VC8/other platforms + +// returns the time zone in the C sense, i.e. the difference UTC - local +// (in seconds) +int wxGetTimeZone() +{ +#ifdef WX_GMTOFF_IN_TM + // set to true when the timezone is set + static bool s_timezoneSet = false; + static long gmtoffset = LONG_MAX; // invalid timezone + + // ensure that the timezone variable is set by calling wxLocaltime_r + if ( !s_timezoneSet ) + { + // just call wxLocaltime_r() instead of figuring out whether this + // system supports tzset(), _tzset() or something else + time_t t = time(NULL); + struct tm tm; + + wxLocaltime_r(&t, &tm); + s_timezoneSet = true; + + // note that GMT offset is the opposite of time zone and so to return + // consistent results in both WX_GMTOFF_IN_TM and !WX_GMTOFF_IN_TM + // cases we have to negate it + gmtoffset = -tm.tm_gmtoff; + + // this function is supposed to return the same value whether DST is + // enabled or not, so we need to use an additional offset if DST is on + // as tm_gmtoff already does include it + if ( tm.tm_isdst ) + gmtoffset += 3600; + } + return (int)gmtoffset; +#elif defined(__DJGPP__) || defined(__WINE__) + struct timeb tb; + ftime(&tb); + return tb.timezone*60; +#elif defined(__VISUALC__) + // We must initialize the time zone information before using it (this will + // be done only once internally). + _tzset(); + + // Starting with VC++ 8 timezone variable is deprecated and is not even + // available in some standard library version so use the new function for + // accessing it instead. + #if wxCHECK_VISUALC_VERSION(8) + long t; + _get_timezone(&t); + return t; + #else // VC++ < 8 + return timezone; + #endif +#else // Use some kind of time zone variable. + // In any case we must initialize the time zone before using it. + tzset(); + + #if defined(WX_TIMEZONE) // If WX_TIMEZONE was defined by configure, use it. + return WX_TIMEZONE; + #elif defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__) + return _timezone; + #elif defined(__MWERKS__) + // This is just plain wrong but apparently MetroWerks runtime didn't have + // any way to get the time zone. + return 28800; + #else // unknown platform -- assume it has timezone + return timezone; + #endif // different time zone variables +#endif // different ways to determine time zone +} + +// Get local time as seconds since 00:00:00, Jan 1st 1970 +long wxGetLocalTime() +{ + struct tm tm; + time_t t0, t1; + + // This cannot be made static because mktime can overwrite it. + // + memset(&tm, 0, sizeof(tm)); + tm.tm_year = 70; + tm.tm_mon = 0; + tm.tm_mday = 5; // not Jan 1st 1970 due to mktime 'feature' + tm.tm_hour = 0; + tm.tm_min = 0; + tm.tm_sec = 0; + tm.tm_isdst = -1; // let mktime guess + + // Note that mktime assumes that the struct tm contains local time. + // + t1 = time(&t1); // now + t0 = mktime(&tm); // origin + + // Return the difference in seconds. + // + if (( t0 != (time_t)-1 ) && ( t1 != (time_t)-1 )) + return (long)difftime(t1, t0) + (60 * 60 * 24 * 4); + + wxLogSysError(_("Failed to get the local system time")); + return -1; +} + +// Get UTC time as seconds since 00:00:00, Jan 1st 1970 +long wxGetUTCTime() +{ + return (long)time(NULL); +} + +#if wxUSE_LONGLONG + +wxLongLong wxGetUTCTimeUSec() +{ +#if defined(__WINDOWS__) + FILETIME ft; + ::GetSystemTimeAsFileTime(&ft); + + // FILETIME is in 100ns or 0.1us since 1601-01-01, transform to us since + // 1970-01-01. + wxLongLong t(ft.dwHighDateTime, ft.dwLowDateTime); + t /= 10; + t -= wxLL(11644473600000000); // Unix - Windows epochs difference in us. + return t; +#else // non-MSW + +#ifdef HAVE_GETTIMEOFDAY + timeval tv; + if ( wxGetTimeOfDay(&tv) != -1 ) + { + wxLongLong val(tv.tv_sec); + val *= MICROSECONDS_PER_SECOND; + val += tv.tv_usec; + return val; + } +#endif // HAVE_GETTIMEOFDAY + + // Fall back to lesser precision function. + return wxGetUTCTimeMillis()*MICROSECONDS_PER_MILLISECOND; +#endif // MSW/!MSW +} + +// Get local time as milliseconds since 00:00:00, Jan 1st 1970 +wxLongLong wxGetUTCTimeMillis() +{ + wxLongLong val = MILLISECONDS_PER_SECOND; + + // If possible, use a function which avoids conversions from + // broken-up time structures to milliseconds +#if defined(__WINDOWS__) + FILETIME ft; + ::GetSystemTimeAsFileTime(&ft); + + // FILETIME is expressed in 100ns (or 0.1us) units since 1601-01-01, + // transform them to ms since 1970-01-01. + wxLongLong t(ft.dwHighDateTime, ft.dwLowDateTime); + t /= 10000; + t -= wxLL(11644473600000); // Unix - Windows epochs difference in ms. + return t; +#elif defined(HAVE_GETTIMEOFDAY) + struct timeval tp; + if ( wxGetTimeOfDay(&tp) != -1 ) + { + val *= tp.tv_sec; + return (val + (tp.tv_usec / MICROSECONDS_PER_MILLISECOND)); + } + else + { + wxLogError(_("wxGetTimeOfDay failed.")); + return 0; + } +#elif defined(HAVE_FTIME) + struct timeb tp; + + // ftime() is void and not int in some mingw32 headers, so don't + // test the return code (well, it shouldn't fail anyhow...) + (void)::ftime(&tp); + val *= tp.time; + return (val + tp.millitm); +#else // no gettimeofday() nor ftime() + // If your platform/compiler does not support ms resolution please + // do NOT just shut off these warnings, drop me a line instead at + // + + #if defined(__VISUALC__) || defined (__WATCOMC__) + #pragma message("wxStopWatch will be up to second resolution!") + #elif defined(__BORLANDC__) + #pragma message "wxStopWatch will be up to second resolution!" + #else + #warning "wxStopWatch will be up to second resolution!" + #endif // compiler + + val *= wxGetUTCTime(); + return val; +#endif // time functions +} + +wxLongLong wxGetLocalTimeMillis() +{ + return wxGetUTCTimeMillis() - wxGetTimeZone()*MILLISECONDS_PER_SECOND; +} + +#else // !wxUSE_LONGLONG + +double wxGetLocalTimeMillis(void) +{ + return (double(clock()) / double(CLOCKS_PER_SEC)) * 1000.0; +} + +#endif // wxUSE_LONGLONG/!wxUSE_LONGLONG diff --git a/Externals/wxWidgets3/src/common/toplvcmn.cpp b/Externals/wxWidgets3/src/common/toplvcmn.cpp index fa3176bb19..5b4dcb3837 100644 --- a/Externals/wxWidgets3/src/common/toplvcmn.cpp +++ b/Externals/wxWidgets3/src/common/toplvcmn.cpp @@ -3,7 +3,7 @@ // Purpose: common (for all platforms) wxTopLevelWindow functions // Author: Julian Smart, Vadim Zeitlin // Created: 01/02/97 -// Id: $Id: toplvcmn.cpp 63171 2010-01-18 00:28:53Z VZ $ +// Id: $Id: toplvcmn.cpp 68366 2011-07-24 22:19:33Z VZ $ // Copyright: (c) 1998 Robert Roebling and Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -39,11 +39,8 @@ BEGIN_EVENT_TABLE(wxTopLevelWindowBase, wxWindow) EVT_CLOSE(wxTopLevelWindowBase::OnCloseWindow) EVT_SIZE(wxTopLevelWindowBase::OnSize) - WX_EVENT_TABLE_CONTROL_CONTAINER(wxTopLevelWindowBase) END_EVENT_TABLE() -WX_DELEGATE_TO_CONTROL_CONTAINER(wxTopLevelWindowBase, wxWindow) - // ============================================================================ // implementation // ============================================================================ @@ -58,8 +55,6 @@ wxTopLevelWindowBase::wxTopLevelWindowBase() { // Unlike windows, top level windows are created hidden by default. m_isShown = false; - - WX_INIT_CONTROL_CONTAINER(); } wxTopLevelWindowBase::~wxTopLevelWindowBase() @@ -352,7 +347,7 @@ void wxTopLevelWindowBase::SetIcon(const wxIcon& icon) // passing wxNullIcon to SetIcon() is possible (it means that we shouldn't // have any icon), but adding an invalid icon to wxIconBundle is not wxIconBundle icons; - if ( icon.Ok() ) + if ( icon.IsOk() ) icons.AddIcon(icon); SetIcons(icons); diff --git a/Externals/wxWidgets3/src/common/translation.cpp b/Externals/wxWidgets3/src/common/translation.cpp index a278f8aa3e..db59ccd0f2 100644 --- a/Externals/wxWidgets3/src/common/translation.cpp +++ b/Externals/wxWidgets3/src/common/translation.cpp @@ -5,7 +5,7 @@ // Michael N. Filippov // (2003/09/30 - PluralForms support) // Created: 2010-04-23 -// RCS-ID: $Id: translation.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: translation.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -50,7 +50,7 @@ #include "wx/stdpaths.h" #include "wx/hashset.h" -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #include "wx/msw/wrapwin.h" #endif @@ -986,7 +986,7 @@ bool wxMsgCatalogFile::LoadData(const DataBuffer& data, if ( m_charset == wxS("CHARSET") ) { // "CHARSET" is not valid charset, but lazy translator - m_charset.empty(); + m_charset.clear(); } } } @@ -1440,7 +1440,7 @@ wxString wxTranslations::ChooseLanguageForDomain(const wxString& WXUNUSED(domain namespace { -WX_DECLARE_HASH_SET(wxString, wxStringHash, wxStringEqual, +WX_DECLARE_HASH_SET(wxString, ::wxStringHash, ::wxStringEqual, wxLocaleUntranslatedStrings); } diff --git a/Externals/wxWidgets3/src/common/treebase.cpp b/Externals/wxWidgets3/src/common/treebase.cpp index 92134a0a0c..5bb5455d4b 100644 --- a/Externals/wxWidgets3/src/common/treebase.cpp +++ b/Externals/wxWidgets3/src/common/treebase.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Created: 01/02/97 // Modified: -// Id: $Id: treebase.cpp 67254 2011-03-20 00:14:35Z DS $ +// Id: $Id: treebase.cpp 70795 2012-03-04 00:29:21Z VZ $ // Copyright: (c) 1998 Robert Roebling, Julian Smart et al // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -167,6 +167,22 @@ wxTreeEvent::wxTreeEvent(const wxTreeEvent & event) // wxTreeCtrlBase // ---------------------------------------------------------------------------- +wxTreeCtrlBase::wxTreeCtrlBase() +{ + m_imageListNormal = + m_imageListState = NULL; + m_ownsImageListNormal = + m_ownsImageListState = false; + + // arbitrary default + m_spacing = 18; + + // quick DoGetBestSize calculation + m_quickBestSize = true; + + Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(wxTreeCtrlBase::OnCharHook)); +} + wxTreeCtrlBase::~wxTreeCtrlBase() { if (m_ownsImageListNormal) @@ -335,4 +351,26 @@ bool wxTreeCtrlBase::IsEmpty() const return !GetRootItem().IsOk(); } +void wxTreeCtrlBase::OnCharHook(wxKeyEvent& event) +{ + if ( GetEditControl() ) + { + bool discardChanges = false; + switch ( event.GetKeyCode() ) + { + case WXK_ESCAPE: + discardChanges = true; + // fall through + + case WXK_RETURN: + EndEditLabel(GetFocusedItem(), discardChanges); + + // Do not call Skip() below. + return; + } + } + + event.Skip(); +} + #endif // wxUSE_TREECTRL diff --git a/Externals/wxWidgets3/src/common/txtstrm.cpp b/Externals/wxWidgets3/src/common/txtstrm.cpp index 52865e8ab5..11da612bb9 100644 --- a/Externals/wxWidgets3/src/common/txtstrm.cpp +++ b/Externals/wxWidgets3/src/common/txtstrm.cpp @@ -4,7 +4,7 @@ // Author: Guilhem Lavaux // Modified by: // Created: 28/06/98 -// RCS-ID: $Id: txtstrm.cpp 63244 2010-01-24 10:13:33Z VZ $ +// RCS-ID: $Id: txtstrm.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -336,7 +336,7 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode) m_mode = mode; if (m_mode == wxEOL_NATIVE) { -#if defined(__WXMSW__) || defined(__WXPM__) +#if defined(__WINDOWS__) || defined(__WXPM__) m_mode = wxEOL_DOS; #else m_mode = wxEOL_UNIX; @@ -356,7 +356,7 @@ void wxTextOutputStream::SetMode(wxEOL mode) m_mode = mode; if (m_mode == wxEOL_NATIVE) { -#if defined(__WXMSW__) || defined(__WXPM__) +#if defined(__WINDOWS__) || defined(__WXPM__) m_mode = wxEOL_DOS; #else m_mode = wxEOL_UNIX; diff --git a/Externals/wxWidgets3/src/common/uiactioncmn.cpp b/Externals/wxWidgets3/src/common/uiactioncmn.cpp index 85376a86bf..96097c9e27 100644 --- a/Externals/wxWidgets3/src/common/uiactioncmn.cpp +++ b/Externals/wxWidgets3/src/common/uiactioncmn.cpp @@ -4,7 +4,7 @@ // Author: Kevin Ollivier, Steven Lamerton, Vadim Zeitlin // Modified by: // Created: 2010-03-06 -// RCS-ID: $Id: uiactioncmn.cpp 65561 2010-09-17 11:17:55Z DS $ +// RCS-ID: $Id: uiactioncmn.cpp 69960 2011-12-08 15:55:40Z VZ $ // Copyright: (c) Kevin Ollivier // (c) 2010 Steven Lamerton // (c) 2010 Vadim Zeitlin @@ -80,6 +80,51 @@ void wxUIActionSimulator::SimulateModifiers(int modifiers, bool isDown) bool wxUIActionSimulator::Char(int keycode, int modifiers) { + switch(keycode) + { + case '0': + keycode = '0'; + break; + case '1': + keycode = '1'; + break; + case '2': + keycode = '2'; + break; + case '3': + keycode = '3'; + break; + case '4': + keycode = '4'; + break; + case '5': + keycode = '5'; + break; + case '6': + keycode = '6'; + break; + case '7': + keycode = '7'; + break; + case '8': + keycode = '8'; + break; + case '9': + keycode = '9'; + break; + case '+': + keycode = '+'; + break; + case '-': + keycode = '-'; + break; + case '.': + keycode = '.'; + break; + default: + break; + }; + Key(keycode, modifiers, true); Key(keycode, modifiers, false); @@ -91,9 +136,6 @@ bool wxUIActionSimulator::Text(const char *s) while ( *s != '\0' ) { const char ch = *s++; - - wxASSERT_MSG( ch, "Only letters are allowed" ); - if ( !Char(ch, isupper(ch) ? wxMOD_SHIFT : 0) ) return false; } diff --git a/Externals/wxWidgets3/src/common/utilscmn.cpp b/Externals/wxWidgets3/src/common/utilscmn.cpp index c4d1d6e152..6fdb219826 100644 --- a/Externals/wxWidgets3/src/common/utilscmn.cpp +++ b/Externals/wxWidgets3/src/common/utilscmn.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 29/01/98 -// RCS-ID: $Id: utilscmn.cpp 67129 2011-03-05 12:21:20Z SC $ +// RCS-ID: $Id: utilscmn.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) 1998 Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -76,26 +76,22 @@ #include "wx/statusbr.h" #endif // wxUSE_GUI -#ifndef __WXPALMOS5__ #ifndef __WXWINCE__ #include #else #include "wx/msw/wince/time.h" #endif -#endif // ! __WXPALMOS5__ #ifdef __WXMAC__ #include "wx/osx/private.h" #endif -#ifndef __WXPALMOS5__ #if !defined(__MWERKS__) && !defined(__WXWINCE__) #include #include #endif -#endif // ! __WXPALMOS5__ -#if defined(__WXMSW__) +#if defined(__WINDOWS__) #include "wx/msw/private.h" #include "wx/filesys.h" #endif @@ -354,7 +350,7 @@ void wxPlatform::ClearPlatforms() bool wxPlatform::Is(int platform) { -#ifdef __WXMSW__ +#ifdef __WINDOWS__ if (platform == wxOS_WINDOWS) return true; #endif @@ -394,10 +390,6 @@ bool wxPlatform::Is(int platform) if (platform == wxOS_UNIX) return true; #endif -#ifdef __WXMGL__ - if (platform == wxPORT_MGL) - return true; -#endif #ifdef __OS2__ if (platform == wxOS_OS2) return true; @@ -580,10 +572,21 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map) #else // non-MSVC non-Mac // Not sure if other compilers have _tenviron so use the (more standard) // ANSI version only for them. -#ifdef __BSD__ - // POSIX, but not in an include file + + // Both POSIX and Single UNIX Specification say that this variable must + // exist but not that it must be declared anywhere and, indeed, it's not + // declared in several common systems (some BSDs, Solaris with native CC) + // so we (re)declare it ourselves to deal with these cases. However we do + // not do this under MSW where there can be DLL-related complications, i.e. + // the variable might be DLL-imported or not. Luckily we don't have to + // worry about this as all MSW compilers do seem to define it in their + // standard headers anyhow so we can just rely on already having the + // correct declaration. And if this turns out to be wrong, we can always + // add a configure test checking whether it is declared later. +#ifndef __WINDOWS__ extern char **environ; -#endif +#endif // !__WINDOWS__ + char **env = environ; #endif @@ -812,8 +815,8 @@ typedef struct smaller partition. This *guarantees* no more than log (n) stack size is needed (actually O(1) in this case)! */ -void wxQsort(void *const pbase, size_t total_elems, - size_t size, CMPFUNCDATA cmp, const void* user_data) +void wxQsort(void* pbase, size_t total_elems, + size_t size, wxSortCallback cmp, const void* user_data) { register char *base_ptr = (char *) pbase; const size_t max_thresh = MAX_THRESH * size; @@ -995,7 +998,7 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) // Launch default browser // ---------------------------------------------------------------------------- -#if defined(__WXMSW__) +#if defined(__WINDOWS__) // implemented in a port-specific utils source file: bool wxDoLaunchDefaultBrowser(const wxString& url, const wxString& scheme, int flags); @@ -1061,7 +1064,7 @@ static bool DoLaunchDefaultBrowserHelper(const wxString& urlOrig, int flags) // (e.g. "C:\\test.txt" when parsed by wxURI reports a scheme == "C") bool hasValidScheme = uri.HasScheme() && uri.GetScheme().length() > 1; -#if defined(__WXMSW__) +#if defined(__WINDOWS__) // NOTE: when testing wxMSW's wxLaunchDefaultBrowser all possible forms // of the URL/flags should be tested; e.g.: @@ -1361,6 +1364,8 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style, return wxNO; case wxID_CANCEL: return wxCANCEL; + case wxID_HELP: + return wxHELP; } wxFAIL_MSG( wxT("unexpected return code from wxMessageDialog") ); @@ -1406,7 +1411,7 @@ wxVersionInfo wxGetLibraryVersionInfo() wxMINOR_VERSION, wxRELEASE_NUMBER, msg, - wxS("Copyright (c) 1995-2010 wxWidgets team")); + wxS("Copyright (c) 1995-2011 wxWidgets team")); } void wxInfoMessageBox(wxWindow* parent) @@ -1536,7 +1541,7 @@ wxColour wxGetColourFromUser(wxWindow *parent, wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxString& caption) { wxFontData data; - if ( fontInit.Ok() ) + if ( fontInit.IsOk() ) { data.SetInitialFont(fontInit); } diff --git a/Externals/wxWidgets3/src/common/valgen.cpp b/Externals/wxWidgets3/src/common/valgen.cpp index fa04139d2f..7bbdc13088 100644 --- a/Externals/wxWidgets3/src/common/valgen.cpp +++ b/Externals/wxWidgets3/src/common/valgen.cpp @@ -4,7 +4,7 @@ // Author: Kevin Smith // Modified by: // Created: Jan 22 1999 -// RCS-ID: $Id: valgen.cpp 66533 2011-01-03 11:23:49Z VZ $ +// RCS-ID: $Id: valgen.cpp 68225 2011-07-11 14:51:32Z VZ $ // Copyright: (c) 1999 Kevin Smith // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -46,6 +46,7 @@ #if wxUSE_TOGGLEBTN #include "wx/tglbtn.h" #endif +#include "wx/filename.h" #include "wx/valgen.h" @@ -83,6 +84,24 @@ wxGenericValidator::wxGenericValidator(wxDateTime *val) m_pDateTime = val; } +wxGenericValidator::wxGenericValidator(wxFileName *val) +{ + Initialize(); + m_pFileName = val; +} + +wxGenericValidator::wxGenericValidator(float *val) +{ + Initialize(); + m_pFloat = val; +} + +wxGenericValidator::wxGenericValidator(double *val) +{ + Initialize(); + m_pDouble = val; +} + #endif // wxUSE_DATETIME wxGenericValidator::wxGenericValidator(const wxGenericValidator& val) @@ -102,6 +121,9 @@ bool wxGenericValidator::Copy(const wxGenericValidator& val) #if wxUSE_DATETIME m_pDateTime = val.m_pDateTime; #endif // wxUSE_DATETIME + m_pFileName = val.m_pFileName; + m_pFloat = val.m_pFloat; + m_pDouble = val.m_pDouble; return true; } @@ -321,6 +343,21 @@ bool wxGenericValidator::TransferToWindow(void) pControl->SetValue(str); return true; } + else if (m_pFileName) + { + pControl->SetValue(m_pFileName->GetFullPath()); + return true; + } + else if (m_pFloat) + { + pControl->SetValue(wxString::Format(wxT("%g"), *m_pFloat)); + return true; + } + else if (m_pDouble) + { + pControl->SetValue(wxString::Format(wxT("%g"), *m_pDouble)); + return true; + } } else #endif @@ -582,6 +619,21 @@ bool wxGenericValidator::TransferFromWindow(void) *m_pInt = wxAtoi(pControl->GetValue()); return true; } + else if (m_pFileName) + { + m_pFileName->Assign(pControl->GetValue()); + return true; + } + else if (m_pFloat) + { + *m_pFloat = (float)wxAtof(pControl->GetValue()); + return true; + } + else if (m_pDouble) + { + *m_pDouble = wxAtof(pControl->GetValue()); + return true; + } } else #endif @@ -645,13 +697,16 @@ bool wxGenericValidator::TransferFromWindow(void) */ void wxGenericValidator::Initialize() { - m_pBool = 0; - m_pInt = 0; - m_pString = 0; - m_pArrayInt = 0; + m_pBool = NULL; + m_pInt = NULL; + m_pString = NULL; + m_pArrayInt = NULL; #if wxUSE_DATETIME - m_pDateTime = 0; + m_pDateTime = NULL; #endif // wxUSE_DATETIME + m_pFileName = NULL; + m_pFloat = NULL; + m_pDouble = NULL; } #endif // wxUSE_VALIDATORS diff --git a/Externals/wxWidgets3/src/common/webview.cpp b/Externals/wxWidgets3/src/common/webview.cpp new file mode 100644 index 0000000000..79524c245b --- /dev/null +++ b/Externals/wxWidgets3/src/common/webview.cpp @@ -0,0 +1,119 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: webview.cpp +// Purpose: Common interface and events for web view component +// Author: Marianne Gagnon +// Id: $Id: webview.cpp 69981 2011-12-11 05:36:52Z PC $ +// Copyright: (c) 2010 Marianne Gagnon, 2011 Steven Lamerton +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if wxUSE_WEBVIEW + +#if defined(__BORLANDC__) + #pragma hdrstop +#endif + +#include "wx/webview.h" + +#if defined(__WXOSX_COCOA__) || defined(__WXOSX_CARBON__) +#include "wx/osx/webview_webkit.h" +#elif defined(__WXGTK__) +#include "wx/gtk/webview_webkit.h" +#elif defined(__WXMSW__) +#include "wx/msw/webview_ie.h" +#endif + +// DLL options compatibility check: +#include "wx/app.h" +WX_CHECK_BUILD_OPTIONS("wxWEBVIEW") + +extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewNameStr[] = "wxWebView"; +extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewDefaultURLStr[] = "about:blank"; + +wxIMPLEMENT_ABSTRACT_CLASS(wxWebView, wxControl); +wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewEvent, wxCommandEvent); + +wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, wxWebViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, wxWebViewEvent ); + +// static +wxWebView* wxWebView::New(wxWebViewBackend backend) +{ + switch (backend) + { + #if defined(wxUSE_WEBVIEW_WEBKIT) && \ + (defined(__WXGTK__) || defined(__WXOSX__)) + case wxWEB_VIEW_BACKEND_WEBKIT: + return new wxWebViewWebKit(); + #endif + + #if wxUSE_WEBVIEW_IE + case wxWEB_VIEW_BACKEND_IE: + return new wxWebViewIE(); + #endif + + case wxWEB_VIEW_BACKEND_DEFAULT: + + #if defined(wxUSE_WEBVIEW_WEBKIT) && \ + (defined(__WXGTK__) || defined(__WXOSX__)) + return new wxWebViewWebKit(); + #endif + + #if wxUSE_WEBVIEW_IE + return new wxWebViewIE(); + #endif + + // fall-through intended + default: + return NULL; + } +} + +// static +wxWebView* wxWebView::New(wxWindow* parent, + wxWindowID id, + const wxString& url, + const wxPoint& pos, + const wxSize& size, + wxWebViewBackend backend, + long style, + const wxString& name) +{ + switch (backend) + { + #if defined(wxUSE_WEBVIEW_WEBKIT) && \ + (defined(__WXGTK__) || defined(__WXOSX__)) + case wxWEB_VIEW_BACKEND_WEBKIT: + return new wxWebViewWebKit(parent, id, url, pos, size, style, name); + #endif + + #if wxUSE_WEBVIEW_IE + case wxWEB_VIEW_BACKEND_IE: + return new wxWebViewIE(parent, id, url, pos, size, style, name); + #endif + + case wxWEB_VIEW_BACKEND_DEFAULT: + + #if defined(wxUSE_WEBVIEW_WEBKIT) && \ + (defined(__WXGTK__) || defined(__WXOSX__)) + return new wxWebViewWebKit(parent, id, url, pos, size, style, name); + #endif + + #if wxUSE_WEBVIEW_IE + return new wxWebViewIE(parent, id, url, pos, size, style, name); + #endif + + // fall-through intended + default: + return NULL; + } +} + +#endif // wxUSE_WEBVIEW diff --git a/Externals/wxWidgets3/src/common/webviewarchivehandler.cpp b/Externals/wxWidgets3/src/common/webviewarchivehandler.cpp new file mode 100644 index 0000000000..1752458ad6 --- /dev/null +++ b/Externals/wxWidgets3/src/common/webviewarchivehandler.cpp @@ -0,0 +1,118 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: webviewfilehandler.cpp +// Purpose: Custom webview handler to allow archive browsing +// Author: Steven Lamerton +// Id: $Id: webviewarchivehandler.cpp 69317 2011-10-06 10:01:17Z SJL $ +// Copyright: (c) 2011 Steven Lamerton +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if wxUSE_WEBVIEW + +#if defined(__BORLANDC__) + #pragma hdrstop +#endif + +#include "wx/webviewarchivehandler.h" +#include "wx/filesys.h" + +//Taken from wx/filesys.cpp +static wxString EscapeFileNameCharsInURL(const char *in) +{ + wxString s; + + for ( const unsigned char *p = (const unsigned char*)in; *p; ++p ) + { + const unsigned char c = *p; + + if ( c == '/' || c == '-' || c == '.' || c == '_' || c == '~' || + (c >= '0' && c <= '9') || + (c >= 'a' && c <= 'z') || + (c >= 'A' && c <= 'Z') ) + { + s << c; + } + else + { + s << wxString::Format("%%%02x", c); + } + } + + return s; +} + +wxWebViewArchiveHandler::wxWebViewArchiveHandler(const wxString& scheme) : + wxWebViewHandler(scheme) +{ + m_fileSystem = new wxFileSystem(); +} + +wxWebViewArchiveHandler::~wxWebViewArchiveHandler() +{ + wxDELETE(m_fileSystem); +} + +wxFSFile* wxWebViewArchiveHandler::GetFile(const wxString &uri) +{ + //If there is a fragment at the end of the path then we need to strip it + //off as not all backends do this for us + wxString path = uri; + size_t hashloc = uri.find('#'); + if(hashloc != wxString::npos) + { + path = uri.substr(0, hashloc); + } + + //We iterate through the string to see if there is a protocol description + size_t start = wxString::npos; + for(size_t i = 0; i < path.length(); i++) + { + if(path[i] == ';' && path.substr(i, 10) == ";protocol=") + { + start = i; + break; + } + } + + //We do not have a protocol string so we just pass the path withouth the + if(start == wxString::npos) + { + size_t doubleslash = path.find("//"); + //The path is incorrectly formed without // after the scheme + if(doubleslash == wxString::npos) + return NULL; + + wxString fspath = "file:" + + EscapeFileNameCharsInURL(path.substr(doubleslash + 2).c_str()); + return m_fileSystem->OpenFile(fspath); + } + //Otherwise we need to extract the protocol + else + { + size_t end = path.find('/', start); + //For the path to be valid there must to a path after the protocol + if(end == wxString::npos) + { + return NULL; + } + wxString mainpath = path.substr(0, start); + wxString archivepath = path.substr(end); + wxString protstring = path.substr(start, end - start); + wxString protocol = protstring.substr(10); + //We can now construct the correct path + size_t doubleslash = path.find("//"); + //The path is incorrectly formed without // after the first protocol + if(doubleslash == wxString::npos) + return NULL; + + wxString fspath = "file:" + + EscapeFileNameCharsInURL(mainpath.substr(doubleslash + 2).c_str()) + + "#" + protocol +":" + archivepath; + return m_fileSystem->OpenFile(fspath); + } +} + +#endif // wxUSE_WEBVIEW diff --git a/Externals/wxWidgets3/src/common/wincmn.cpp b/Externals/wxWidgets3/src/common/wincmn.cpp index 693af6563b..0abcc2778d 100644 --- a/Externals/wxWidgets3/src/common/wincmn.cpp +++ b/Externals/wxWidgets3/src/common/wincmn.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart, Vadim Zeitlin // Modified by: // Created: 13/07/98 -// RCS-ID: $Id: wincmn.cpp 67285 2011-03-22 17:15:38Z VZ $ +// RCS-ID: $Id: wincmn.cpp 70838 2012-03-07 23:50:21Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -75,7 +75,7 @@ #include "wx/platinfo.h" #include "wx/private/window.h" -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #include "wx/msw/wrapwin.h" #endif @@ -554,7 +554,14 @@ void wxWindowBase::SendDestroyEvent() bool wxWindowBase::Destroy() { - SendDestroyEvent(); + // If our handle is invalid, it means that this window has never been + // created, either because creating it failed or, more typically, because + // this wxWindow object was default-constructed and its Create() method had + // never been called. As we didn't send wxWindowCreateEvent in this case + // (which is sent after successful creation), don't send the matching + // wxWindowDestroyEvent neither. + if ( GetHandle() ) + SendDestroyEvent(); delete this; @@ -1521,7 +1528,7 @@ wxColour wxWindowBase::GetBackgroundColour() const // wxWidgets versions where GetBackgroundColour() always returned // something -- so give them something even if it doesn't make sense // for this window (e.g. it has a themed background) - if ( !colBg.Ok() ) + if ( !colBg.IsOk() ) colBg = GetClassDefaultAttributes().colBg; return colBg; @@ -1533,7 +1540,7 @@ wxColour wxWindowBase::GetBackgroundColour() const wxColour wxWindowBase::GetForegroundColour() const { // logic is the same as above - if ( !m_hasFgCol && !m_foregroundColour.Ok() ) + if ( !m_hasFgCol && !m_foregroundColour.IsOk() ) { wxColour colFg = GetDefaultAttributes().colFg; @@ -1546,6 +1553,39 @@ wxColour wxWindowBase::GetForegroundColour() const return m_foregroundColour; } +bool wxWindowBase::SetBackgroundStyle(wxBackgroundStyle style) +{ + // The checks below shouldn't be triggered if we're not really changing the + // style. + if ( style == m_backgroundStyle ) + return true; + + // Transparent background style can be only set before creation because of + // wxGTK limitation. + wxCHECK_MSG( (style != wxBG_STYLE_TRANSPARENT) || !GetHandle(), + false, + "wxBG_STYLE_TRANSPARENT style can only be set before " + "Create()-ing the window." ); + + // And once it is set, wxBG_STYLE_TRANSPARENT can't be unset. + wxCHECK_MSG( (m_backgroundStyle != wxBG_STYLE_TRANSPARENT) || + (style == wxBG_STYLE_TRANSPARENT), + false, + "wxBG_STYLE_TRANSPARENT can't be unset once it was set." ); + + m_backgroundStyle = style; + + return true; +} + +bool wxWindowBase::IsTransparentBackgroundSupported(wxString *reason) const +{ + if ( reason ) + *reason = _("This platform does not support background transparency."); + + return false; +} + bool wxWindowBase::SetBackgroundColour( const wxColour &colour ) { if ( colour == m_backgroundColour ) @@ -1555,7 +1595,7 @@ bool wxWindowBase::SetBackgroundColour( const wxColour &colour ) m_inheritBgCol = m_hasBgCol; m_backgroundColour = colour; - SetThemeEnabled( !m_hasBgCol && !m_foregroundColour.Ok() ); + SetThemeEnabled( !m_hasBgCol && !m_foregroundColour.IsOk() ); return true; } @@ -1567,7 +1607,7 @@ bool wxWindowBase::SetForegroundColour( const wxColour &colour ) m_hasFgCol = colour.IsOk(); m_inheritFgCol = m_hasFgCol; m_foregroundColour = colour; - SetThemeEnabled( !m_hasFgCol && !m_backgroundColour.Ok() ); + SetThemeEnabled( !m_hasFgCol && !m_backgroundColour.IsOk() ); return true; } @@ -1876,6 +1916,7 @@ wxWindowBase::FindWindowById( long id, const wxWindow* parent ) // dialog oriented functions // ---------------------------------------------------------------------------- +#if WXWIN_COMPATIBILITY_2_8 void wxWindowBase::MakeModal(bool modal) { // Disable all other windows @@ -1892,6 +1933,7 @@ void wxWindowBase::MakeModal(bool modal) } } } +#endif // WXWIN_COMPATIBILITY_2_8 bool wxWindowBase::Validate() { @@ -2114,6 +2156,13 @@ void wxWindowBase::DoSetToolTip(wxToolTip *tooltip) } } +bool wxWindowBase::CopyToolTip(wxToolTip *tip) +{ + SetToolTip(tip ? new wxToolTip(tip->GetTip()) : NULL); + + return tip != NULL; +} + #endif // wxUSE_TOOLTIPS // ---------------------------------------------------------------------------- @@ -2560,17 +2609,12 @@ void wxWindowBase::GetPositionConstraint(int *x, int *y) const void wxWindowBase::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) const { - // don't do it for the dialogs/frames - they float independently of their - // parent - if ( !IsTopLevel() ) + wxWindow *parent = GetParent(); + if ( !(sizeFlags & wxSIZE_NO_ADJUSTMENTS) && parent ) { - wxWindow *parent = GetParent(); - if ( !(sizeFlags & wxSIZE_NO_ADJUSTMENTS) && parent ) - { - wxPoint pt(parent->GetClientAreaOrigin()); - x += pt.x; - y += pt.y; - } + wxPoint pt(parent->GetClientAreaOrigin()); + x += pt.x; + y += pt.y; } } @@ -2644,7 +2688,7 @@ bool wxWindowBase::SendIdleEvents(wxIdleEvent& event) void wxWindowBase::OnInternalIdle() { - if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen()) + if ( wxUpdateUIEvent::CanUpdate(this) ) UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } @@ -2967,19 +3011,19 @@ wxAccessible* wxWindowBase::CreateAccessible() // list classes implementation // ---------------------------------------------------------------------------- -#if wxUSE_STL +#if wxUSE_STD_CONTAINERS #include "wx/listimpl.cpp" WX_DEFINE_LIST(wxWindowList) -#else // !wxUSE_STL +#else // !wxUSE_STD_CONTAINERS void wxWindowListNode::DeleteData() { delete (wxWindow *)GetData(); } -#endif // wxUSE_STL/!wxUSE_STL +#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS // ---------------------------------------------------------------------------- // borders @@ -3283,8 +3327,8 @@ void wxWindowBase::DoMoveInTabOrder(wxWindow *win, WindowOrder move) wxWindowList::compatibility_iterator i = siblings.Find(win); wxCHECK_RET( i, wxT("MoveBefore/AfterInTabOrder(): win is not a sibling") ); - // unfortunately, when wxUSE_STL == 1 DetachNode() is not implemented so we - // can't just move the node around + // unfortunately, when wxUSE_STD_CONTAINERS == 1 DetachNode() is not + // implemented so we can't just move the node around wxWindow *self = (wxWindow *)this; siblings.DeleteObject(self); if ( move == OrderAfter ) @@ -3314,9 +3358,9 @@ void wxWindowBase::DoMoveInTabOrder(wxWindow *win, WindowOrder move) bool wxWindowBase::HasFocus() const { - wxWindowBase *win = DoFindFocus(); - return win == this || - win == wxConstCast(this, wxWindowBase)->GetMainWindowOfCompositeControl(); + wxWindowBase* const win = DoFindFocus(); + return win && + (this == win || this == win->GetMainWindowOfCompositeControl()); } // ---------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/src/common/windowid.cpp b/Externals/wxWidgets3/src/common/windowid.cpp index 9cab454730..e4105c0eaf 100644 --- a/Externals/wxWidgets3/src/common/windowid.cpp +++ b/Externals/wxWidgets3/src/common/windowid.cpp @@ -3,7 +3,7 @@ // Purpose: wxWindowID class - a class for managing window ids // Author: Brian Vanderburg II // Created: 2007-09-21 -// RCS-ID: $Id: windowid.cpp 67211 2011-03-16 07:06:43Z SC $ +// RCS-ID: $Id: windowid.cpp 69682 2011-11-05 11:24:04Z VZ $ // Copyright: (c) 2007 Brian Vanderburg II // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -22,6 +22,8 @@ #include "wx/intl.h" #endif //WX_PRECOMP +#include "wx/hashmap.h" + // Not needed, included in defs.h // #include "wx/windowid.h" @@ -38,11 +40,22 @@ namespace // meanwhile static const wxUint8 ID_FREE = 0; static const wxUint8 ID_STARTCOUNT = 1; -static const wxUint8 ID_MAXCOUNT = 254; +static const wxUint8 ID_COUNTTOOLARGE = 254; static const wxUint8 ID_RESERVED = 255; +// we use a two level count, most IDs will be used less than ID_COUNTTOOLARGE-1 +// thus we store their count directly in this array, however when the same ID +// is reused a great number of times (more than or equal to ID_COUNTTOOLARGE), +// the hash map stores the actual count wxUint8 gs_autoIdsRefCount[wxID_AUTO_HIGHEST - wxID_AUTO_LOWEST + 1] = { 0 }; +// NB: this variable is allocated (again) only when an ID gets at least +// ID_COUNTTOOLARGE refs, and is freed when the latest entry in the map gets +// freed. The cell storing the count for an ID is freed only when its count +// gets to zero (not when it goes below ID_COUNTTOOLARGE, so as to avoid +// degenerate cases) +wxLongToLongHashMap *gs_autoIdsLargeRefCount = NULL; + // this is an optimization used until we wrap around wxID_AUTO_HIGHEST: if this // value is < wxID_AUTO_HIGHEST we know that we haven't wrapped yet and so can // allocate the ids simply by incrementing it @@ -81,7 +94,10 @@ int GetIdRefCount(wxWindowID winid) wxT("invalid id range")); winid -= wxID_AUTO_LOWEST; - return gs_autoIdsRefCount[winid]; + int refCount = gs_autoIdsRefCount[winid]; + if (refCount == ID_COUNTTOOLARGE) + refCount = (*gs_autoIdsLargeRefCount)[winid]; + return refCount; } // Increase the count for an id @@ -92,16 +108,32 @@ void IncIdRefCount(wxWindowID winid) winid -= wxID_AUTO_LOWEST; - wxCHECK_RET(gs_autoIdsRefCount[winid] != ID_MAXCOUNT, wxT("id count at max")); wxCHECK_RET(gs_autoIdsRefCount[winid] != ID_FREE, wxT("id should first be reserved")); if(gs_autoIdsRefCount[winid] == ID_RESERVED) + { gs_autoIdsRefCount[winid] = ID_STARTCOUNT; + } + else if (gs_autoIdsRefCount[winid] >= ID_COUNTTOOLARGE-1) + { + if (gs_autoIdsRefCount[winid] == ID_COUNTTOOLARGE-1) + { + // we need to allocate a cell, and maybe the hash map itself + if (!gs_autoIdsLargeRefCount) + gs_autoIdsLargeRefCount = new wxLongToLongHashMap; + (*gs_autoIdsLargeRefCount)[winid] = ID_COUNTTOOLARGE-1; + + gs_autoIdsRefCount[winid] = ID_COUNTTOOLARGE; + } + ++(*gs_autoIdsLargeRefCount)[winid]; + } else + { gs_autoIdsRefCount[winid]++; + } wxLogTrace(wxTRACE_WINDOWID, wxT("Increasing ref count of ID %d to %d"), - winid + wxID_AUTO_LOWEST, gs_autoIdsRefCount[winid]); + winid + wxID_AUTO_LOWEST, GetIdRefCount(winid + wxID_AUTO_LOWEST)); } // Decrease the count for an id @@ -121,11 +153,24 @@ void DecIdRefCount(wxWindowID winid) wxFAIL_MSG(wxT("reserve id being decreased")); gs_autoIdsRefCount[winid] = ID_FREE; } + else if(gs_autoIdsRefCount[winid] == ID_COUNTTOOLARGE) + { + long &largeCount = (*gs_autoIdsLargeRefCount)[winid]; + --largeCount; + if (largeCount == 0) + { + gs_autoIdsLargeRefCount->erase (winid); + gs_autoIdsRefCount[winid] = ID_FREE; + + if (gs_autoIdsLargeRefCount->empty()) + wxDELETE (gs_autoIdsLargeRefCount); + } + } else gs_autoIdsRefCount[winid]--; wxLogTrace(wxTRACE_WINDOWID, wxT("Decreasing ref count of ID %d to %d"), - winid + wxID_AUTO_LOWEST, gs_autoIdsRefCount[winid]); + winid + wxID_AUTO_LOWEST, GetIdRefCount(winid + wxID_AUTO_LOWEST)); } #else // wxUSE_AUTOID_MANAGEMENT diff --git a/Externals/wxWidgets3/src/common/wxcrt.cpp b/Externals/wxWidgets3/src/common/wxcrt.cpp index 8c6147727d..3bf1855968 100644 --- a/Externals/wxWidgets3/src/common/wxcrt.cpp +++ b/Externals/wxWidgets3/src/common/wxcrt.cpp @@ -4,7 +4,7 @@ // Author: Ove Kaven // Modified by: Ron Lee, Francesco Montorsi // Created: 09/04/99 -// RCS-ID: $Id: wxcrt.cpp 65691 2010-09-30 14:30:41Z VZ $ +// RCS-ID: $Id: wxcrt.cpp 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) wxWidgets copyright // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -40,14 +40,12 @@ extern "C" int vswscanf(const wchar_t *, const wchar_t *, va_list); #endif -#ifndef __WXPALMOS5__ #ifndef __WXWINCE__ #include #include #else #include "wx/msw/wince/time.h" #endif -#endif // !__WXPALMOS5__ #ifndef WX_PRECOMP #include "wx/string.h" diff --git a/Externals/wxWidgets3/src/common/xlocale.cpp b/Externals/wxWidgets3/src/common/xlocale.cpp index 2a6326c092..cbca33cf31 100644 --- a/Externals/wxWidgets3/src/common/xlocale.cpp +++ b/Externals/wxWidgets3/src/common/xlocale.cpp @@ -3,7 +3,7 @@ // Purpose: xlocale wrappers/impl to provide some xlocale wrappers // Author: Brian Vanderburg II, Vadim Zeitlin // Created: 2008-01-07 -// RCS-ID: $Id: xlocale.cpp 66054 2010-11-07 13:16:20Z VZ $ +// RCS-ID: $Id: xlocale.cpp 67406 2011-04-06 14:37:32Z VZ $ // Copyright: (c) 2008 Brian Vanderburg II // 2008 Vadim Zeitlin // Licence: wxWindows licence @@ -279,70 +279,91 @@ int wxToupper_l(const wxUniChar& c, const wxXLocale& loc) case !wxHAS_XLOCALE_SUPPORT... */ -/* - Note that this code is similar to (a portion of) wxLocale::IsAvailable code -*/ -#define IMPLEMENT_STRTOX_L_START \ - wxCHECK(loc.IsOk(), 0); \ - \ - /* (Try to) temporary set the 'C' locale */ \ - const char *oldLocale = wxSetlocale(LC_NUMERIC, "C"); \ - if ( !oldLocale ) \ - { \ - /* the current locale was not changed; no need to */ \ - /* restore the previous one... */ \ - errno = EINVAL; \ - /* signal an error (better than nothing) */ \ - return 0; \ +namespace +{ + +// Helper class that changes LC_NUMERIC facet of the global locale in its ctor +// to "C" locale and restores it in its dtor later. +class CNumericLocaleSetter +{ +public: + CNumericLocaleSetter() + : m_oldLocale(wxStrdupA(setlocale(LC_NUMERIC, NULL))) + { + if ( !wxSetlocale(LC_NUMERIC, "C") ) + { + // Setting locale to "C" should really always work. + wxFAIL_MSG( wxS("Couldn't set LC_NUMERIC to \"C\"") ); + } } -#define IMPLEMENT_STRTOX_L_END \ - /* restore the original locale */ \ - wxSetlocale(LC_NUMERIC, oldLocale); \ - return ret; + ~CNumericLocaleSetter() + { + wxSetlocale(LC_NUMERIC, m_oldLocale); + free(m_oldLocale); + } + +private: + char * const m_oldLocale; + + wxDECLARE_NO_COPY_CLASS(CNumericLocaleSetter); +}; + +} // anonymous namespace double wxStrtod_l(const wchar_t* str, wchar_t **endptr, const wxXLocale& loc) { - IMPLEMENT_STRTOX_L_START - double ret = wxStrtod(str, endptr); - IMPLEMENT_STRTOX_L_END + wxCHECK( loc.IsOk(), 0. ); + + CNumericLocaleSetter locSetter; + + return wxStrtod(str, endptr); } double wxStrtod_l(const char* str, char **endptr, const wxXLocale& loc) { - IMPLEMENT_STRTOX_L_START - double ret = wxStrtod(str, endptr); - IMPLEMENT_STRTOX_L_END + wxCHECK( loc.IsOk(), 0. ); + + CNumericLocaleSetter locSetter; + + return wxStrtod(str, endptr); } long wxStrtol_l(const wchar_t* str, wchar_t **endptr, int base, const wxXLocale& loc) { - IMPLEMENT_STRTOX_L_START - long ret = wxStrtol(str, endptr, base); - IMPLEMENT_STRTOX_L_END + wxCHECK( loc.IsOk(), 0 ); + + CNumericLocaleSetter locSetter; + + return wxStrtol(str, endptr, base); } long wxStrtol_l(const char* str, char **endptr, int base, const wxXLocale& loc) { - IMPLEMENT_STRTOX_L_START - long ret = wxStrtol(str, endptr, base); - IMPLEMENT_STRTOX_L_END + wxCHECK( loc.IsOk(), 0 ); + + CNumericLocaleSetter locSetter; + + return wxStrtol(str, endptr, base); } unsigned long wxStrtoul_l(const wchar_t* str, wchar_t **endptr, int base, const wxXLocale& loc) { - IMPLEMENT_STRTOX_L_START - unsigned long ret = wxStrtoul(str, endptr, base); - IMPLEMENT_STRTOX_L_END + wxCHECK( loc.IsOk(), 0 ); + + CNumericLocaleSetter locSetter; + + return wxStrtoul(str, endptr, base); } unsigned long wxStrtoul_l(const char* str, char **endptr, int base, const wxXLocale& loc) { - IMPLEMENT_STRTOX_L_START - unsigned long ret = wxStrtoul(str, endptr, base); - IMPLEMENT_STRTOX_L_END -} + wxCHECK( loc.IsOk(), 0 ); + CNumericLocaleSetter locSetter; + + return wxStrtoul(str, endptr, base); +} #endif // !defined(wxHAS_XLOCALE_SUPPORT) diff --git a/Externals/wxWidgets3/src/common/xti.cpp b/Externals/wxWidgets3/src/common/xti.cpp index 9c6e06d1c8..f69652644c 100644 --- a/Externals/wxWidgets3/src/common/xti.cpp +++ b/Externals/wxWidgets3/src/common/xti.cpp @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 27/07/03 -// RCS-ID: $Id: xti.cpp 66651 2011-01-08 10:22:30Z SC $ +// RCS-ID: $Id: xti.cpp 70306 2012-01-09 18:48:39Z VZ $ // Copyright: (c) 1997 Julian Smart // (c) 2003 Stefan Csomor // Licence: wxWindows licence @@ -117,13 +117,13 @@ const wxChar * wxEnumData::GetEnumMemberNameByIndex( int idx ) const template<> void wxStringReadValue(const wxString &s, bool &data ) { int intdata; - wxSscanf(s, _T("%d"), &intdata ); + wxSscanf(s, wxT("%d"), &intdata ); data = (bool)(intdata != 0); } template<> void wxStringWriteValue(wxString &s, const bool &data ) { - s = wxString::Format(_T("%d"), data ); + s = wxString::Format(wxT("%d"), data ); } // char @@ -131,13 +131,13 @@ template<> void wxStringWriteValue(wxString &s, const bool &data ) template<> void wxStringReadValue(const wxString &s, char &data ) { int intdata; - wxSscanf(s, _T("%d"), &intdata ); + wxSscanf(s, wxT("%d"), &intdata ); data = char(intdata); } template<> void wxStringWriteValue(wxString &s, const char &data ) { - s = wxString::Format(_T("%d"), data ); + s = wxString::Format(wxT("%d"), data ); } // unsigned char @@ -145,106 +145,106 @@ template<> void wxStringWriteValue(wxString &s, const char &data ) template<> void wxStringReadValue(const wxString &s, unsigned char &data ) { int intdata; - wxSscanf(s, _T("%d"), &intdata ); + wxSscanf(s, wxT("%d"), &intdata ); data = (unsigned char)(intdata); } template<> void wxStringWriteValue(wxString &s, const unsigned char &data ) { - s = wxString::Format(_T("%d"), data ); + s = wxString::Format(wxT("%d"), data ); } // int template<> void wxStringReadValue(const wxString &s, int &data ) { - wxSscanf(s, _T("%d"), &data ); + wxSscanf(s, wxT("%d"), &data ); } template<> void wxStringWriteValue(wxString &s, const int &data ) { - s = wxString::Format(_T("%d"), data ); + s = wxString::Format(wxT("%d"), data ); } // unsigned int template<> void wxStringReadValue(const wxString &s, unsigned int &data ) { - wxSscanf(s, _T("%d"), &data ); + wxSscanf(s, wxT("%d"), &data ); } template<> void wxStringWriteValue(wxString &s, const unsigned int &data ) { - s = wxString::Format(_T("%d"), data ); + s = wxString::Format(wxT("%d"), data ); } // long template<> void wxStringReadValue(const wxString &s, long &data ) { - wxSscanf(s, _T("%ld"), &data ); + wxSscanf(s, wxT("%ld"), &data ); } template<> void wxStringWriteValue(wxString &s, const long &data ) { - s = wxString::Format(_T("%ld"), data ); + s = wxString::Format(wxT("%ld"), data ); } // unsigned long template<> void wxStringReadValue(const wxString &s, unsigned long &data ) { - wxSscanf(s, _T("%ld"), &data ); + wxSscanf(s, wxT("%ld"), &data ); } template<> void wxStringWriteValue(wxString &s, const unsigned long &data ) { - s = wxString::Format(_T("%ld"), data ); + s = wxString::Format(wxT("%ld"), data ); } #ifdef wxLongLong_t template<> void wxStringReadValue(const wxString &s, wxLongLong_t &data ) { - wxSscanf(s, _T("%lld"), &data ); + wxSscanf(s, wxT("%lld"), &data ); } template<> void wxStringWriteValue(wxString &s, const wxLongLong_t &data ) { - s = wxString::Format(_T("%lld"), data ); + s = wxString::Format(wxT("%lld"), data ); } template<> void wxStringReadValue(const wxString &s, wxULongLong_t &data ) { - wxSscanf(s, _T("%lld"), &data ); + wxSscanf(s, wxT("%lld"), &data ); } template<> void wxStringWriteValue(wxString &s, const wxULongLong_t &data ) { - s = wxString::Format(_T("%lld"), data ); + s = wxString::Format(wxT("%lld"), data ); } #endif // float template<> void wxStringReadValue(const wxString &s, float &data ) { - wxSscanf(s, _T("%f"), &data ); + wxSscanf(s, wxT("%f"), &data ); } template<> void wxStringWriteValue(wxString &s, const float &data ) { - s = wxString::Format(_T("%f"), data ); + s = wxString::Format(wxT("%f"), data ); } // double template<> void wxStringReadValue(const wxString &s, double &data ) { - wxSscanf(s, _T("%lf"), &data ); + wxSscanf(s, wxT("%lf"), &data ); } template<> void wxStringWriteValue(wxString &s, const double &data ) { - s = wxString::Format(_T("%lf"), data ); + s = wxString::Format(wxT("%lf"), data ); } // wxString @@ -931,14 +931,14 @@ void wxGenericPropertyAccessor::SetProperty(wxObject *object, const wxAny &value { wxDynamicObject* dynobj = wx_dynamic_cast(wxDynamicObject*, object); wxASSERT_MSG( dynobj, wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ); - dynobj->SetProperty(m_propertyName, value ); + dynobj->SetProperty(m_propertyName.c_str(), value ); } void wxGenericPropertyAccessor::GetProperty(const wxObject *object, wxAny& value) const { const wxDynamicObject* dynobj = wx_dynamic_cast( const wxDynamicObject * , object ); wxASSERT_MSG( dynobj, wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ); - value = dynobj->GetProperty( m_propertyName ); + value = dynobj->GetProperty( m_propertyName.c_str() ); } // ---------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/src/common/xtistrm.cpp b/Externals/wxWidgets3/src/common/xtistrm.cpp index 95b77afe2b..16881d3b7d 100644 --- a/Externals/wxWidgets3/src/common/xtistrm.cpp +++ b/Externals/wxWidgets3/src/common/xtistrm.cpp @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 27/07/03 -// RCS-ID: $Id: xtistrm.cpp 66630 2011-01-07 17:49:18Z SC $ +// RCS-ID: $Id: xtistrm.cpp 70306 2012-01-09 18:48:39Z VZ $ // Copyright: (c) 2003 Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -289,8 +289,8 @@ void wxObjectWriter::WriteOneProperty( const wxObject *obj, const wxClassInfo* c } else { - wxLogError( _T("Streaming delegates for not already ") - _T("streamed objects not yet supported") ); + wxLogError( wxT("Streaming delegates for not already ") + wxT("streamed objects not yet supported") ); } } } @@ -577,7 +577,7 @@ void wxObjectRuntimeReaderCallback::SetProperty(int objectID, { wxObject *o; o = m_data->GetObject(objectID); - classInfo->SetProperty( o, propertyInfo->GetName(), value ); + classInfo->SetProperty( o, propertyInfo->GetName().c_str(), value ); } void wxObjectRuntimeReaderCallback::SetPropertyAsObject(int objectID, @@ -599,7 +599,7 @@ void wxObjectRuntimeReaderCallback::SetPropertyAsObject(int objectID, valo = dynvalo->GetSuperClassInstance(); } - classInfo->SetProperty( o, propertyInfo->GetName(), + classInfo->SetProperty( o, propertyInfo->GetName().c_str(), valClassInfo->ObjectPtrToAny(valo) ); } @@ -650,7 +650,7 @@ void wxObjectRuntimeReaderCallback::AddToPropertyCollection( int objectID, { wxObject *o; o = m_data->GetObject(objectID); - classInfo->AddToPropertyCollection( o, propertyInfo->GetName(), value ); + classInfo->AddToPropertyCollection( o, propertyInfo->GetName().c_str(), value ); } void wxObjectRuntimeReaderCallback::AddToPropertyCollectionAsObject(int objectID, @@ -674,7 +674,7 @@ void wxObjectRuntimeReaderCallback::AddToPropertyCollectionAsObject(int objectID valo = dynvalo->GetSuperClassInstance(); } - classInfo->AddToPropertyCollection( o, propertyInfo->GetName(), + classInfo->AddToPropertyCollection( o, propertyInfo->GetName().c_str(), valClassInfo->ObjectPtrToAny(valo) ); } diff --git a/Externals/wxWidgets3/src/common/xtixml.cpp b/Externals/wxWidgets3/src/common/xtixml.cpp index 3bb3dd2d14..892d282e74 100644 --- a/Externals/wxWidgets3/src/common/xtixml.cpp +++ b/Externals/wxWidgets3/src/common/xtixml.cpp @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 27/07/03 -// RCS-ID: $Id: xtixml.cpp 66728 2011-01-22 14:38:36Z DS $ +// RCS-ID: $Id: xtixml.cpp 68949 2011-08-29 12:33:40Z VZ $ // Copyright: (c) 2003 Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -325,7 +325,7 @@ int wxObjectXmlReader::ReadComponent(wxXmlNode *node, wxObjectReaderCallback *ca const wxPropertyInfo* pi = classInfo->FindPropertyInfo( paramName ); if ( pi == 0 ) { - wxLogError( wxString::Format(_("Unkown Property %s"),paramName) ); + wxLogError( wxString::Format(_("Unknown Property %s"),paramName) ); } // if we don't have the value of a create param set in the xml // we use the default value @@ -483,7 +483,7 @@ int wxObjectXmlReader::ReadComponent(wxXmlNode *node, wxObjectReaderCallback *ca wxClassInfo* sinkClassInfo = GetObjectClassInfo( sinkOid ); callbacks->SetConnect( objectID, classInfo, pi, sinkClassInfo, - sinkClassInfo->FindHandlerInfo(handlerName), sinkOid ); + sinkClassInfo->FindHandlerInfo(handlerName.c_str()), sinkOid ); } else { diff --git a/Externals/wxWidgets3/src/common/zipstrm.cpp b/Externals/wxWidgets3/src/common/zipstrm.cpp index a42686d6f8..2e36c4ac1f 100644 --- a/Externals/wxWidgets3/src/common/zipstrm.cpp +++ b/Externals/wxWidgets3/src/common/zipstrm.cpp @@ -2,7 +2,7 @@ // Name: src/common/zipstrm.cpp // Purpose: Streams for Zip files // Author: Mike Wetherell -// RCS-ID: $Id: zipstrm.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: zipstrm.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) Mike Wetherell // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -1341,7 +1341,7 @@ void wxZipInputStream::Init(const wxString& file) ffile = static_cast(m_parent_i_stream); wxZipEntryPtr_ entry; - if (ffile->Ok()) { + if (ffile->IsOk()) { do { entry.reset(GetNextEntry()); } diff --git a/Externals/wxWidgets3/src/common/zstream.cpp b/Externals/wxWidgets3/src/common/zstream.cpp index 448be53223..e478441bfa 100644 --- a/Externals/wxWidgets3/src/common/zstream.cpp +++ b/Externals/wxWidgets3/src/common/zstream.cpp @@ -4,7 +4,7 @@ // Author: Guilhem Lavaux // Modified by: Mike Wetherell // Created: 11/07/98 -// RCS-ID: $Id: zstream.cpp 66259 2010-11-25 00:53:44Z VZ $ +// RCS-ID: $Id: zstream.cpp 70796 2012-03-04 00:29:31Z VZ $ // Copyright: (c) Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -32,7 +32,7 @@ // apparently not the case for all MSW makefiles and so, unless we use // configure (which defines __WX_SETUP_H__) or it is explicitly overridden by // the user (who can define wxUSE_ZLIB_H_IN_PATH), we hardcode the path here -#if defined(__WXMSW__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH) +#if defined(__WINDOWS__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH) #include "../zlib/zlib.h" #else #include "zlib.h" diff --git a/Externals/wxWidgets3/src/generic/aboutdlgg.cpp b/Externals/wxWidgets3/src/generic/aboutdlgg.cpp index 01d6dca7af..b5e507bfd0 100644 --- a/Externals/wxWidgets3/src/generic/aboutdlgg.cpp +++ b/Externals/wxWidgets3/src/generic/aboutdlgg.cpp @@ -3,7 +3,7 @@ // Purpose: implements wxGenericAboutBox() function // Author: Vadim Zeitlin // Created: 2006-10-08 -// RCS-ID: $Id: aboutdlgg.cpp 61534 2009-07-25 22:53:23Z VZ $ +// RCS-ID: $Id: aboutdlgg.cpp 70671 2012-02-22 17:35:21Z JS $ // Copyright: (c) 2006 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -85,7 +85,7 @@ wxString wxAboutDialogInfo::GetDescriptionAndCredits() const wxIcon wxAboutDialogInfo::GetIcon() const { wxIcon icon = m_icon; - if ( !icon.Ok() && wxTheApp ) + if ( !icon.IsOk() && wxTheApp ) { const wxTopLevelWindow * const tlw = wxDynamicCast(wxTheApp->GetTopWindow(), wxTopLevelWindow); @@ -138,7 +138,7 @@ void wxAboutDialogInfo::SetVersion(const wxString& version, bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info, wxWindow* parent) { - if ( !wxDialog::Create(parent, wxID_ANY, _("About ") + info.GetName(), + if ( !wxDialog::Create(parent, wxID_ANY, wxString::Format(_("About %s"), info.GetName()), wxDefaultPosition, wxDefaultSize, wxRESIZE_BORDER|wxDEFAULT_DIALOG_STYLE) ) return false; @@ -196,7 +196,7 @@ bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info, wxWindow* paren wxSizer *sizerIconAndText = new wxBoxSizer(wxHORIZONTAL); #if wxUSE_STATBMP wxIcon icon = info.GetIcon(); - if ( icon.Ok() ) + if ( icon.IsOk() ) { sizerIconAndText->Add(new wxStaticBitmap(this, wxID_ANY, icon), wxSizerFlags().Border(wxRIGHT)); @@ -220,6 +220,13 @@ bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info, wxWindow* paren CentreOnParent(); +#if !wxUSE_MODAL_ABOUT_DIALOG + Connect(wxEVT_CLOSE_WINDOW, + wxCloseEventHandler(wxGenericAboutDialog::OnCloseWindow)); + Connect(wxID_OK, wxEVT_COMMAND_BUTTON_CLICKED, + wxCommandEventHandler(wxGenericAboutDialog::OnOK)); +#endif // !wxUSE_MODAL_ABOUT_DIALOG + return true; } @@ -242,6 +249,7 @@ void wxGenericAboutDialog::AddText(const wxString& text) AddControl(new wxStaticText(this, wxID_ANY, text)); } +#if wxUSE_COLLPANE void wxGenericAboutDialog::AddCollapsiblePane(const wxString& title, const wxString& text) { @@ -264,6 +272,25 @@ void wxGenericAboutDialog::AddCollapsiblePane(const wxString& title, // NB: all the wxCollapsiblePanes must be added with a null proportion value m_sizerText->Add(pane, wxSizerFlags(0).Expand().Border(wxBOTTOM)); } +#endif + +#if !wxUSE_MODAL_ABOUT_DIALOG + +void wxGenericAboutDialog::OnCloseWindow(wxCloseEvent& event) +{ + Destroy(); + + event.Skip(); +} + +void wxGenericAboutDialog::OnOK(wxCommandEvent& WXUNUSED(event)) +{ + // By default a modeless dialog would be just hidden, destroy this one + // instead. + Destroy(); +} + +#endif // !wxUSE_MODAL_ABOUT_DIALOG // ---------------------------------------------------------------------------- // public functions @@ -271,7 +298,7 @@ void wxGenericAboutDialog::AddCollapsiblePane(const wxString& title, void wxGenericAboutBox(const wxAboutDialogInfo& info, wxWindow* parent) { -#if !defined(__WXGTK__) && !defined(__WXMAC__) +#if wxUSE_MODAL_ABOUT_DIALOG wxGenericAboutDialog dlg(info, parent); dlg.ShowModal(); #else diff --git a/Externals/wxWidgets3/src/generic/accel.cpp b/Externals/wxWidgets3/src/generic/accel.cpp index 17daccf0a7..832c357870 100644 --- a/Externals/wxWidgets3/src/generic/accel.cpp +++ b/Externals/wxWidgets3/src/generic/accel.cpp @@ -3,7 +3,7 @@ // Purpose: generic implementation of wxAcceleratorTable class // Author: Robert Roebling // Modified: VZ pn 31.05.01: use typed lists, Unicode cleanup, Add/Remove -// Id: $Id: accel.cpp 63165 2010-01-18 00:28:11Z VZ $ +// Id: $Id: accel.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -162,7 +162,7 @@ void wxAcceleratorTable::Remove(const wxAcceleratorEntry& entry) const wxAcceleratorEntry * wxAcceleratorTable::GetEntry(const wxKeyEvent& event) const { - if ( !Ok() ) + if ( !IsOk() ) { // not an error, the accel table is just empty return NULL; diff --git a/Externals/wxWidgets3/src/generic/animateg.cpp b/Externals/wxWidgets3/src/generic/animateg.cpp index da8256b384..af4d2416b8 100644 --- a/Externals/wxWidgets3/src/generic/animateg.cpp +++ b/Externals/wxWidgets3/src/generic/animateg.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart and Guillermo Rodriguez Garcia // Modified by: Francesco Montorsi // Created: 13/8/99 -// RCS-ID: $Id: animateg.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: animateg.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) Julian Smart and Guillermo Rodriguez Garcia // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -308,7 +308,7 @@ wxAnimationCtrl::~wxAnimationCtrl() bool wxAnimationCtrl::LoadFile(const wxString& filename, wxAnimationType type) { wxFileInputStream fis(filename); - if (!fis.Ok()) + if (!fis.IsOk()) return false; return Load(fis, type); } diff --git a/Externals/wxWidgets3/src/generic/bannerwindow.cpp b/Externals/wxWidgets3/src/generic/bannerwindow.cpp new file mode 100644 index 0000000000..450b0a90a2 --- /dev/null +++ b/Externals/wxWidgets3/src/generic/bannerwindow.cpp @@ -0,0 +1,344 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/bannerwindow.h +// Purpose: wxBannerWindow class implementation +// Author: Vadim Zeitlin +// Created: 2011-08-16 +// RCS-ID: $Id: bannerwindow.cpp 69859 2011-11-28 18:58:52Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#if wxUSE_BANNERWINDOW + +#include "wx/bannerwindow.h" + +#ifndef WX_PRECOMP + #include "wx/bitmap.h" + #include "wx/colour.h" +#endif + +#include "wx/dcbuffer.h" + +namespace +{ + +// Some constants for banner layout, currently they're hard coded but we could +// easily make them configurable if needed later. +const int MARGIN_X = 5; +const int MARGIN_Y = 5; + +} // anonymous namespace + +const char wxBannerWindowNameStr[] = "bannerwindow"; + +BEGIN_EVENT_TABLE(wxBannerWindow, wxWindow) + EVT_SIZE(wxBannerWindow::OnSize) + EVT_PAINT(wxBannerWindow::OnPaint) +END_EVENT_TABLE() + +void wxBannerWindow::Init() +{ + m_direction = wxLEFT; + + m_colStart = *wxWHITE; + m_colEnd = *wxBLUE; +} + +bool +wxBannerWindow::Create(wxWindow* parent, + wxWindowID winid, + wxDirection dir, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) +{ + if ( !wxWindow::Create(parent, winid, pos, size, style, name) ) + return false; + + wxASSERT_MSG + ( + dir == wxLEFT || dir == wxRIGHT || dir == wxTOP || dir == wxBOTTOM, + wxS("Invalid banner direction") + ); + + m_direction = dir; + + SetBackgroundStyle(wxBG_STYLE_PAINT); + + return true; +} + +void wxBannerWindow::SetBitmap(const wxBitmap& bmp) +{ + m_bitmap = bmp; + + m_colBitmapBg = wxColour(); + + InvalidateBestSize(); + + Refresh(); +} + +void wxBannerWindow::SetText(const wxString& title, const wxString& message) +{ + m_title = title; + m_message = message; + + InvalidateBestSize(); + + Refresh(); +} + +void wxBannerWindow::SetGradient(const wxColour& start, const wxColour& end) +{ + m_colStart = start; + m_colEnd = end; + + Refresh(); +} + +wxFont wxBannerWindow::GetTitleFont() const +{ + wxFont font = GetFont(); + font.MakeBold().MakeLarger(); + return font; +} + +wxSize wxBannerWindow::DoGetBestClientSize() const +{ + if ( m_bitmap.IsOk() ) + { + return m_bitmap.GetSize(); + } + else + { + wxClientDC dc(const_cast(this)); + const wxSize sizeText = dc.GetMultiLineTextExtent(m_message); + + dc.SetFont(GetTitleFont()); + + const wxSize sizeTitle = dc.GetTextExtent(m_title); + + wxSize sizeWin(wxMax(sizeTitle.x, sizeText.x), sizeTitle.y + sizeText.y); + + // If we draw the text vertically width and height are swapped. + if ( m_direction == wxLEFT || m_direction == wxRIGHT ) + wxSwap(sizeWin.x, sizeWin.y); + + sizeWin += 2*wxSize(MARGIN_X, MARGIN_Y); + + return sizeWin; + } +} + +void wxBannerWindow::OnSize(wxSizeEvent& event) +{ + Refresh(); + + event.Skip(); +} + +void wxBannerWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) +{ + if ( m_bitmap.IsOk() && m_title.empty() && m_message.empty() ) + { + // No need for buffering in this case. + wxPaintDC dc(this); + + DrawBitmapBackground(dc); + } + else // We need to compose our contents ourselves. + { + wxAutoBufferedPaintDC dc(this); + + // Deal with the background first. + if ( m_bitmap.IsOk() ) + { + DrawBitmapBackground(dc); + } + else // Draw gradient background. + { + wxDirection gradientDir; + if ( m_direction == wxLEFT ) + { + gradientDir = wxTOP; + } + else if ( m_direction == wxRIGHT ) + { + gradientDir = wxBOTTOM; + } + else // For both wxTOP and wxBOTTOM. + { + gradientDir = wxRIGHT; + } + + dc.GradientFillLinear(GetClientRect(), m_colStart, m_colEnd, + gradientDir); + } + + // Now draw the text on top of it. + dc.SetFont(GetTitleFont()); + + wxPoint pos(MARGIN_X, MARGIN_Y); + DrawBannerTextLine(dc, m_title, pos); + pos.y += dc.GetTextExtent(m_title).y; + + dc.SetFont(GetFont()); + + wxArrayString lines = wxSplit(m_message, '\n', '\0'); + const unsigned numLines = lines.size(); + for ( unsigned n = 0; n < numLines; n++ ) + { + const wxString& line = lines[n]; + + DrawBannerTextLine(dc, line, pos); + pos.y += dc.GetTextExtent(line).y; + } + } +} + +wxColour wxBannerWindow::GetBitmapBg() +{ + if ( m_colBitmapBg.IsOk() ) + return m_colBitmapBg; + + // Determine the colour to use to extend the bitmap. It's the colour of the + // bitmap pixels at the edge closest to the area where it can be extended. + wxImage image(m_bitmap.ConvertToImage()); + + // The point we get the colour from. The choice is arbitrary and in general + // the bitmap should have the same colour on the entire edge of this point + // for extending it to look good. + wxPoint p; + + wxSize size = image.GetSize(); + size.x--; + size.y--; + + switch ( m_direction ) + { + case wxTOP: + case wxBOTTOM: + // The bitmap will be extended to the right. + p.x = size.x; + p.y = 0; + break; + + case wxLEFT: + // The bitmap will be extended from the top. + p.x = 0; + p.y = 0; + break; + + case wxRIGHT: + // The bitmap will be extended to the bottom. + p.x = 0; + p.y = size.y; + break; + + // This case is there only to prevent g++ warnings about not handling + // some enum elements in the switch, it can't really happen. + case wxALL: + wxFAIL_MSG( wxS("Unreachable") ); + } + + m_colBitmapBg.Set(image.GetRed(p.x, p.y), + image.GetGreen(p.x, p.y), + image.GetBlue(p.x, p.y)); + + return m_colBitmapBg; +} + +void wxBannerWindow::DrawBitmapBackground(wxDC& dc) +{ + // We may need to fill the part of the background not covered by the bitmap + // with the solid colour extending the bitmap, this rectangle will hold the + // area to be filled (which could be empty if the bitmap is big enough). + wxRect rectSolid; + + const wxSize size = GetClientSize(); + + switch ( m_direction ) + { + case wxTOP: + case wxBOTTOM: + // Draw the bitmap at the origin, its rightmost could be truncated, + // as it's meant to be. + dc.DrawBitmap(m_bitmap, 0, 0); + + rectSolid.x = m_bitmap.GetWidth(); + rectSolid.width = size.x - rectSolid.x; + rectSolid.height = size.y; + break; + + case wxLEFT: + // The top most part of the bitmap may be truncated but its bottom + // must be always visible so intentionally draw it possibly partly + // outside of the window. + rectSolid.width = size.x; + rectSolid.height = size.y - m_bitmap.GetHeight(); + dc.DrawBitmap(m_bitmap, 0, rectSolid.height); + break; + + case wxRIGHT: + // Draw the bitmap at the origin, possibly truncating its + // bottommost part. + dc.DrawBitmap(m_bitmap, 0, 0); + + rectSolid.y = m_bitmap.GetHeight(); + rectSolid.height = size.y - rectSolid.y; + rectSolid.width = size.x; + break; + + // This case is there only to prevent g++ warnings about not handling + // some enum elements in the switch, it can't really happen. + case wxALL: + wxFAIL_MSG( wxS("Unreachable") ); + } + + if ( rectSolid.width > 0 && rectSolid.height > 0 ) + { + dc.SetPen(*wxTRANSPARENT_PEN); + dc.SetBrush(GetBitmapBg()); + dc.DrawRectangle(rectSolid); + } +} + +void +wxBannerWindow::DrawBannerTextLine(wxDC& dc, + const wxString& str, + const wxPoint& pos) +{ + switch ( m_direction ) + { + case wxTOP: + case wxBOTTOM: + // The simple case: we just draw the text normally. + dc.DrawText(str, pos); + break; + + case wxLEFT: + // We draw the text vertically and start from the lower left + // corner and not the upper left one as usual. + dc.DrawRotatedText(str, pos.y, GetClientSize().y - pos.x, 90); + break; + + case wxRIGHT: + // We also draw the text vertically but now we start from the upper + // right corner and draw it from top to bottom. + dc.DrawRotatedText(str, GetClientSize().x - pos.y, pos.x, -90); + break; + + case wxALL: + wxFAIL_MSG( wxS("Unreachable") ); + } +} + +#endif // wxUSE_BANNERWINDOW diff --git a/Externals/wxWidgets3/src/generic/buttonbar.cpp b/Externals/wxWidgets3/src/generic/buttonbar.cpp index 1f7d2e03b3..65b7279583 100644 --- a/Externals/wxWidgets3/src/generic/buttonbar.cpp +++ b/Externals/wxWidgets3/src/generic/buttonbar.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart, after Robert Roebling, Vadim Zeitlin, SciTech // Modified by: // Created: 2006-04-13 -// Id: $Id: buttonbar.cpp 61508 2009-07-23 20:30:22Z VZ $ +// Id: $Id: buttonbar.cpp 70450 2012-01-23 14:42:53Z VZ $ // Copyright: (c) Julian Smart, Robert Roebling, Vadim Zeitlin, // SciTech Software, Inc. // Licence: wxWindows licence @@ -140,7 +140,10 @@ bool wxButtonToolBar::Create(wxWindow *parent, // wxColour lightBackground(244, 244, 244); - wxFont font(wxSMALL_FONT->GetPointSize(), wxNORMAL_FONT->GetFamily(), wxNORMAL_FONT->GetStyle(), wxNORMAL); + wxFont font(wxSMALL_FONT->GetPointSize(), + wxNORMAL_FONT->GetFamily(), + wxNORMAL_FONT->GetStyle(), + wxFONTWEIGHT_NORMAL); SetFont(font); // Calculate the label height if necessary diff --git a/Externals/wxWidgets3/src/generic/calctrlg.cpp b/Externals/wxWidgets3/src/generic/calctrlg.cpp index f722bc201e..1317c799a8 100644 --- a/Externals/wxWidgets3/src/generic/calctrlg.cpp +++ b/Externals/wxWidgets3/src/generic/calctrlg.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 29.12.99 -// RCS-ID: $Id: calctrlg.cpp 66576 2011-01-04 15:08:25Z SC $ +// RCS-ID: $Id: calctrlg.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 1999 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -287,9 +287,6 @@ void wxGenericCalendarCtrl::CreateYearSpinCtrl() wxDefaultSize, wxSP_ARROW_KEYS | wxCLIP_SIBLINGS, -4300, 10000, GetDate().GetYear()); -#ifdef __WXMAC__ - m_spinYear->SetSize( 90, -1 ); -#endif m_spinYear->Connect(m_spinYear->GetId(), wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(wxGenericCalendarCtrl::OnYearTextChange), @@ -700,12 +697,8 @@ wxSize wxGenericCalendarCtrl::DoGetBestSize() const height += wxMax(bestSizeCombo.y, m_spinYear->GetBestSize().y) + VERT_MARGIN; -#ifdef __WXMAC__ - // the spin control get clipped otherwise - width += 25; -#endif - wxCoord w2 = bestSizeCombo.x + HORZ_MARGIN + GetCharWidth()*6; + wxCoord w2 = bestSizeCombo.x + HORZ_MARGIN + GetCharWidth()*8; if ( width < w2 ) width = w2; } @@ -733,12 +726,8 @@ void wxGenericCalendarCtrl::DoMoveWindow(int x, int y, int width, int height) int maxHeight = wxMax(sizeSpin.y, sizeCombo.y); int dy = (maxHeight - sizeStatic.y) / 2; -#ifdef __WXMAC__ - m_comboMonth->Move(x, y + (maxHeight - sizeCombo.y)/2 + 2); // FIXME, something is reporting the wrong size.. -#else m_comboMonth->Move(x, y + (maxHeight - sizeCombo.y)/2); -#endif - m_staticMonth->SetSize(x, y + dy, sizeCombo.x, -1, sizeStatic.y); + m_staticMonth->SetSize(x, y + dy, sizeCombo.x, -1); int xDiff = sizeCombo.x + HORZ_MARGIN; @@ -757,20 +746,7 @@ void wxGenericCalendarCtrl::DoMoveWindow(int x, int y, int width, int height) void wxGenericCalendarCtrl::DoGetSize(int *width, int *height) const { -#ifdef __WXMAC__ wxControl::DoGetSize( width, height ); - - if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) && m_staticMonth && height ) - { - wxSize sizeCombo = m_comboMonth->GetEffectiveMinSize(); - wxSize sizeSpin = m_spinYear->GetSize(); - - int maxHeight = wxMax(sizeSpin.y, sizeCombo.y); - *height += maxHeight + VERT_MARGIN; - } -#else - wxControl::DoGetSize( width, height ); -#endif } void wxGenericCalendarCtrl::RecalcGeometry() @@ -1026,13 +1002,13 @@ void wxGenericCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) colBg = attr->GetBackgroundColour(); } - if ( colFg.Ok() ) + if ( colFg.IsOk() ) { dc.SetTextForeground(colFg); changedColours = true; } - if ( colBg.Ok() ) + if ( colBg.IsOk() ) { dc.SetTextBackground(colBg); changedColours = true; diff --git a/Externals/wxWidgets3/src/generic/choicdgg.cpp b/Externals/wxWidgets3/src/generic/choicdgg.cpp index d29635eab2..0efc15262c 100644 --- a/Externals/wxWidgets3/src/generic/choicdgg.cpp +++ b/Externals/wxWidgets3/src/generic/choicdgg.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: 03.11.00: VZ to add wxArrayString and multiple sel functions // Created: 04/01/98 -// RCS-ID: $Id: choicdgg.cpp 63734 2010-03-22 11:40:19Z VZ $ +// RCS-ID: $Id: choicdgg.cpp 70514 2012-02-05 14:18:33Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -222,13 +222,13 @@ void *wxGetSingleChoiceData( const wxString& message, int initialSelection) { wxSingleChoiceDialog dialog(parent, message, caption, n, choices, - (char **)client_data); + client_data); dialog.SetSelection(initialSelection); void *data; if ( dialog.ShowModal() == wxID_OK ) - data = dialog.GetSelectionClientData(); + data = dialog.GetSelectionData(); else data = NULL; @@ -467,35 +467,12 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxSingleChoiceDialog, wxDialog) -wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent, - const wxString& message, - const wxString& caption, - int n, - const wxString *choices, - char **clientData, - long style, - const wxPoint& WXUNUSED(pos)) -{ - Create(parent, message, caption, n, choices, clientData, style); -} - -wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent, - const wxString& message, - const wxString& caption, - const wxArrayString& choices, - char **clientData, - long style, - const wxPoint& WXUNUSED(pos)) -{ - Create(parent, message, caption, choices, clientData, style); -} - bool wxSingleChoiceDialog::Create( wxWindow *parent, const wxString& message, const wxString& caption, int n, const wxString *choices, - char **clientData, + void **clientData, long style, const wxPoint& pos ) { @@ -519,7 +496,7 @@ bool wxSingleChoiceDialog::Create( wxWindow *parent, const wxString& message, const wxString& caption, const wxArrayString& choices, - char **clientData, + void **clientData, long style, const wxPoint& pos ) { diff --git a/Externals/wxWidgets3/src/generic/collpaneg.cpp b/Externals/wxWidgets3/src/generic/collpaneg.cpp index f3ea4135f5..26b7525dfd 100644 --- a/Externals/wxWidgets3/src/generic/collpaneg.cpp +++ b/Externals/wxWidgets3/src/generic/collpaneg.cpp @@ -4,7 +4,7 @@ // Author: Francesco Montorsi // Modified By: // Created: 8/10/2006 -// Id: $Id: collpaneg.cpp 67280 2011-03-22 14:17:38Z DS $ +// Id: $Id: collpaneg.cpp 68366 2011-07-24 22:19:33Z VZ $ // Copyright: (c) Francesco Montorsi // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -57,16 +57,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent) BEGIN_EVENT_TABLE(wxGenericCollapsiblePane, wxControl) EVT_BUTTON(wxID_ANY, wxGenericCollapsiblePane::OnButton) EVT_SIZE(wxGenericCollapsiblePane::OnSize) - - WX_EVENT_TABLE_CONTROL_CONTAINER(wxGenericCollapsiblePane) END_EVENT_TABLE() -WX_DELEGATE_TO_CONTROL_CONTAINER(wxGenericCollapsiblePane, wxControl) - void wxGenericCollapsiblePane::Init() { - WX_INIT_CONTROL_CONTAINER(); - m_pButton = NULL; m_pPane = NULL; m_pStaticLine = NULL; diff --git a/Externals/wxWidgets3/src/generic/colrdlgg.cpp b/Externals/wxWidgets3/src/generic/colrdlgg.cpp index 30fd78ef6c..4ca1da61b1 100644 --- a/Externals/wxWidgets3/src/generic/colrdlgg.cpp +++ b/Externals/wxWidgets3/src/generic/colrdlgg.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: colrdlgg.cpp 66615 2011-01-07 05:26:57Z PC $ +// RCS-ID: $Id: colrdlgg.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -315,7 +315,7 @@ void wxGenericColourDialog::InitializeColours(void) for (i = 0; i < WXSIZEOF(wxColourDialogNames); i++) { wxColour col = wxTheColourDatabase->Find(wxColourDialogNames[i]); - if (col.Ok()) + if (col.IsOk()) m_standardColours[i].Set(col.Red(), col.Green(), col.Blue()); else m_standardColours[i].Set(0, 0, 0); @@ -324,14 +324,14 @@ void wxGenericColourDialog::InitializeColours(void) for (i = 0; i < WXSIZEOF(m_customColours); i++) { wxColour c = m_colourData.GetCustomColour(i); - if (c.Ok()) + if (c.IsOk()) m_customColours[i] = m_colourData.GetCustomColour(i); else m_customColours[i] = wxColour(255, 255, 255); } wxColour curr = m_colourData.GetColour(); - if ( curr.Ok() ) + if ( curr.IsOk() ) { bool m_initColourFound = false; diff --git a/Externals/wxWidgets3/src/generic/combog.cpp b/Externals/wxWidgets3/src/generic/combog.cpp index 39ef0ddd78..3fbbdae486 100644 --- a/Externals/wxWidgets3/src/generic/combog.cpp +++ b/Externals/wxWidgets3/src/generic/combog.cpp @@ -4,7 +4,7 @@ // Author: Jaakko Salli // Modified by: // Created: Apr-30-2006 -// RCS-ID: $Id: combog.cpp 67255 2011-03-20 10:59:22Z JMS $ +// RCS-ID: $Id: combog.cpp 70773 2012-03-02 12:43:39Z JS $ // Copyright: (c) 2005 Jaakko Salli // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -46,7 +46,6 @@ // meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp #define TEXTCTRLXADJUST 0 -#define TEXTCTRLYADJUST 0 #define TEXTXADJUST 0 // how much is read-only text's x adjusted #define DEFAULT_DROPBUTTON_WIDTH 19 @@ -56,7 +55,6 @@ // meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp #define TEXTCTRLXADJUST 2 -#define TEXTCTRLYADJUST 3 #define TEXTXADJUST 0 // how much is read-only text's x adjusted #define DEFAULT_DROPBUTTON_WIDTH 17 @@ -66,7 +64,6 @@ // meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp #define TEXTCTRLXADJUST -1 -#define TEXTCTRLYADJUST 0 #define TEXTXADJUST 1 // how much is read-only text's x adjusted #define DEFAULT_DROPBUTTON_WIDTH 23 @@ -76,7 +73,6 @@ // meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp #define TEXTCTRLXADJUST 0 -#define TEXTCTRLYADJUST 0 #define TEXTXADJUST 0 // how much is read-only text's x adjusted #define DEFAULT_DROPBUTTON_WIDTH 22 @@ -86,7 +82,6 @@ // meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp #define TEXTCTRLXADJUST 0 -#define TEXTCTRLYADJUST 0 #define TEXTXADJUST 0 // how much is read-only text's x adjusted #define DEFAULT_DROPBUTTON_WIDTH 19 @@ -235,7 +230,7 @@ void wxGenericComboCtrl::OnResize() #endif // Move textctrl, if any, accordingly - PositionTextCtrl( TEXTCTRLXADJUST, TEXTCTRLYADJUST ); + PositionTextCtrl( TEXTCTRLXADJUST ); } void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) ) @@ -260,9 +255,15 @@ void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) ) int customBorder = m_widthCustomBorder; // Set border colour +#ifdef __WXMAC__ + wxPen pen1( wxColour(133,133,133), + customBorder, + wxSOLID ); +#else wxPen pen1( wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT), customBorder, wxPENSTYLE_SOLID); +#endif dc.SetPen( pen1 ); // area around both controls diff --git a/Externals/wxWidgets3/src/generic/datavgen.cpp b/Externals/wxWidgets3/src/generic/datavgen.cpp index d27d2445b2..b88b1c952b 100644 --- a/Externals/wxWidgets3/src/generic/datavgen.cpp +++ b/Externals/wxWidgets3/src/generic/datavgen.cpp @@ -3,7 +3,7 @@ // Purpose: wxDataViewCtrl generic implementation // Author: Robert Roebling // Modified by: Francesco Montorsi, Guru Kathiresan, Bo Yang -// Id: $Id: datavgen.cpp 67158 2011-03-09 09:44:03Z VZ $ +// Id: $Id: datavgen.cpp 70717 2012-02-27 18:54:02Z VZ $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -38,7 +38,6 @@ #endif #include "wx/stockitem.h" -#include "wx/calctrl.h" #include "wx/popupwin.h" #include "wx/renderer.h" #include "wx/dcbuffer.h" @@ -49,6 +48,7 @@ #include "wx/headerctrl.h" #include "wx/dnd.h" #include "wx/stopwatch.h" +#include "wx/weakref.h" //----------------------------------------------------------------------------- // classes @@ -83,6 +83,30 @@ static wxDataViewModel* g_model; static int g_column = -2; static bool g_asending = true; +// ---------------------------------------------------------------------------- +// helper functions +// ---------------------------------------------------------------------------- + +namespace +{ + +// Return the expander column or, if it is not set, the first column and also +// set it as the expander one for the future. +wxDataViewColumn* GetExpanderColumnOrFirstOne(wxDataViewCtrl* dataview) +{ + wxDataViewColumn* expander = dataview->GetExpanderColumn(); + if (!expander) + { + // TODO-RTL: last column for RTL support + expander = dataview->GetColumnAt( 0 ); + dataview->SetExpanderColumn(expander); + } + + return expander; +} + +} // anonymous namespace + //----------------------------------------------------------------------------- // wxDataViewColumn //----------------------------------------------------------------------------- @@ -122,6 +146,30 @@ void wxDataViewColumn::UpdateDisplay() } } +void wxDataViewColumn::SetSortOrder(bool ascending) +{ + if ( !m_owner ) + return; + + // First unset the old sort column if any. + int oldSortKey = m_owner->GetSortingColumnIndex(); + if ( oldSortKey != wxNOT_FOUND ) + { + m_owner->GetColumn(oldSortKey)->UnsetAsSortKey(); + } + + // Now set this one as the new sort column. + const int idx = m_owner->GetColumnIndex(this); + m_owner->SetSortingColumnIndex(idx); + + m_sort = true; + m_sortAscending = ascending; + + // Call this directly instead of using UpdateDisplay() as we already have + // the column index, no need to look it up again. + m_owner->OnColumnChange(idx); +} + //----------------------------------------------------------------------------- // wxDataViewHeaderWindow //----------------------------------------------------------------------------- @@ -169,7 +217,7 @@ private: // for events created by wxDataViewHeaderWindow the // row / value fields are not valid - return owner->GetEventHandler()->ProcessEvent(event); + return owner->ProcessWindowEvent(event); } void OnClick(wxHeaderCtrlEvent& event) @@ -197,16 +245,7 @@ private: } else // not using this column for sorting yet { - // first unset the old sort column if any - int oldSortKey = owner->GetSortingColumnIndex(); - if ( oldSortKey != wxNOT_FOUND ) - { - owner->GetColumn(oldSortKey)->UnsetAsSortKey(); - owner->OnColumnChange(oldSortKey); - } - - owner->SetSortingColumnIndex(idx); - col->SetAsSortKey(); + col->SetSortOrder(true); } wxDataViewModel * const model = owner->GetModel(); @@ -214,6 +253,8 @@ private: model->Resort(); owner->OnColumnChange(idx); + + SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, idx); } void OnRClick(wxHeaderCtrlEvent& event) @@ -273,57 +314,89 @@ public: class wxDataViewTreeNode; WX_DEFINE_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes ); -WX_DEFINE_ARRAY( void* , wxDataViewTreeLeaves); int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2); -int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2); class wxDataViewTreeNode { public: - wxDataViewTreeNode( wxDataViewTreeNode * parent = NULL ) + wxDataViewTreeNode(wxDataViewTreeNode *parent, const wxDataViewItem& item) + : m_parent(parent), + m_item(item), + m_branchData(NULL) { - m_parent = parent; - if (!parent) - m_open = true; - else - m_open = false; - m_hasChildren = false; - m_subTreeCount = 0; } ~wxDataViewTreeNode() { + if ( m_branchData ) + { + wxDataViewTreeNodes& nodes = m_branchData->children; + for ( wxDataViewTreeNodes::iterator i = nodes.begin(); + i != nodes.end(); + ++i ) + { + delete *i; + } + + delete m_branchData; + } + } + + static wxDataViewTreeNode* CreateRootNode() + { + wxDataViewTreeNode *n = new wxDataViewTreeNode(NULL, wxDataViewItem()); + n->SetHasChildren(true); + n->m_branchData->open = true; + return n; } wxDataViewTreeNode * GetParent() const { return m_parent; } - void SetParent( wxDataViewTreeNode * parent ) { m_parent = parent; } - wxDataViewTreeNodes & GetNodes() { return m_nodes; } - wxDataViewTreeLeaves & GetChildren() { return m_leaves; } - void AddNode( wxDataViewTreeNode * node ) + const wxDataViewTreeNodes& GetChildNodes() const { - m_leaves.Add( node->GetItem().GetID() ); - if (g_column >= -1) - m_leaves.Sort( &wxGenericTreeModelItemCmp ); - m_nodes.Add( node ); - if (g_column >= -1) - m_nodes.Sort( &wxGenericTreeModelNodeCmp ); - } - void AddLeaf( void * leaf ) - { - m_leaves.Add( leaf ); - if (g_column >= -1) - m_leaves.Sort( &wxGenericTreeModelItemCmp ); + wxASSERT( m_branchData != NULL ); + return m_branchData->children; + } + + void InsertChild(wxDataViewTreeNode *node, unsigned index) + { + if ( !m_branchData ) + m_branchData = new BranchNodeData; + + m_branchData->children.Insert(node, index); + + // TODO: insert into sorted array directly in O(log n) instead of resorting in O(n log n) + if (g_column >= -1) + m_branchData->children.Sort( &wxGenericTreeModelNodeCmp ); + } + + void RemoveChild(wxDataViewTreeNode *node) + { + wxCHECK_RET( m_branchData != NULL, "leaf node doesn't have children" ); + m_branchData->children.Remove(node); + } + + // returns position of child node for given item in children list or wxNOT_FOUND + int FindChildByItem(const wxDataViewItem& item) const + { + if ( !m_branchData ) + return wxNOT_FOUND; + + const wxDataViewTreeNodes& nodes = m_branchData->children; + const int len = nodes.size(); + for ( int i = 0; i < len; i++ ) + { + if ( nodes[i]->m_item == item ) + return i; + } + return wxNOT_FOUND; } - wxDataViewItem & GetItem() { return m_item; } const wxDataViewItem & GetItem() const { return m_item; } void SetItem( const wxDataViewItem & item ) { m_item = item; } - unsigned int GetChildrenNumber() const { return m_leaves.GetCount(); } - unsigned int GetNodeNumber() const { return m_nodes.GetCount(); } int GetIndentLevel() const { int ret = 0; @@ -338,84 +411,136 @@ public: bool IsOpen() const { - return m_open; + return m_branchData && m_branchData->open; } void ToggleOpen() { - int len = m_nodes.GetCount(); - int sum = 0; - for ( int i = 0;i < len; i ++) - sum += m_nodes[i]->GetSubTreeCount(); + wxCHECK_RET( m_branchData != NULL, "can't open leaf node" ); - sum += m_leaves.GetCount(); - if (m_open) + int sum = 0; + + const wxDataViewTreeNodes& nodes = m_branchData->children; + const int len = nodes.GetCount(); + for ( int i = 0;i < len; i ++) + sum += 1 + nodes[i]->GetSubTreeCount(); + + if (m_branchData->open) { ChangeSubTreeCount(-sum); - m_open = !m_open; + m_branchData->open = !m_branchData->open; } else { - m_open = !m_open; - ChangeSubTreeCount(sum); + m_branchData->open = !m_branchData->open; + ChangeSubTreeCount(+sum); } } - bool HasChildren() const { return m_hasChildren; } - void SetHasChildren( bool has ){ m_hasChildren = has; } - void SetSubTreeCount( int num ) { m_subTreeCount = num; } - int GetSubTreeCount() const { return m_subTreeCount; } + // "HasChildren" property corresponds to model's IsContainer(). Note that it may be true + // even if GetChildNodes() is empty; see below. + bool HasChildren() const + { + return m_branchData != NULL; + } + + void SetHasChildren(bool has) + { + if ( !has ) + { + wxDELETE(m_branchData); + } + else if ( m_branchData == NULL ) + { + m_branchData = new BranchNodeData; + } + } + + int GetSubTreeCount() const + { + return m_branchData ? m_branchData->subTreeCount : 0; + } + void ChangeSubTreeCount( int num ) { - if( !m_open ) + wxASSERT( m_branchData != NULL ); + + if( !m_branchData->open ) return; - m_subTreeCount += num; + + m_branchData->subTreeCount += num; + wxASSERT( m_branchData->subTreeCount >= 0 ); + if( m_parent ) m_parent->ChangeSubTreeCount(num); } void Resort() { + if ( !m_branchData ) + return; + if (g_column >= -1) { - m_nodes.Sort( &wxGenericTreeModelNodeCmp ); - int len = m_nodes.GetCount(); + wxDataViewTreeNodes& nodes = m_branchData->children; + + nodes.Sort( &wxGenericTreeModelNodeCmp ); + int len = nodes.GetCount(); for (int i = 0; i < len; i ++) - m_nodes[i]->Resort(); - m_leaves.Sort( &wxGenericTreeModelItemCmp ); + { + if ( nodes[i]->HasChildren() ) + nodes[i]->Resort(); + } } } + private: wxDataViewTreeNode *m_parent; - wxDataViewTreeNodes m_nodes; - wxDataViewTreeLeaves m_leaves; + + // Corresponding model item. wxDataViewItem m_item; - bool m_open; - bool m_hasChildren; - int m_subTreeCount; + + // Data specific to non-leaf (branch, inner) nodes. They are kept in a + // separate struct in order to conserve memory. + struct BranchNodeData + { + BranchNodeData() + : open(false), + subTreeCount(0) + { + } + + // Child nodes. Note that this may be empty even if m_hasChildren in + // case this branch of the tree wasn't expanded and realized yet. + wxDataViewTreeNodes children; + + // Is the branch node currently open (expanded)? + bool open; + + // Total count of expanded (i.e. visible with the help of some + // scrolling) items in the subtree, but excluding this node. I.e. it is + // 0 for leaves and is the number of rows the subtree occupies for + // branch nodes. + int subTreeCount; + }; + + BranchNodeData *m_branchData; }; + int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2) { return g_model->Compare( (*node1)->GetItem(), (*node2)->GetItem(), g_column, g_asending ); } -int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2) -{ - return g_model->Compare( *id1, *id2, g_column, g_asending ); -} - //----------------------------------------------------------------------------- // wxDataViewMainWindow //----------------------------------------------------------------------------- -WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection, - WXDLLIMPEXP_ADV); -WX_DECLARE_LIST(wxDataViewItem, ItemList); -WX_DEFINE_LIST(ItemList) +WX_DEFINE_SORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection); class wxDataViewMainWindow: public wxWindow { @@ -427,7 +552,7 @@ public: const wxString &name = wxT("wxdataviewctrlmainwindow") ); virtual ~wxDataViewMainWindow(); - bool IsList() const { return GetOwner()->GetModel()->IsListModel(); } + bool IsList() const { return GetModel()->IsListModel(); } bool IsVirtualList() const { return m_root == NULL; } // notifications from wxDataViewModel @@ -448,7 +573,7 @@ public: void SortPrepare() { - g_model = GetOwner()->GetModel(); + g_model = GetModel(); wxDataViewColumn* col = GetOwner()->GetSortingColumn(); if( !col ) { @@ -468,12 +593,18 @@ public: wxDataViewCtrl *GetOwner() { return m_owner; } const wxDataViewCtrl *GetOwner() const { return m_owner; } + wxDataViewModel* GetModel() { return GetOwner()->GetModel(); } + const wxDataViewModel* GetModel() const { return GetOwner()->GetModel(); } + #if wxUSE_DRAG_AND_DROP wxBitmap CreateItemBitmap( unsigned int row, int &indent ); #endif // wxUSE_DRAG_AND_DROP void OnPaint( wxPaintEvent &event ); - void OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event); + void OnCharHook( wxKeyEvent &event ); void OnChar( wxKeyEvent &event ); + void OnVerticalNavigation(unsigned int newCurrent, const wxKeyEvent& event); + void OnLeftKey(); + void OnRightKey(); void OnMouse( wxMouseEvent &event ); void OnSetFocus( wxFocusEvent &event ); void OnKillFocus( wxFocusEvent &event ); @@ -490,6 +621,10 @@ public: unsigned GetCurrentRow() const { return m_currentRow; } bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; } void ChangeCurrentRow( unsigned int row ); + bool TryAdvanceCurrentColumn(wxDataViewTreeNode *node, bool forward); + + wxDataViewColumn *GetCurrentColumn() const { return m_currentCol; } + void ClearCurrentColumn() { m_currentCol = NULL; } bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); } bool IsEmpty() { return GetRowCount() == 0; } @@ -502,10 +637,9 @@ public: // the displaying number of the tree are changing along with the // expanding/collapsing of the tree nodes unsigned int GetLastVisibleRow(); - unsigned int GetRowCount(); + unsigned int GetRowCount() const; - wxDataViewItem GetSelection() const; - wxDataViewSelection GetSelections(){ return m_selection; } + const wxDataViewSelection& GetSelections() const { return m_selection; } void SetSelections( const wxDataViewSelection & sel ) { m_selection = sel; UpdateDisplay(); } void Select( const wxArrayInt& aSelections ); @@ -532,10 +666,17 @@ public: int GetLineHeight( unsigned int row ) const; // m_lineHeight in fixed mode int GetLineAt( unsigned int y ) const; // y / m_lineHeight in fixed mode + void SetRowHeight( int lineHeight ) { m_lineHeight = lineHeight; } + int GetRowHeight() const { return m_lineHeight; } + // Some useful functions for row and item mapping wxDataViewItem GetItemByRow( unsigned int row ) const; int GetRowByItem( const wxDataViewItem & item ) const; + wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const; + // We did not need this temporarily + // wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item ); + // Methods for building the mapping tree void BuildTree( wxDataViewModel * model ); void DestroyTree(); @@ -558,17 +699,26 @@ public: void OnLeave(); #endif // wxUSE_DRAG_AND_DROP + void OnColumnsCountChanged(); + + // Called by wxDataViewCtrl and our own OnRenameTimer() to start edit the + // specified item in the given column. + void StartEditing(const wxDataViewItem& item, const wxDataViewColumn* col); + private: - wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const; - // We did not need this temporarily - // wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item ); + int RecalculateCount() const; - int RecalculateCount(); - - wxDataViewEvent SendExpanderEvent( wxEventType type, const wxDataViewItem & item ); + // Return false only if the event was vetoed by its handler. + bool SendExpanderEvent(wxEventType type, const wxDataViewItem& item); wxDataViewTreeNode * FindNode( const wxDataViewItem & item ); + wxDataViewColumn *FindColumnForEditing(const wxDataViewItem& item, wxDataViewCellMode mode); + + bool IsCellEditableInMode(const wxDataViewItem& item, const wxDataViewColumn *col, wxDataViewCellMode mode) const; + + void DrawCellBackground( wxDataViewRenderer* cell, wxDC& dc, const wxRect& rect ); + private: wxDataViewCtrl *m_owner; int m_lineHeight; @@ -582,6 +732,8 @@ private: bool m_lastOnSame; bool m_hasFocus; + bool m_useCellFocus; + bool m_currentColSetByKeyboard; #if wxUSE_DRAG_AND_DROP int m_dragCount; @@ -614,6 +766,12 @@ private: // This is the tree node under the cursor wxDataViewTreeNode * m_underMouse; + // The control used for editing or NULL. + wxWeakRef m_editorCtrl; + + // Id m_editorCtrl is non-NULL, pointer to the associated renderer. + wxDataViewRenderer* m_editorRenderer; + private: DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow) DECLARE_EVENT_TABLE() @@ -732,12 +890,13 @@ bool wxDataViewTextRenderer::HasEditorCtrl() const return true; } -wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent, +wxWindow* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) { wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, value, wxPoint(labelRect.x,labelRect.y), - wxSize(labelRect.width,labelRect.height) ); + wxSize(labelRect.width,labelRect.height), + wxTE_PROCESS_ENTER ); // select the text in the control an place the cursor at the end ctrl->SetInsertionPointEnd(); @@ -746,7 +905,7 @@ wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent, return ctrl; } -bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant &value ) +bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxWindow *editor, wxVariant &value ) { wxTextCtrl *text = (wxTextCtrl*) editor; value = text->GetValue(); @@ -796,9 +955,9 @@ bool wxDataViewBitmapRenderer::GetValue( wxVariant& WXUNUSED(value) ) const bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) dc->DrawBitmap( m_bitmap, cell.x, cell.y ); - else if (m_icon.Ok()) + else if (m_icon.IsOk()) dc->DrawIcon( m_icon, cell.x, cell.y ); return true; @@ -806,9 +965,9 @@ bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state wxSize wxDataViewBitmapRenderer::GetSize() const { - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) return wxSize( m_bitmap.GetWidth(), m_bitmap.GetHeight() ); - else if (m_icon.Ok()) + else if (m_icon.IsOk()) return wxSize( m_icon.GetWidth(), m_icon.GetHeight() ); return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE); @@ -863,19 +1022,21 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state return true; } -bool wxDataViewToggleRenderer::WXOnLeftClick(const wxPoint& WXUNUSED(cursor), - const wxRect& WXUNUSED(cell), - wxDataViewModel *model, - const wxDataViewItem& item, - unsigned int col) +bool wxDataViewToggleRenderer::WXActivateCell(const wxRect& WXUNUSED(cell), + wxDataViewModel *model, + const wxDataViewItem& item, + unsigned int col, + const wxMouseEvent *mouseEvent) { - if (model->IsEnabled(item, col)) + if ( mouseEvent ) { - model->ChangeValue(!m_toggle, item, col); - return true; + // only react to clicks directly on the checkbox, not elsewhere in the same cell: + if ( !wxRect(GetSize()).Contains(mouseEvent->GetPosition()) ) + return false; } - return false; + model->ChangeValue(!m_toggle, item, col); + return true; } wxSize wxDataViewToggleRenderer::GetSize() const @@ -941,113 +1102,6 @@ wxSize wxDataViewProgressRenderer::GetSize() const return wxSize(40,12); } -// --------------------------------------------------------- -// wxDataViewDateRenderer -// --------------------------------------------------------- - -#define wxUSE_DATE_RENDERER_POPUP (wxUSE_CALENDARCTRL && wxUSE_POPUPWIN) - -#if wxUSE_DATE_RENDERER_POPUP - -class wxDataViewDateRendererPopupTransient: public wxPopupTransientWindow -{ -public: - wxDataViewDateRendererPopupTransient( wxWindow* parent, wxDateTime *value, - wxDataViewModel *model, const wxDataViewItem & item, unsigned int col) : - wxPopupTransientWindow( parent, wxBORDER_SIMPLE ), - m_item( item ) - { - m_model = model; - m_col = col; - m_cal = new wxCalendarCtrl( this, wxID_ANY, *value ); - wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL ); - sizer->Add( m_cal, 1, wxGROW ); - SetSizer( sizer ); - sizer->Fit( this ); - } - - void OnCalendar( wxCalendarEvent &event ); - - wxCalendarCtrl *m_cal; - wxDataViewModel *m_model; - unsigned int m_col; - const wxDataViewItem & m_item; - -protected: - virtual void OnDismiss() - { - } - -private: - DECLARE_EVENT_TABLE() -}; - -BEGIN_EVENT_TABLE(wxDataViewDateRendererPopupTransient,wxPopupTransientWindow) - EVT_CALENDAR( wxID_ANY, wxDataViewDateRendererPopupTransient::OnCalendar ) -END_EVENT_TABLE() - -void wxDataViewDateRendererPopupTransient::OnCalendar( wxCalendarEvent &event ) -{ - m_model->ChangeValue( event.GetDate(), m_item, m_col ); - DismissAndNotify(); -} - -#endif // wxUSE_DATE_RENDERER_POPUP - -IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer, wxDataViewRenderer) - -wxDataViewDateRenderer::wxDataViewDateRenderer( const wxString &varianttype, - wxDataViewCellMode mode, int align ) : - wxDataViewRenderer( varianttype, mode, align ) -{ -} - -bool wxDataViewDateRenderer::SetValue( const wxVariant &value ) -{ - m_date = value.GetDateTime(); - - return true; -} - -bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const -{ - value = m_date; - return true; -} - -bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state ) -{ - wxString tmp = m_date.FormatDate(); - RenderText( tmp, 0, cell, dc, state ); - return true; -} - -wxSize wxDataViewDateRenderer::GetSize() const -{ - return GetTextExtent(m_date.FormatDate()); -} - -bool wxDataViewDateRenderer::WXOnActivate(const wxRect& WXUNUSED(cell), - wxDataViewModel *model, - const wxDataViewItem& item, - unsigned int col) -{ - wxDateTime dtOld = m_date; - -#if wxUSE_DATE_RENDERER_POPUP - wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient( - GetOwner()->GetOwner()->GetParent(), &dtOld, model, item, col); - wxPoint pos = wxGetMousePosition(); - popup->Move( pos ); - popup->Layout(); - popup->Popup( popup->m_cal ); -#else // !wxUSE_DATE_RENDERER_POPUP - wxMessageBox(dtOld.Format()); -#endif // wxUSE_DATE_RENDERER_POPUP/!wxUSE_DATE_RENDERER_POPUP - - return true; -} - // --------------------------------------------------------- // wxDataViewIconTextRenderer // --------------------------------------------------------- @@ -1102,7 +1156,7 @@ wxSize wxDataViewIconTextRenderer::GetSize() const return wxSize(80,20); } -wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant& value) +wxWindow* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant& value) { wxDataViewIconText iconText; iconText << value; @@ -1119,7 +1173,8 @@ wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, text, wxPoint(labelRect.x,labelRect.y), - wxSize(labelRect.width,labelRect.height) ); + wxSize(labelRect.width,labelRect.height), + wxTE_PROCESS_ENTER ); // select the text in the control an place the cursor at the end ctrl->SetInsertionPointEnd(); @@ -1128,7 +1183,7 @@ wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect return ctrl; } -bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant& value ) +bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxWindow *editor, wxVariant& value ) { wxTextCtrl *text = (wxTextCtrl*) editor; @@ -1299,6 +1354,7 @@ BEGIN_EVENT_TABLE(wxDataViewMainWindow,wxWindow) EVT_MOUSE_EVENTS (wxDataViewMainWindow::OnMouse) EVT_SET_FOCUS (wxDataViewMainWindow::OnSetFocus) EVT_KILL_FOCUS (wxDataViewMainWindow::OnKillFocus) + EVT_CHAR_HOOK (wxDataViewMainWindow::OnCharHook) EVT_CHAR (wxDataViewMainWindow::OnChar) END_EVENT_TABLE() @@ -1310,14 +1366,25 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i { SetOwner( parent ); + m_editorRenderer = NULL; + m_lastOnSame = false; m_renameTimer = new wxDataViewRenameTimer( this ); // TODO: user better initial values/nothing selected m_currentCol = NULL; + m_currentColSetByKeyboard = false; + m_useCellFocus = false; m_currentRow = 0; - m_lineHeight = wxMax( 17, GetCharHeight() + 2 ); // 17 = mini icon height + 1 +#ifdef __WXMSW__ + // We would like to use the same line height that Explorer uses. This is + // different from standard ListView control since Vista. + if ( wxGetWinVersion() >= wxWinVersion_Vista ) + m_lineHeight = wxMax(16, GetCharHeight()) + 6; // 16 = mini icon height + else +#endif // __WXMSW__ + m_lineHeight = wxMax(16, GetCharHeight()) + 1; // 16 = mini icon height #if wxUSE_DRAG_AND_DROP m_dragCount = 0; @@ -1345,8 +1412,7 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i // TODO: maybe there is something system colour to use m_penExpander = wxPen(wxColour(0,0,0)); - m_root = new wxDataViewTreeNode( NULL ); - m_root->SetHasChildren(true); + m_root = wxDataViewTreeNode::CreateRootNode(); // Make m_count = -1 will cause the class recaculate the real displaying number of rows. m_count = -1; @@ -1407,7 +1473,7 @@ wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, wxDataViewItem item = GetItemByRow( row ); - wxDataViewModel *model = GetOwner()->GetModel(); + wxDataViewModel *model = GetModel(); wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() ); event.SetEventObject( m_owner ); @@ -1450,7 +1516,7 @@ bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y ) wxDataViewItem item = GetItemByRow( row ); - wxDataViewModel *model = GetOwner()->GetModel(); + wxDataViewModel *model = GetModel(); wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() ); event.SetEventObject( m_owner ); @@ -1479,7 +1545,7 @@ wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoo wxDataViewItem item = GetItemByRow( row ); - wxDataViewModel *model = GetOwner()->GetModel(); + wxDataViewModel *model = GetModel(); wxCustomDataObject *obj = (wxCustomDataObject *) GetDropTarget()->GetDataObject(); @@ -1525,9 +1591,6 @@ wxBitmap wxDataViewMainWindow::CreateItemBitmap( unsigned int row, int &indent ) indent = GetOwner()->GetIndent() * node->GetIndentLevel(); indent = indent + m_lineHeight; // try to use the m_lineHeight as the expander space - - if(!node->HasChildren()) - delete node; } width -= indent; @@ -1540,14 +1603,8 @@ wxBitmap wxDataViewMainWindow::CreateItemBitmap( unsigned int row, int &indent ) wxDataViewModel *model = m_owner->GetModel(); - wxDataViewColumn *expander = GetOwner()->GetExpanderColumn(); - if (!expander) - { - // TODO-RTL: last column for RTL support - expander = GetOwner()->GetColumnAt( 0 ); - GetOwner()->SetExpanderColumn(expander); - } - + wxDataViewColumn * const + expander = GetExpanderColumnOrFirstOne(GetOwner()); int x = 0; for (col = 0; col < cols; col++) @@ -1582,9 +1639,46 @@ wxBitmap wxDataViewMainWindow::CreateItemBitmap( unsigned int row, int &indent ) #endif // wxUSE_DRAG_AND_DROP +// Draw focus rect for individual cell. Unlike native focus rect, we render +// this in foreground text color (typically white) to enhance contrast and +// make it visible. +static void DrawSelectedCellFocusRect(wxDC& dc, const wxRect& rect) +{ + // (This code is based on wxRendererGeneric::DrawFocusRect and modified.) + + // draw the pixels manually because the "dots" in wxPen with wxDOT style + // may be short traits and not really dots + // + // note that to behave in the same manner as DrawRect(), we must exclude + // the bottom and right borders from the rectangle + wxCoord x1 = rect.GetLeft(), + y1 = rect.GetTop(), + x2 = rect.GetRight(), + y2 = rect.GetBottom(); + + wxDCPenChanger pen(dc, wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT)); + + wxCoord z; + for ( z = x1 + 1; z < x2; z += 2 ) + dc.DrawPoint(z, rect.GetTop()); + + wxCoord shift = z == x2 ? 0 : 1; + for ( z = y1 + shift; z < y2; z += 2 ) + dc.DrawPoint(x2, z); + + shift = z == y2 ? 0 : 1; + for ( z = x2 - shift; z > x1; z -= 2 ) + dc.DrawPoint(z, y2); + + shift = z == x1 ? 0 : 1; + for ( z = y2 - shift; z > y1; z -= 2 ) + dc.DrawPoint(x1, z); +} + + void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { - wxDataViewModel *model = GetOwner()->GetModel(); + wxDataViewModel *model = GetModel(); wxAutoBufferedPaintDC dc( this ); #ifdef __WXMSW__ @@ -1593,6 +1687,12 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.DrawRectangle(GetClientSize()); #endif + if ( IsEmpty() ) + { + // No items to draw. + return; + } + // prepare the DC GetOwner()->PrepareDC( dc ); dc.SetFont( GetFont() ); @@ -1652,6 +1752,37 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) x_last += col->GetWidth(); } + // Draw background of alternate rows specially if required + if ( m_owner->HasFlag(wxDV_ROW_LINES) ) + { + wxColour altRowColour = m_owner->m_alternateRowColour; + if ( !altRowColour.IsOk() ) + { + // Determine the alternate rows colour automatically from the + // background colour. + const wxColour bgColour = m_owner->GetBackgroundColour(); + + // Depending on the background, alternate row color + // will be 3% more dark or 50% brighter. + int alpha = bgColour.GetRGB() > 0x808080 ? 97 : 150; + altRowColour = bgColour.ChangeLightness(alpha); + } + + dc.SetPen(*wxTRANSPARENT_PEN); + dc.SetBrush(wxBrush(altRowColour)); + + for (unsigned int item = item_start; item < item_last; item++) + { + if ( item % 2 ) + { + dc.DrawRectangle(x_start, + GetLineStart(item), + GetClientSize().GetWidth(), + GetLineHeight(item)); + } + } + } + // Draw horizontal rules if required if ( m_owner->HasFlag(wxDV_HORIZ_RULES) ) { @@ -1694,23 +1825,97 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) for (unsigned int item = item_start; item < item_last; item++) { bool selected = m_selection.Index( item ) != wxNOT_FOUND; + if (selected || item == m_currentRow) { - int flags = selected ? (int)wxCONTROL_SELECTED : 0; - if (item == m_currentRow) - flags |= wxCONTROL_CURRENT; - if (m_hasFocus) - flags |= wxCONTROL_FOCUSED; - wxRect rect( x_start, GetLineStart( item ), x_last - x_start, GetLineHeight( item ) ); - wxRendererNative::Get().DrawItemSelectionRect - ( - this, - dc, - rect, - flags - ); + + // draw selection and whole-item focus: + if ( selected ) + { + int flags = wxCONTROL_SELECTED; + if (m_hasFocus) + flags |= wxCONTROL_FOCUSED; + + wxRendererNative::Get().DrawItemSelectionRect + ( + this, + dc, + rect, + flags + ); + } + + // draw keyboard focus rect if applicable + if ( item == m_currentRow && m_hasFocus ) + { + bool renderColumnFocus = false; + + if ( m_useCellFocus && m_currentCol && m_currentColSetByKeyboard ) + { + renderColumnFocus = true; + + // If this is container node without columns, render full-row focus: + if ( !IsList() ) + { + wxDataViewTreeNode *node = GetTreeNodeByRow(item); + if ( node->HasChildren() && !model->HasContainerColumns(node->GetItem()) ) + renderColumnFocus = false; + } + } + + if ( renderColumnFocus ) + { + for ( unsigned int i = col_start; i < col_last; i++ ) + { + wxDataViewColumn *col = GetOwner()->GetColumnAt(i); + if ( col->IsHidden() ) + continue; + + rect.width = col->GetWidth(); + + if ( col == m_currentCol ) + { + // make the rect more visible by adding a small + // margin around it: + rect.Deflate(1, 1); + + if ( selected ) + { + // DrawFocusRect() uses XOR and is all but + // invisible against dark-blue background. Use + // the same color used for selected text. + DrawSelectedCellFocusRect(dc, rect); + } + else + { + wxRendererNative::Get().DrawFocusRect + ( + this, + dc, + rect, + 0 + ); + } + break; + } + + rect.x += rect.width; + } + } + else + { + // render focus rectangle for the whole row + wxRendererNative::Get().DrawFocusRect + ( + this, + dc, + rect, + selected ? (int)wxCONTROL_SELECTED : 0 + ); + } + } } } @@ -1725,13 +1930,8 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) } #endif // wxUSE_DRAG_AND_DROP - wxDataViewColumn *expander = GetOwner()->GetExpanderColumn(); - if (!expander) - { - // TODO-RTL: last column for RTL support - expander = GetOwner()->GetColumnAt( 0 ); - GetOwner()->SetExpanderColumn(expander); - } + wxDataViewColumn * const + expander = GetExpanderColumnOrFirstOne(GetOwner()); // redraw all cells for all rows which must be repainted and all columns wxRect cell_rect; @@ -1759,8 +1959,11 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) dataitem = node->GetItem(); - if ((i > 0) && model->IsContainer(dataitem) && - !model->HasContainerColumns(dataitem)) + // Skip all columns of "container" rows except the expander + // column itself unless HasContainerColumns() overrides this. + if ( col != expander && + model->IsContainer(dataitem) && + !model->HasContainerColumns(dataitem) ) continue; } else @@ -1774,6 +1977,11 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) cell_rect.y = GetLineStart( item ); cell_rect.height = GetLineHeight( item ); + // draw the background + bool selected = m_selection.Index( item ) != wxNOT_FOUND; + if ( !selected ) + DrawCellBackground( cell, dc, cell_rect ); + // deal with the expander int indent = 0; if ((!IsList()) && (col == expander)) @@ -1815,12 +2023,6 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) // force the expander column to left-center align cell->SetAlignment( wxALIGN_CENTER_VERTICAL ); } - if (node && !node->HasChildren()) - { - // Yes, if the node does not have any child, it must be a leaf which - // mean that it is a temporarily created by GetTreeNodeByRow - wxDELETE(node); - } wxRect item_rect = cell_rect; item_rect.Deflate(PADDING_RIGHTLEFT, 0); @@ -1833,7 +2035,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) continue; int state = 0; - if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND)) + if (m_hasFocus && selected) state |= wxDATAVIEW_CELL_SELECTED; // TODO: it would be much more efficient to create a clipping @@ -1852,6 +2054,28 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) } } + +void wxDataViewMainWindow::DrawCellBackground( wxDataViewRenderer* cell, wxDC& dc, const wxRect& rect ) +{ + wxRect rectBg( rect ); + + // don't overlap the horizontal rules + if ( m_owner->HasFlag(wxDV_HORIZ_RULES) ) + { + rectBg.x++; + rectBg.width--; + } + + // don't overlap the vertical rules + if ( m_owner->HasFlag(wxDV_VERT_RULES) ) + { + rectBg.y++; + rectBg.height--; + } + + cell->RenderBackground(&dc, rectBg); +} + void wxDataViewMainWindow::OnRenameTimer() { // We have to call this here because changes may just have @@ -1865,9 +2089,25 @@ void wxDataViewMainWindow::OnRenameTimer() wxDataViewItem item = GetItemByRow( m_currentRow ); - wxRect labelRect = GetItemRect(item, m_currentCol); + StartEditing( item, m_currentCol ); +} - m_currentCol->GetRenderer()->StartEditing( item, labelRect ); +void +wxDataViewMainWindow::StartEditing(const wxDataViewItem& item, + const wxDataViewColumn* col) +{ + wxDataViewRenderer* renderer = col->GetRenderer(); + if ( !IsCellEditableInMode(item, col, wxDATAVIEW_CELL_EDITABLE) ) + return; + + const wxRect itemRect = GetItemRect(item, col); + if ( renderer->StartEditing(item, itemRect) ) + { + // Save the renderer to be able to finish/cancel editing it later and + // save the control to be able to detect if we're still editing it. + m_editorRenderer = renderer; + m_editorCtrl = renderer->GetEditorCtrl(); + } } //----------------------------------------------------------------------------- @@ -1880,183 +2120,256 @@ public: virtual ~DoJob() { } // The return value control how the tree-walker tranverse the tree - // 0: Job done, stop tranverse and return - // 1: Ignore the current node's subtree and continue - // 2: Job not done, continue - enum { OK = 0 , IGR = 1, CONT = 2 }; + enum + { + DONE, // Job done, stop traversing and return + SKIP_SUBTREE, // Ignore the current node's subtree and continue + CONTINUE // Job not done, continue + }; + virtual int operator() ( wxDataViewTreeNode * node ) = 0; - virtual int operator() ( void * n ) = 0; }; bool Walker( wxDataViewTreeNode * node, DoJob & func ) { - if( node==NULL ) - return false; + wxCHECK_MSG( node, false, "can't walk NULL node" ); switch( func( node ) ) { - case DoJob::OK : + case DoJob::DONE: return true; - case DoJob::IGR: + case DoJob::SKIP_SUBTREE: return false; - case DoJob::CONT: - default: - ; + case DoJob::CONTINUE: + break; } - const wxDataViewTreeNodes& nodes = node->GetNodes(); - const wxDataViewTreeLeaves& leaves = node->GetChildren(); - - int len_nodes = nodes.GetCount(); - int len = leaves.GetCount(); - int i = 0, nodes_i = 0; - - for(; i < len; i ++ ) + if ( node->HasChildren() ) { - void * n = leaves[i]; - if( nodes_i < len_nodes && n == nodes[nodes_i]->GetItem().GetID() ) + const wxDataViewTreeNodes& nodes = node->GetChildNodes(); + + for ( wxDataViewTreeNodes::const_iterator i = nodes.begin(); + i != nodes.end(); + ++i ) { - wxDataViewTreeNode * nd = nodes[nodes_i]; - nodes_i++; - - if( Walker( nd , func ) ) + if ( Walker(*i, func) ) return true; - } - else - switch( func( n ) ) - { - case DoJob::OK : - return true; - case DoJob::IGR: - continue; - case DoJob::CONT: - default: - ; - } } + return false; } bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item) { - GetOwner()->InvalidateColBestWidths(); - if (IsVirtualList()) { wxDataViewVirtualListModel *list_model = - (wxDataViewVirtualListModel*) GetOwner()->GetModel(); + (wxDataViewVirtualListModel*) GetModel(); m_count = list_model->GetCount(); - UpdateDisplay(); - return true; - } - - SortPrepare(); - - wxDataViewTreeNode * node; - node = FindNode(parent); - - if( node == NULL ) - return false; - - node->SetHasChildren( true ); - - if( g_model->IsContainer( item ) ) - { - wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node ); - newnode->SetItem(item); - newnode->SetHasChildren( true ); - node->AddNode( newnode); } else - node->AddLeaf( item.GetID() ); + { + SortPrepare(); - node->ChangeSubTreeCount(1); + wxDataViewTreeNode *parentNode = FindNode(parent); - m_count = -1; + if ( !parentNode ) + return false; + + wxDataViewItemArray modelSiblings; + GetModel()->GetChildren(parent, modelSiblings); + const int modelSiblingsSize = modelSiblings.size(); + + int posInModel = modelSiblings.Index(item, /*fromEnd=*/true); + wxCHECK_MSG( posInModel != wxNOT_FOUND, false, "adding non-existent item?" ); + + wxDataViewTreeNode *itemNode = new wxDataViewTreeNode(parentNode, item); + itemNode->SetHasChildren(GetModel()->IsContainer(item)); + + parentNode->SetHasChildren(true); + + const wxDataViewTreeNodes& nodeSiblings = parentNode->GetChildNodes(); + const int nodeSiblingsSize = nodeSiblings.size(); + + int nodePos = 0; + + if ( posInModel == modelSiblingsSize - 1 ) + { + nodePos = nodeSiblingsSize; + } + else if ( modelSiblingsSize == nodeSiblingsSize + 1 ) + { + // This is the simple case when our node tree already matches the + // model and only this one item is missing. + nodePos = posInModel; + } + else + { + // It's possible that a larger discrepancy between the model and + // our realization exists. This can happen e.g. when adding a bunch + // of items to the model and then calling ItemsAdded() just once + // afterwards. In this case, we must find the right position by + // looking at sibling items. + + // append to the end if we won't find a better position: + nodePos = nodeSiblingsSize; + + for ( int nextItemPos = posInModel + 1; + nextItemPos < modelSiblingsSize; + nextItemPos++ ) + { + int nextNodePos = parentNode->FindChildByItem(modelSiblings[nextItemPos]); + if ( nextNodePos != wxNOT_FOUND ) + { + nodePos = nextNodePos; + break; + } + } + } + + parentNode->ChangeSubTreeCount(+1); + parentNode->InsertChild(itemNode, nodePos); + + m_count = -1; + } + + GetOwner()->InvalidateColBestWidths(); UpdateDisplay(); return true; } -static void DestroyTreeHelper( wxDataViewTreeNode * node); - bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, const wxDataViewItem& item) { - GetOwner()->InvalidateColBestWidths(); - if (IsVirtualList()) { wxDataViewVirtualListModel *list_model = - (wxDataViewVirtualListModel*) GetOwner()->GetModel(); + (wxDataViewVirtualListModel*) GetModel(); m_count = list_model->GetCount(); - if( m_currentRow > GetRowCount() ) - m_currentRow = m_count - 1; - - // TODO: why empty the entire selection? - m_selection.Empty(); - - UpdateDisplay(); - - return true; - } - - wxDataViewTreeNode * node = FindNode(parent); - - // Notice that it is possible that the item being deleted is not in the - // tree at all, for example we could be deleting a never shown (because - // collapsed) item in a tree model. So it's not an error if we don't know - // about this item, just return without doing anything then. - if ( !node || node->GetChildren().Index(item.GetID()) == wxNOT_FOUND ) - return false; - - int sub = -1; - node->GetChildren().Remove( item.GetID() ); - // Manipolate selection - if( m_selection.GetCount() > 1 ) - { - m_selection.Empty(); - } - bool isContainer = false; - wxDataViewTreeNodes nds = node->GetNodes(); - for (size_t i = 0; i < nds.GetCount(); i ++) - { - if (nds[i]->GetItem() == item) + if ( !m_selection.empty() ) { - isContainer = true; - break; - } - } - if( isContainer ) - { - wxDataViewTreeNode * n = NULL; - wxDataViewTreeNodes nodes = node->GetNodes(); - int len = nodes.GetCount(); - for( int i = 0; i < len; i ++) - { - if( nodes[i]->GetItem() == item ) + const int row = GetRowByItem(item); + + int rowIndexInSelection = wxNOT_FOUND; + + const size_t selCount = m_selection.size(); + for ( size_t i = 0; i < selCount; i++ ) { - n = nodes[i]; + if ( m_selection[i] == (unsigned)row ) + rowIndexInSelection = i; + else if ( m_selection[i] > (unsigned)row ) + m_selection[i]--; + } + + if ( rowIndexInSelection != wxNOT_FOUND ) + m_selection.RemoveAt(rowIndexInSelection); + } + + } + else // general case + { + wxDataViewTreeNode *parentNode = FindNode(parent); + + // Notice that it is possible that the item being deleted is not in the + // tree at all, for example we could be deleting a never shown (because + // collapsed) item in a tree model. So it's not an error if we don't know + // about this item, just return without doing anything then. + if ( !parentNode ) + return true; + + wxCHECK_MSG( parentNode->HasChildren(), false, "parent node doesn't have children?" ); + const wxDataViewTreeNodes& parentsChildren = parentNode->GetChildNodes(); + + // We can't use FindNode() to find 'item', because it was already + // removed from the model by the time ItemDeleted() is called, so we + // have to do it manually. We keep track of its position as well for + // later use. + int itemPosInNode = 0; + wxDataViewTreeNode *itemNode = NULL; + for ( wxDataViewTreeNodes::const_iterator i = parentsChildren.begin(); + i != parentsChildren.end(); + ++i, ++itemPosInNode ) + { + if( (*i)->GetItem() == item ) + { + itemNode = *i; break; } } - wxCHECK_MSG( n != NULL, false, "item not found" ); + // If the parent wasn't expanded, it's possible that we didn't have a + // node corresponding to 'item' and so there's nothing left to do. + if ( !itemNode ) + { + // If this was the last child to be removed, it's possible the parent + // node became a leaf. Let's ask the model about it. + if ( parentNode->GetChildNodes().empty() ) + parentNode->SetHasChildren(GetModel()->IsContainer(parent)); - node->GetNodes().Remove( n ); - sub -= n->GetSubTreeCount(); - ::DestroyTreeHelper(n); + return true; + } + + // Delete the item from wxDataViewTreeNode representation: + const int itemsDeleted = 1 + itemNode->GetSubTreeCount(); + + parentNode->RemoveChild(itemNode); + delete itemNode; + parentNode->ChangeSubTreeCount(-itemsDeleted); + + // Make the row number invalid and get a new valid one when user call GetRowCount + m_count = -1; + + // If this was the last child to be removed, it's possible the parent + // node became a leaf. Let's ask the model about it. + if ( parentNode->GetChildNodes().empty() ) + parentNode->SetHasChildren(GetModel()->IsContainer(parent)); + + // Update selection by removing 'item' and its entire children tree from the selection. + if ( !m_selection.empty() ) + { + // we can't call GetRowByItem() on 'item', as it's already deleted, so compute it from + // the parent ('parentNode') and position in its list of children + int itemRow; + if ( itemPosInNode == 0 ) + { + // 1st child, row number is that of the parent parentNode + 1 + itemRow = GetRowByItem(parentNode->GetItem()) + 1; + } + else + { + // row number is that of the sibling above 'item' + its subtree if any + 1 + const wxDataViewTreeNode *siblingNode = parentNode->GetChildNodes()[itemPosInNode - 1]; + + itemRow = GetRowByItem(siblingNode->GetItem()) + + siblingNode->GetSubTreeCount() + + 1; + } + + wxDataViewSelection newsel(wxDataViewSelectionCmp); + + const size_t numSelections = m_selection.size(); + for ( size_t i = 0; i < numSelections; ++i ) + { + const int s = m_selection[i]; + if ( s < itemRow ) + newsel.push_back(s); + else if ( s >= itemRow + itemsDeleted ) + newsel.push_back(s - itemsDeleted); + // else: deleted item, remove from selection + } + + m_selection = newsel; + } } - // Make the row number invalid and get a new valid one when user call GetRowCount - m_count = -1; - node->ChangeSubTreeCount(sub); // Change the current row to the last row if the current exceed the max row number if( m_currentRow > GetRowCount() ) - m_currentRow = m_count - 1; + ChangeCurrentRow(m_count - 1); + GetOwner()->InvalidateColBestWidths(); UpdateDisplay(); return true; @@ -2064,18 +2377,18 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item) { - GetOwner()->InvalidateColBestWidths(); - SortPrepare(); g_model->Resort(); + GetOwner()->InvalidateColBestWidths(); + // Send event wxWindow *parent = GetParent(); wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId()); le.SetEventObject(parent); - le.SetModel(GetOwner()->GetModel()); + le.SetModel(GetModel()); le.SetItem(item); - parent->GetEventHandler()->ProcessEvent(le); + parent->ProcessWindowEvent(le); return true; } @@ -2096,8 +2409,6 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i if (view_column == -1) return false; - GetOwner()->InvalidateColBestWidth(view_column); - // NOTE: to be valid, we cannot use e.g. INT_MAX - 1 /*#define MAX_VIRTUAL_WIDTH 100000 @@ -2110,29 +2421,30 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i SortPrepare(); g_model->Resort(); + GetOwner()->InvalidateColBestWidth(view_column); + // Send event wxWindow *parent = GetParent(); wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId()); le.SetEventObject(parent); - le.SetModel(GetOwner()->GetModel()); + le.SetModel(GetModel()); le.SetItem(item); le.SetColumn(view_column); le.SetDataViewColumn(GetOwner()->GetColumn(view_column)); - parent->GetEventHandler()->ProcessEvent(le); + parent->ProcessWindowEvent(le); return true; } bool wxDataViewMainWindow::Cleared() { - GetOwner()->InvalidateColBestWidths(); - DestroyTree(); m_selection.Clear(); SortPrepare(); - BuildTree( GetOwner()->GetModel() ); + BuildTree( GetModel() ); + GetOwner()->InvalidateColBestWidths(); UpdateDisplay(); return true; @@ -2157,7 +2469,7 @@ void wxDataViewMainWindow::OnInternalIdle() void wxDataViewMainWindow::RecalculateDisplay() { - wxDataViewModel *model = GetOwner()->GetModel(); + wxDataViewModel *model = GetModel(); if (!model) { Refresh(); @@ -2190,7 +2502,7 @@ void wxDataViewMainWindow::ScrollTo( int rows, int column ) int x, y; m_owner->GetScrollPixelsPerUnit( &x, &y ); int sy = GetLineStart( rows )/y; - int sx = 0; + int sx = -1; if( column != -1 ) { wxRect rect = GetClientRect(); @@ -2264,12 +2576,14 @@ unsigned int wxDataViewMainWindow::GetLastVisibleRow() return wxMin( GetRowCount()-1, row ); } -unsigned int wxDataViewMainWindow::GetRowCount() +unsigned int wxDataViewMainWindow::GetRowCount() const { if ( m_count == -1 ) { - m_count = RecalculateCount(); - UpdateDisplay(); + wxDataViewMainWindow* const + self = const_cast(this); + self->m_count = RecalculateCount(); + self->UpdateDisplay(); } return m_count; } @@ -2385,10 +2699,10 @@ void wxDataViewMainWindow::SendSelectionChangedEvent( const wxDataViewItem& item wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, parent->GetId()); le.SetEventObject(parent); - le.SetModel(GetOwner()->GetModel()); + le.SetModel(GetModel()); le.SetItem( item ); - parent->GetEventHandler()->ProcessEvent(le); + parent->ProcessWindowEvent(le); } void wxDataViewMainWindow::RefreshRow( unsigned int row ) @@ -2434,58 +2748,6 @@ void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow ) Refresh( true, &rect ); } -void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event) -{ - wxCHECK_RET( newCurrent < GetRowCount(), - wxT("invalid item index in OnArrowChar()") ); - - // if there is no selection, we cannot move it anywhere - if (!HasCurrentRow()) - return; - - unsigned int oldCurrent = m_currentRow; - - // in single selection we just ignore Shift as we can't select several - // items anyhow - if ( event.ShiftDown() && !IsSingleSel() ) - { - RefreshRow( oldCurrent ); - - ChangeCurrentRow( newCurrent ); - - // select all the items between the old and the new one - if ( oldCurrent > newCurrent ) - { - newCurrent = oldCurrent; - oldCurrent = m_currentRow; - } - - SelectRows( oldCurrent, newCurrent, true ); - if (oldCurrent!=newCurrent) - SendSelectionChangedEvent(GetItemByRow(m_selection[0])); - } - else // !shift - { - RefreshRow( oldCurrent ); - - // all previously selected items are unselected unless ctrl is held - if ( !event.ControlDown() ) - SelectAllRows(false); - - ChangeCurrentRow( newCurrent ); - - if ( !event.ControlDown() ) - { - SelectRow( m_currentRow, true ); - SendSelectionChangedEvent(GetItemByRow(m_currentRow)); - } - else - RefreshRow( m_currentRow ); - } - - GetOwner()->EnsureVisible( m_currentRow, -1 ); -} - wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const { wxRect rect; @@ -2499,7 +2761,7 @@ wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const int wxDataViewMainWindow::GetLineStart( unsigned int row ) const { - const wxDataViewModel *model = GetOwner()->GetModel(); + const wxDataViewModel *model = GetModel(); if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) { @@ -2515,13 +2777,6 @@ int wxDataViewMainWindow::GetLineStart( unsigned int row ) const wxDataViewItem item = node->GetItem(); - if (node && !node->HasChildren()) - { - // Yes, if the node does not have any child, it must be a leaf which - // mean that it is a temporarily created by GetTreeNodeByRow - wxDELETE(node); - } - unsigned int cols = GetOwner()->GetColumnCount(); unsigned int col; int height = m_lineHeight; @@ -2556,7 +2811,7 @@ int wxDataViewMainWindow::GetLineStart( unsigned int row ) const int wxDataViewMainWindow::GetLineAt( unsigned int y ) const { - const wxDataViewModel *model = GetOwner()->GetModel(); + const wxDataViewModel *model = GetModel(); // check for the easy case first if ( !GetOwner()->HasFlag(wxDV_VARIABLE_LINE_HEIGHT) ) @@ -2576,13 +2831,6 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const wxDataViewItem item = node->GetItem(); - if (node && !node->HasChildren()) - { - // Yes, if the node does not have any child, it must be a leaf which - // mean that it is a temporarily created by GetTreeNodeByRow - wxDELETE(node); - } - unsigned int cols = GetOwner()->GetColumnCount(); unsigned int col; int height = m_lineHeight; @@ -2614,7 +2862,7 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const { - const wxDataViewModel *model = GetOwner()->GetModel(); + const wxDataViewModel *model = GetModel(); if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) { @@ -2626,13 +2874,6 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const wxDataViewItem item = node->GetItem(); - if (node && !node->HasChildren()) - { - // Yes, if the node does not have any child, it must be a leaf which - // mean that it is a temporarily created by GetTreeNodeByRow - wxDELETE(node); - } - int height = m_lineHeight; unsigned int cols = GetOwner()->GetColumnCount(); @@ -2663,76 +2904,6 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const } } -class RowToItemJob: public DoJob -{ -public: - RowToItemJob( unsigned int row , int current ) - { this->row = row; this->current = current; } - virtual ~RowToItemJob() {} - - virtual int operator() ( wxDataViewTreeNode * node ) - { - current ++; - if( current == static_cast(row)) - { - ret = node->GetItem(); - return DoJob::OK; - } - - if( node->GetSubTreeCount() + current < static_cast(row) ) - { - current += node->GetSubTreeCount(); - return DoJob::IGR; - } - else - { - // If the current has no child node, we can find the desired item of the row - // number directly. - // This if can speed up finding in some case, and will has a very good effect - // when it comes to list view - if( node->GetNodes().GetCount() == 0) - { - int index = static_cast(row) - current - 1; - ret = node->GetChildren().Item( index ); - return DoJob::OK; - } - return DoJob::CONT; - } - } - - virtual int operator() ( void * n ) - { - current ++; - if( current == static_cast(row)) - { - ret = wxDataViewItem( n ); - return DoJob::OK; - } - return DoJob::CONT; - } - - wxDataViewItem GetResult() const - { return ret; } - -private: - unsigned int row; - int current; - wxDataViewItem ret; -}; - -wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const -{ - if (IsVirtualList()) - { - return wxDataViewItem( wxUIntToPtr(row+1) ); - } - else - { - RowToItemJob job( row, -2 ); - Walker( m_root , job ); - return job.GetResult(); - } -} class RowToTreeNodeJob: public DoJob { @@ -2744,7 +2915,6 @@ public: ret = NULL; parent = node; } - virtual ~RowToTreeNodeJob(){ } virtual int operator() ( wxDataViewTreeNode * node ) { @@ -2752,47 +2922,31 @@ public: if( current == static_cast(row)) { ret = node; - return DoJob::OK; + return DoJob::DONE; } if( node->GetSubTreeCount() + current < static_cast(row) ) { current += node->GetSubTreeCount(); - return DoJob::IGR; + return DoJob::SKIP_SUBTREE; } else { parent = node; - // If the current node has no children, we can find the desired item of the - // row number directly. - // This if can speed up finding in some case, and will have a very good - // effect for list views. - if( node->GetNodes().GetCount() == 0) + // If the current node has only leaf children, we can find the + // desired node directly. This can speed up finding the node + // in some cases, and will have a very good effect for list views. + if ( node->HasChildren() && + (int)node->GetChildNodes().size() == node->GetSubTreeCount() ) { - int index = static_cast(row) - current - 1; - void * n = node->GetChildren().Item( index ); - ret = new wxDataViewTreeNode( parent ); - ret->SetItem( wxDataViewItem( n )); - ret->SetHasChildren(false); - return DoJob::OK; + const int index = static_cast(row) - current - 1; + ret = node->GetChildNodes()[index]; + return DoJob::DONE; } - return DoJob::CONT; - } - } - virtual int operator() ( void * n ) - { - current ++; - if( current == static_cast(row)) - { - ret = new wxDataViewTreeNode( parent ); - ret->SetItem( wxDataViewItem( n )); - ret->SetHasChildren(false); - return DoJob::OK; + return DoJob::CONTINUE; } - - return DoJob::CONT; } wxDataViewTreeNode * GetResult() const @@ -2814,18 +2968,36 @@ wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) co return job.GetResult(); } -wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, - const wxDataViewItem & item ) +wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const +{ + wxDataViewItem item; + if (IsVirtualList()) + { + if ( row < GetRowCount() ) + item = wxDataViewItem(wxUIntToPtr(row+1)); + } + else + { + wxDataViewTreeNode *node = GetTreeNodeByRow(row); + if ( node ) + item = node->GetItem(); + } + + return item; +} + +bool +wxDataViewMainWindow::SendExpanderEvent(wxEventType type, + const wxDataViewItem& item) { wxWindow *parent = GetParent(); wxDataViewEvent le(type, parent->GetId()); le.SetEventObject(parent); - le.SetModel(GetOwner()->GetModel()); + le.SetModel(GetModel()); le.SetItem( item ); - parent->GetEventHandler()->ProcessEvent(le); - return le; + return !parent->ProcessWindowEvent(le) || le.IsAllowed(); } bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const @@ -2838,10 +3010,7 @@ bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const return false; if (!node->HasChildren()) - { - delete node; return false; - } return node->IsOpen(); } @@ -2856,10 +3025,7 @@ bool wxDataViewMainWindow::HasChildren( unsigned int row ) const return false; if (!node->HasChildren()) - { - delete node; return false; - } return true; } @@ -2874,27 +3040,23 @@ void wxDataViewMainWindow::Expand( unsigned int row ) return; if (!node->HasChildren()) - { - delete node; return; - } if (!node->IsOpen()) { - wxDataViewEvent e = - SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, node->GetItem()); - - // Check if the user prevent expanding - if( e.GetSkipped() ) + if ( !SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, node->GetItem()) ) + { + // Vetoed by the event handler. return; + } node->ToggleOpen(); // build the children of current node - if( node->GetChildrenNumber() == 0 ) + if( node->GetChildNodes().empty() ) { SortPrepare(); - ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node); + ::BuildTreeHelper(GetModel(), node->GetItem(), node); } // By expanding the node all row indices that are currently in the selection list @@ -2930,17 +3092,15 @@ void wxDataViewMainWindow::Collapse(unsigned int row) return; if (!node->HasChildren()) - { - delete node; return; - } if (node->IsOpen()) { - wxDataViewEvent e = - SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem()); - if( e.GetSkipped() ) + if ( !SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem()) ) + { + // Vetoed by the event handler. return; + } // Find out if there are selected items below the current node. bool selectCollapsingRow = false; @@ -2998,7 +3158,7 @@ void wxDataViewMainWindow::Collapse(unsigned int row) wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item ) { - const wxDataViewModel * model = GetOwner()->GetModel(); + const wxDataViewModel * model = GetModel(); if( model == NULL ) return NULL; @@ -3017,17 +3177,20 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item // Find the item along the parent-chain. // This algorithm is designed to speed up the node-finding method wxDataViewTreeNode* node = m_root; - for( unsigned iter = parentChain.size()-1; iter>=0; --iter ) + for( unsigned iter = parentChain.size()-1; ; --iter ) { if( node->HasChildren() ) { - if( node->GetChildrenNumber() == 0 ) + if( node->GetChildNodes().empty() ) { + // Even though the item is a container, it doesn't have any + // child nodes in the control's representation yet. We have + // to realize its subtree now. SortPrepare(); ::BuildTreeHelper(model, node->GetItem(), node); } - const wxDataViewTreeNodes& nodes = node->GetNodes(); + const wxDataViewTreeNodes& nodes = node->GetChildNodes(); bool found = false; for (unsigned i = 0; i < nodes.GetCount(); ++i) @@ -3048,6 +3211,9 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item } else return NULL; + + if ( !iter ) + break; } return NULL; } @@ -3119,14 +3285,12 @@ wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, // to get the correct x position where the actual text is int indent = 0; int row = GetRowByItem(item); - if (!IsList() && (column == 0 || GetOwner()->GetExpanderColumn() == column) ) + if (!IsList() && + (column == 0 || GetExpanderColumnOrFirstOne(GetOwner()) == column) ) { wxDataViewTreeNode* node = GetTreeNodeByRow(row); indent = GetOwner()->GetIndent() * node->GetIndentLevel(); indent = indent + m_lineHeight; // use m_lineHeight as the width of the expander - - if(!node->HasChildren()) - delete node; } wxRect itemRect( xpos + indent, @@ -3140,12 +3304,12 @@ wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, return itemRect; } -int wxDataViewMainWindow::RecalculateCount() +int wxDataViewMainWindow::RecalculateCount() const { if (IsVirtualList()) { wxDataViewVirtualListModel *list_model = - (wxDataViewVirtualListModel*) GetOwner()->GetModel(); + (wxDataViewVirtualListModel*) GetModel(); return list_model->GetCount(); } @@ -3171,30 +3335,22 @@ public: ret ++; if( node->GetItem() == item ) { - return DoJob::OK; + return DoJob::DONE; } if( node->GetItem() == *m_iter ) { m_iter++; - return DoJob::CONT; + return DoJob::CONTINUE; } else { ret += node->GetSubTreeCount(); - return DoJob::IGR; + return DoJob::SKIP_SUBTREE; } } - virtual int operator() ( void * n ) - { - ret ++; - if( n == item.GetID() ) - return DoJob::OK; - return DoJob::CONT; - } - // the row number is begin from zero int GetResult() const { return ret -1; } @@ -3208,7 +3364,7 @@ private: int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) const { - const wxDataViewModel * model = GetOwner()->GetModel(); + const wxDataViewModel * model = GetModel(); if( model == NULL ) return -1; @@ -3250,41 +3406,31 @@ static void BuildTreeHelper( const wxDataViewModel * model, const wxDataViewIte wxDataViewItemArray children; unsigned int num = model->GetChildren( item, children); - unsigned int index = 0; - while( index < num ) + for ( unsigned int index = 0; index < num; index++ ) { - if( model->IsContainer( children[index] ) ) - { - wxDataViewTreeNode * n = new wxDataViewTreeNode( node ); - n->SetItem(children[index]); - n->SetHasChildren( true ); - node->AddNode( n ); - } - else - { - node->AddLeaf( children[index].GetID() ); - } - index ++; - } - node->SetSubTreeCount( num ); - wxDataViewTreeNode * n = node->GetParent(); - if( n != NULL) - n->ChangeSubTreeCount(num); + wxDataViewTreeNode *n = new wxDataViewTreeNode(node, children[index]); + if( model->IsContainer(children[index]) ) + n->SetHasChildren( true ); + + node->InsertChild(n, index); + } + + wxASSERT( node->IsOpen() ); + node->ChangeSubTreeCount(+num); } void wxDataViewMainWindow::BuildTree(wxDataViewModel * model) { DestroyTree(); - if (GetOwner()->GetModel()->IsVirtualListModel()) + if (GetModel()->IsVirtualListModel()) { m_count = -1; return; } - m_root = new wxDataViewTreeNode( NULL ); - m_root->SetHasChildren(true); + m_root = wxDataViewTreeNode::CreateRootNode(); // First we define a invalid item to fetch the top-level elements wxDataViewItem item; @@ -3293,28 +3439,112 @@ void wxDataViewMainWindow::BuildTree(wxDataViewModel * model) m_count = -1; } -static void DestroyTreeHelper( wxDataViewTreeNode * node ) -{ - if( node->GetNodeNumber() != 0 ) - { - int len = node->GetNodeNumber(); - wxDataViewTreeNodes& nodes = node->GetNodes(); - for (int i = 0; i < len; i++) - DestroyTreeHelper(nodes[i]); - } - delete node; -} - void wxDataViewMainWindow::DestroyTree() { if (!IsVirtualList()) { - ::DestroyTreeHelper(m_root); - m_count = 0; - m_root = NULL; + wxDELETE(m_root); + m_count = 0; } } +wxDataViewColumn* +wxDataViewMainWindow::FindColumnForEditing(const wxDataViewItem& item, wxDataViewCellMode mode) +{ + // Edit the current column editable in 'mode'. If no column is focused + // (typically because the user has full row selected), try to find the + // first editable column (this would typically be a checkbox for + // wxDATAVIEW_CELL_ACTIVATABLE and we don't want to force the user to set + // focus on the checkbox column; or on the only editable text column). + + wxDataViewColumn *candidate = m_currentCol; + + if ( candidate && + !IsCellEditableInMode(item, candidate, mode) && + !m_currentColSetByKeyboard ) + { + // If current column was set by mouse to something not editable (in + // 'mode') and the user pressed Space/F2 to edit it, treat the + // situation as if there was whole-row focus, because that's what is + // visually indicated and the mouse click could very well be targeted + // on the row rather than on an individual cell. + // + // But if it was done by keyboard, respect that even if the column + // isn't editable, because focus is visually on that column and editing + // something else would be surprising. + candidate = NULL; + } + + if ( !candidate ) + { + const unsigned cols = GetOwner()->GetColumnCount(); + for ( unsigned i = 0; i < cols; i++ ) + { + wxDataViewColumn *c = GetOwner()->GetColumnAt(i); + if ( c->IsHidden() ) + continue; + + if ( IsCellEditableInMode(item, c, mode) ) + { + candidate = c; + break; + } + } + } + + // If on container item without columns, only the expander column + // may be directly editable: + if ( candidate && + GetOwner()->GetExpanderColumn() != candidate && + GetModel()->IsContainer(item) && + !GetModel()->HasContainerColumns(item) ) + { + candidate = GetOwner()->GetExpanderColumn(); + } + + if ( !candidate ) + return NULL; + + if ( !IsCellEditableInMode(item, candidate, mode) ) + return NULL; + + return candidate; +} + +bool wxDataViewMainWindow::IsCellEditableInMode(const wxDataViewItem& item, + const wxDataViewColumn *col, + wxDataViewCellMode mode) const +{ + if ( col->GetRenderer()->GetMode() != mode ) + return false; + + if ( !GetModel()->IsEnabled(item, col->GetModelColumn()) ) + return false; + + return true; +} + +void wxDataViewMainWindow::OnCharHook(wxKeyEvent& event) +{ + if ( m_editorCtrl ) + { + // Handle any keys special for the in-place editor and return without + // calling Skip() below. + switch ( event.GetKeyCode() ) + { + case WXK_ESCAPE: + m_editorRenderer->CancelEditing(); + return; + + case WXK_RETURN: + m_editorRenderer->FinishEditing(); + return; + } + } + + event.Skip(); +} + void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) { wxWindow * const parent = GetParent(); @@ -3342,87 +3572,125 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) switch ( event.GetKeyCode() ) { case WXK_RETURN: + if ( event.HasModifiers() ) { + event.Skip(); + break; + } + else + { + // Enter activates the item, i.e. sends wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED to + // it. Only if that event is not handled do we activate column renderer (which + // is normally done by Space) or even inline editing. + + const wxDataViewItem item = GetItemByRow(m_currentRow); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); - le.SetItem( GetItemByRow(m_currentRow) ); + le.SetItem(item); le.SetEventObject(parent); - le.SetModel(GetOwner()->GetModel()); + le.SetModel(GetModel()); - parent->GetEventHandler()->ProcessEvent(le); + if ( parent->ProcessWindowEvent(le) ) + break; + // else: fall through to WXK_SPACE handling + } + + case WXK_SPACE: + if ( event.HasModifiers() ) + { + event.Skip(); + break; + } + else + { + // Space toggles activatable items or -- if not activatable -- + // starts inline editing (this is normally done using F2 on + // Windows, but Space is common everywhere else, so use it too + // for greater cross-platform compatibility). + + const wxDataViewItem item = GetItemByRow(m_currentRow); + + // Activate the current activatable column. If not column is focused (typically + // because the user has full row selected), try to find the first activatable + // column (this would typically be a checkbox and we don't want to force the user + // to set focus on the checkbox column). + wxDataViewColumn *activatableCol = FindColumnForEditing(item, wxDATAVIEW_CELL_ACTIVATABLE); + + if ( activatableCol ) + { + const unsigned colIdx = activatableCol->GetModelColumn(); + const wxRect cell_rect = GetOwner()->GetItemRect(item, activatableCol); + + wxDataViewRenderer *cell = activatableCol->GetRenderer(); + cell->PrepareForItem(GetModel(), item, colIdx); + cell->WXActivateCell(cell_rect, GetModel(), item, colIdx, NULL); + + break; + } + // else: fall through to WXK_F2 handling + } + + case WXK_F2: + if ( event.HasModifiers() ) + { + event.Skip(); + break; + } + else + { + if( !m_selection.empty() ) + { + // Mimic Windows 7 behavior: edit the item that has focus + // if it is selected and the first selected item if focus + // is out of selection. + int sel; + if ( m_selection.Index(m_currentRow) != wxNOT_FOUND ) + sel = m_currentRow; + else + sel = m_selection[0]; + + + const wxDataViewItem item = GetItemByRow(sel); + + // Edit the current column. If no column is focused + // (typically because the user has full row selected), try + // to find the first editable column. + wxDataViewColumn *editableCol = FindColumnForEditing(item, wxDATAVIEW_CELL_EDITABLE); + + if ( editableCol ) + GetOwner()->EditItem(item, editableCol); + } } break; case WXK_UP: if ( m_currentRow > 0 ) - OnArrowChar( m_currentRow - 1, event ); + OnVerticalNavigation( m_currentRow - 1, event ); break; case WXK_DOWN: - if ( m_currentRow < GetRowCount() - 1 ) - OnArrowChar( m_currentRow + 1, event ); + if ( m_currentRow + 1 < GetRowCount() ) + OnVerticalNavigation( m_currentRow + 1, event ); break; // Add the process for tree expanding/collapsing case WXK_LEFT: - { - if (IsList()) - break; - - wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow); - if (!node) - break; - - if (node->HasChildren() && node->IsOpen()) - { - Collapse(m_currentRow); - } - else // if the node is already closed we move the selection to its parent - { - wxDataViewTreeNode *parent_node = node->GetParent(); - - if(!node->HasChildren()) - delete node; - - if (parent_node) - { - int parent = GetRowByItem( parent_node->GetItem() ); - if ( parent >= 0 ) - { - unsigned int row = m_currentRow; - SelectRow( row, false); - SelectRow( parent, true ); - ChangeCurrentRow( parent ); - GetOwner()->EnsureVisible( parent, -1 ); - SendSelectionChangedEvent( parent_node->GetItem() ); - } - } - } + OnLeftKey(); break; - } + case WXK_RIGHT: - { - if (!IsExpanded( m_currentRow )) - Expand( m_currentRow ); - else - { - unsigned int row = m_currentRow; - SelectRow( row, false ); - SelectRow( row + 1, true ); - ChangeCurrentRow( row + 1 ); - GetOwner()->EnsureVisible( row + 1, -1 ); - SendSelectionChangedEvent( GetItemByRow(row+1) ); - } + OnRightKey(); break; - } + case WXK_END: { if (!IsEmpty()) - OnArrowChar( GetRowCount() - 1, event ); + OnVerticalNavigation( GetRowCount() - 1, event ); break; } case WXK_HOME: if (!IsEmpty()) - OnArrowChar( 0, event ); + OnVerticalNavigation( 0, event ); break; case WXK_PAGEUP: @@ -3432,7 +3700,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) if (index < 0) index = 0; - OnArrowChar( index, event ); + OnVerticalNavigation( index, event ); } break; @@ -3444,17 +3712,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) if ( index >= count ) index = count - 1; - OnArrowChar( index, event ); - } - break; - - case WXK_F2: - { - if(m_selection.size() == 1) - { - // TODO: we need to revise that when we have a concept for a 'current column' - GetOwner()->StartEditor(GetItemByRow(m_selection[0]), 0); - } + OnVerticalNavigation( index, event ); } break; @@ -3463,6 +3721,184 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) } } +void wxDataViewMainWindow::OnVerticalNavigation(unsigned int newCurrent, const wxKeyEvent& event) +{ + wxCHECK_RET( newCurrent < GetRowCount(), + wxT("invalid item index in OnVerticalNavigation()") ); + + // if there is no selection, we cannot move it anywhere + if (!HasCurrentRow()) + return; + + unsigned int oldCurrent = m_currentRow; + + // in single selection we just ignore Shift as we can't select several + // items anyhow + if ( event.ShiftDown() && !IsSingleSel() ) + { + RefreshRow( oldCurrent ); + + ChangeCurrentRow( newCurrent ); + + // select all the items between the old and the new one + if ( oldCurrent > newCurrent ) + { + newCurrent = oldCurrent; + oldCurrent = m_currentRow; + } + + SelectRows( oldCurrent, newCurrent, true ); + if (oldCurrent!=newCurrent) + SendSelectionChangedEvent(GetItemByRow(m_selection[0])); + } + else // !shift + { + RefreshRow( oldCurrent ); + + // all previously selected items are unselected unless ctrl is held + if ( !event.ControlDown() ) + SelectAllRows(false); + + ChangeCurrentRow( newCurrent ); + + if ( !event.ControlDown() ) + { + SelectRow( m_currentRow, true ); + SendSelectionChangedEvent(GetItemByRow(m_currentRow)); + } + else + RefreshRow( m_currentRow ); + } + + GetOwner()->EnsureVisible( m_currentRow, -1 ); +} + +void wxDataViewMainWindow::OnLeftKey() +{ + if ( IsList() ) + { + TryAdvanceCurrentColumn(NULL, /*forward=*/false); + } + else + { + wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow); + + if ( TryAdvanceCurrentColumn(node, /*forward=*/false) ) + return; + + // Because TryAdvanceCurrentColumn() return false, we are at the first + // column or using whole-row selection. In this situation, we can use + // the standard TreeView handling of the left key. + if (node->HasChildren() && node->IsOpen()) + { + Collapse(m_currentRow); + } + else + { + // if the node is already closed, we move the selection to its parent + wxDataViewTreeNode *parent_node = node->GetParent(); + + if (parent_node) + { + int parent = GetRowByItem( parent_node->GetItem() ); + if ( parent >= 0 ) + { + unsigned int row = m_currentRow; + SelectRow( row, false); + SelectRow( parent, true ); + ChangeCurrentRow( parent ); + GetOwner()->EnsureVisible( parent, -1 ); + SendSelectionChangedEvent( parent_node->GetItem() ); + } + } + } + } +} + +void wxDataViewMainWindow::OnRightKey() +{ + if ( IsList() ) + { + TryAdvanceCurrentColumn(NULL, /*forward=*/true); + } + else + { + wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow); + + if ( node->HasChildren() ) + { + if ( !node->IsOpen() ) + { + Expand( m_currentRow ); + } + else + { + // if the node is already open, we move the selection to the first child + unsigned int row = m_currentRow; + SelectRow( row, false ); + SelectRow( row + 1, true ); + ChangeCurrentRow( row + 1 ); + GetOwner()->EnsureVisible( row + 1, -1 ); + SendSelectionChangedEvent( GetItemByRow(row+1) ); + } + } + else + { + TryAdvanceCurrentColumn(node, /*forward=*/true); + } + } +} + +bool wxDataViewMainWindow::TryAdvanceCurrentColumn(wxDataViewTreeNode *node, bool forward) +{ + if ( GetOwner()->GetColumnCount() == 0 ) + return false; + + if ( !m_useCellFocus ) + return false; + + if ( node ) + { + // navigation shouldn't work in branch nodes without other columns: + if ( node->HasChildren() && !GetModel()->HasContainerColumns(node->GetItem()) ) + return false; + } + + if ( m_currentCol == NULL || !m_currentColSetByKeyboard ) + { + if ( forward ) + { + m_currentCol = GetOwner()->GetColumnAt(1); + m_currentColSetByKeyboard = true; + RefreshRow(m_currentRow); + return true; + } + else + return false; + } + + int idx = GetOwner()->GetColumnIndex(m_currentCol) + (forward ? +1 : -1); + + if ( idx >= (int)GetOwner()->GetColumnCount() ) + return false; + + GetOwner()->EnsureVisible(m_currentRow, idx); + + if ( idx < 1 ) + { + // We are going to the left of the second column. Reset to whole-row + // focus (which means first column would be edited). + m_currentCol = NULL; + RefreshRow(m_currentRow); + return true; + } + + m_currentCol = GetOwner()->GetColumnAt(idx); + m_currentColSetByKeyboard = true; + RefreshRow(m_currentRow); + return true; +} + void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { if (event.GetEventType() == wxEVT_MOUSEWHEEL) @@ -3497,6 +3933,37 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } xpos += c->GetWidth(); } + + wxDataViewModel* const model = GetModel(); + + const unsigned int current = GetLineAt( y ); + const wxDataViewItem item = GetItemByRow(current); + + // Handle right clicking here, before everything else as context menu + // events should be sent even when we click outside of any item, unlike all + // the other ones. + if (event.RightUp()) + { + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId()); + le.SetEventObject(parent); + le.SetModel(model); + + if ( item.IsOk() && col ) + { + le.SetItem( item ); + le.SetColumn( col->GetModelColumn() ); + le.SetDataViewColumn( col ); + + wxVariant value; + model->GetValue( value, item, col->GetModelColumn() ); + le.SetValue(value); + } + + parent->ProcessWindowEvent(le); + return; + } + if (!col) { event.Skip(); @@ -3504,7 +3971,6 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } wxDataViewRenderer *cell = col->GetRenderer(); - unsigned int current = GetLineAt( y ); if ((current >= GetRowCount()) || (x > GetEndOfLastCol())) { // Unselect all if below the last row ? @@ -3512,21 +3978,29 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) return; } - // Test whether the mouse is hovered on the tree item button + wxDataViewColumn* const + expander = GetExpanderColumnOrFirstOne(GetOwner()); + + // Test whether the mouse is hovering over the expander (a.k.a tree "+" + // button) and also determine the offset of the real cell start, skipping + // the indentation and the expander itself. bool hoverOverExpander = false; - if ((!IsList()) && (GetOwner()->GetExpanderColumn() == col)) + int itemOffset = 0; + if ((!IsList()) && (expander == col)) { wxDataViewTreeNode * node = GetTreeNodeByRow(current); - if( node!=NULL && node->HasChildren() ) - { - int indent = node->GetIndentLevel(); - indent = GetOwner()->GetIndent()*indent; + int indent = node->GetIndentLevel(); + itemOffset = GetOwner()->GetIndent()*indent; + + if ( node->HasChildren() ) + { // we make the rectangle we are looking in a bit bigger than the actual // visual expander so the user can hit that little thing reliably - wxRect rect( xpos + indent, + wxRect rect(itemOffset, GetLineStart( current ) + (GetLineHeight(current) - m_lineHeight)/2, m_lineHeight, m_lineHeight); + if( rect.Contains(x, y) ) { // So the mouse is over the expander @@ -3544,8 +4018,10 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) m_underMouse = node; } } - if (node!=NULL && !node->HasChildren()) - delete node; + + // Account for the expander as well, even if this item doesn't have it, + // its parent does so it still counts for the offset. + itemOffset += m_lineHeight; } if (!hoverOverExpander) { @@ -3557,8 +4033,6 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } } - wxDataViewModel *model = GetOwner()->GetModel(); - #if wxUSE_DRAG_AND_DROP if (event.Dragging()) { @@ -3580,12 +4054,12 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) m_owner->CalcUnscrolledPosition( m_dragStart.x, m_dragStart.y, &m_dragStart.x, &m_dragStart.y ); unsigned int drag_item_row = GetLineAt( m_dragStart.y ); - wxDataViewItem item = GetItemByRow( drag_item_row ); + wxDataViewItem itemDragged = GetItemByRow( drag_item_row ); // Notify cell about drag wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() ); event.SetEventObject( m_owner ); - event.SetItem( item ); + event.SetItem( itemDragged ); event.SetModel( model ); if (!m_owner->HandleWindowEvent( event )) return; @@ -3618,9 +4092,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) m_lastOnSame = false; } - wxDataViewItem item = GetItemByRow(current); bool ignore_other_columns = - ((GetOwner()->GetExpanderColumn() != col) && + ((expander != col) && (model->IsContainer(item)) && (!model->HasContainerColumns(item))); @@ -3633,28 +4106,15 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } else if ( current == m_lineLastClicked ) { - if ((!ignore_other_columns) && (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE)) - { - const unsigned colIdx = col->GetModelColumn(); + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); + le.SetItem( item ); + le.SetColumn( col->GetModelColumn() ); + le.SetDataViewColumn( col ); + le.SetEventObject(parent); + le.SetModel(GetModel()); - cell->PrepareForItem(model, item, colIdx); - - wxRect cell_rect( xpos, GetLineStart( current ), - col->GetWidth(), GetLineHeight( current ) ); - cell->WXOnActivate( cell_rect, model, item, colIdx ); - } - else - { - wxWindow *parent = GetParent(); - wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); - le.SetItem( item ); - le.SetColumn( col->GetModelColumn() ); - le.SetDataViewColumn( col ); - le.SetEventObject(parent); - le.SetModel(GetOwner()->GetModel()); - - parent->GetEventHandler()->ProcessEvent(le); - } + parent->ProcessWindowEvent(le); return; } else @@ -3680,7 +4140,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (m_lastOnSame && !ignore_other_columns) { if ((col == m_currentCol) && (current == m_currentRow) && - (cell->GetMode() & wxDATAVIEW_CELL_EDITABLE) ) + IsCellEditableInMode(item, col, wxDATAVIEW_CELL_EDITABLE) ) { m_renameTimer->Start( 100, true ); } @@ -3708,25 +4168,13 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (!IsRowSelected(current)) { SelectAllRows(false); + const unsigned oldCurrent = m_currentRow; ChangeCurrentRow(current); SelectRow(m_currentRow,true); + RefreshRow(oldCurrent); SendSelectionChangedEvent(GetItemByRow( m_currentRow ) ); } } - else if (event.RightUp()) - { - wxVariant value; - model->GetValue( value, item, col->GetModelColumn() ); - wxWindow *parent = GetParent(); - wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId()); - le.SetItem( item ); - le.SetColumn( col->GetModelColumn() ); - le.SetDataViewColumn( col ); - le.SetEventObject(parent); - le.SetModel(GetOwner()->GetModel()); - le.SetValue(value); - parent->GetEventHandler()->ProcessEvent(le); - } else if (event.MiddleDown()) { } @@ -3805,18 +4253,21 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) // Update selection here... m_currentCol = col; + m_currentColSetByKeyboard = false; m_lastOnSame = !simulateClick && ((col == oldCurrentCol) && (current == oldCurrentRow)) && oldWasSelected; - // Call LeftClick after everything else as under GTK+ - if (cell->GetMode() & wxDATAVIEW_CELL_ACTIVATABLE) + // Call ActivateCell() after everything else as under GTK+ + if ( IsCellEditableInMode(item, col, wxDATAVIEW_CELL_ACTIVATABLE) ) { // notify cell about click cell->PrepareForItem(model, item, col->GetModelColumn()); - wxRect cell_rect( xpos, GetLineStart( current ), - col->GetWidth(), GetLineHeight( current ) ); + wxRect cell_rect( xpos + itemOffset, + GetLineStart( current ), + col->GetWidth() - itemOffset, + GetLineHeight( current ) ); // Report position relative to the cell's custom area, i.e. // no the entire space as given by the control but the one @@ -3848,14 +4299,19 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } } - wxPoint pos( event.GetPosition() ); - pos.x -= rectItem.x; - pos.y -= rectItem.y; + wxMouseEvent event2(event); + event2.m_x -= rectItem.x; + event2.m_y -= rectItem.y; + m_owner->CalcUnscrolledPosition(event2.m_x, event2.m_y, &event2.m_x, &event2.m_y); - m_owner->CalcUnscrolledPosition( pos.x, pos.y, &pos.x, &pos.y ); - - /* ignore ret */ cell->WXOnLeftClick( pos, cell_rect, - model, item, col->GetModelColumn()); + /* ignore ret */ cell->WXActivateCell + ( + cell_rect, + model, + item, + col->GetModelColumn(), + &event2 + ); } } } @@ -3880,12 +4336,23 @@ void wxDataViewMainWindow::OnKillFocus( wxFocusEvent &event ) event.Skip(); } -wxDataViewItem wxDataViewMainWindow::GetSelection() const +void wxDataViewMainWindow::OnColumnsCountChanged() { - if( m_selection.GetCount() != 1 ) - return wxDataViewItem(); + int editableCount = 0; - return GetItemByRow( m_selection.Item(0)); + const unsigned cols = GetOwner()->GetColumnCount(); + for ( unsigned i = 0; i < cols; i++ ) + { + wxDataViewColumn *c = GetOwner()->GetColumnAt(i); + if ( c->IsHidden() ) + continue; + if ( c->GetRenderer()->GetMode() != wxDATAVIEW_CELL_INERT ) + editableCount++; + } + + m_useCellFocus = (editableCount > 1); + + UpdateDisplay(); } //----------------------------------------------------------------------------- @@ -3917,6 +4384,8 @@ void wxDataViewCtrl::Init() m_sortingColumnIdx = wxNOT_FOUND; m_headerArea = NULL; + + m_colsDirty = false; } bool wxDataViewCtrl::Create(wxWindow *parent, @@ -4010,6 +4479,16 @@ void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) ) Layout(); AdjustScrollbars(); + + // We must redraw the headers if their height changed. Normally this + // shouldn't happen as the control shouldn't let itself be resized beneath + // its minimal height but avoid the display artefacts that appear if it + // does happen, e.g. because there is really not enough vertical space. + if ( !HasFlag(wxDV_NO_HEADER) && m_headerArea && + m_headerArea->GetSize().y <= m_headerArea->GetBestSize(). y ) + { + m_headerArea->Refresh(); + } } void wxDataViewCtrl::SetFocus() @@ -4096,7 +4575,7 @@ void wxDataViewCtrl::OnColumnsCountChanged() if (m_headerArea) m_headerArea->SetColumnCount(GetColumnCount()); - m_clientArea->UpdateDisplay(); + m_clientArea->OnColumnsCountChanged(); } void wxDataViewCtrl::DoSetExpanderColumn() @@ -4114,6 +4593,16 @@ unsigned int wxDataViewCtrl::GetColumnCount() const return m_cols.GetCount(); } +bool wxDataViewCtrl::SetRowHeight( int lineHeight ) +{ + if ( !m_clientArea ) + return false; + + m_clientArea->SetRowHeight(lineHeight); + + return true; +} + wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int idx ) const { return m_cols[idx]; @@ -4154,16 +4643,25 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const class MaxWidthCalculator { public: - MaxWidthCalculator(wxDataViewMainWindow *clientArea, + MaxWidthCalculator(const wxDataViewCtrl *dvc, + wxDataViewMainWindow *clientArea, wxDataViewRenderer *renderer, const wxDataViewModel *model, - unsigned column) + unsigned column, + int expanderSize) : m_width(0), + m_dvc(dvc), m_clientArea(clientArea), m_renderer(renderer), m_model(model), - m_column(column) + m_column(column), + m_expanderSize(expanderSize) + { + m_isExpanderCol = + !clientArea->IsList() && + (column == 0 || + GetExpanderColumnOrFirstOne(const_cast(dvc)) == dvc->GetColumnAt(column)); } void UpdateWithWidth(int width) @@ -4173,32 +4671,43 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const void UpdateWithRow(int row) { - wxDataViewItem item = m_clientArea->GetItemByRow(row); + int indent = 0; + wxDataViewItem item; + + if ( m_isExpanderCol ) + { + wxDataViewTreeNode *node = m_clientArea->GetTreeNodeByRow(row); + item = node->GetItem(); + indent = m_dvc->GetIndent() * node->GetIndentLevel() + m_expanderSize; + } + else + { + item = m_clientArea->GetItemByRow(row); + } + m_renderer->PrepareForItem(m_model, item, m_column); - m_width = wxMax(m_width, m_renderer->GetSize().x); + m_width = wxMax(m_width, m_renderer->GetSize().x + indent); } int GetMaxWidth() const { return m_width; } private: int m_width; + const wxDataViewCtrl *m_dvc; wxDataViewMainWindow *m_clientArea; wxDataViewRenderer *m_renderer; const wxDataViewModel *m_model; unsigned m_column; + bool m_isExpanderCol; + int m_expanderSize; }; - MaxWidthCalculator calculator(m_clientArea, renderer, - GetModel(), column->GetModelColumn()); + MaxWidthCalculator calculator(this, m_clientArea, renderer, + GetModel(), column->GetModelColumn(), + m_clientArea->GetRowHeight()); if ( m_headerArea ) - { - int header_width = m_headerArea->GetTextExtent(column->GetTitle()).x; - // Labels on native MSW header are indented on both sides - header_width += - wxRendererNative::Get().GetHeaderButtonMargin(m_headerArea); - calculator.UpdateWithWidth(header_width); - } + calculator.UpdateWithWidth(m_headerArea->GetColumnTitleWidth(*column)); // The code below deserves some explanation. For very large controls, we // simply can't afford to calculate sizes for all items, it takes too @@ -4293,6 +4802,10 @@ bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) m_colsBestWidths.erase(m_colsBestWidths.begin() + GetColumnIndex(column)); m_cols.Erase(ret); + + if ( m_clientArea->GetCurrentColumn() == column ) + m_clientArea->ClearCurrentColumn(); + OnColumnsCountChanged(); return true; @@ -4300,36 +4813,56 @@ bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) bool wxDataViewCtrl::ClearColumns() { + SetExpanderColumn(NULL); m_cols.Clear(); m_colsBestWidths.clear(); + + m_clientArea->ClearCurrentColumn(); + OnColumnsCountChanged(); + return true; } void wxDataViewCtrl::InvalidateColBestWidth(int idx) { m_colsBestWidths[idx] = 0; - - if ( m_headerArea ) - m_headerArea->UpdateColumn(idx); + m_colsDirty = true; } void wxDataViewCtrl::InvalidateColBestWidths() { m_colsBestWidths.clear(); m_colsBestWidths.resize(m_cols.size()); + m_colsDirty = true; +} - if ( m_headerArea ) +void wxDataViewCtrl::UpdateColWidths() +{ + if ( !m_headerArea ) + return; + + const unsigned len = m_colsBestWidths.size(); + for ( unsigned i = 0; i < len; i++ ) { - const unsigned cols = m_headerArea->GetColumnCount(); - for ( unsigned i = 0; i < cols; i++ ) + if ( m_colsBestWidths[i] == 0 ) m_headerArea->UpdateColumn(i); } } +void wxDataViewCtrl::OnInternalIdle() +{ + wxDataViewCtrlBase::OnInternalIdle(); + + if ( m_colsDirty ) + { + m_colsDirty = false; + UpdateColWidths(); + } +} + int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const { -#if 1 unsigned int len = GetColumnCount(); for ( unsigned int i = 0; i < len; i++ ) { @@ -4339,25 +4872,6 @@ int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const } return wxNOT_FOUND; -#else - // This returns the position in pixels which is not what we want. - int ret = 0, - dummy = 0; - unsigned int len = GetColumnCount(); - for ( unsigned int i = 0; i < len; i++ ) - { - wxDataViewColumn * col = GetColumnAt(i); - if (col->IsHidden()) - continue; - ret += col->GetWidth(); - if (column==col) - { - CalcScrolledPosition( ret, dummy, &ret, &dummy ); - break; - } - } - return ret; -#endif } wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const @@ -4384,23 +4898,36 @@ void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item) } } -// Selection code with wxDataViewItem as parameters -wxDataViewItem wxDataViewCtrl::GetSelection() const +wxDataViewColumn *wxDataViewCtrl::GetCurrentColumn() const { - return m_clientArea->GetSelection(); + return m_clientArea->GetCurrentColumn(); +} + +int wxDataViewCtrl::GetSelectedItemsCount() const +{ + return m_clientArea->GetSelections().size(); } int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const { sel.Empty(); - wxDataViewSelection selection = m_clientArea->GetSelections(); - int len = selection.GetCount(); - for( int i = 0; i < len; i ++) + const wxDataViewSelection& selections = m_clientArea->GetSelections(); + + const size_t len = selections.size(); + for ( size_t i = 0; i < len; i++ ) { - unsigned int row = selection[i]; - sel.Add( m_clientArea->GetItemByRow( row ) ); + wxDataViewItem item = m_clientArea->GetItemByRow(selections[i]); + if ( item.IsOk() ) + { + sel.Add(item); + } + else + { + wxFAIL_MSG( "invalid item in selection - bad internal state" ); + } } - return len; + + return sel.size(); } void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel ) @@ -4464,71 +4991,9 @@ bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const return false; } -// Selection code with row number as parameter -int wxDataViewCtrl::GetSelections( wxArrayInt & sel ) const +void wxDataViewCtrl::SetAlternateRowColour(const wxColour& colour) { - sel.Empty(); - wxDataViewSelection selection = m_clientArea->GetSelections(); - int len = selection.GetCount(); - for( int i = 0; i < len; i ++) - { - unsigned int row = selection[i]; - sel.Add( row ); - } - return len; -} - -void wxDataViewCtrl::SetSelections( const wxArrayInt & sel ) -{ - wxDataViewSelection selection(wxDataViewSelectionCmp); - int len = sel.GetCount(); - for( int i = 0; i < len; i ++ ) - { - int row = sel[i]; - if( row >= 0 ) - selection.Add( static_cast(row) ); - } - m_clientArea->SetSelections( selection ); -} - -void wxDataViewCtrl::Select( int row ) -{ - if( row >= 0 ) - { - if (m_clientArea->IsSingleSel()) - m_clientArea->SelectAllRows(false); - m_clientArea->SelectRow( row, true ); - } -} - -void wxDataViewCtrl::Unselect( int row ) -{ - if( row >= 0 ) - m_clientArea->SelectRow(row, false); -} - -bool wxDataViewCtrl::IsSelected( int row ) const -{ - if( row >= 0 ) - return m_clientArea->IsRowSelected(row); - return false; -} - -void wxDataViewCtrl::SelectRange( int from, int to ) -{ - wxArrayInt sel; - for( int i = from; i < to; i ++ ) - sel.Add( i ); - m_clientArea->Select(sel); -} - -void wxDataViewCtrl::UnselectRange( int from, int to ) -{ - wxDataViewSelection sel = m_clientArea->GetSelections(); - for( int i = from; i < to; i ++ ) - if( sel.Index( i ) != wxNOT_FOUND ) - sel.Remove( i ); - m_clientArea->SetSelections(sel); + m_alternateRowColour = colour; } void wxDataViewCtrl::SelectAll() @@ -4621,16 +5086,12 @@ bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const return false; } -void wxDataViewCtrl::StartEditor( const wxDataViewItem & item, unsigned int column ) +void wxDataViewCtrl::EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) { - wxDataViewColumn* col = GetColumn( column ); - if (!col) - return; + wxCHECK_RET( item.IsOk(), "invalid item" ); + wxCHECK_RET( column, "no column provided" ); - wxRect itemRect = GetItemRect(item, col); - wxDataViewRenderer* renderer = col->GetRenderer(); - if (renderer->GetMode() == wxDATAVIEW_CELL_EDITABLE) - renderer->StartEditing(item, itemRect); + m_clientArea->StartEditing(item, column); } #endif // !wxUSE_GENERICDATAVIEWCTRL diff --git a/Externals/wxWidgets3/src/generic/datectlg.cpp b/Externals/wxWidgets3/src/generic/datectlg.cpp index 7e3a760573..a1b3e0a13d 100644 --- a/Externals/wxWidgets3/src/generic/datectlg.cpp +++ b/Externals/wxWidgets3/src/generic/datectlg.cpp @@ -4,7 +4,7 @@ // Author: Andreas Pflug // Modified by: // Created: 2005-01-19 -// RCS-ID: $Id: datectlg.cpp 66771 2011-01-26 15:52:41Z SC $ +// RCS-ID: $Id: datectlg.cpp 68910 2011-08-27 12:13:18Z VZ $ // Copyright: (c) 2005 Andreas Pflug // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -209,11 +209,15 @@ private: // functions honours wxDP_SHOWCENTURY flag. wxString GetLocaleDateFormat() const { +#if wxUSE_INTL wxString fmt = wxLocale::GetInfo(wxLOCALE_SHORT_DATE_FMT); if ( HasDPFlag(wxDP_SHOWCENTURY) ) fmt.Replace("%y", "%Y"); return fmt; +#else // !wxUSE_INTL + return wxT("x"); +#endif // wxUSE_INTL/!wxUSE_INTL } bool SetFormat(const wxString& fmt) @@ -381,10 +385,8 @@ wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const wxWindowList wxDatePickerCtrlGeneric::GetCompositeWindowParts() const { wxWindowList parts; - if (m_combo) - parts.push_back(m_combo); - if (m_popup) - parts.push_back(m_popup); + parts.push_back(m_combo); + parts.push_back(m_popup); return parts; } diff --git a/Externals/wxWidgets3/src/generic/dbgrptg.cpp b/Externals/wxWidgets3/src/generic/dbgrptg.cpp index efbe4d8b6a..6cc1f4bc35 100644 --- a/Externals/wxWidgets3/src/generic/dbgrptg.cpp +++ b/Externals/wxWidgets3/src/generic/dbgrptg.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin, Andrej Putrin // Modified by: // Created: 2005-01-21 -// RCS-ID: $Id: dbgrptg.cpp 64940 2010-07-13 13:29:13Z VZ $ +// RCS-ID: $Id: dbgrptg.cpp 69828 2011-11-27 19:49:43Z VZ $ // Copyright: (c) 2005 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -228,7 +228,7 @@ void wxDumpOpenExternalDlg::OnBrowse(wxCommandEvent& ) fname.GetPathWithSep(), fname.GetFullName() #ifdef __WXMSW__ - , _("Executable files (*.exe)|*.exe|All files (*.*)|*.*||") + , _("Executable files (*.exe)|*.exe|") + wxALL_FILES #endif // __WXMSW__ ); if ( dlg.ShowModal() == wxID_OK ) diff --git a/Externals/wxWidgets3/src/generic/dcpsg.cpp b/Externals/wxWidgets3/src/generic/dcpsg.cpp index 5eabe59d83..09980ebf5f 100644 --- a/Externals/wxWidgets3/src/generic/dcpsg.cpp +++ b/Externals/wxWidgets3/src/generic/dcpsg.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart, Robert Roebling, Markus Holzhem // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: dcpsg.cpp 65820 2010-10-15 23:46:46Z VZ $ +// RCS-ID: $Id: dcpsg.cpp 69243 2011-09-30 15:26:36Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -509,13 +509,10 @@ void wxPostScriptDCImpl::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord wxString buffer; buffer.Printf( "newpath\n" "%f %f %f %f %f %f ellipse\n" - "%f %f lineto\n" - "closepath\n" "stroke\n", XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL(i_radius), YLOG2DEVREL(i_radius), - alpha1, alpha2, - XLOG2DEV(xc), YLOG2DEV(yc) ); + alpha1, alpha2 ); buffer.Replace( ",", "." ); PsPrint( buffer ); @@ -971,11 +968,11 @@ void wxPostScriptDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoor { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (!bitmap.Ok()) return; + if (!bitmap.IsOk()) return; wxImage image = bitmap.ConvertToImage(); - if (!image.Ok()) return; + if (!image.IsOk()) return; wxCoord w = image.GetWidth(); wxCoord h = image.GetHeight(); @@ -1041,7 +1038,7 @@ void wxPostScriptDCImpl::SetFont( const wxFont& font ) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (!font.Ok()) return; + if (!font.IsOk()) return; m_font = font; @@ -1136,9 +1133,9 @@ void wxPostScriptDCImpl::SetPen( const wxPen& pen ) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (!pen.Ok()) return; + if (!pen.IsOk()) return; - int oldStyle = m_pen.GetStyle(); + int oldStyle = m_pen.IsOk() ? m_pen.GetStyle() : wxPENSTYLE_INVALID; m_pen = pen; @@ -1243,7 +1240,7 @@ void wxPostScriptDCImpl::SetBrush( const wxBrush& brush ) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (!brush.Ok()) return; + if (!brush.IsOk()) return; m_brush = brush; @@ -1291,7 +1288,7 @@ void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y if ( !textbuf ) return; - if (m_textForegroundColour.Ok()) + if (m_textForegroundColour.IsOk()) { unsigned char red = m_textForegroundColour.Red(); unsigned char blue = m_textForegroundColour.Blue(); @@ -1401,7 +1398,7 @@ void wxPostScriptDCImpl::DoDrawRotatedText( const wxString& text, wxCoord x, wxC SetFont( m_font ); - if (m_textForegroundColour.Ok()) + if (m_textForegroundColour.IsOk()) { unsigned char red = m_textForegroundColour.Red(); unsigned char blue = m_textForegroundColour.Blue(); @@ -1960,7 +1957,7 @@ bool wxPostScriptDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord wxPostScriptDCImpl::GetCharHeight() const { - if (m_font.Ok()) + if (m_font.IsOk()) return m_font.GetPointSize(); else return 12; @@ -2058,7 +2055,7 @@ void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string, / example: / / wxPostScriptDC dc(NULL, true); - / if (dc.Ok()){ + / if (dc.IsOk()){ / wxSetAFMPath("d:\\wxw161\\afm\\"); / dc.StartDoc("Test"); / dc.StartPage(); diff --git a/Externals/wxWidgets3/src/generic/descrip.mms b/Externals/wxWidgets3/src/generic/descrip.mms index b8365be853..558e6636dd 100644 --- a/Externals/wxWidgets3/src/generic/descrip.mms +++ b/Externals/wxWidgets3/src/generic/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 21 March 2011 * +# Date : 3 January 2012 * # * #***************************************************************************** .first @@ -70,7 +70,6 @@ OBJECTS = \ msgdlgg.obj,\ numdlgg.obj,\ odcombo.obj,\ - panelg.obj,\ printps.obj,\ prntdlgg.obj,\ propdlg.obj,\ @@ -95,7 +94,8 @@ OBJECTS = \ grideditors.obj,vlbox.obj,vscroll.obj,stattextg.obj,\ editlbox.obj,datavgen.obj,dbgrptg.obj,dragimgg.obj,\ richmsgdlgg.obj,commandlinkbuttong.obj,spinctlg.obj,\ - markuptext.obj + markuptext.obj,bannerwindow.obj,timectrlg.obj,richtooltipg.obj\ + ,statbmpg.obj SOURCES = \ aboutdlgg.cpp,\ @@ -132,7 +132,6 @@ SOURCES = \ numdlgg.cpp,\ odcombo.cpp,\ paletteg.cpp,\ - panelg.cpp,\ printps.cpp,\ prntdlgg.cpp,\ propdlg.cpp,\ @@ -167,7 +166,8 @@ SOURCES = \ icon.cpp,bmpcboxg.cpp,filectrlg.cpp,srchctlg.cpp,notifmsgg.cpp\ ,headerctrlg.cpp,grideditors.cpp,stattextg.cpp,editlbox.cpp,\ datavgen.cpp,dbgrptg.cpp,dragimgg.cpp,richmsgdlgg.cpp,\ - commandlinkbuttong.cpp,spinctlg.cpp markuptext.cpp + commandlinkbuttong.cpp,spinctlg.cpp markuptext.cpp \ + bannerwindow.cpp timectrlg.cpp richtooltipg.cpp statbmpg.cpp .ifdef __WXMOTIF__ OBJECTS0=statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\ @@ -243,13 +243,13 @@ icon.obj : icon.cpp imaglist.obj : imaglist.cpp laywin.obj : laywin.cpp listctrl.obj : listctrl.cpp + cxx $(CXXFLAGS)$(CXX_DEFINE)/warn=disable=(INTTRUNCATED) listctrl.cpp logg.obj : logg.cpp msgdlgg.obj : msgdlgg.cpp notebook.obj : notebook.cpp numdlgg.obj : numdlgg.cpp odcombo.obj : odcombo.cpp paletteg.obj : paletteg.cpp -panelg.obj : panelg.cpp printps.obj : printps.cpp prntdlgg.obj : prntdlgg.cpp progdlgg.obj : progdlgg.cpp @@ -304,3 +304,7 @@ richmsgdlgg.obj : richmsgdlgg.cpp commandlinkbuttong.obj : commandlinkbuttong.cpp spinctlg.obj : spinctlg.cpp markuptext.obj : markuptext.cpp +bannerwindow.obj : bannerwindow.cpp +timectrlg.obj : timectrlg.cpp +richtooltipg.obj : richtooltipg.cpp +statbmpg.obj : statbmpg.cpp diff --git a/Externals/wxWidgets3/src/generic/dirctrlg.cpp b/Externals/wxWidgets3/src/generic/dirctrlg.cpp index 77ef878caf..358e0cea3c 100644 --- a/Externals/wxWidgets3/src/generic/dirctrlg.cpp +++ b/Externals/wxWidgets3/src/generic/dirctrlg.cpp @@ -4,7 +4,7 @@ // Author: Harm van der Heijden, Robert Roebling, Julian Smart // Modified by: // Created: 12/12/98 -// RCS-ID: $Id: dirctrlg.cpp 67206 2011-03-16 06:36:43Z SC $ +// RCS-ID: $Id: dirctrlg.cpp 70808 2012-03-04 20:31:42Z VZ $ // Copyright: (c) Harm van der Heijden, Robert Roebling and Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -55,7 +55,7 @@ #include "wx/osx/private.h" // includes mac headers #endif -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #include #include "wx/msw/winundef.h" #include "wx/volume.h" @@ -71,7 +71,7 @@ #include #endif -#endif +#endif // __WINDOWS__ #if defined(__OS2__) || defined(__DOS__) #ifdef __OS2__ @@ -250,7 +250,7 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI } } -#elif defined(__UNIX__) || defined(__WXPALMOS__) +#elif defined(__UNIX__) paths.Add(wxT("/")); names.Add(wxT("/")); icon_ids.Add(wxFileIconsTable::computer); @@ -270,7 +270,7 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI bool wxIsDriveAvailable(const wxString& dirName) { - // FIXME_MGL - this method leads to hang up under Watcom for some reason + // FIXME: this method leads to hang up under Watcom for some reason #ifdef __WATCOMC__ wxUnusedVar(dirName); #else @@ -310,7 +310,7 @@ int setdrive(int WXUNUSED_IN_WINCE(drive)) #else newdrive[2] = wxT('\0'); #endif -#if defined(__WXMSW__) +#if defined(__WINDOWS__) if (::SetCurrentDirectory(newdrive)) #else // VA doesn't know what LPSTR is and has its own set @@ -1170,7 +1170,7 @@ void wxGenericDirCtrl::FindChildFiles(wxTreeItemId treeid, int dirFlags, wxArray wxString dirName(data->m_path); -#if defined(__WXMSW__) || defined(__OS2__) +#if defined(__WINDOWS__) || defined(__OS2__) if (dirName.Last() == ':') dirName += wxString(wxFILE_SEP_PATH); #endif @@ -1572,7 +1572,7 @@ wxImageList *wxFileIconsTable::GetSmallImageList() return m_smallImageList; } -#if wxUSE_MIMETYPE && wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB) +#if wxUSE_MIMETYPE && wxUSE_IMAGE && (!defined(__WINDOWS__) || wxUSE_WXDIB) // VS: we don't need this function w/o wxMimeTypesManager because we'll only have // one icon and we won't resize it @@ -1708,7 +1708,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) delete ft; - if ( !ic.Ok() ) + if ( !ic.IsOk() ) { int newid = file; m_HashTable->Put(extension, new wxFileIconEntry(newid)); @@ -1718,7 +1718,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) wxBitmap bmp; bmp.CopyFromIcon(ic); - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) { int newid = file; m_HashTable->Put(extension, new wxFileIconEntry(newid)); @@ -1732,7 +1732,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) { m_smallImageList->Add(bmp); } -#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB) +#if wxUSE_IMAGE && (!defined(__WINDOWS__) || wxUSE_WXDIB) else { wxImage img = bmp.ConvertToImage(); diff --git a/Externals/wxWidgets3/src/generic/dirdlgg.cpp b/Externals/wxWidgets3/src/generic/dirdlgg.cpp index 21f85928ef..8d25c0f04c 100644 --- a/Externals/wxWidgets3/src/generic/dirdlgg.cpp +++ b/Externals/wxWidgets3/src/generic/dirdlgg.cpp @@ -4,7 +4,7 @@ // Author: Harm van der Heijden, Robert Roebling & Julian Smart // Modified by: // Created: 12/12/98 -// RCS-ID: $Id: dirdlgg.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: dirdlgg.cpp 67384 2011-04-03 20:31:32Z DS $ // Copyright: (c) Harm van der Heijden, Robert Roebling, Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -166,7 +166,7 @@ bool wxGenericDirDialog::Create(wxWindow* parent, topsizer->Add(m_dirCtrl, wxSizerFlags(flagsBorder2).Proportion(1).Expand()); #ifndef __SMARTPHONE__ - // Make the an option depending on a flag? + // TODO: Make this an option depending on a flag? wxCheckBox * check = new wxCheckBox(this, ID_SHOW_HIDDEN, _("Show &hidden directories")); topsizer->Add(check, wxSizerFlags(flagsBorder2).Right()); diff --git a/Externals/wxWidgets3/src/generic/dragimgg.cpp b/Externals/wxWidgets3/src/generic/dragimgg.cpp index 1e84178dce..421926207c 100644 --- a/Externals/wxWidgets3/src/generic/dragimgg.cpp +++ b/Externals/wxWidgets3/src/generic/dragimgg.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 29/2/2000 -// RCS-ID: $Id: dragimgg.cpp 64656 2010-06-20 18:18:23Z VZ $ +// RCS-ID: $Id: dragimgg.cpp 70749 2012-02-29 13:58:55Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -247,9 +247,9 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, m_boundingRect = * rect; m_isDirty = false; - m_isDirty = false; + m_isShown = false; - if (m_cursor.Ok()) + if (m_cursor.IsOk()) { m_oldCursor = window->GetCursor(); window->SetCursor(m_cursor); @@ -288,7 +288,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, #ifndef wxHAS_NATIVE_OVERLAY wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap); - if (!backing->Ok() || (backing->GetWidth() < clientSize.x || backing->GetHeight() < clientSize.y)) + if (!backing->IsOk() || (backing->GetWidth() < clientSize.x || backing->GetHeight() < clientSize.y)) (*backing) = wxBitmap(clientSize.x, clientSize.y); #endif // !wxHAS_NATIVE_OVERLAY @@ -345,7 +345,7 @@ bool wxGenericDragImage::EndDrag() #endif m_window->ReleaseMouse(); - if (m_cursor.Ok() && m_oldCursor.Ok()) + if (m_cursor.IsOk() && m_oldCursor.IsOk()) { m_window->SetCursor(m_oldCursor); } @@ -467,7 +467,7 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, DoDrawImage(*m_windowDC, newPos); #else // !wxHAS_NATIVE_OVERLAY wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap); - if (!backing->Ok()) + if (!backing->IsOk()) return false; wxRect oldRect(GetImageRect(oldPos)); @@ -499,7 +499,7 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, // keep reallocating all the time. int excess = 50; - if (!m_repairBitmap.Ok() || (m_repairBitmap.GetWidth() < fullRect.GetWidth() || m_repairBitmap.GetHeight() < fullRect.GetHeight())) + if (!m_repairBitmap.IsOk() || (m_repairBitmap.GetWidth() < fullRect.GetWidth() || m_repairBitmap.GetHeight() < fullRect.GetHeight())) { m_repairBitmap = wxBitmap(fullRect.GetWidth() + excess, fullRect.GetHeight() + excess); } @@ -539,12 +539,12 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, // Override this if you are using a virtual image (drawing your own image) bool wxGenericDragImage::DoDrawImage(wxDC& dc, const wxPoint& pos) const { - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { dc.DrawBitmap(m_bitmap, pos.x, pos.y, (m_bitmap.GetMask() != 0)); return true; } - else if (m_icon.Ok()) + else if (m_icon.IsOk()) { dc.DrawIcon(m_icon, pos.x, pos.y); return true; @@ -556,11 +556,11 @@ bool wxGenericDragImage::DoDrawImage(wxDC& dc, const wxPoint& pos) const // Override this if you are using a virtual image (drawing your own image) wxRect wxGenericDragImage::GetImageRect(const wxPoint& pos) const { - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { return wxRect(pos.x, pos.y, m_bitmap.GetWidth(), m_bitmap.GetHeight()); } - else if (m_icon.Ok()) + else if (m_icon.IsOk()) { return wxRect(pos.x, pos.y, m_icon.GetWidth(), m_icon.GetHeight()); } diff --git a/Externals/wxWidgets3/src/generic/filectrlg.cpp b/Externals/wxWidgets3/src/generic/filectrlg.cpp index e33397496b..67f713baf8 100644 --- a/Externals/wxWidgets3/src/generic/filectrlg.cpp +++ b/Externals/wxWidgets3/src/generic/filectrlg.cpp @@ -3,7 +3,7 @@ // Purpose: wxGenericFileCtrl Implementation // Author: Diaa M. Sami // Created: 2007-07-07 -// RCS-ID: $Id: filectrlg.cpp 67214 2011-03-16 07:22:56Z SC $ +// RCS-ID: $Id: filectrlg.cpp 70808 2012-03-04 20:31:42Z VZ $ // Copyright: (c) Diaa M. Sami // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ #include "wx/tokenzr.h" #include "wx/imaglist.h" -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #include "wx/msw/wrapwin.h" #endif @@ -53,7 +53,7 @@ // ---------------------------------------------------------------------------- static -int wxCALLBACK wxFileDataNameCompare( long data1, long data2, wxIntPtr sortOrder) +int wxCALLBACK wxFileDataNameCompare( wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder) { wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); @@ -71,7 +71,7 @@ int wxCALLBACK wxFileDataNameCompare( long data1, long data2, wxIntPtr sortOrder } static -int wxCALLBACK wxFileDataSizeCompare(long data1, long data2, wxIntPtr sortOrder) +int wxCALLBACK wxFileDataSizeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder) { wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); @@ -93,7 +93,7 @@ int wxCALLBACK wxFileDataSizeCompare(long data1, long data2, wxIntPtr sortOrder) } static -int wxCALLBACK wxFileDataTypeCompare(long data1, long data2, wxIntPtr sortOrder) +int wxCALLBACK wxFileDataTypeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder) { wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); @@ -115,7 +115,7 @@ int wxCALLBACK wxFileDataTypeCompare(long data1, long data2, wxIntPtr sortOrder) } static -int wxCALLBACK wxFileDataTimeCompare(long data1, long data2, wxIntPtr sortOrder) +int wxCALLBACK wxFileDataTimeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder) { wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); @@ -377,7 +377,7 @@ void wxFileData::MakeItem( wxListItem &item ) if (IsLink()) { wxColour dg = wxTheColourDatabase->Find( wxT("MEDIUM GREY") ); - if ( dg.Ok() ) + if ( dg.IsOk() ) item.SetTextColour(dg); } item.m_data = wxPtrToUInt(this); diff --git a/Externals/wxWidgets3/src/generic/filedlgg.cpp b/Externals/wxWidgets3/src/generic/filedlgg.cpp index c4d34a9c5f..390abba9a7 100644 --- a/Externals/wxWidgets3/src/generic/filedlgg.cpp +++ b/Externals/wxWidgets3/src/generic/filedlgg.cpp @@ -4,7 +4,7 @@ // Author: Robert Roebling // Modified by: // Created: 12/12/98 -// RCS-ID: $Id: filedlgg.cpp 64019 2010-04-18 00:05:37Z VZ $ +// RCS-ID: $Id: filedlgg.cpp 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,7 +19,7 @@ #if wxUSE_FILEDLG // NOTE : it probably also supports MAC, untested -#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__) && !defined(__PALMOS__) +#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__) #error wxGenericFileDialog currently only supports Unix, win32 and DOS #endif @@ -57,7 +57,6 @@ #include "wx/config.h" #endif -#ifndef __WXPALMOS5__ #ifndef __WXWINCE__ #include #include @@ -86,7 +85,6 @@ #if defined(__UNIX__) || defined(__DOS__) #include #endif -#endif // ! __WXPALMOS5__ #if defined(__WXWINCE__) #define IsTopMostDir(dir) (dir == wxT("\\") || dir == wxT("/")) diff --git a/Externals/wxWidgets3/src/generic/filepickerg.cpp b/Externals/wxWidgets3/src/generic/filepickerg.cpp index 52e1c56b67..98c7935a7a 100644 --- a/Externals/wxWidgets3/src/generic/filepickerg.cpp +++ b/Externals/wxWidgets3/src/generic/filepickerg.cpp @@ -4,7 +4,7 @@ // Author: Francesco Montorsi // Modified by: // Created: 15/04/2006 -// RCS-ID: $Id: filepickerg.cpp 63654 2010-03-08 19:37:08Z VZ $ +// RCS-ID: $Id: filepickerg.cpp 70732 2012-02-28 02:05:01Z VZ $ // Copyright: (c) Francesco Montorsi // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -26,8 +26,11 @@ #if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL +#include "wx/filename.h" #include "wx/filepicker.h" +#include "wx/scopedptr.h" + // ============================================================================ // implementation @@ -54,8 +57,24 @@ bool wxGenericFileDirButton::Create(wxWindow *parent, { m_pickerStyle = style; + // If the special wxPB_SMALL flag is used, ignore the provided label and + // use the shortest possible label and the smallest possible button fitting + // it. + long styleButton = 0; + wxString labelButton; + if ( m_pickerStyle & wxPB_SMALL ) + { + labelButton = _("..."); + styleButton = wxBU_EXACTFIT; + } + else + { + labelButton = label; + } + // create this button - if ( !wxButton::Create(parent, id, label, pos, size, 0, validator, name) ) + if ( !wxButton::Create(parent, id, labelButton, + pos, size, styleButton, validator, name) ) { wxFAIL_MSG( wxT("wxGenericFileButton creation failed") ); return false; @@ -76,18 +95,80 @@ bool wxGenericFileDirButton::Create(wxWindow *parent, void wxGenericFileDirButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev)) { - wxDialog *p = CreateDialog(); + wxScopedPtr p(CreateDialog()); if (p->ShowModal() == wxID_OK) { // save updated path in m_path - UpdatePathFromDialog(p); + UpdatePathFromDialog(p.get()); // fire an event wxFileDirPickerEvent event(GetEventType(), this, GetId(), m_path); GetEventHandler()->ProcessEvent(event); } +} - wxDELETE(p); +void wxGenericFileDirButton::SetInitialDirectory(const wxString& dir) +{ + m_initialDir = dir; +} + +// ---------------------------------------------------------------------------- +// wxGenericFileutton +// ---------------------------------------------------------------------------- + +void +wxGenericFileButton::DoSetInitialDirectory(wxFileDialog* dialog, + const wxString& dir) +{ + if ( m_path.find_first_of(wxFileName::GetPathSeparators()) == + wxString::npos ) + { + dialog->SetDirectory(dir); + } +} + +wxDialog *wxGenericFileButton::CreateDialog() +{ + wxFileDialog* const dialog = new wxFileDialog + ( + GetDialogParent(), + m_message, + wxEmptyString, + wxEmptyString, + m_wildcard, + GetDialogStyle() + ); + + // If there is no default file or if it doesn't have any path, use the + // explicitly set initial directory. + // + // Notice that it is important to call this before SetPath() below as if we + // do have m_initialDir and no directory in m_path, we need to interpret + // the path as being relative with respect to m_initialDir. + if ( !m_initialDir.empty() ) + DoSetInitialDirectory(dialog, m_initialDir); + + // This sets both the default file name and the default directory of the + // dialog if m_path contains directory part. + dialog->SetPath(m_path); + + return dialog; +} + +// ---------------------------------------------------------------------------- +// wxGenericDirButton +// ---------------------------------------------------------------------------- + +wxDialog *wxGenericDirButton::CreateDialog() +{ + wxDirDialog* const dialog = new wxDirDialog + ( + GetDialogParent(), + m_message, + m_path.empty() ? m_initialDir : m_path, + GetDialogStyle() + ); + return dialog; } #endif // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL diff --git a/Externals/wxWidgets3/src/generic/fontdlgg.cpp b/Externals/wxWidgets3/src/generic/fontdlgg.cpp index 77f2b66217..391f5d57b9 100644 --- a/Externals/wxWidgets3/src/generic/fontdlgg.cpp +++ b/Externals/wxWidgets3/src/generic/fontdlgg.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: fontdlgg.cpp 66728 2011-01-22 14:38:36Z DS $ +// RCS-ID: $Id: fontdlgg.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -76,7 +76,7 @@ void wxFontPreviewer::OnPaint(wxPaintEvent& WXUNUSED(event)) dc.SetBrush(*wxWHITE_BRUSH); dc.DrawRectangle(0, 0, size.x, size.y); - if ( font.Ok() ) + if ( font.IsOk() ) { dc.SetFont(font); dc.SetTextForeground(GetForegroundColour()); @@ -550,7 +550,7 @@ void wxGenericFontDialog::InitializeFont() int fontSize = 12; bool fontUnderline = false; - if (m_fontData.m_initialFont.Ok()) + if (m_fontData.m_initialFont.IsOk()) { fontFamily = m_fontData.m_initialFont.GetFamily(); fontWeight = m_fontData.m_initialFont.GetWeight(); @@ -602,7 +602,7 @@ void wxGenericFontDialog::DoChangeFont() if ( !m_colourChoice->GetStringSelection().empty() ) { wxColour col = wxTheColourDatabase->Find(m_colourChoice->GetStringSelection()); - if (col.Ok()) + if (col.IsOk()) { m_fontData.m_fontColour = col; } @@ -610,7 +610,7 @@ void wxGenericFontDialog::DoChangeFont() } // Update color here so that we can also use the color originally passed in // (EnableEffects may be false) - if (m_fontData.m_fontColour.Ok()) + if (m_fontData.m_fontColour.IsOk()) m_previewer->SetForegroundColour(m_fontData.m_fontColour); m_previewer->Refresh(); diff --git a/Externals/wxWidgets3/src/generic/fontpickerg.cpp b/Externals/wxWidgets3/src/generic/fontpickerg.cpp index a1a61c0062..3d3b13ed6a 100644 --- a/Externals/wxWidgets3/src/generic/fontpickerg.cpp +++ b/Externals/wxWidgets3/src/generic/fontpickerg.cpp @@ -4,7 +4,7 @@ // Author: Francesco Montorsi // Modified by: // Created: 15/04/2006 -// RCS-ID: $Id: fontpickerg.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: fontpickerg.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) Francesco Montorsi // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -97,7 +97,7 @@ void wxGenericFontButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev)) void wxGenericFontButton::UpdateFont() { - if ( !m_selectedFont.Ok() ) + if ( !m_selectedFont.IsOk() ) return; SetForegroundColour(m_data.GetColour()); diff --git a/Externals/wxWidgets3/src/generic/graphicc.cpp b/Externals/wxWidgets3/src/generic/graphicc.cpp index 44e8ac6abf..68588879ae 100644 --- a/Externals/wxWidgets3/src/generic/graphicc.cpp +++ b/Externals/wxWidgets3/src/generic/graphicc.cpp @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 2006-10-03 -// RCS-ID: $Id: graphicc.cpp 66615 2011-01-07 05:26:57Z PC $ +// RCS-ID: $Id: graphicc.cpp 70477 2012-01-29 08:35:45Z PC $ // Copyright: (c) 2006 Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -21,6 +21,10 @@ #if wxUSE_CAIRO +// keep cairo.h from defining dllimport as we're defining the symbols inside +// the wx dll in order to load them dynamically. +#define cairo_public + #include "wx/cairo.h" #ifndef WX_PRECOMP @@ -278,16 +282,24 @@ class wxCairoFontData : public wxGraphicsObjectRefData { public: wxCairoFontData( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col ); + wxCairoFontData(wxGraphicsRenderer* renderer, + double sizeInPixels, + const wxString& facename, + int flags, + const wxColour& col); ~wxCairoFontData(); - virtual void Apply( wxGraphicsContext* context ); + virtual bool Apply( wxGraphicsContext* context ); #ifdef __WXGTK__ - const PangoFontDescription* GetFont() const { return m_font; } - bool GetUnderlined() const { return m_underlined; } + const wxFont& GetFont() const { return m_wxfont; } #endif private : + void InitColour(const wxColour& col); + void InitFontComponents(const wxString& facename, + cairo_font_slant_t slant, + cairo_font_weight_t weight); + double m_size; - bool m_underlined; double m_red; double m_green; double m_blue; @@ -295,28 +307,53 @@ private : #ifdef __WXMAC__ cairo_font_face_t *m_font; #elif defined(__WXGTK__) - PangoFontDescription* m_font; -#else + wxFont m_wxfont; +#endif + + // These members are used when the font is created from its face name and + // flags (and not from wxFont) and also even when creating it from wxFont + // on the platforms not covered above. + // + // Notice that we can't use cairo_font_face_t instead of storing those, + // even though it would be simpler and need less #ifdefs, because + // cairo_toy_font_face_create() that we'd need to create it is only + // available in Cairo 1.8 and we require just 1.2 currently. If we do drop + // support for < 1.8 versions in the future it would be definitely better + // to use cairo_toy_font_face_create() instead. wxCharBuffer m_fontName; cairo_font_slant_t m_slant; cairo_font_weight_t m_weight; -#endif -#ifdef __WXMSW__ - wxCairoContext( wxGraphicsRenderer* renderer, HDC context ); -#endif }; class wxCairoBitmapData : public wxGraphicsObjectRefData { public: wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitmap& bmp ); +#if wxUSE_IMAGE + wxCairoBitmapData(wxGraphicsRenderer* renderer, const wxImage& image); +#endif // wxUSE_IMAGE wxCairoBitmapData( wxGraphicsRenderer* renderer, cairo_surface_t* bitmap ); ~wxCairoBitmapData(); virtual cairo_surface_t* GetCairoSurface() { return m_surface; } virtual cairo_pattern_t* GetCairoPattern() { return m_pattern; } virtual wxSize GetSize() { return wxSize(m_width, m_height); } + +#if wxUSE_IMAGE + wxImage ConvertToImage() const; +#endif // wxUSE_IMAGE + private : + // Allocate m_buffer for the bitmap of the given size in the given format. + // + // Returns the stride used for the buffer. + int InitBuffer(int width, int height, cairo_format_t format); + + // Really create the surface using the buffer (which was supposed to be + // filled since InitBuffer() call). + void InitSurface(cairo_format_t format, int stride); + + cairo_surface_t* m_surface; cairo_pattern_t* m_pattern; int m_width; @@ -332,14 +369,23 @@ public: wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& dc ); #ifdef __WXGTK__ wxCairoContext( wxGraphicsRenderer* renderer, GdkDrawable *drawable ); +#endif +#ifdef __WXMSW__ + wxCairoContext( wxGraphicsRenderer* renderer, HDC context ); #endif wxCairoContext( wxGraphicsRenderer* renderer, cairo_t *context ); wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window); - wxCairoContext(); + + // If this ctor is used, Init() must be called by the derived class later. + wxCairoContext( wxGraphicsRenderer* renderer ); + virtual ~wxCairoContext(); virtual bool ShouldOffset() const { + if ( !m_enableOffset ) + return false; + int penwidth = 0 ; if ( !m_pen.IsNull() ) { @@ -365,6 +411,8 @@ public: virtual bool SetAntialiasMode(wxAntialiasMode antialias); + virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation); + virtual bool SetCompositionMode(wxCompositionMode op); virtual void BeginLayer(wxDouble opacity); @@ -400,9 +448,9 @@ public: protected: virtual void DoDrawText( const wxString &str, wxDouble x, wxDouble y ); -private: void Init(cairo_t *context); +private: cairo_t* m_context; wxVector m_layerOpacities; @@ -410,6 +458,35 @@ private: wxDECLARE_NO_COPY_CLASS(wxCairoContext); }; +#if wxUSE_IMAGE +// ---------------------------------------------------------------------------- +// wxCairoImageContext: context associated with a wxImage. +// ---------------------------------------------------------------------------- + +class wxCairoImageContext : public wxCairoContext +{ +public: + wxCairoImageContext(wxGraphicsRenderer* renderer, wxImage& image) : + wxCairoContext(renderer), + m_image(image), + m_data(renderer, image) + { + Init(cairo_create(m_data.GetCairoSurface())); + } + + virtual ~wxCairoImageContext() + { + m_image = m_data.ConvertToImage(); + } + +private: + wxImage& m_image; + wxCairoBitmapData m_data; + + wxDECLARE_NO_COPY_CLASS(wxCairoImageContext); +}; +#endif // wxUSE_IMAGE + //----------------------------------------------------------------------------- // wxCairoPenData implementation //----------------------------------------------------------------------------- @@ -548,7 +625,7 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen ) { /* wxBitmap* bmp = pen.GetStipple(); - if ( bmp && bmp->Ok() ) + if ( bmp && bmp->IsOk() ) { wxDELETE( m_penImage ); wxDELETE( m_penBrush ); @@ -663,7 +740,7 @@ wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer, const wxBrush else { wxBitmap* bmp = brush.GetStipple(); - if ( bmp && bmp->Ok() ) + if ( bmp && bmp->IsOk() ) { wxDELETE( m_brushImage ); m_brushImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(),(HPALETTE)bmp->GetPalette()->GetHPALETTE()); @@ -747,50 +824,117 @@ void wxCairoBrushData::Init() // wxCairoFontData implementation //----------------------------------------------------------------------------- -wxCairoFontData::wxCairoFontData( wxGraphicsRenderer* renderer, const wxFont &font, - const wxColour& col ) : wxGraphicsObjectRefData(renderer) +void wxCairoFontData::InitColour(const wxColour& col) { m_red = col.Red()/255.0; m_green = col.Green()/255.0; m_blue = col.Blue()/255.0; m_alpha = col.Alpha()/255.0; +} + +void +wxCairoFontData::InitFontComponents(const wxString& facename, + cairo_font_slant_t slant, + cairo_font_weight_t weight) +{ + m_fontName = facename.mb_str(wxConvUTF8); + m_slant = slant; + m_weight = weight; +} + +wxCairoFontData::wxCairoFontData( wxGraphicsRenderer* renderer, const wxFont &font, + const wxColour& col ) + : wxGraphicsObjectRefData(renderer) +#ifdef __WXGTK__ + , m_wxfont(font) +#endif +{ + InitColour(col); + m_size = font.GetPointSize(); - m_underlined = font.GetUnderlined(); #ifdef __WXMAC__ m_font = cairo_quartz_font_face_create_for_cgfont( font.OSXGetCGFont() ); #elif defined(__WXGTK__) - m_font = pango_font_description_copy( font.GetNativeFontInfo()->description ); #else - m_fontName = font.GetFaceName().mb_str(wxConvUTF8); - m_slant = font.GetStyle() == wxFONTSTYLE_ITALIC ? CAIRO_FONT_SLANT_ITALIC:CAIRO_FONT_SLANT_NORMAL; - m_weight = font.GetWeight() == wxFONTWEIGHT_BOLD ? CAIRO_FONT_WEIGHT_BOLD:CAIRO_FONT_WEIGHT_NORMAL; + InitFontComponents + ( + font.GetFaceName(), + font.GetStyle() == wxFONTSTYLE_ITALIC ? CAIRO_FONT_SLANT_ITALIC + : CAIRO_FONT_SLANT_NORMAL, + font.GetWeight() == wxFONTWEIGHT_BOLD ? CAIRO_FONT_WEIGHT_BOLD + : CAIRO_FONT_WEIGHT_NORMAL + ); #endif } +wxCairoFontData::wxCairoFontData(wxGraphicsRenderer* renderer, + double sizeInPixels, + const wxString& facename, + int flags, + const wxColour& col) : + wxGraphicsObjectRefData(renderer) +{ + InitColour(col); + + // Resolution for Cairo image surfaces is 72 DPI meaning that the sizes in + // points and pixels are identical, so we can just pass the size in pixels + // directly to cairo_set_font_size(). + m_size = sizeInPixels; + +#if defined(__WXMAC__) + m_font = NULL; +#endif + + // There is no need to set m_underlined under wxGTK in this case, it can + // only be used if m_font != NULL. + + InitFontComponents + ( + facename, + flags & wxFONTFLAG_ITALIC ? CAIRO_FONT_SLANT_ITALIC + : CAIRO_FONT_SLANT_NORMAL, + flags & wxFONTFLAG_BOLD ? CAIRO_FONT_WEIGHT_BOLD + : CAIRO_FONT_WEIGHT_NORMAL + ); +} + wxCairoFontData::~wxCairoFontData() { #ifdef __WXMAC__ - cairo_font_face_destroy( m_font ); -#elif defined(__WXGTK__) - pango_font_description_free( m_font ); -#else + if ( m_font ) + cairo_font_face_destroy( m_font ); #endif } -void wxCairoFontData::Apply( wxGraphicsContext* context ) +bool wxCairoFontData::Apply( wxGraphicsContext* context ) { cairo_t * ctext = (cairo_t*) context->GetNativeContext(); cairo_set_source_rgba(ctext,m_red,m_green, m_blue,m_alpha); #ifdef __WXGTK__ - // the rest is done using Pango layouts + if (m_wxfont.IsOk()) + { + // Nothing to do, the caller uses Pango layout functions to do + // everything. + return true; + } #elif defined(__WXMAC__) - cairo_set_font_face(ctext, m_font); - cairo_set_font_size(ctext, m_size ); -#else + if ( m_font ) + { + cairo_set_font_face(ctext, m_font); + cairo_set_font_size(ctext, m_size ); + return true; + } +#endif + + // If we get here, we must be on a platform without native font support or + // we're using toy Cairo API even under wxGTK/wxMac. cairo_select_font_face(ctext, m_fontName, m_slant, m_weight ); cairo_set_font_size(ctext, m_size ); -#endif + + // Indicate that we don't use native fonts for the platforms which care + // about this (currently only wxGTK). + return false; } //----------------------------------------------------------------------------- @@ -1060,8 +1204,49 @@ void * wxCairoMatrixData::GetNativeMatrix() const return (void*) &m_matrix; } +// ---------------------------------------------------------------------------- // wxCairoBitmap implementation -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- + +int wxCairoBitmapData::InitBuffer(int width, int height, cairo_format_t format) +{ + wxUnusedVar(format); // Only really unused with Cairo < 1.6. + + // Determine the stride: use cairo_format_stride_for_width() if available + // but fall back to 4*width for the earlier versions as this is what that + // function always returns, even in latest Cairo, anyhow. + int stride; +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0) + if ( cairo_version() >= CAIRO_VERSION_ENCODE(1, 6, 0) ) + { + stride = cairo_format_stride_for_width(format, width); + + // All our code would totally break if stride were not a multiple of 4 + // so ensure this is the case. + if ( stride % 4 ) + { + wxFAIL_MSG("Unexpected Cairo image surface stride."); + + stride += 4 - stride % 4; + } + } + else +#endif + stride = 4*width; + + m_width = width; + m_height = height; + m_buffer = new unsigned char[height*stride]; + + return stride; +} + +void wxCairoBitmapData::InitSurface(cairo_format_t format, int stride) +{ + m_surface = cairo_image_surface_create_for_data( + m_buffer, format, m_width, m_height, stride); + m_pattern = cairo_pattern_create_for_surface(m_surface); +} wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, cairo_surface_t* bitmap ) : wxGraphicsObjectRefData( renderer ) @@ -1075,27 +1260,34 @@ wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitm wxCHECK_RET( bmp.IsOk(), wxT("Invalid bitmap in wxCairoContext::DrawBitmap")); #ifdef wxHAS_RAW_BITMAP - int bw = m_width = bmp.GetWidth(); - int bh = m_height = bmp.GetHeight(); - wxBitmap bmpSource = bmp; // we need a non-const instance - m_buffer = new unsigned char[bw*bh*4]; - wxUint32* data = (wxUint32*)m_buffer; - // Create a surface object and copy the bitmap pixel data to it. if the // image has alpha (or a mask represented as alpha) then we'll use a // different format and iterator than if it doesn't... - if (bmpSource.HasAlpha() || bmpSource.GetMask()) + cairo_format_t bufferFormat = bmp.GetDepth() == 32 +#ifdef __WXGTK__ + || bmp.GetMask() +#endif + ? CAIRO_FORMAT_ARGB32 + : CAIRO_FORMAT_RGB24; + + int stride = InitBuffer(bmp.GetWidth(), bmp.GetHeight(), bufferFormat); + + wxBitmap bmpSource = bmp; // we need a non-const instance + wxUint32* data = (wxUint32*)m_buffer; + + if ( bufferFormat == CAIRO_FORMAT_ARGB32 ) { - m_surface = cairo_image_surface_create_for_data( - m_buffer, CAIRO_FORMAT_ARGB32, bw, bh, bw*4); - wxAlphaPixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh)); + // use the bitmap's alpha + wxAlphaPixelData + pixData(bmpSource, wxPoint(0, 0), wxSize(m_width, m_height)); wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data.")); wxAlphaPixelData::Iterator p(pixData); - for (int y=0; y(m_buffer); + const unsigned char* src = image.GetData(); + + if ( bufferFormat == CAIRO_FORMAT_ARGB32 ) + { + const unsigned char* alpha = image.GetAlpha(); + + for ( int y = 0; y < m_height; y++ ) + { + wxUint32* const rowStartDst = dst; + + for ( int x = 0; x < m_width; x++ ) + { + const unsigned char a = *alpha++; + + *dst++ = a << 24 | + Premultiply(a, src[0]) << 16 | + Premultiply(a, src[1]) << 8 | + Premultiply(a, src[2]); + src += 3; + } + + dst = rowStartDst + stride / 4; + } + } + else // RGB + { + for ( int y = 0; y < m_height; y++ ) + { + wxUint32* const rowStartDst = dst; + + for ( int x = 0; x < m_width; x++ ) + { + *dst++ = src[0] << 16 | + src[1] << 8 | + src[2]; + src += 3; + } + + dst = rowStartDst + stride / 4; + } + } + + InitSurface(bufferFormat, stride); +} + +wxImage wxCairoBitmapData::ConvertToImage() const +{ + wxImage image(m_width, m_height, false /* don't clear */); + + // Get the surface type and format. + wxCHECK_MSG( cairo_surface_get_type(m_surface) == CAIRO_SURFACE_TYPE_IMAGE, + wxNullImage, + wxS("Can't convert non-image surface to image.") ); + + switch ( cairo_image_surface_get_format(m_surface) ) + { + case CAIRO_FORMAT_ARGB32: + image.SetAlpha(); + break; + + case CAIRO_FORMAT_RGB24: + // Nothing to do, we don't use alpha by default. + break; + + case CAIRO_FORMAT_A8: + case CAIRO_FORMAT_A1: + wxFAIL_MSG(wxS("Unsupported Cairo image surface type.")); + return wxNullImage; + + default: + wxFAIL_MSG(wxS("Unknown Cairo image surface type.")); + return wxNullImage; + } + + // Prepare for copying data. + const wxUint32* src = (wxUint32*)cairo_image_surface_get_data(m_surface); + wxCHECK_MSG( src, wxNullImage, wxS("Failed to get Cairo surface data.") ); + + int stride = cairo_image_surface_get_stride(m_surface); + wxCHECK_MSG( stride > 0, wxNullImage, + wxS("Failed to get Cairo surface stride.") ); + + // As we work with wxUint32 pointers and not char ones, we need to adjust + // the stride accordingly. This should be lossless as the stride must be a + // multiple of pixel size. + wxASSERT_MSG( !(stride % sizeof(wxUint32)), wxS("Unexpected stride.") ); + stride /= sizeof(wxUint32); + + unsigned char* dst = image.GetData(); + unsigned char *alpha = image.GetAlpha(); + if ( alpha ) + { + // We need to also copy alpha and undo the pre-multiplication as Cairo + // stores pre-multiplied values in this format while wxImage does not. + for ( int y = 0; y < m_height; y++ ) + { + const wxUint32* const rowStart = src; + for ( int x = 0; x < m_width; x++ ) + { + const wxUint32 argb = *src++; + + *alpha++ = (argb & 0xff000000) >> 24; + + // Copy the RGB data undoing the pre-multiplication. + *dst++ = Unpremultiply(*alpha, (argb & 0x00ff0000) >> 16); + *dst++ = Unpremultiply(*alpha, (argb & 0x0000ff00) >> 8); + *dst++ = Unpremultiply(*alpha, (argb & 0x000000ff)); + } + + src = rowStart + stride; + } + } + else // RGB + { + // Things are pretty simple in this case, just copy RGB bytes. + for ( int y = 0; y < m_height; y++ ) + { + const wxUint32* const rowStart = src; + for ( int x = 0; x < m_width; x++ ) + { + const wxUint32 argb = *src++; + + *dst++ = (argb & 0x00ff0000) >> 16; + *dst++ = (argb & 0x0000ff00) >> 8; + *dst++ = (argb & 0x000000ff); + } + + src = rowStart + stride; + } + } + + return image; +} + +#endif // wxUSE_IMAGE + wxCairoBitmapData::~wxCairoBitmapData() { if (m_pattern) @@ -1156,8 +1554,6 @@ wxCairoBitmapData::~wxCairoBitmapData() delete [] m_buffer; } - - //----------------------------------------------------------------------------- // wxCairoContext implementation //----------------------------------------------------------------------------- @@ -1185,25 +1581,61 @@ public : wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& dc ) : wxGraphicsContext(renderer) { +#ifdef __WXMSW__ + // wxMSW contexts always use MM_ANISOTROPIC, which messes up + // text rendering when printing using Cairo. Switch it to MM_TEXT + // map mode to avoid this problem. + HDC hdc = (HDC)dc.GetHDC(); + ::SetMapMode(hdc, MM_TEXT); + m_mswSurface = cairo_win32_printing_surface_create(hdc); + Init( cairo_create(m_mswSurface) ); +#endif + #ifdef __WXGTK20__ const wxDCImpl *impl = dc.GetImpl(); Init( (cairo_t*) impl->GetCairoContext() ); +#endif + wxSize sz = dc.GetSize(); + m_width = sz.x; + m_height = sz.y; wxPoint org = dc.GetDeviceOrigin(); cairo_translate( m_context, org.x, org.y ); double sx,sy; dc.GetUserScale( &sx, &sy ); + +// TODO: Determine if these fixes are needed on other platforms too. +// On MSW, without this the printer context will not respect wxDC SetMapMode calls. +// For example, using dc.SetMapMode(wxMM_POINTS) can let us share printer and screen +// drawing code +#ifdef __WXMSW__ + double lsx,lsy; + dc.GetLogicalScale( &lsx, &lsy ); + sx *= lsx; + sy *= lsy; +#endif cairo_scale( m_context, sx, sy ); org = dc.GetLogicalOrigin(); cairo_translate( m_context, -org.x, -org.y ); -#endif } wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc ) : wxGraphicsContext(renderer) { + int width, height; + dc.GetSize( &width, &height ); + m_width = width; + m_height = height; + + m_enableOffset = true; + +#ifdef __WXMSW__ + m_mswSurface = cairo_win32_surface_create((HDC)dc.GetHDC()); + Init( cairo_create(m_mswSurface) ); +#endif + #ifdef __WXGTK20__ wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl(); Init( gdk_cairo_create( impldc->GetGDKWindow() ) ); @@ -1226,8 +1658,6 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& #endif #ifdef __WXMAC__ - int width, height; - dc.GetSize( &width, &height ); CGContextRef cgcontext = (CGContextRef)dc.GetWindow()->MacGetCGContextRef(); cairo_surface_t* surface = cairo_quartz_surface_create_for_cg_context(cgcontext, width, height); Init( cairo_create( surface ) ); @@ -1238,6 +1668,18 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& dc ) : wxGraphicsContext(renderer) { + int width, height; + dc.GetSize( &width, &height ); + m_width = width; + m_height = height; + + m_enableOffset = true; + +#ifdef __WXMSW__ + m_mswSurface = cairo_win32_surface_create((HDC)dc.GetHDC()); + Init( cairo_create(m_mswSurface) ); +#endif + #ifdef __WXGTK20__ wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl(); Init( gdk_cairo_create( impldc->GetGDKWindow() ) ); @@ -1260,8 +1702,6 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& #endif #ifdef __WXMAC__ - int width, height; - dc.GetSize( &width, &height ); CGContextRef cgcontext = (CGContextRef)dc.GetWindow()->MacGetCGContextRef(); cairo_surface_t* surface = cairo_quartz_surface_create_for_cg_context(cgcontext, width, height); Init( cairo_create( surface ) ); @@ -1274,6 +1714,11 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, GdkDrawable *drawa : wxGraphicsContext(renderer) { Init( gdk_cairo_create( drawable ) ); + + int width, height; + gdk_drawable_get_size( drawable, &width, &height ); + m_width = width; + m_height = height; } #endif @@ -1282,9 +1727,9 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, HDC handle ) : wxGraphicsContext(renderer) { m_mswSurface = cairo_win32_surface_create(handle); - m_context = cairo_create(m_mswSurface); - PushState(); - PushState(); + Init( cairo_create(m_mswSurface) ); + m_width = + m_height = 0; } #endif @@ -1293,11 +1738,14 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, cairo_t *context ) : wxGraphicsContext(renderer) { Init( context ); + m_width = + m_height = 0; } wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window) : wxGraphicsContext(renderer) { + m_enableOffset = true; #ifdef __WXGTK__ // something along these lines (copied from dcclient) @@ -1312,7 +1760,23 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window) wxASSERT_MSG( window->m_wxwindow, wxT("wxCairoContext needs a widget") ); Init(gdk_cairo_create(window->GTKGetDrawingWindow())); + + wxSize sz = window->GetSize(); + m_width = sz.x; + m_height = sz.y; #endif + +#ifdef __WXMSW__ + m_mswSurface = cairo_win32_surface_create((HDC)window->GetHandle()); + Init(cairo_create(m_mswSurface)); +#endif + +} + +wxCairoContext::wxCairoContext(wxGraphicsRenderer* renderer) : + wxGraphicsContext(renderer) +{ + m_context = NULL; } wxCairoContext::~wxCairoContext() @@ -1320,10 +1784,6 @@ wxCairoContext::~wxCairoContext() if ( m_context ) { PopState(); -#ifdef __WXMSW__ - m_mswSurface = cairo_win32_surface_create((HDC)window->GetHandle()); - m_context = cairo_create(m_mswSurface); -#endif PopState(); cairo_destroy(m_context); } @@ -1510,30 +1970,25 @@ void wxCairoContext::DoDrawText(const wxString& str, wxDouble x, wxDouble y) if ( !data ) return; - ((wxCairoFontData*)m_font.GetRefData())->Apply(this); - -#ifdef __WXGTK__ - size_t datalen = strlen(data); - - PangoLayout *layout = pango_cairo_create_layout (m_context); - wxCairoFontData* font_data = (wxCairoFontData*) m_font.GetRefData(); - pango_layout_set_font_description( layout, font_data->GetFont()); - pango_layout_set_text(layout, data, datalen); - - if (font_data->GetUnderlined()) + if ( ((wxCairoFontData*)m_font.GetRefData())->Apply(this) ) { - PangoAttrList *attrs = pango_attr_list_new(); - PangoAttribute *attr = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE); - pango_attr_list_insert(attrs, attr); - pango_layout_set_attributes(layout, attrs); - pango_attr_list_unref(attrs); +#ifdef __WXGTK__ + PangoLayout *layout = pango_cairo_create_layout (m_context); + const wxFont& font = static_cast(m_font.GetRefData())->GetFont(); + pango_layout_set_font_description(layout, font.GetNativeFontInfo()->description); + pango_layout_set_text(layout, data, data.length()); + font.GTKSetPangoAttrs(layout); + + cairo_move_to(m_context, x, y); + pango_cairo_show_layout (m_context, layout); + + g_object_unref (layout); + + // Don't use Cairo text API, we already did everything. + return; +#endif } - cairo_move_to(m_context, x, y); - pango_cairo_show_layout (m_context, layout); - - g_object_unref (layout); -#else // Cairo's x,y for drawing text is at the baseline, so we need to adjust // the position we move to by the ascent. cairo_font_extents_t fe; @@ -1541,7 +1996,6 @@ void wxCairoContext::DoDrawText(const wxString& str, wxDouble x, wxDouble y) cairo_move_to(m_context, x, y+fe.ascent); cairo_show_text(m_context, data); -#endif } void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height, @@ -1561,32 +2015,36 @@ void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDoub if ( str.empty()) return; + if ( ((wxCairoFontData*)m_font.GetRefData())->Apply((wxCairoContext*)this) ) + { #ifdef __WXGTK__ - int w, h; + int w, h; - PangoLayout *layout = pango_cairo_create_layout (m_context); - pango_layout_set_font_description( layout, ((wxCairoFontData*)m_font.GetRefData())->GetFont()); - const wxCharBuffer data = str.utf8_str(); - if ( !data ) - { + PangoLayout *layout = pango_cairo_create_layout (m_context); + const wxFont& font = static_cast(m_font.GetRefData())->GetFont(); + pango_layout_set_font_description(layout, font.GetNativeFontInfo()->description); + const wxCharBuffer data = str.utf8_str(); + if ( !data ) + { + return; + } + pango_layout_set_text(layout, data, data.length()); + pango_layout_get_pixel_size (layout, &w, &h); + if ( width ) + *width = w; + if ( height ) + *height = h; + if (descent) + { + PangoLayoutIter *iter = pango_layout_get_iter(layout); + int baseline = pango_layout_iter_get_baseline(iter); + pango_layout_iter_free(iter); + *descent = h - PANGO_PIXELS(baseline); + } + g_object_unref (layout); return; +#endif } - pango_layout_set_text( layout, data, strlen(data) ); - pango_layout_get_pixel_size (layout, &w, &h); - if ( width ) - *width = w; - if ( height ) - *height = h; - if (descent) - { - PangoLayoutIter *iter = pango_layout_get_iter(layout); - int baseline = pango_layout_iter_get_baseline(iter); - pango_layout_iter_free(iter); - *descent = h - PANGO_PIXELS(baseline); - } - g_object_unref (layout); -#else - ((wxCairoFontData*)m_font.GetRefData())->Apply((wxCairoContext*)this); if (width) { @@ -1619,7 +2077,6 @@ void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDoub if ( externalLeading ) *externalLeading = wxMax(0, fe.height - (fe.ascent + fe.descent)); } -#endif } void wxCairoContext::GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const @@ -1663,6 +2120,12 @@ bool wxCairoContext::SetAntialiasMode(wxAntialiasMode antialias) return true; } +bool wxCairoContext::SetInterpolationQuality(wxInterpolationQuality WXUNUSED(interpolation)) +{ + // placeholder + return false; +} + bool wxCairoContext::SetCompositionMode(wxCompositionMode op) { if ( m_composition == op ) @@ -1752,11 +2215,18 @@ public : virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ); virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ); +#if wxUSE_IMAGE + virtual wxGraphicsContext * CreateContextFromImage(wxImage& image); +#endif // wxUSE_IMAGE virtual wxGraphicsContext * CreateContext( wxWindow* window ); virtual wxGraphicsContext * CreateMeasuringContext(); - +#ifdef __WXMSW__ +#if wxUSE_ENH_METAFILE + virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc); +#endif +#endif // Path virtual wxGraphicsPath CreatePath(); @@ -1784,9 +2254,17 @@ public : // sets the font virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ; + virtual wxGraphicsFont CreateFont(double sizeInPixels, + const wxString& facename, + int flags = wxFONTFLAG_DEFAULT, + const wxColour& col = *wxBLACK); // create a native bitmap representation virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ); +#if wxUSE_IMAGE + virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image); + virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp); +#endif // wxUSE_IMAGE // create a graphics bitmap from a native bitmap virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap ); @@ -1794,7 +2272,13 @@ public : // create a subimage from a native image representation virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ); +protected : + bool EnsureIsLoaded(); + void Load(); + void Unload(); + friend class wxCairoModule; private : + int m_loaded; DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoRenderer) } ; @@ -1809,30 +2293,62 @@ static wxCairoRenderer gs_cairoGraphicsRenderer; extern wxGraphicsRenderer* gCairoRenderer; wxGraphicsRenderer* gCairoRenderer = &gs_cairoGraphicsRenderer; +bool wxCairoRenderer::EnsureIsLoaded() +{ +#ifndef __WXGTK__ + Load(); + return wxCairoInit(); +#else + return true; +#endif +} + +void wxCairoRenderer::Load() +{ + wxCairoInit(); +} + +void wxCairoRenderer::Unload() +{ + wxCairoCleanUp(); +} + +// call EnsureIsLoaded() and return returnOnFail value if it fails +#define ENSURE_LOADED_OR_RETURN(returnOnFail) \ + if ( !EnsureIsLoaded() ) \ + return (returnOnFail) + wxGraphicsContext * wxCairoRenderer::CreateContext( const wxWindowDC& dc) { + ENSURE_LOADED_OR_RETURN(NULL); return new wxCairoContext(this,dc); } wxGraphicsContext * wxCairoRenderer::CreateContext( const wxMemoryDC& dc) { + ENSURE_LOADED_OR_RETURN(NULL); return new wxCairoContext(this,dc); } wxGraphicsContext * wxCairoRenderer::CreateContext( const wxPrinterDC& dc) { -#ifdef __WXGTK20__ - const wxDCImpl *impl = dc.GetImpl(); - cairo_t* context = (cairo_t*) impl->GetCairoContext(); - if (context) - return new wxCairoContext(this,dc); - else -#endif - return NULL; + ENSURE_LOADED_OR_RETURN(NULL); + return new wxCairoContext(this, dc); } +#ifdef __WXMSW__ +#if wxUSE_ENH_METAFILE +wxGraphicsContext * wxCairoRenderer::CreateContext( const wxEnhMetaFileDC& WXUNUSED(dc) ) +{ + ENSURE_LOADED_OR_RETURN(NULL); + return NULL; +} +#endif +#endif + wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeContext( void * context ) { + ENSURE_LOADED_OR_RETURN(NULL); #ifdef __WXMSW__ return new wxCairoContext(this,(HDC)context); #else @@ -1843,15 +2359,25 @@ wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeContext( void * cont wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeWindow( void * window ) { + ENSURE_LOADED_OR_RETURN(NULL); #ifdef __WXGTK__ return new wxCairoContext(this,(GdkDrawable*)window); #else + wxUnusedVar(window); return NULL; #endif } +#if wxUSE_IMAGE +wxGraphicsContext * wxCairoRenderer::CreateContextFromImage(wxImage& image) +{ + return new wxCairoImageContext(this, image); +} +#endif // wxUSE_IMAGE + wxGraphicsContext * wxCairoRenderer::CreateMeasuringContext() { + ENSURE_LOADED_OR_RETURN(NULL); #ifdef __WXGTK__ return CreateContextFromNativeWindow(gdk_get_default_root_window()); #endif @@ -1861,6 +2387,7 @@ wxGraphicsContext * wxCairoRenderer::CreateMeasuringContext() wxGraphicsContext * wxCairoRenderer::CreateContext( wxWindow* window ) { + ENSURE_LOADED_OR_RETURN(NULL); return new wxCairoContext(this, window ); } @@ -1868,6 +2395,7 @@ wxGraphicsContext * wxCairoRenderer::CreateContext( wxWindow* window ) wxGraphicsPath wxCairoRenderer::CreatePath() { + ENSURE_LOADED_OR_RETURN(wxNullGraphicsPath); wxGraphicsPath path; path.SetRefData( new wxCairoPathData(this) ); return path; @@ -1880,6 +2408,7 @@ wxGraphicsMatrix wxCairoRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble wxDouble tx, wxDouble ty) { + ENSURE_LOADED_OR_RETURN(wxNullGraphicsMatrix); wxGraphicsMatrix m; wxCairoMatrixData* data = new wxCairoMatrixData( this ); data->Set( a,b,c,d,tx,ty ) ; @@ -1889,7 +2418,8 @@ wxGraphicsMatrix wxCairoRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble wxGraphicsPen wxCairoRenderer::CreatePen(const wxPen& pen) { - if ( !pen.Ok() || pen.GetStyle() == wxPENSTYLE_TRANSPARENT ) + ENSURE_LOADED_OR_RETURN(wxNullGraphicsPen); + if ( !pen.IsOk() || pen.GetStyle() == wxPENSTYLE_TRANSPARENT ) return wxNullGraphicsPen; else { @@ -1901,7 +2431,8 @@ wxGraphicsPen wxCairoRenderer::CreatePen(const wxPen& pen) wxGraphicsBrush wxCairoRenderer::CreateBrush(const wxBrush& brush ) { - if ( !brush.Ok() || brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT ) + ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush); + if ( !brush.IsOk() || brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT ) return wxNullGraphicsBrush; else { @@ -1916,6 +2447,7 @@ wxCairoRenderer::CreateLinearGradientBrush(wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, const wxGraphicsGradientStops& stops) { + ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush); wxGraphicsBrush p; wxCairoBrushData* d = new wxCairoBrushData( this ); d->CreateLinearGradientBrush(x1, y1, x2, y2, stops); @@ -1928,6 +2460,7 @@ wxCairoRenderer::CreateRadialGradientBrush(wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble r, const wxGraphicsGradientStops& stops) { + ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush); wxGraphicsBrush p; wxCairoBrushData* d = new wxCairoBrushData( this ); d->CreateRadialGradientBrush(xo, yo, xc, yc, r, stops); @@ -1935,10 +2468,10 @@ wxCairoRenderer::CreateRadialGradientBrush(wxDouble xo, wxDouble yo, return p; } -// sets the font wxGraphicsFont wxCairoRenderer::CreateFont( const wxFont &font , const wxColour &col ) { - if ( font.Ok() ) + ENSURE_LOADED_OR_RETURN(wxNullGraphicsFont); + if ( font.IsOk() ) { wxGraphicsFont p; p.SetRefData(new wxCairoFontData( this , font, col )); @@ -1948,9 +2481,23 @@ wxGraphicsFont wxCairoRenderer::CreateFont( const wxFont &font , const wxColour return wxNullGraphicsFont; } +wxGraphicsFont +wxCairoRenderer::CreateFont(double sizeInPixels, + const wxString& facename, + int flags, + const wxColour& col) +{ + ENSURE_LOADED_OR_RETURN(wxNullGraphicsFont); + + wxGraphicsFont font; + font.SetRefData(new wxCairoFontData(this, sizeInPixels, facename, flags, col)); + return font; +} + wxGraphicsBitmap wxCairoRenderer::CreateBitmap( const wxBitmap& bmp ) { - if ( bmp.Ok() ) + ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap); + if ( bmp.IsOk() ) { wxGraphicsBitmap p; p.SetRefData(new wxCairoBitmapData( this , bmp )); @@ -1960,8 +2507,38 @@ wxGraphicsBitmap wxCairoRenderer::CreateBitmap( const wxBitmap& bmp ) return wxNullGraphicsBitmap; } +#if wxUSE_IMAGE + +wxGraphicsBitmap wxCairoRenderer::CreateBitmapFromImage(const wxImage& image) +{ + wxGraphicsBitmap bmp; + + ENSURE_LOADED_OR_RETURN(bmp); + + if ( image.IsOk() ) + { + bmp.SetRefData(new wxCairoBitmapData(this, image)); + } + + return bmp; +} + +wxImage wxCairoRenderer::CreateImageFromBitmap(const wxGraphicsBitmap& bmp) +{ + ENSURE_LOADED_OR_RETURN(wxNullImage); + + const wxCairoBitmapData* const + data = static_cast(bmp.GetGraphicsData()); + + return data ? data->ConvertToImage() : wxNullImage; +} + +#endif // wxUSE_IMAGE + + wxGraphicsBitmap wxCairoRenderer::CreateBitmapFromNativeBitmap( void* bitmap ) { + ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap); if ( bitmap != NULL ) { wxGraphicsBitmap p; @@ -1979,6 +2556,7 @@ wxCairoRenderer::CreateSubBitmap(const wxGraphicsBitmap& WXUNUSED(bitmap), wxDouble WXUNUSED(w), wxDouble WXUNUSED(h)) { + ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap); wxFAIL_MSG("wxCairoRenderer::CreateSubBitmap is not implemented."); return wxNullGraphicsBitmap; } diff --git a/Externals/wxWidgets3/src/generic/grid.cpp b/Externals/wxWidgets3/src/generic/grid.cpp index b335b1f755..0fb00db063 100644 --- a/Externals/wxWidgets3/src/generic/grid.cpp +++ b/Externals/wxWidgets3/src/generic/grid.cpp @@ -4,7 +4,7 @@ // Author: Michael Bedward (based on code by Julian Smart, Robin Dunn) // Modified by: Robin Dunn, Vadim Zeitlin, Santiago Palacios // Created: 1/08/1999 -// RCS-ID: $Id: grid.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: grid.cpp 70826 2012-03-06 13:18:22Z SC $ // Copyright: (c) Michael Bedward (mbedward@ozemail.com.au) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -72,8 +72,8 @@ const char wxGridNameStr[] = "grid"; // Required for wxIs... functions #include -WX_DECLARE_HASH_SET_WITH_DECL(int, wxIntegerHash, wxIntegerEqual, - wxGridFixedIndicesSet, class WXDLLIMPEXP_ADV); +WX_DECLARE_HASH_SET_WITH_DECL_PTR(int, ::wxIntegerHash, ::wxIntegerEqual, + wxGridFixedIndicesSet, class WXDLLIMPEXP_ADV); // ---------------------------------------------------------------------------- @@ -419,7 +419,7 @@ void wxGridCellAttr::SetSize(int num_rows, int num_cols) wxASSERT_MSG( (!((num_rows > 0) && (num_cols <= 0)) || !((num_rows <= 0) && (num_cols > 0)) || !((num_rows == 0) && (num_cols == 0))), - wxT("wxGridCellAttr::SetSize only takes two postive values or negative/zero values")); + wxT("wxGridCellAttr::SetSize only takes two positive values or negative/zero values")); m_sizeRows = num_rows; m_sizeCols = num_cols; @@ -1534,9 +1534,8 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) // m_colLabels stores just as many elements as it needs, e.g. if only // the label of the first column had been set it would have only one // element and not numCols, so account for it - int nToRm = m_colLabels.size() - colID; - if ( nToRm > 0 ) - m_colLabels.RemoveAt( colID, nToRm ); + int numRemaining = m_colLabels.size() - colID; + m_colLabels.RemoveAt( colID, wxMin(numCols, numRemaining) ); } if ( numCols >= curNumCols ) @@ -3069,7 +3068,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow()); m_dragLastPos = -1; } - else // not on row separator or it's not resizeable + else // not on row separator or it's not resizable { row = YToRow(y); if ( row >=0 && @@ -3648,13 +3647,15 @@ void wxGrid::ChangeCursorMode(CursorMode mode, // grid mouse event processing // ---------------------------------------------------------------------------- -void +bool wxGrid::DoGridCellDrag(wxMouseEvent& event, const wxGridCellCoords& coords, bool isFirstDrag) { + bool performDefault = true ; + if ( coords == wxGridNoCellCoords ) - return; // we're outside any valid cell + return performDefault; // we're outside any valid cell // Hide the edit control, so it won't interfere with drag-shrinking. if ( IsCellEditControlShown() ) @@ -3665,7 +3666,7 @@ wxGrid::DoGridCellDrag(wxMouseEvent& event, switch ( event.GetModifiers() ) { - case wxMOD_CMD: + case wxMOD_CONTROL: if ( m_selectedBlockCorner == wxGridNoCellCoords) m_selectedBlockCorner = coords; UpdateBlockBeingSelected(m_selectedBlockCorner, coords); @@ -3679,8 +3680,11 @@ wxGrid::DoGridCellDrag(wxMouseEvent& event, if ( m_selectedBlockCorner == wxGridNoCellCoords) m_selectedBlockCorner = coords; - SendEvent(wxEVT_GRID_CELL_BEGIN_DRAG, coords, event); - return; + // if event is handled by user code, no further processing + if ( SendEvent(wxEVT_GRID_CELL_BEGIN_DRAG, coords, event) != 0 ) + performDefault = false; + + return performDefault; } } @@ -3691,6 +3695,8 @@ wxGrid::DoGridCellDrag(wxMouseEvent& event, // we don't handle the other key modifiers event.Skip(); } + + return performDefault; } void wxGrid::DoGridLineDrag(wxMouseEvent& event, const wxGridOperations& oper) @@ -3743,7 +3749,9 @@ void wxGrid::DoGridDragEvent(wxMouseEvent& event, const wxGridCellCoords& coords switch ( m_cursorMode ) { case WXGRID_CURSOR_SELECT_CELL: - DoGridCellDrag(event, coords, isFirstDrag); + // no further handling if handled by user + if ( DoGridCellDrag(event, coords, isFirstDrag) == false ) + return; break; case WXGRID_CURSOR_RESIZE_ROW: @@ -4397,6 +4405,14 @@ wxGrid::SendEvent(const wxEventType type, mouseEv.GetY() + GetColLabelSize(), false, mouseEv); + + if ( type == wxEVT_GRID_CELL_BEGIN_DRAG ) + { + // by default the dragging is not supported, the user code must + // explicitly allow the event for it to take place + gridEvt.Veto(); + } + claimed = GetEventHandler()->ProcessEvent(gridEvt); vetoed = !gridEvt.IsAllowed(); } @@ -8152,10 +8168,12 @@ void wxGrid::Fit() AutoSize(); } +#if WXWIN_COMPATIBILITY_2_8 wxPen& wxGrid::GetDividerPen() const { return wxNullPen; } +#endif // WXWIN_COMPATIBILITY_2_8 // ---------------------------------------------------------------------------- // cell value accessor functions diff --git a/Externals/wxWidgets3/src/generic/gridctrl.cpp b/Externals/wxWidgets3/src/generic/gridctrl.cpp index d1da4409d4..2a9378afef 100644 --- a/Externals/wxWidgets3/src/generic/gridctrl.cpp +++ b/Externals/wxWidgets3/src/generic/gridctrl.cpp @@ -4,7 +4,7 @@ // Author: Paul Gammans, Roger Gammans // Modified by: // Created: 11/04/2001 -// RCS-ID: $Id: gridctrl.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: gridctrl.cpp 69856 2011-11-28 13:23:33Z VZ $ // Copyright: (c) The Computer Surgery (paul@compsurg.co.uk) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -311,7 +311,7 @@ wxGridCellAutoWrapStringRenderer::GetTextLines(wxGrid& grid, while ( tk.HasMoreTokens() ) { wxString tok = tk.GetNextToken(); - //FIXME: this causes us to print an extra unnecesary + //FIXME: this causes us to print an extra unnecessary // space at the end of the line. But it // is invisible , simplifies the size calculation // and ensures tokens are separated in the display @@ -598,10 +598,13 @@ wxSize wxGridCellNumberRenderer::GetBestSize(wxGrid& grid, // wxGridCellFloatRenderer // ---------------------------------------------------------------------------- -wxGridCellFloatRenderer::wxGridCellFloatRenderer(int width, int precision) +wxGridCellFloatRenderer::wxGridCellFloatRenderer(int width, + int precision, + int format) { SetWidth(width); SetPrecision(precision); + SetFormat(format); } wxGridCellRenderer *wxGridCellFloatRenderer::Clone() const @@ -609,6 +612,7 @@ wxGridCellRenderer *wxGridCellFloatRenderer::Clone() const wxGridCellFloatRenderer *renderer = new wxGridCellFloatRenderer; renderer->m_width = m_width; renderer->m_precision = m_precision; + renderer->m_style = m_style; renderer->m_format = m_format; return renderer; @@ -641,22 +645,30 @@ wxString wxGridCellFloatRenderer::GetString(const wxGrid& grid, int row, int col if ( m_precision == -1 ) { // default width/precision - m_format = wxT("%f"); + m_format = wxT("%"); } else { - m_format.Printf(wxT("%%.%df"), m_precision); + m_format.Printf(wxT("%%.%d"), m_precision); } } else if ( m_precision == -1 ) { // default precision - m_format.Printf(wxT("%%%d.f"), m_width); + m_format.Printf(wxT("%%%d."), m_width); } else { - m_format.Printf(wxT("%%%d.%df"), m_width, m_precision); + m_format.Printf(wxT("%%%d.%d"), m_width, m_precision); } + + bool isUpper = ( ( m_style & wxGRID_FLOAT_FORMAT_UPPER ) == wxGRID_FLOAT_FORMAT_UPPER); + if ( ( m_style & wxGRID_FLOAT_FORMAT_SCIENTIFIC ) == wxGRID_FLOAT_FORMAT_SCIENTIFIC) + m_format += isUpper ? wxT('E') : wxT('e'); + else if ( ( m_style & wxGRID_FLOAT_FORMAT_COMPACT ) == wxGRID_FLOAT_FORMAT_COMPACT) + m_format += isUpper ? wxT('G') : wxT('g'); + else + m_format += wxT('f'); } text.Printf(m_format, val); @@ -704,10 +716,12 @@ void wxGridCellFloatRenderer::SetParameters(const wxString& params) // reset to defaults SetWidth(-1); SetPrecision(-1); + SetFormat(wxGRID_FLOAT_FORMAT_DEFAULT); } else { - wxString tmp = params.BeforeFirst(wxT(',')); + wxString rest; + wxString tmp = params.BeforeFirst(wxT(','), &rest); if ( !tmp.empty() ) { long width; @@ -721,7 +735,7 @@ void wxGridCellFloatRenderer::SetParameters(const wxString& params) } } - tmp = params.AfterFirst(wxT(',')); + tmp = rest.BeforeFirst(wxT(',')); if ( !tmp.empty() ) { long precision; @@ -734,6 +748,43 @@ void wxGridCellFloatRenderer::SetParameters(const wxString& params) wxLogDebug(wxT("Invalid wxGridCellFloatRenderer precision parameter string '%s ignored"), params.c_str()); } } + + tmp = rest.AfterFirst(wxT(',')); + if ( !tmp.empty() ) + { + if ( tmp[0] == wxT('f') ) + { + SetFormat(wxGRID_FLOAT_FORMAT_FIXED); + } + else if ( tmp[0] == wxT('e') ) + { + SetFormat(wxGRID_FLOAT_FORMAT_SCIENTIFIC); + } + else if ( tmp[0] == wxT('g') ) + { + SetFormat(wxGRID_FLOAT_FORMAT_COMPACT); + } + else if ( tmp[0] == wxT('E') ) + { + SetFormat(wxGRID_FLOAT_FORMAT_SCIENTIFIC | + wxGRID_FLOAT_FORMAT_UPPER); + } + else if ( tmp[0] == wxT('F') ) + { + SetFormat(wxGRID_FLOAT_FORMAT_FIXED | + wxGRID_FLOAT_FORMAT_UPPER); + } + else if ( tmp[0] == wxT('G') ) + { + SetFormat(wxGRID_FLOAT_FORMAT_COMPACT | + wxGRID_FLOAT_FORMAT_UPPER); + } + else + { + wxLogDebug("Invalid wxGridCellFloatRenderer format " + "parameter string '%s ignored", params); + } + } } } diff --git a/Externals/wxWidgets3/src/generic/grideditors.cpp b/Externals/wxWidgets3/src/generic/grideditors.cpp index 1d77e8be57..c92f876811 100644 --- a/Externals/wxWidgets3/src/generic/grideditors.cpp +++ b/Externals/wxWidgets3/src/generic/grideditors.cpp @@ -4,7 +4,7 @@ // Author: Michael Bedward (based on code by Julian Smart, Robin Dunn) // Modified by: Robin Dunn, Vadim Zeitlin, Santiago Palacios // Created: 1/08/1999 -// RCS-ID: $Id: grideditors.cpp 66714 2011-01-19 10:48:28Z VZ $ +// RCS-ID: $Id: grideditors.cpp 70693 2012-02-25 23:49:55Z VZ $ // Copyright: (c) Michael Bedward (mbedward@ozemail.com.au) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -300,13 +300,13 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr) else { // restore the standard colours fonts - if ( m_colFgOld.Ok() ) + if ( m_colFgOld.IsOk() ) { m_control->SetForegroundColour(m_colFgOld); m_colFgOld = wxNullColour; } - if ( m_colBgOld.Ok() ) + if ( m_colBgOld.IsOk() ) { m_control->SetBackgroundColour(m_colBgOld); m_colBgOld = wxNullColour; @@ -314,7 +314,7 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr) // Workaround for GTK+1 font setting problem on some platforms #if !defined(__WXGTK__) || defined(__WXGTK20__) - if ( m_fontOld.Ok() ) + if ( m_fontOld.IsOk() ) { m_control->SetFont(m_fontOld); m_fontOld = wxNullFont; @@ -862,10 +862,13 @@ wxString wxGridCellNumberEditor::GetValue() const // wxGridCellFloatEditor // ---------------------------------------------------------------------------- -wxGridCellFloatEditor::wxGridCellFloatEditor(int width, int precision) +wxGridCellFloatEditor::wxGridCellFloatEditor(int width, + int precision, + int format) { m_width = width; m_precision = precision; + m_style = format; } void wxGridCellFloatEditor::Create(wxWindow* parent, @@ -988,51 +991,113 @@ void wxGridCellFloatEditor::SetParameters(const wxString& params) // reset to default m_width = m_precision = -1; + m_style = wxGRID_FLOAT_FORMAT_DEFAULT; + m_format.clear(); } else { - long tmp; - if ( params.BeforeFirst(wxT(',')).ToLong(&tmp) ) + wxString rest; + wxString tmp = params.BeforeFirst(wxT(','), &rest); + if ( !tmp.empty() ) { - m_width = (int)tmp; - - if ( params.AfterFirst(wxT(',')).ToLong(&tmp) ) + long width; + if ( tmp.ToLong(&width) ) { - m_precision = (int)tmp; - - // skip the error message below - return; + m_width = (int)width; + } + else + { + wxLogDebug(wxT("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str()); } } - wxLogDebug(wxT("Invalid wxGridCellFloatEditor parameter string '%s' ignored"), params.c_str()); + tmp = rest.BeforeFirst(wxT(',')); + if ( !tmp.empty() ) + { + long precision; + if ( tmp.ToLong(&precision) ) + { + m_precision = (int)precision; + } + else + { + wxLogDebug(wxT("Invalid wxGridCellFloatRenderer precision parameter string '%s ignored"), params.c_str()); + } + } + + tmp = rest.AfterFirst(wxT(',')); + if ( !tmp.empty() ) + { + if ( tmp[0] == wxT('f') ) + { + m_style = wxGRID_FLOAT_FORMAT_FIXED; + } + else if ( tmp[0] == wxT('e') ) + { + m_style = wxGRID_FLOAT_FORMAT_SCIENTIFIC; + } + else if ( tmp[0] == wxT('g') ) + { + m_style = wxGRID_FLOAT_FORMAT_COMPACT; + } + else if ( tmp[0] == wxT('E') ) + { + m_style = wxGRID_FLOAT_FORMAT_SCIENTIFIC | + wxGRID_FLOAT_FORMAT_UPPER; + } + else if ( tmp[0] == wxT('F') ) + { + m_style = wxGRID_FLOAT_FORMAT_FIXED | + wxGRID_FLOAT_FORMAT_UPPER; + } + else if ( tmp[0] == wxT('G') ) + { + m_style = wxGRID_FLOAT_FORMAT_COMPACT | + wxGRID_FLOAT_FORMAT_UPPER; + } + else + { + wxLogDebug("Invalid wxGridCellFloatRenderer format " + "parameter string '%s ignored", params); + } + } } } -wxString wxGridCellFloatEditor::GetString() const +wxString wxGridCellFloatEditor::GetString() { - wxString fmt; - if ( m_precision == -1 && m_width != -1) + if ( !m_format ) { - // default precision - fmt.Printf(wxT("%%%d.f"), m_width); - } - else if ( m_precision != -1 && m_width == -1) - { - // default width - fmt.Printf(wxT("%%.%df"), m_precision); - } - else if ( m_precision != -1 && m_width != -1 ) - { - fmt.Printf(wxT("%%%d.%df"), m_width, m_precision); - } - else - { - // default width/precision - fmt = wxT("%f"); + if ( m_precision == -1 && m_width != -1) + { + // default precision + m_format.Printf(wxT("%%%d."), m_width); + } + else if ( m_precision != -1 && m_width == -1) + { + // default width + m_format.Printf(wxT("%%.%d"), m_precision); + } + else if ( m_precision != -1 && m_width != -1 ) + { + m_format.Printf(wxT("%%%d.%d"), m_width, m_precision); + } + else + { + // default width/precision + m_format = wxT("%"); + } + + bool isUpper = (m_style & wxGRID_FLOAT_FORMAT_UPPER) != 0; + if ( m_style & wxGRID_FLOAT_FORMAT_SCIENTIFIC ) + m_format += isUpper ? wxT('E') : wxT('e'); + else if ( m_style & wxGRID_FLOAT_FORMAT_COMPACT ) + m_format += isUpper ? wxT('G') : wxT('g'); + else + m_format += wxT('f'); } - return wxString::Format(fmt, m_value); + return wxString::Format(m_format, m_value); } bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event) @@ -1349,6 +1414,29 @@ void wxGridCellChoiceEditor::Create(wxWindow* parent, wxGridCellEditor::Create(parent, id, evtHandler); } +void wxGridCellChoiceEditor::SetSize(const wxRect& rect) +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellChoiceEditor must be created first!")); + + // Check that the height is not too small to fit the combobox. + wxRect rectTallEnough = rect; + const wxSize bestSize = m_control->GetBestSize(); + const wxCoord diffY = bestSize.GetHeight() - rectTallEnough.GetHeight(); + if ( diffY > 0 ) + { + // Do make it tall enough. + rectTallEnough.height += diffY; + + // Also centre the effective rectangle vertically with respect to the + // original one. + rectTallEnough.y -= diffY/2; + } + //else: The rectangle provided is already tall enough. + + wxGridCellEditor::SetSize(rectTallEnough); +} + void wxGridCellChoiceEditor::PaintBackground(const wxRect& rectCell, wxGridCellAttr * attr) { @@ -1380,6 +1468,14 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid) Combo()->SetFocus(); +#ifdef __WXOSX_COCOA__ + // This is a work around for the combobox being simply dismissed when a + // choice is made in it under OS X. The bug is almost certainly due to a + // problem in focus events generation logic but it's not obvious to fix and + // for now this at least allows to use wxGrid. + Combo()->Popup(); +#endif + if (evtHandler) { // When dropping down the menu, a kill focus event diff --git a/Externals/wxWidgets3/src/generic/gridsel.cpp b/Externals/wxWidgets3/src/generic/gridsel.cpp index 7f77177307..0d84cd8e49 100644 --- a/Externals/wxWidgets3/src/generic/gridsel.cpp +++ b/Externals/wxWidgets3/src/generic/gridsel.cpp @@ -4,7 +4,7 @@ // Author: Stefan Neis // Modified by: // Created: 20/02/1999 -// RCS-ID: $Id: gridsel.cpp 60078 2009-04-09 09:01:02Z VZ $ +// RCS-ID: $Id: gridsel.cpp 70177 2011-12-29 22:05:23Z VZ $ // Copyright: (c) Stefan Neis (Stefan.Neis@t-online.de) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -428,55 +428,101 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol, size_t count, n; - // Remove single cells contained in newly selected block. - if ( m_selectionMode == wxGrid::wxGridSelectCells ) + if ( m_selectionMode == wxGrid::wxGridSelectRows ) { - count = m_cellSelection.GetCount(); - for ( n = 0; n < count; n++ ) + // find out which rows are already selected: + wxArrayInt alreadyselected; + alreadyselected.Add(0,bottomRow-topRow+1); + for( n = 0; n < m_rowSelection.GetCount(); n++) { - wxGridCellCoords& coords = m_cellSelection[n]; - if ( BlockContainsCell( topRow, leftCol, bottomRow, rightCol, - coords.GetRow(), coords.GetCol() ) ) + int row = m_rowSelection[n]; + if( (row >= topRow) && (row <= bottomRow) ) { - m_cellSelection.RemoveAt(n); - n--; - count--; + alreadyselected[ row - topRow ]=1; + } + } + + // add the newly selected rows: + for ( int row = topRow; row <= bottomRow; row++ ) + { + if ( alreadyselected[ row - topRow ] == 0 ) + { + m_rowSelection.Add( row ); } } } - - // If a block containing the selection is already selected, return, - // if a block contained in the selection is found, remove it. - - count = m_blockSelectionTopLeft.GetCount(); - for ( n = 0; n < count; n++ ) + else if ( m_selectionMode == wxGrid::wxGridSelectColumns ) { - wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n]; - wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n]; - - switch ( BlockContain( coords1.GetRow(), coords1.GetCol(), - coords2.GetRow(), coords2.GetCol(), - topRow, leftCol, bottomRow, rightCol ) ) + // find out which columns are already selected: + wxArrayInt alreadyselected; + alreadyselected.Add(0,rightCol-leftCol+1); + for( n = 0; n < m_colSelection.GetCount(); n++) { - case 1: - return; + int col = m_colSelection[n]; + if( (col >= leftCol) && (col <= rightCol) ) + { + alreadyselected[ col - leftCol ]=1; + } + } - case -1: - m_blockSelectionTopLeft.RemoveAt(n); - m_blockSelectionBottomRight.RemoveAt(n); - n--; - count--; - break; - - default: - break; + // add the newly selected columns: + for ( int col = leftCol; col <= rightCol; col++ ) + { + if ( alreadyselected[ col - leftCol ] == 0 ) + { + m_colSelection.Add( col ); + } } } - - // If a row containing the selection is already selected, return, - // if a row contained in newly selected block is found, remove it. - if ( m_selectionMode != wxGrid::wxGridSelectColumns ) + else { + // Remove single cells contained in newly selected block. + if ( m_selectionMode == wxGrid::wxGridSelectCells ) + { + count = m_cellSelection.GetCount(); + for ( n = 0; n < count; n++ ) + { + wxGridCellCoords& coords = m_cellSelection[n]; + if ( BlockContainsCell( topRow, leftCol, bottomRow, rightCol, + coords.GetRow(), coords.GetCol() ) ) + { + m_cellSelection.RemoveAt(n); + n--; + count--; + } + } + } + + // If a block containing the selection is already selected, return, + // if a block contained in the selection is found, remove it. + + count = m_blockSelectionTopLeft.GetCount(); + for ( n = 0; n < count; n++ ) + { + wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n]; + wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n]; + + switch ( BlockContain( coords1.GetRow(), coords1.GetCol(), + coords2.GetRow(), coords2.GetCol(), + topRow, leftCol, bottomRow, rightCol ) ) + { + case 1: + return; + + case -1: + m_blockSelectionTopLeft.RemoveAt(n); + m_blockSelectionBottomRight.RemoveAt(n); + n--; + count--; + break; + + default: + break; + } + } + + // If a row containing the selection is already selected, return, + // if a row contained in newly selected block is found, remove it. count = m_rowSelection.GetCount(); for ( n = 0; n < count; n++ ) { @@ -497,10 +543,8 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol, break; } } - } - if ( m_selectionMode != wxGrid::wxGridSelectRows ) - { + // Same for columns. count = m_colSelection.GetCount(); for ( n = 0; n < count; n++ ) { @@ -521,11 +565,10 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol, break; } } + + m_blockSelectionTopLeft.Add( wxGridCellCoords( topRow, leftCol ) ); + m_blockSelectionBottomRight.Add( wxGridCellCoords( bottomRow, rightCol ) ); } - - m_blockSelectionTopLeft.Add( wxGridCellCoords( topRow, leftCol ) ); - m_blockSelectionBottomRight.Add( wxGridCellCoords( bottomRow, rightCol ) ); - // Update View: if ( !m_grid->GetBatchCount() ) { @@ -552,29 +595,35 @@ void wxGridSelection::SelectCell( int row, int col, const wxKeyboardState& kbd, bool sendEvent ) { + if ( IsInSelection ( row, col ) ) + return; + + wxGridCellCoords selectedTopLeft, selectedBottomRight; if ( m_selectionMode == wxGrid::wxGridSelectRows ) { - SelectBlock(row, 0, row, m_grid->GetNumberCols() - 1, kbd, sendEvent); - - return; + m_rowSelection.Add( row ); + selectedTopLeft = wxGridCellCoords( row, 0 ); + selectedBottomRight = wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ); } else if ( m_selectionMode == wxGrid::wxGridSelectColumns ) { - SelectBlock(0, col, m_grid->GetNumberRows() - 1, col, kbd, sendEvent); - - return; + m_colSelection.Add( col ); + selectedTopLeft = wxGridCellCoords( 0, col ); + selectedBottomRight = wxGridCellCoords( m_grid->GetNumberRows() - 1, col ); + } + else + { + m_cellSelection.Add( wxGridCellCoords( row, col ) ); + selectedTopLeft = wxGridCellCoords( row, col ); + selectedBottomRight = wxGridCellCoords( row, col ); } - else if ( IsInSelection ( row, col ) ) - return; - - m_cellSelection.Add( wxGridCellCoords( row, col ) ); // Update View: if ( !m_grid->GetBatchCount() ) { wxRect r = m_grid->BlockToDeviceRect( - wxGridCellCoords( row, col ), - wxGridCellCoords( row, col ) ); + selectedTopLeft, + selectedBottomRight ); ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r ); } @@ -584,8 +633,8 @@ void wxGridSelection::SelectCell( int row, int col, wxGridRangeSelectEvent gridEvt( m_grid->GetId(), wxEVT_GRID_RANGE_SELECT, m_grid, - wxGridCellCoords( row, col ), - wxGridCellCoords( row, col ), + selectedTopLeft, + selectedBottomRight, true, kbd); m_grid->GetEventHandler()->ProcessEvent( gridEvt ); diff --git a/Externals/wxWidgets3/src/generic/headerctrlg.cpp b/Externals/wxWidgets3/src/generic/headerctrlg.cpp index 105f90f7ef..a4735d7f07 100644 --- a/Externals/wxWidgets3/src/generic/headerctrlg.cpp +++ b/Externals/wxWidgets3/src/generic/headerctrlg.cpp @@ -3,7 +3,7 @@ // Purpose: generic wxHeaderCtrl implementation // Author: Vadim Zeitlin // Created: 2008-12-03 -// RCS-ID: $Id: headerctrlg.cpp 63575 2010-02-28 11:08:42Z VZ $ +// RCS-ID: $Id: headerctrlg.cpp 67384 2011-04-03 20:31:32Z DS $ // Copyright: (c) 2008 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -180,7 +180,7 @@ unsigned int wxHeaderCtrl::FindColumnAtPoint(int x, bool *onSeparator) const pos += col.GetWidth(); - // if the column is resizeable, check if we're approximatively over the + // if the column is resizable, check if we're approximatively over the // line separating it from the next column // // TODO: don't hardcode sensitivity diff --git a/Externals/wxWidgets3/src/generic/htmllbox.cpp b/Externals/wxWidgets3/src/generic/htmllbox.cpp index b76cddeb44..1779404086 100644 --- a/Externals/wxWidgets3/src/generic/htmllbox.cpp +++ b/Externals/wxWidgets3/src/generic/htmllbox.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 31.05.03 -// RCS-ID: $Id: htmllbox.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: htmllbox.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -308,7 +308,7 @@ void wxHtmlListBox::CacheItem(size_t n) const m_htmlParser->SetDC(new wxClientDC(self)); m_htmlParser->SetFS(&self->m_filesystem); #if !wxUSE_UNICODE - if (GetFont().Ok()) + if (GetFont().IsOk()) m_htmlParser->SetInputEncoding(GetFont().GetEncoding()); #endif // use system's default GUI font by default: diff --git a/Externals/wxWidgets3/src/generic/hyperlinkg.cpp b/Externals/wxWidgets3/src/generic/hyperlinkg.cpp index 7248f8e1e9..5a302817e5 100644 --- a/Externals/wxWidgets3/src/generic/hyperlinkg.cpp +++ b/Externals/wxWidgets3/src/generic/hyperlinkg.cpp @@ -4,7 +4,7 @@ // Author: David Norris , Otto Wyss // Modified by: Ryan Norton, Francesco Montorsi // Created: 04/02/2005 -// RCS-ID: $Id: hyperlinkg.cpp 65334 2010-08-17 16:55:32Z VZ $ +// RCS-ID: $Id: hyperlinkg.cpp 67948 2011-06-15 21:56:23Z VZ $ // Copyright: (c) 2005 David Norris // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -41,6 +41,7 @@ #endif #include "wx/clipbrd.h" +#include "wx/renderer.h" // ============================================================================ // implementation @@ -89,6 +90,9 @@ bool wxGenericHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id, // with GTK+'s native handling): Connect( wxEVT_PAINT, wxPaintEventHandler(wxGenericHyperlinkCtrl::OnPaint) ); + Connect( wxEVT_SET_FOCUS, wxFocusEventHandler(wxGenericHyperlinkCtrl::OnFocus) ); + Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler(wxGenericHyperlinkCtrl::OnFocus) ); + Connect( wxEVT_CHAR, wxKeyEventHandler(wxGenericHyperlinkCtrl::OnChar) ); Connect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeaveWindow) ); Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeftDown) ); @@ -187,6 +191,32 @@ void wxGenericHyperlinkCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) dc.SetTextBackground(GetBackgroundColour()); dc.DrawText(GetLabel(), GetLabelRect().GetTopLeft()); + if (HasFocus()) + { + wxRendererNative::Get().DrawFocusRect(this, dc, GetClientRect(), wxCONTROL_SELECTED); + } +} + +void wxGenericHyperlinkCtrl::OnFocus(wxFocusEvent& event) +{ + Refresh(); + event.Skip(); +} + +void wxGenericHyperlinkCtrl::OnChar(wxKeyEvent& event) +{ + switch (event.m_keyCode) + { + default: + event.Skip(); + break; + case WXK_SPACE: + case WXK_NUMPAD_SPACE: + SetForegroundColour(m_visitedColour); + m_visited = true; + SendEvent(); + break; + } } void wxGenericHyperlinkCtrl::OnLeftDown(wxMouseEvent& event) diff --git a/Externals/wxWidgets3/src/generic/imaglist.cpp b/Externals/wxWidgets3/src/generic/imaglist.cpp index 60fd71eae2..79c28ae14e 100644 --- a/Externals/wxWidgets3/src/generic/imaglist.cpp +++ b/Externals/wxWidgets3/src/generic/imaglist.cpp @@ -2,7 +2,7 @@ // Name: src/generic/imaglist.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: imaglist.cpp 67280 2011-03-22 14:17:38Z DS $ +// Id: $Id: imaglist.cpp 70345 2012-01-15 01:05:28Z VZ $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -16,8 +16,6 @@ #if wxUSE_IMAGLIST && !defined(wxHAS_NATIVE_IMAGELIST) -#ifndef __WXPALMOS__ - #include "wx/imaglist.h" #ifndef WX_PRECOMP @@ -106,7 +104,7 @@ int wxGenericImageList::Add( const wxBitmap &bitmap ) int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask ) { wxBitmap bmp(bitmap); - if (mask.Ok()) + if (mask.IsOk()) bmp.SetMask(new wxMask(mask)); return Add(bmp); } @@ -214,7 +212,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBit m_images.Insert( next, newBitmap ); } - if (mask.Ok()) + if (mask.IsOk()) newBitmap->SetMask(new wxMask(mask)); return true; @@ -273,6 +271,4 @@ bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y, return true; } -#endif // __WXPALMOS__ - #endif // wxUSE_IMAGLIST diff --git a/Externals/wxWidgets3/src/generic/listctrl.cpp b/Externals/wxWidgets3/src/generic/listctrl.cpp index 97cb983eb9..4f7fe3c9ec 100644 --- a/Externals/wxWidgets3/src/generic/listctrl.cpp +++ b/Externals/wxWidgets3/src/generic/listctrl.cpp @@ -3,7 +3,7 @@ // Purpose: generic implementation of wxListCtrl // Author: Robert Roebling // Vadim Zeitlin (virtual list control support) -// Id: $Id: listctrl.cpp 67280 2011-03-22 14:17:38Z DS $ +// Id: $Id: listctrl.cpp 70368 2012-01-16 13:37:18Z VZ $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -342,12 +342,23 @@ bool wxListHeaderData::IsHit( int x, int y ) const void wxListHeaderData::GetItem( wxListItem& item ) { - item.m_mask = m_mask; - item.m_text = m_text; - item.m_image = m_image; - item.m_format = m_format; - item.m_width = m_width; - item.m_state = m_state; + long mask = item.m_mask; + if ( !mask ) + { + // by default, get everything for backwards compatibility + mask = -1; + } + + if ( mask & wxLIST_MASK_STATE ) + item.m_state = m_state; + if ( mask & wxLIST_MASK_TEXT ) + item.m_text = m_text; + if ( mask & wxLIST_MASK_IMAGE ) + item.m_image = m_image; + if ( mask & wxLIST_MASK_WIDTH ) + item.m_width = m_width; + if ( mask & wxLIST_MASK_FORMAT ) + item.m_format = m_format; } int wxListHeaderData::GetImage() const @@ -1461,6 +1472,12 @@ bool wxListTextCtrlWrapper::AcceptChanges() } void wxListTextCtrlWrapper::OnChar( wxKeyEvent &event ) +{ + if ( !CheckForEndEditKey(event) ) + event.Skip(); +} + +bool wxListTextCtrlWrapper::CheckForEndEditKey(const wxKeyEvent& event) { switch ( event.m_keyCode ) { @@ -1473,8 +1490,10 @@ void wxListTextCtrlWrapper::OnChar( wxKeyEvent &event ) break; default: - event.Skip(); + return false; } + + return true; } void wxListTextCtrlWrapper::OnKeyUp( wxKeyEvent &event ) @@ -1518,6 +1537,7 @@ void wxListTextCtrlWrapper::OnKillFocus( wxFocusEvent &event ) BEGIN_EVENT_TABLE(wxListMainWindow, wxWindow) EVT_PAINT (wxListMainWindow::OnPaint) EVT_MOUSE_EVENTS (wxListMainWindow::OnMouse) + EVT_CHAR_HOOK (wxListMainWindow::OnCharHook) EVT_CHAR (wxListMainWindow::OnChar) EVT_KEY_DOWN (wxListMainWindow::OnKeyDown) EVT_KEY_UP (wxListMainWindow::OnKeyUp) @@ -2023,6 +2043,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) GetParent()->GetId()); evCache.SetEventObject( GetParent() ); evCache.m_oldItemIndex = visibleFrom; + evCache.m_item.m_itemId = evCache.m_itemIndex = visibleTo; GetParent()->GetEventHandler()->ProcessEvent( evCache ); } @@ -2153,6 +2174,7 @@ void wxListMainWindow::SendNotify( size_t line, wxListEvent le( command, GetParent()->GetId() ); le.SetEventObject( GetParent() ); + le.m_item.m_itemId = le.m_itemIndex = line; // set only for events which have position @@ -2200,6 +2222,7 @@ wxTextCtrl *wxListMainWindow::EditLabel(long item, wxClassInfo* textControlClass wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() ); le.SetEventObject( GetParent() ); + le.m_item.m_itemId = le.m_itemIndex = item; wxListLineData *data = GetLine(itemEdit); wxCHECK_MSG( data, NULL, wxT("invalid index in EditLabel()") ); @@ -2242,6 +2265,7 @@ bool wxListMainWindow::OnRenameAccept(size_t itemEdit, const wxString& value) { wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() ); le.SetEventObject( GetParent() ); + le.m_item.m_itemId = le.m_itemIndex = itemEdit; wxListLineData *data = GetLine(itemEdit); @@ -2262,6 +2286,7 @@ void wxListMainWindow::OnRenameCancelled(size_t itemEdit) le.SetEditCanceled(true); le.SetEventObject( GetParent() ); + le.m_item.m_itemId = le.m_itemIndex = itemEdit; wxListLineData *data = GetLine(itemEdit); @@ -2346,37 +2371,19 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) } } + // Update drag events counter first as we must do it even if the mouse is + // not on any item right now as we must keep count in case we started + // dragging from the empty control area but continued to do it over a valid + // item -- in this situation we must not start dragging this item. if (event.Dragging()) - { - if (m_dragCount == 0) - { - // we have to report the raw, physical coords as we want to be - // able to call HitTest(event.m_pointDrag) from the user code to - // get the item being dragged - m_dragStart = event.GetPosition(); - } - m_dragCount++; - - if (m_dragCount != 3) - return; - - int command = event.RightIsDown() ? wxEVT_COMMAND_LIST_BEGIN_RDRAG - : wxEVT_COMMAND_LIST_BEGIN_DRAG; - - wxListEvent le( command, GetParent()->GetId() ); - le.SetEventObject( GetParent() ); - le.m_itemIndex = m_lineLastClicked; - le.m_pointDrag = m_dragStart; - GetParent()->GetEventHandler()->ProcessEvent( le ); - - return; - } else - { m_dragCount = 0; - } + // The only mouse event that can be generated without any valid item is + // wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK as it can be useful to have a global + // popup menu for the list control itself which should be shown even when + // the user clicks outside of any item. if ( !hitResult ) { // outside of any item @@ -2400,6 +2407,27 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) return; } + if ( event.Dragging() ) + { + if (m_dragCount == 1) + { + // we have to report the raw, physical coords as we want to be + // able to call HitTest(event.m_pointDrag) from the user code to + // get the item being dragged + m_dragStart = event.GetPosition(); + } + + if (m_dragCount != 3) + return; + + int command = event.RightIsDown() ? wxEVT_COMMAND_LIST_BEGIN_RDRAG + : wxEVT_COMMAND_LIST_BEGIN_DRAG; + + SendNotify( m_lineLastClicked, command, m_dragStart ); + + return; + } + bool forceClick = false; if (event.ButtonDClick()) { @@ -2690,6 +2718,7 @@ void wxListMainWindow::OnKeyDown( wxKeyEvent &event ) // send a list event wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, parent->GetId() ); + le.m_item.m_itemId = le.m_itemIndex = m_current; if (HasCurrent()) GetLine(m_current)->GetItem( 0, le.m_item ); @@ -2713,6 +2742,22 @@ void wxListMainWindow::OnKeyUp( wxKeyEvent &event ) event.Skip(); } +void wxListMainWindow::OnCharHook( wxKeyEvent &event ) +{ + if ( m_textctrlWrapper ) + { + // When an in-place editor is active we should ensure that it always + // gets the key events that are special to it. + if ( m_textctrlWrapper->CheckForEndEditKey(event) ) + { + // Skip the call to wxEvent::Skip() below. + return; + } + } + + event.Skip(); +} + void wxListMainWindow::OnChar( wxKeyEvent &event ) { wxWindow *parent = GetParent(); @@ -2932,17 +2977,6 @@ void wxListMainWindow::GetImageSize( int index, int &width, int &height ) const } } -int wxListMainWindow::GetTextLength( const wxString &s ) const -{ - wxClientDC dc( wxConstCast(this, wxListMainWindow) ); - dc.SetFont( GetFont() ); - - wxCoord lw; - dc.GetTextExtent( s, &lw, NULL ); - - return lw + AUTOSIZE_COL_MARGIN; -} - void wxListMainWindow::SetImageList( wxImageList *imageList, int which ) { m_dirty = true; @@ -2985,18 +3019,42 @@ int wxListMainWindow::GetItemSpacing( bool isSmall ) // columns // ---------------------------------------------------------------------------- -void wxListMainWindow::SetColumn( int col, wxListItem &item ) +int +wxListMainWindow::ComputeMinHeaderWidth(const wxListHeaderData* column) const +{ + wxClientDC dc(const_cast(this)); + + int width = dc.GetTextExtent(column->GetText()).x + AUTOSIZE_COL_MARGIN; + + width += 2*EXTRA_WIDTH; + + // check for column header's image availability + const int image = column->GetImage(); + if ( image != -1 ) + { + if ( m_small_image_list ) + { + int ix = 0, iy = 0; + m_small_image_list->GetSize(image, ix, iy); + width += ix + HEADER_IMAGE_MARGIN_IN_REPORT_MODE; + } + } + + return width; +} + +void wxListMainWindow::SetColumn( int col, const wxListItem &item ) { wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col ); wxCHECK_RET( node, wxT("invalid column index in SetColumn") ); - if ( item.m_width == wxLIST_AUTOSIZE_USEHEADER ) - item.m_width = GetTextLength( item.m_text ); - wxListHeaderData *column = node->GetData(); column->SetItem( item ); + if ( item.m_width == wxLIST_AUTOSIZE_USEHEADER ) + column->SetWidth(ComputeMinHeaderWidth(column)); + wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin; if ( headerWin ) headerWin->m_dirty = true; @@ -3030,29 +3088,13 @@ void wxListMainWindow::SetColumnWidth( int col, int width ) if (width == wxLIST_AUTOSIZE_USEHEADER) { - width = GetTextLength(column->GetText()); - width += 2*EXTRA_WIDTH; - - // check for column header's image availability - const int image = column->GetImage(); - if ( image != -1 ) - { - if ( m_small_image_list ) - { - int ix = 0, iy = 0; - m_small_image_list->GetSize(image, ix, iy); - width += ix + HEADER_IMAGE_MARGIN_IN_REPORT_MODE; - } - } + width = ComputeMinHeaderWidth(column); } else if ( width == wxLIST_AUTOSIZE ) { - if ( IsVirtual() ) - { - // TODO: determine the max width somehow... - width = WIDTH_COL_DEFAULT; - } - else // !virtual + width = ComputeMinHeaderWidth(column); + + if ( !IsVirtual() ) { wxClientDC dc(this); dc.SetFont( GetFont() ); @@ -3082,8 +3124,9 @@ void wxListMainWindow::SetColumnWidth( int col, int width ) m_aColWidths.Item(col)->nMaxWidth = max; } - max = m_aColWidths.Item(col)->nMaxWidth; - width = max + AUTOSIZE_COL_MARGIN; + max = m_aColWidths.Item(col)->nMaxWidth + AUTOSIZE_COL_MARGIN; + if ( width < max ) + width = max; } } @@ -3156,10 +3199,14 @@ void wxListMainWindow::SetItem( wxListItem &item ) } } - // update the item on screen - wxRect rectItem; - GetItemRect(id, rectItem); - RefreshRect(rectItem); + // update the item on screen unless we're going to update everything soon + // anyhow + if ( !m_dirty ) + { + wxRect rectItem; + GetItemRect(id, rectItem); + RefreshRect(rectItem); + } } void wxListMainWindow::SetItemStateAll(long state, long stateMask) @@ -3604,6 +3651,9 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh) int x = EXTRA_BORDER_X; int y = EXTRA_BORDER_Y; + + // Note that "row" here is vertical, i.e. what is called + // "column" in many other places in wxWidgets. int maxWidthInThisRow = 0; m_linesPerPage = 0; @@ -3625,8 +3675,24 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh) if (currentlyVisibleLines > m_linesPerPage) m_linesPerPage = currentlyVisibleLines; - if ( y + sizeLine.y >= clientHeight ) + // Have we reached the end of the row either because no + // more items would fit or because there are simply no more + // items? + if ( y + sizeLine.y >= clientHeight + || i == count - 1) { + // Adjust all items in this row to have the same + // width to ensure that they all align horizontally in + // icon view. + if ( HasFlag(wxLC_ICON) || HasFlag(wxLC_SMALL_ICON) ) + { + size_t firstRowLine = i - currentlyVisibleLines + 1; + for (size_t j = firstRowLine; j <= i; j++) + { + GetLine(j)->m_gi->ExtendWidth(maxWidthInThisRow); + } + } + currentlyVisibleLines = 0; y = EXTRA_BORDER_Y; maxWidthInThisRow += MARGIN_BETWEEN_ROWS; @@ -3635,10 +3701,6 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh) maxWidthInThisRow = 0; } - // We have reached the last item. - if ( i == count - 1 ) - entireWidth += maxWidthInThisRow; - if ( (tries == 0) && (entireWidth + SCROLL_UNIT_X > clientWidth) ) { @@ -3811,6 +3873,21 @@ void wxListMainWindow::DeleteColumn( int col ) for ( size_t i = 0; i < m_lines.GetCount(); i++ ) { wxListLineData * const line = GetLine(i); + + // In the following atypical but possible scenario it can be + // legal to call DeleteColumn() but the items may not have any + // values for it: + // 1. In report view, insert a second column. + // 2. Still in report view, add an item with 2 values. + // 3. Switch to an icon (or list) view. + // 4. Add an item -- necessarily with 1 value only. + // 5. Switch back to report view. + // 6. Call DeleteColumn(). + // So we need to check for this as otherwise we would simply crash + // if this happens. + if ( line->m_items.GetCount() <= static_cast(col) ) + continue; + wxListItemDataList::compatibility_iterator n = line->m_items.Item( col ); delete n->GetData(); line->m_items.Erase(n); @@ -4027,6 +4104,19 @@ void wxListMainWindow::InsertItem( wxListItem &item ) wxListLineData *line = new wxListLineData(this); line->SetItem( item.m_col, item ); + if ( item.m_mask & wxLIST_MASK_IMAGE ) + { + // Reset the buffered height if it's not big enough for the new image. + int image = item.GetImage(); + if ( m_small_image_list && image != -1 && InReportView() ) + { + int imageWidth, imageHeight; + m_small_image_list->GetSize(image, imageWidth, imageHeight); + + if ( imageHeight > m_lineHeight ) + m_lineHeight = 0; + } + } m_lines.Insert( line, id ); @@ -4043,15 +4133,15 @@ void wxListMainWindow::InsertItem( wxListItem &item ) RefreshLines(id, GetItemCount() - 1); } -void wxListMainWindow::InsertColumn( long col, wxListItem &item ) +void wxListMainWindow::InsertColumn( long col, const wxListItem &item ) { m_dirty = true; if ( InReportView() ) { - if (item.m_width == wxLIST_AUTOSIZE_USEHEADER) - item.m_width = GetTextLength( item.m_text ); - wxListHeaderData *column = new wxListHeaderData( item ); + if (item.m_width == wxLIST_AUTOSIZE_USEHEADER) + column->SetWidth(ComputeMinHeaderWidth(column)); + wxColWidthInfo *colWidthInfo = new wxColWidthInfo(); bool insert = (col >= 0) && ((size_t)col < m_columns.GetCount()); @@ -4221,7 +4311,7 @@ void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to) IMPLEMENT_DYNAMIC_CLASS(wxGenericListCtrl, wxControl) -BEGIN_EVENT_TABLE(wxGenericListCtrl,wxControl) +BEGIN_EVENT_TABLE(wxGenericListCtrl,wxListCtrlBase) EVT_SIZE(wxGenericListCtrl::OnSize) EVT_SCROLLWIN(wxGenericListCtrl::OnScroll) END_EVENT_TABLE() @@ -4301,7 +4391,9 @@ bool wxGenericListCtrl::Create(wxWindow *parent, wxASSERT_MSG( (style & wxLC_MASK_TYPE), wxT("wxListCtrl style should have exactly one mode bit set") ); - if ( !wxControl::Create( parent, id, pos, size, style|wxVSCROLL|wxHSCROLL, validator, name ) ) + if ( !wxListCtrlBase::Create( parent, id, pos, size, + style | wxVSCROLL | wxHSCROLL, + validator, name ) ) return false; #ifdef __WXGTK__ @@ -4339,7 +4431,7 @@ WXLRESULT wxGenericListCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { - WXLRESULT rc = wxControl::MSWWindowProc(nMsg, wParam, lParam); + WXLRESULT rc = wxListCtrlBase::MSWWindowProc(nMsg, wParam, lParam); // we need to process arrows ourselves for scrolling if ( nMsg == WM_GETDLGCODE ) @@ -4447,7 +4539,7 @@ bool wxGenericListCtrl::GetColumn(int col, wxListItem &item) const return true; } -bool wxGenericListCtrl::SetColumn( int col, wxListItem& item ) +bool wxGenericListCtrl::SetColumn( int col, const wxListItem& item ) { m_mainWin->SetColumn( col, item ); return true; @@ -4782,6 +4874,10 @@ bool wxGenericListCtrl::DeleteColumn( int col ) // if we don't have the header any longer, we need to relayout the window // if ( !GetColumnCount() ) + + // Ensure that the non-existent columns are really removed from display. + Refresh(); + return true; } @@ -4853,12 +4949,14 @@ long wxGenericListCtrl::InsertItem( long index, const wxString &label, int image wxListItem info; info.m_text = label; info.m_image = imageIndex; - info.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_IMAGE; + info.m_mask = wxLIST_MASK_TEXT; + if (imageIndex > -1) + info.m_mask |= wxLIST_MASK_IMAGE; info.m_itemId = index; return InsertItem( info ); } -long wxGenericListCtrl::InsertColumn( long col, wxListItem &item ) +long wxGenericListCtrl::DoInsertColumn( long col, const wxListItem &item ) { wxCHECK_MSG( InReportView(), -1, wxT("can't add column in non report mode") ); @@ -4872,23 +4970,6 @@ long wxGenericListCtrl::InsertColumn( long col, wxListItem &item ) return 0; } -long wxGenericListCtrl::InsertColumn( long col, const wxString &heading, - int format, int width ) -{ - wxListItem item; - item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT; - item.m_text = heading; - if (width >= -2) - { - item.m_mask |= wxLIST_MASK_WIDTH; - item.m_width = width; - } - - item.m_format = format; - - return InsertColumn( col, item ); -} - bool wxGenericListCtrl::ScrollList( int dx, int dy ) { return m_mainWin->ScrollList(dx, dy); @@ -5060,7 +5141,7 @@ void wxGenericListCtrl::DoClientToScreen( int *x, int *y ) const if ( m_mainWin ) m_mainWin->DoClientToScreen(x, y); else - wxControl::DoClientToScreen(x, y); + wxListCtrlBase::DoClientToScreen(x, y); } void wxGenericListCtrl::DoScreenToClient( int *x, int *y ) const @@ -5070,7 +5151,7 @@ void wxGenericListCtrl::DoScreenToClient( int *x, int *y ) const if ( m_mainWin ) m_mainWin->DoScreenToClient(x, y); else - wxControl::DoScreenToClient(x, y); + wxListCtrlBase::DoScreenToClient(x, y); } void wxGenericListCtrl::SetFocus() diff --git a/Externals/wxWidgets3/src/generic/logg.cpp b/Externals/wxWidgets3/src/generic/logg.cpp index 06e7b0cb5d..e40376598f 100644 --- a/Externals/wxWidgets3/src/generic/logg.cpp +++ b/Externals/wxWidgets3/src/generic/logg.cpp @@ -5,7 +5,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 20.09.99 (extracted from src/common/log.cpp) -// RCS-ID: $Id: logg.cpp 66503 2010-12-31 17:38:51Z VZ $ +// RCS-ID: $Id: logg.cpp 70671 2012-02-22 17:35:21Z JS $ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -73,7 +73,7 @@ #include #endif -#include "wx/datetime.h" +#include "wx/time.h" // the suffix we add to the button to show that the dialog can be expanded #define EXPAND_SUFFIX wxT(" >>") @@ -90,7 +90,6 @@ // allows to exclude the usage of wxDateTime static wxString TimeStamp(const wxString& format, time_t t) { -#if wxUSE_DATETIME wxChar buf[4096]; struct tm tm; if ( !wxStrftime(buf, WXSIZEOF(buf), format, wxLocaltime_r(&t, &tm)) ) @@ -99,9 +98,6 @@ static wxString TimeStamp(const wxString& format, time_t t) wxFAIL_MSG(wxT("strftime() failed")); } return wxString(buf); -#else // !wxUSE_DATETIME - return wxEmptyString; -#endif // wxUSE_DATETIME/!wxUSE_DATETIME } @@ -521,7 +517,7 @@ wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTi wxMenuBar *pMenuBar = new wxMenuBar; wxMenu *pMenu = new wxMenu; #if CAN_SAVE_FILES - pMenu->Append(Menu_Save, _("&Save..."), _("Save log contents to file")); + pMenu->Append(Menu_Save, _("Save &As..."), _("Save log contents to file")); #endif // CAN_SAVE_FILES pMenu->Append(Menu_Clear, _("C&lear"), _("Clear the log contents")); pMenu->AppendSeparator(); @@ -726,7 +722,7 @@ wxLogDialog::wxLogDialog(wxWindow *parent, bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); // create the controls which are always shown and layout them: we use - // sizers even though our window is not resizeable to calculate the size of + // sizers even though our window is not resizable to calculate the size of // the dialog properly wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL); wxBoxSizer *sizerAll = new wxBoxSizer(isPda ? wxVERTICAL : wxHORIZONTAL); @@ -757,11 +753,17 @@ wxLogDialog::wxLogDialog(wxWindow *parent, // add the details pane #ifndef __SMARTPHONE__ + +#if wxUSE_COLLPANE wxCollapsiblePane * const collpane = new wxCollapsiblePane(this, wxID_ANY, ms_details); sizerTop->Add(collpane, wxSizerFlags(1).Expand().Border()); wxWindow *win = collpane->GetPane(); +#else + wxPanel* win = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, + wxBORDER_NONE); +#endif wxSizer * const paneSz = new wxBoxSizer(wxVERTICAL); CreateDetailsControls(win); @@ -850,7 +852,7 @@ void wxLogDialog::CreateDetailsControls(wxWindow *parent) // This may very well fail if there are insufficient colours available. // Degrade gracefully. - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) { loadedIcons = false; diff --git a/Externals/wxWidgets3/src/generic/mask.cpp b/Externals/wxWidgets3/src/generic/mask.cpp index 69d6cfaf74..a7ea34ad2a 100644 --- a/Externals/wxWidgets3/src/generic/mask.cpp +++ b/Externals/wxWidgets3/src/generic/mask.cpp @@ -3,7 +3,7 @@ // Purpose: generic wxMask implementation // Author: Vadim Zeitlin // Created: 2006-09-28 -// RCS-ID: $Id: mask.cpp 41495 2006-09-28 23:02:39Z VZ $ +// RCS-ID: $Id: mask.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 2006 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -49,12 +49,12 @@ bool wxMask::InitFromColour(const wxBitmap& bitmap, const wxColour& colour) wxImage imgSrc(bitmap.ConvertToImage()); imgSrc.SetMask(false); wxImage image(imgSrc.ConvertToMono(clr.Red(), clr.Green(), clr.Blue())); - if ( !image.Ok() ) + if ( !image.IsOk() ) return false; m_bitmap = wxBitmap(image, 1); - return m_bitmap.Ok(); + return m_bitmap.IsOk(); #else // !wxUSE_IMAGE wxUnusedVar(bitmap); wxUnusedVar(colour); @@ -65,7 +65,7 @@ bool wxMask::InitFromColour(const wxBitmap& bitmap, const wxColour& colour) bool wxMask::InitFromMonoBitmap(const wxBitmap& bitmap) { - wxCHECK_MSG( bitmap.Ok(), false, wxT("Invalid bitmap") ); + wxCHECK_MSG( bitmap.IsOk(), false, wxT("Invalid bitmap") ); wxCHECK_MSG( bitmap.GetDepth() == 1, false, wxT("Cannot create mask from colour bitmap") ); m_bitmap = bitmap; diff --git a/Externals/wxWidgets3/src/generic/msgdlgg.cpp b/Externals/wxWidgets3/src/generic/msgdlgg.cpp index e5532d8cc5..fe1e70f82a 100644 --- a/Externals/wxWidgets3/src/generic/msgdlgg.cpp +++ b/Externals/wxWidgets3/src/generic/msgdlgg.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart, Robert Roebling // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: msgdlgg.cpp 65450 2010-08-30 21:48:25Z VZ $ +// RCS-ID: $Id: msgdlgg.cpp 68537 2011-08-04 22:53:42Z VZ $ // Copyright: (c) Julian Smart and Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -74,6 +74,7 @@ protected: BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog) EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes) EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo) + EVT_BUTTON(wxID_HELP, wxGenericMessageDialog::OnHelp) EVT_BUTTON(wxID_CANCEL, wxGenericMessageDialog::OnCancel) END_EVENT_TABLE() @@ -133,6 +134,13 @@ wxSizer *wxGenericMessageDialog::CreateMsgDlgButtonSizer() btnDef = yes; } + if ( m_dialogStyle & wxHELP ) + { + wxButton * const + help = new wxButton(this, wxID_HELP, GetCustomHelpLabel()); + sizerStd->AddButton(help); + } + if ( btnDef ) { btnDef->SetDefault(); @@ -148,7 +156,7 @@ wxSizer *wxGenericMessageDialog::CreateMsgDlgButtonSizer() // Use standard labels for all buttons return CreateSeparatedButtonSizer ( - m_dialogStyle & (wxOK | wxCANCEL | wxYES_NO | + m_dialogStyle & (wxOK | wxCANCEL | wxHELP | wxYES_NO | wxNO_DEFAULT | wxCANCEL_DEFAULT) ); } @@ -242,6 +250,11 @@ void wxGenericMessageDialog::OnNo(wxCommandEvent& WXUNUSED(event)) EndModal( wxID_NO ); } +void wxGenericMessageDialog::OnHelp(wxCommandEvent& WXUNUSED(event)) +{ + EndModal( wxID_HELP ); +} + void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) { // Allow cancellation via ESC/Close button except if diff --git a/Externals/wxWidgets3/src/generic/odcombo.cpp b/Externals/wxWidgets3/src/generic/odcombo.cpp index 635932107c..91d1c3ffa3 100644 --- a/Externals/wxWidgets3/src/generic/odcombo.cpp +++ b/Externals/wxWidgets3/src/generic/odcombo.cpp @@ -4,7 +4,7 @@ // Author: Jaakko Salli // Modified by: // Created: Apr-30-2006 -// RCS-ID: $Id: odcombo.cpp 66728 2011-01-22 14:38:36Z DS $ +// RCS-ID: $Id: odcombo.cpp 70625 2012-02-19 14:49:37Z SN $ // Copyright: (c) 2005 Jaakko Salli // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -375,7 +375,7 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar keychar // The m_combo->SetValue() call above sets m_value to the index of this // string. But if there are more identical string, the index is of the - // first occurence, which may be wrong, so set the index explicitly here, + // first occurrence, which may be wrong, so set the index explicitly here, // _after_ the SetValue() call. m_value = value; @@ -902,7 +902,6 @@ wxOwnerDrawnComboBox::wxOwnerDrawnComboBox(wxWindow *parent, long style, const wxValidator& validator, const wxString& name) - : wxComboCtrl() { Init(); diff --git a/Externals/wxWidgets3/src/generic/panelg.cpp b/Externals/wxWidgets3/src/generic/panelg.cpp deleted file mode 100644 index 75468ab942..0000000000 --- a/Externals/wxWidgets3/src/generic/panelg.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/generic/panelg.cpp -// Purpose: Generic wxPanel implementation. -// Author: Vadim Zeitlin -// Created: 2011-03-20 -// RCS-ID: $Id: panelg.cpp 67258 2011-03-20 11:50:47Z VZ $ -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/dc.h" - #include "wx/panel.h" -#endif // WX_PRECOMP - -#ifdef wxHAS_GENERIC_PANEL - -// ============================================================================ -// implementation -// ============================================================================ - -void wxPanel::DoSetBackgroundBitmap(const wxBitmap& bmp) -{ - m_bitmapBg = bmp; - - if ( m_bitmapBg.IsOk() ) - { - Connect(wxEVT_ERASE_BACKGROUND, - wxEraseEventHandler(wxPanel::OnEraseBackground)); - } - else - { - Disconnect(wxEVT_ERASE_BACKGROUND, - wxEraseEventHandler(wxPanel::OnEraseBackground)); - } -} - -void wxPanel::OnEraseBackground(wxEraseEvent& event) -{ - wxDC& dc = *event.GetDC(); - - const wxSize clientSize = GetClientSize(); - const wxSize bitmapSize = m_bitmapBg.GetSize(); - - for ( int x = 0; x < clientSize.x; x += bitmapSize.x ) - { - for ( int y = 0; y < clientSize.y; y += bitmapSize.y ) - { - dc.DrawBitmap(m_bitmapBg, x, y); - } - } -} - -#endif // wxHAS_GENERIC_PANEL diff --git a/Externals/wxWidgets3/src/generic/prntdlgg.cpp b/Externals/wxWidgets3/src/generic/prntdlgg.cpp index 244146f639..69141398ee 100644 --- a/Externals/wxWidgets3/src/generic/prntdlgg.cpp +++ b/Externals/wxWidgets3/src/generic/prntdlgg.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: prntdlgg.cpp 64019 2010-04-18 00:05:37Z VZ $ +// RCS-ID: $Id: prntdlgg.cpp 69828 2011-11-27 19:49:43Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -804,7 +804,7 @@ wxComboBox *wxGenericPrintSetupDialog::CreatePaperTypeChoice() wxComboBox *choice = new wxComboBox( this, wxPRINTID_PAPERSIZE, - _("Paper Size"), + _("Paper size"), wxDefaultPosition, wxSize(width, wxDefaultCoord), n, choices ); @@ -831,7 +831,7 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent, wxPageSetupDialogData* data) : wxPageSetupDialogBase( parent, wxID_ANY, - _("Page Setup"), + _("Page setup"), wxPoint(0,0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL ) @@ -858,7 +858,7 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent, m_paperTypeChoice = new wxComboBox( this, wxPRINTID_PAPERSIZE, - _("Paper Size"), + _("Paper size"), wxDefaultPosition, wxSize(300, wxDefaultCoord), n, choices ); @@ -1060,7 +1060,7 @@ wxComboBox *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y) wxComboBox *choice = new wxComboBox( this, wxPRINTID_PAPERSIZE, - _("Paper Size"), + _("Paper size"), wxPoint(*x, *y), wxSize(300, wxDefaultCoord), n, choices ); diff --git a/Externals/wxWidgets3/src/generic/progdlgg.cpp b/Externals/wxWidgets3/src/generic/progdlgg.cpp index 5fd81e58d2..d8f04b6c1a 100644 --- a/Externals/wxWidgets3/src/generic/progdlgg.cpp +++ b/Externals/wxWidgets3/src/generic/progdlgg.cpp @@ -4,7 +4,7 @@ // Author: Karsten Ballueder // Modified by: // Created: 09.05.1999 -// RCS-ID: $Id: progdlgg.cpp 67134 2011-03-06 15:24:26Z SC $ +// RCS-ID: $Id: progdlgg.cpp 70512 2012-02-05 14:18:25Z VZ $ // Copyright: (c) Karsten Ballueder // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -87,7 +87,7 @@ wxIMPLEMENT_CLASS(wxProgressDialog, wxDialog) // wxGenericProgressDialog creation // ---------------------------------------------------------------------------- -void wxGenericProgressDialog::Init(wxWindow *parent, int style) +void wxGenericProgressDialog::Init() { // we may disappear at any moment, let the others know about it SetExtraStyle(GetExtraStyle() | wxWS_EX_TRANSIENT); @@ -95,9 +95,8 @@ void wxGenericProgressDialog::Init(wxWindow *parent, int style) // Initialize all our members that we always use (even when we don't // create a valid window in this class). - m_pdStyle = style; - - m_parentTop = wxGetTopLevelParent(parent); + m_pdStyle = 0; + m_parentTop = NULL; m_gauge = NULL; m_msg = NULL; @@ -129,10 +128,10 @@ void wxGenericProgressDialog::Init(wxWindow *parent, int style) m_tempEventLoop = NULL; } -wxGenericProgressDialog::wxGenericProgressDialog(wxWindow *parent, int style) +wxGenericProgressDialog::wxGenericProgressDialog() : wxDialog() { - Init(parent, style); + Init(); } wxGenericProgressDialog::wxGenericProgressDialog(const wxString& title, @@ -142,21 +141,32 @@ wxGenericProgressDialog::wxGenericProgressDialog(const wxString& title, int style) : wxDialog() { - Init(parent, style); + Init(); Create( title, message, maximum, parent, style ); } -void wxGenericProgressDialog::Create( const wxString& title, +void wxGenericProgressDialog::SetTopParent(wxWindow* parent) +{ + m_parentTop = GetParentForModalDialog(parent, GetWindowStyle()); +} + +bool wxGenericProgressDialog::Create( const wxString& title, const wxString& message, int maximum, wxWindow *parent, int style ) { - wxDialog::Create(GetParentForModalDialog(parent, style), wxID_ANY, title); + SetTopParent(parent); - SetParent( GetParentForModalDialog(parent, style) ); - SetTitle( title ); + m_parentTop = wxGetTopLevelParent(parent); + m_pdStyle = style; + + wxWindow* const + realParent = GetParentForModalDialog(parent, GetWindowStyle()); + + if (!wxDialog::Create(realParent, wxID_ANY, title)) + return false; SetMaximum(maximum); @@ -306,6 +316,7 @@ void wxGenericProgressDialog::Create( const wxString& title, } Update(); + return true; } void wxGenericProgressDialog::UpdateTimeEstimates(int value, diff --git a/Externals/wxWidgets3/src/generic/regiong.cpp b/Externals/wxWidgets3/src/generic/regiong.cpp index 654cb4327d..a7af760553 100644 --- a/Externals/wxWidgets3/src/generic/regiong.cpp +++ b/Externals/wxWidgets3/src/generic/regiong.cpp @@ -4,7 +4,7 @@ // Author: David Elliott // Modified by: // Created: 2004/04/12 -// RCS-ID: $Id: regiong.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: regiong.cpp 70625 2012-02-19 14:49:37Z SN $ // Copyright: (c) 2004 David Elliott // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -1645,7 +1645,7 @@ miSubtractO ( else if (r2->x1 <= x1) { /* - * Subtrahend preceeds minuend: nuke left edge of minuend. + * Subtrahend precedes minuend: nuke left edge of minuend. */ x1 = r2->x2; if (x1 >= r1->x2) diff --git a/Externals/wxWidgets3/src/generic/renderg.cpp b/Externals/wxWidgets3/src/generic/renderg.cpp index 53a50e75c6..5a3598e798 100644 --- a/Externals/wxWidgets3/src/generic/renderg.cpp +++ b/Externals/wxWidgets3/src/generic/renderg.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 20.07.2003 -// RCS-ID: $Id: renderg.cpp 66091 2010-11-10 13:52:22Z VZ $ +// RCS-ID: $Id: renderg.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -281,7 +281,7 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win, // native hot-tracking line (on XP) const int penwidth = 3; int y = rect.y + rect.height + 1 - penwidth; - wxColour c = (params && params->m_selectionColour.Ok()) ? + wxColour c = (params && params->m_selectionColour.IsOk()) ? params->m_selectionColour : wxColour(0x66, 0x66, 0x66); wxPen pen(c, penwidth); pen.SetCap(wxCAP_BUTT); @@ -322,7 +322,7 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win, triPt[2].y = ar.height; } - wxColour c = (params && params->m_arrowColour.Ok()) ? + wxColour c = (params && params->m_arrowColour.IsOk()) ? params->m_arrowColour : wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW); wxDCPenChanger setPen(dc, c); @@ -336,7 +336,7 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win, int bmpWidth = 0; // draw the bitmap if there is one - if ( params && params->m_labelBitmap.Ok() ) + if ( params && params->m_labelBitmap.IsOk() ) { int w = params->m_labelBitmap.GetWidth(); int h = params->m_labelBitmap.GetHeight(); @@ -379,9 +379,9 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win, const int margin = 5; // number of pixels to reserve on either side of the label labelWidth += 2*margin; - wxFont font = params->m_labelFont.Ok() ? + wxFont font = params->m_labelFont.IsOk() ? params->m_labelFont : win->GetFont(); - wxColour clr = params->m_labelColour.Ok() ? + wxColour clr = params->m_labelColour.IsOk() ? params->m_labelColour : win->GetForegroundColour(); wxString label( params->m_labelText ); diff --git a/Externals/wxWidgets3/src/generic/richtooltipg.cpp b/Externals/wxWidgets3/src/generic/richtooltipg.cpp new file mode 100644 index 0000000000..68810dae92 --- /dev/null +++ b/Externals/wxWidgets3/src/generic/richtooltipg.cpp @@ -0,0 +1,673 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: src/generic/richtooltipg.cpp +// Purpose: Implementation of wxRichToolTip. +// Author: Vadim Zeitlin +// Created: 2011-10-07 +// RCS-ID: $Id: richtooltipg.cpp 69968 2011-12-09 15:58:40Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#if wxUSE_RICHTOOLTIP + +#ifndef WX_PRECOMP + #include "wx/dcmemory.h" + #include "wx/icon.h" + #include "wx/region.h" + #include "wx/settings.h" + #include "wx/sizer.h" + #include "wx/statbmp.h" + #include "wx/stattext.h" + #include "wx/timer.h" + #include "wx/utils.h" +#endif // WX_PRECOMP + +#include "wx/private/richtooltip.h" +#include "wx/generic/private/richtooltip.h" + +#include "wx/artprov.h" +#include "wx/custombgwin.h" +#include "wx/display.h" +#include "wx/graphics.h" +#include "wx/popupwin.h" +#include "wx/textwrapper.h" + +#ifdef __WXMSW__ + #include "wx/msw/uxtheme.h" + + static const int TTP_BALLOONTITLE = 4; + + static const int TMT_TEXTCOLOR = 3803; + static const int TMT_GRADIENTCOLOR1 = 3810; + static const int TMT_GRADIENTCOLOR2 = 3811; +#endif + +// ---------------------------------------------------------------------------- +// wxRichToolTipPopup: the popup window used by wxRichToolTip. +// ---------------------------------------------------------------------------- + +class wxRichToolTipPopup : + public wxCustomBackgroundWindow +{ +public: + wxRichToolTipPopup(wxWindow* parent, + const wxString& title, + const wxString& message, + const wxIcon& icon, + wxTipKind tipKind, + const wxFont& titleFont_) : + m_timer(this) + { + Create(parent, wxFRAME_SHAPED); + + + wxBoxSizer* const sizerTitle = new wxBoxSizer(wxHORIZONTAL); + if ( icon.IsOk() ) + { + sizerTitle->Add(new wxStaticBitmap(this, wxID_ANY, icon), + wxSizerFlags().Centre().Border(wxRIGHT)); + } + //else: Simply don't show any icon. + + wxStaticText* const labelTitle = new wxStaticText(this, wxID_ANY, ""); + labelTitle->SetLabelText(title); + + wxFont titleFont(titleFont_); + if ( !titleFont.IsOk() ) + { + // Determine the appropriate title font for the current platform. + titleFont = labelTitle->GetFont(); + +#ifdef __WXMSW__ + // When using themes MSW tooltips use larger bluish version of the + // normal font. + wxUxThemeEngine* const theme = GetTooltipTheme(); + if ( theme ) + { + titleFont.MakeLarger(); + + COLORREF c; + if ( FAILED(theme->GetThemeColor + ( + wxUxThemeHandle(parent, L"TOOLTIP"), + TTP_BALLOONTITLE, + 0, + TMT_TEXTCOLOR, + &c + )) ) + { + // Use the standard value of this colour as fallback. + c = 0x993300; + } + + labelTitle->SetForegroundColour(wxRGBToColour(c)); + } + else +#endif // __WXMSW__ + { + // Everything else, including "classic" MSW look uses just the + // bold version of the base font. + titleFont.MakeBold(); + } + } + + labelTitle->SetFont(titleFont); + sizerTitle->Add(labelTitle, wxSizerFlags().Centre()); + + wxBoxSizer* const sizerTop = new wxBoxSizer(wxVERTICAL); + sizerTop->Add(sizerTitle, + wxSizerFlags().DoubleBorder(wxLEFT|wxRIGHT|wxTOP)); + + // Use a spacer as we don't want to have a double border between the + // elements, just a simple one will do. + sizerTop->AddSpacer(wxSizerFlags::GetDefaultBorder()); + + wxTextSizerWrapper wrapper(this); + wxSizer* sizerText = wrapper.CreateSizer(message, -1 /* No wrapping */); + +#ifdef __WXMSW__ + if ( icon.IsOk() && GetTooltipTheme() ) + { + // Themed tooltips under MSW align the text with the title, not + // with the icon, so use a helper horizontal sizer in this case. + wxBoxSizer* const sizerTextIndent = new wxBoxSizer(wxHORIZONTAL); + sizerTextIndent->AddSpacer(icon.GetWidth()); + sizerTextIndent->Add(sizerText, + wxSizerFlags().Border(wxLEFT).Centre()); + + sizerText = sizerTextIndent; + } +#endif // !__WXMSW__ + sizerTop->Add(sizerText, + wxSizerFlags().DoubleBorder(wxLEFT|wxRIGHT|wxBOTTOM) + .Centre()); + + SetSizer(sizerTop); + + const int offsetY = SetTipShapeAndSize(tipKind, GetBestSize()); + if ( offsetY > 0 ) + { + // Offset our contents by the tip height to make it appear in the + // main rectangle. + sizerTop->PrependSpacer(offsetY); + } + + Layout(); + } + + void SetBackgroundColours(wxColour colStart, wxColour colEnd) + { + if ( !colStart.IsOk() ) + { + // Determine the best colour(s) to use on our own. +#ifdef __WXMSW__ + wxUxThemeEngine* const theme = GetTooltipTheme(); + if ( theme ) + { + wxUxThemeHandle hTheme(GetParent(), L"TOOLTIP"); + + COLORREF c1, c2; + if ( FAILED(theme->GetThemeColor + ( + hTheme, + TTP_BALLOONTITLE, + 0, + TMT_GRADIENTCOLOR1, + &c1 + )) || + FAILED(theme->GetThemeColor + ( + hTheme, + TTP_BALLOONTITLE, + 0, + TMT_GRADIENTCOLOR2, + &c2 + )) ) + { + c1 = 0xffffff; + c2 = 0xf0e5e4; + } + + colStart = wxRGBToColour(c1); + colEnd = wxRGBToColour(c2); + } + else +#endif // __WXMSW__ + { + colStart = wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK); + } + } + + if ( colEnd.IsOk() ) + { + // Use gradient-filled background bitmap. + const wxSize size = GetClientSize(); + wxBitmap bmp(size); + { + wxMemoryDC dc(bmp); + dc.Clear(); + dc.GradientFillLinear(size, colStart, colEnd, wxDOWN); + } + + SetBackgroundBitmap(bmp); + } + else // Use solid colour. + { + SetBackgroundColour(colStart); + } + } + + void DoShow() + { + wxPoint pos = GetTipPoint(); + + // We want our anchor point to coincide with this position so offset + // the position of the top left corner passed to Move() accordingly. + pos -= m_anchorPos; + + Move(pos, wxSIZE_NO_ADJUSTMENTS); + + Popup(); + } + + void SetTimeout(unsigned timeout) + { + if ( !timeout ) + return; + + Connect(wxEVT_TIMER, wxTimerEventHandler(wxRichToolTipPopup::OnTimer)); + + m_timer.Start(timeout, true /* one shot */); + } + +protected: + virtual void OnDismiss() + { + Destroy(); + } + +private: +#ifdef __WXMSW__ + // Returns non-NULL theme only if we're using Win7-style tooltips. + static wxUxThemeEngine* GetTooltipTheme() + { + // Even themed applications under XP still use "classic" tooltips. + if ( wxGetWinVersion() <= wxWinVersion_XP ) + return NULL; + + return wxUxThemeEngine::GetIfActive(); + } +#endif // __WXMSW__ + + // For now we just hard code the tip height, would be nice to do something + // smarter in the future. + static int GetTipHeight() + { +#ifdef __WXMSW__ + if ( GetTooltipTheme() ) + return 20; +#endif // __WXMSW__ + + return 15; + } + + // Get the point to which our tip should point. + wxPoint GetTipPoint() const + { + // Currently we always use the middle of the window. It seems that MSW + // native tooltips use a different point but it's not really clear how + // do they determine it nor whether it's worth the trouble to emulate + // their behaviour. + const wxRect r = GetParent()->GetScreenRect(); + return wxPoint(r.x + r.width/2, r.y + r.height/2); + } + + // Choose the correct orientation depending on the window position. + // + // Also use the tip kind appropriate for the current environment. For MSW + // the right triangles are used and for Mac the equilateral ones as this is + // the prevailing kind under these systems. For everything else we go with + // right triangles as well but without any real rationale so this could be + // tweaked in the future. + wxTipKind GetBestTipKind() const + { + const wxPoint pos = GetTipPoint(); + + // Use GetFromWindow() and not GetFromPoint() here to try to get the + // correct display even if the tip point itself is not visible. + int dpy = wxDisplay::GetFromWindow(GetParent()); + if ( dpy == wxNOT_FOUND ) + dpy = 0; // What else can we do? + + const wxRect rectDpy = wxDisplay(dpy).GetClientArea(); + +#ifdef __WXMAC__ + return pos.y > rectDpy.height/2 ? wxTipKind_Bottom : wxTipKind_Top; +#else // !__WXMAC__ + return pos.y > rectDpy.height/2 + ? pos.x > rectDpy.width/2 + ? wxTipKind_BottomRight + : wxTipKind_BottomLeft + : pos.x > rectDpy.width/2 + ? wxTipKind_TopRight + : wxTipKind_TopLeft; +#endif // __WXMAC__/!__WXMAC__ + } + + // Set the size and shape of the tip window and returns the offset of its + // content area from the top (horizontal offset is always 0 currently). + int SetTipShapeAndSize(wxTipKind tipKind, const wxSize& contentSize) + { +#if wxUSE_GRAPHICS_CONTEXT + wxSize size = contentSize; + + // The size is the vertical size and the offset is the distance from + // edge for asymmetric tips, currently hard-coded to be the same as the + // size. + const int tipSize = GetTipHeight(); + const int tipOffset = tipSize; + + // The horizontal position of the tip. + int x = -1; + + // The vertical coordinates of the tip base and apex. + int yBase = -1, + yApex = -1; + + // The offset of the content part of the window. + int dy = -1; + + // Define symbolic names for the rectangle corners and mid-way points + // that we use below in an attempt to make the code more clear. Notice + // that these values must be consecutive as we iterate over them. + enum RectPoint + { + RectPoint_TopLeft, + RectPoint_Top, + RectPoint_TopRight, + RectPoint_Right, + RectPoint_BotRight, + RectPoint_Bot, + RectPoint_BotLeft, + RectPoint_Left, + RectPoint_Max + }; + + // The starting point for AddArcToPoint() calls below, we iterate over + // all RectPoints from it. + RectPoint pointStart = RectPoint_Max; + + + // Hard-coded radius of the round main rectangle corners. + const double RADIUS = 5; + + // Create a path defining the shape of the tooltip window. + wxGraphicsPath + path = wxGraphicsRenderer::GetDefaultRenderer()->CreatePath(); + + if ( tipKind == wxTipKind_Auto ) + tipKind = GetBestTipKind(); + + // Points defining the tip shape (in clockwise order as we must end at + // tipPoints[0] after drawing the rectangle outline in this order). + wxPoint2DDouble tipPoints[3]; + + switch ( tipKind ) + { + case wxTipKind_Auto: + wxFAIL_MSG( "Impossible kind value" ); + break; + + case wxTipKind_TopLeft: + x = tipOffset; + yApex = 0; + yBase = tipSize; + dy = tipSize; + + tipPoints[0] = wxPoint2DDouble(x, yBase); + tipPoints[1] = wxPoint2DDouble(x, yApex); + tipPoints[2] = wxPoint2DDouble(x + tipSize, yBase); + + pointStart = RectPoint_TopRight; + break; + + case wxTipKind_TopRight: + x = size.x - tipOffset; + yApex = 0; + yBase = tipSize; + dy = tipSize; + + tipPoints[0] = wxPoint2DDouble(x - tipSize, yBase); + tipPoints[1] = wxPoint2DDouble(x, yApex); + tipPoints[2] = wxPoint2DDouble(x, yBase); + + pointStart = RectPoint_TopRight; + break; + + case wxTipKind_BottomLeft: + x = tipOffset; + yApex = size.y + tipSize; + yBase = size.y; + dy = 0; + + tipPoints[0] = wxPoint2DDouble(x + tipSize, yBase); + tipPoints[1] = wxPoint2DDouble(x, yApex); + tipPoints[2] = wxPoint2DDouble(x, yBase); + + pointStart = RectPoint_BotLeft; + break; + + case wxTipKind_BottomRight: + x = size.x - tipOffset; + yApex = size.y + tipSize; + yBase = size.y; + dy = 0; + + tipPoints[0] = wxPoint2DDouble(x, yBase); + tipPoints[1] = wxPoint2DDouble(x, yApex); + tipPoints[2] = wxPoint2DDouble(x - tipSize, yBase); + + pointStart = RectPoint_BotLeft; + break; + + case wxTipKind_Top: + x = size.x/2; + yApex = 0; + yBase = tipSize; + dy = tipSize; + + { + // A half-side of an equilateral triangle is its altitude + // divided by sqrt(3) ~= 1.73. + const double halfside = tipSize/1.73; + + tipPoints[0] = wxPoint2DDouble(x - halfside, yBase); + tipPoints[1] = wxPoint2DDouble(x, yApex); + tipPoints[2] = wxPoint2DDouble(x + halfside, yBase); + } + + pointStart = RectPoint_TopRight; + break; + + case wxTipKind_Bottom: + x = size.x/2; + yApex = size.y + tipSize; + yBase = size.y; + dy = 0; + + { + const double halfside = tipSize/1.73; + + tipPoints[0] = wxPoint2DDouble(x + halfside, yBase); + tipPoints[1] = wxPoint2DDouble(x, yApex); + tipPoints[2] = wxPoint2DDouble(x - halfside, yBase); + } + + pointStart = RectPoint_BotLeft; + break; + + case wxTipKind_None: + x = size.x/2; + dy = 0; + + path.AddRoundedRectangle(0, 0, size.x, size.y, RADIUS); + break; + } + + wxASSERT_MSG( dy != -1, wxS("Unknown tip kind?") ); + + size.y += tipSize; + SetSize(size); + + if ( tipKind != wxTipKind_None ) + { + path.MoveToPoint(tipPoints[0]); + path.AddLineToPoint(tipPoints[1]); + path.AddLineToPoint(tipPoints[2]); + + const double xLeft = 0.; + const double xMid = size.x/2.; + const double xRight = size.x; + + const double yTop = dy; + const double yMid = (dy + size.y)/2.; + const double yBot = dy + contentSize.y; + + wxPoint2DDouble rectPoints[RectPoint_Max]; + rectPoints[RectPoint_TopLeft] = wxPoint2DDouble(xLeft, yTop); + rectPoints[RectPoint_Top] = wxPoint2DDouble(xMid, yTop); + rectPoints[RectPoint_TopRight] = wxPoint2DDouble(xRight, yTop); + rectPoints[RectPoint_Right] = wxPoint2DDouble(xRight, yMid); + rectPoints[RectPoint_BotRight] = wxPoint2DDouble(xRight, yBot); + rectPoints[RectPoint_Bot] = wxPoint2DDouble(xMid, yBot); + rectPoints[RectPoint_BotLeft] = wxPoint2DDouble(xLeft, yBot); + rectPoints[RectPoint_Left] = wxPoint2DDouble(xLeft, yMid); + + // Iterate over all rectangle rectPoints for the first 3 corners. + unsigned n = pointStart; + for ( unsigned corner = 0; corner < 3; corner++ ) + { + const wxPoint2DDouble& pt1 = rectPoints[n]; + + n = (n + 1) % RectPoint_Max; + + const wxPoint2DDouble& pt2 = rectPoints[n]; + + path.AddArcToPoint(pt1.m_x, pt1.m_y, pt2.m_x, pt2.m_y, RADIUS); + + n = (n + 1) % RectPoint_Max; + } + + // Last one wraps to the first point of the tip. + const wxPoint2DDouble& pt1 = rectPoints[n]; + const wxPoint2DDouble& pt2 = tipPoints[0]; + + path.AddArcToPoint(pt1.m_x, pt1.m_y, pt2.m_x, pt2.m_y, RADIUS); + + path.CloseSubpath(); + } + + SetShape(path); +#else // !wxUSE_GRAPHICS_CONTEXT + int x = contentSize.x/2, + yApex = 0, + dy = 0; + + SetSize(contentSize); +#endif // wxUSE_GRAPHICS_CONTEXT/!wxUSE_GRAPHICS_CONTEXT + + m_anchorPos.x = x; + m_anchorPos.y = yApex; + + return dy; + } + + // Timer event handler hides the tooltip when the timeout expires. + void OnTimer(wxTimerEvent& WXUNUSED(event)) + { + // Doing "Notify" here ensures that our OnDismiss() is called and so we + // also Destroy() ourselves. We could use Dismiss() and call Destroy() + // explicitly from here as well. + DismissAndNotify(); + } + + + // The anchor point offset if we show a tip or the middle of the top side + // otherwise. + wxPoint m_anchorPos; + + // The timer counting down the time until we're hidden. + wxTimer m_timer; + + wxDECLARE_NO_COPY_CLASS(wxRichToolTipPopup); +}; + +// ---------------------------------------------------------------------------- +// wxRichToolTipGenericImpl: generic implementation of wxRichToolTip. +// ---------------------------------------------------------------------------- + +void +wxRichToolTipGenericImpl::SetBackgroundColour(const wxColour& col, + const wxColour& colEnd) +{ + m_colStart = col; + m_colEnd = colEnd; +} + +void wxRichToolTipGenericImpl::SetCustomIcon(const wxIcon& icon) +{ + m_icon = icon; +} + +void wxRichToolTipGenericImpl::SetStandardIcon(int icon) +{ + switch ( icon & wxICON_MASK ) + { + case wxICON_WARNING: + case wxICON_ERROR: + case wxICON_INFORMATION: + // Although we don't use this icon in a list, we need a smallish + // icon here and not an icon of a typical message box size so use + // wxART_LIST to get it. + m_icon = wxArtProvider::GetIcon + ( + wxArtProvider::GetMessageBoxIconId(icon), + wxART_LIST + ); + break; + + case wxICON_QUESTION: + wxFAIL_MSG("Question icon doesn't make sense for a tooltip"); + break; + + case wxICON_NONE: + m_icon = wxNullIcon; + break; + } +} + +void wxRichToolTipGenericImpl::SetTimeout(unsigned milliseconds) +{ + m_timeout = milliseconds; +} + +void wxRichToolTipGenericImpl::SetTipKind(wxTipKind tipKind) +{ + m_tipKind = tipKind; +} + +void wxRichToolTipGenericImpl::SetTitleFont(const wxFont& font) +{ + m_titleFont = font; +} + +void wxRichToolTipGenericImpl::ShowFor(wxWindow* win) +{ + // Set the focus to the window the tooltip refers to to make it look active. + win->SetFocus(); + + wxRichToolTipPopup* const popup = new wxRichToolTipPopup + ( + win, + m_title, + m_message, + m_icon, + m_tipKind, + m_titleFont + ); + + popup->SetBackgroundColours(m_colStart, m_colEnd); + + popup->DoShow(); + + popup->SetTimeout(m_timeout); +} + +// Currently only wxMSW provides a native implementation. +#ifndef __WXMSW__ + +/* static */ +wxRichToolTipImpl* +wxRichToolTipImpl::Create(const wxString& title, const wxString& message) +{ + return new wxRichToolTipGenericImpl(title, message); +} + +#endif // !__WXMSW__ + +#endif // wxUSE_RICHTOOLTIP diff --git a/Externals/wxWidgets3/src/generic/scrlwing.cpp b/Externals/wxWidgets3/src/generic/scrlwing.cpp index 6210c21360..9ceda4929a 100644 --- a/Externals/wxWidgets3/src/generic/scrlwing.cpp +++ b/Externals/wxWidgets3/src/generic/scrlwing.cpp @@ -5,7 +5,7 @@ // Modified by: Vadim Zeitlin on 31.08.00: wxScrollHelper allows to implement. // Ron Lee on 10.4.02: virtual size / auto scrollbars et al. // Created: 01/02/97 -// RCS-ID: $Id: scrlwing.cpp 64877 2010-07-11 10:43:35Z VZ $ +// RCS-ID: $Id: scrlwing.cpp 70443 2012-01-23 11:28:12Z VZ $ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -385,16 +385,17 @@ void wxScrollHelperBase::SetScrollbars(int pixelsPerUnitX, int yPos, bool noRefresh) { - int xpos, ypos; + // Convert positions expressed in scroll units to positions in pixels. + int xPosInPixels = (xPos + m_xScrollPosition)*m_xScrollPixelsPerLine, + yPosInPixels = (yPos + m_yScrollPosition)*m_yScrollPixelsPerLine; - CalcUnscrolledPosition(xPos, yPos, &xpos, &ypos); bool do_refresh = ( (noUnitsX != 0 && m_xScrollLines == 0) || - (noUnitsX < m_xScrollLines && xpos > pixelsPerUnitX * noUnitsX) || + (noUnitsX < m_xScrollLines && xPosInPixels > pixelsPerUnitX * noUnitsX) || (noUnitsY != 0 && m_yScrollLines == 0) || - (noUnitsY < m_yScrollLines && ypos > pixelsPerUnitY * noUnitsY) || + (noUnitsY < m_yScrollLines && yPosInPixels > pixelsPerUnitY * noUnitsY) || (xPos != m_xScrollPosition) || (yPos != m_yScrollPosition) ); @@ -1111,7 +1112,7 @@ void wxScrollHelperBase::HandleOnChildFocus(wxChildFocusEvent& event) // part of a wxComboCtrl visible and the button would still be outside the // scrolled area. But do so only if the parent fits *entirely* inside the // scrolled window. In other situations, such as nested wxPanel or - // wxScrolledWindows, the parent might be way to big to fit inside the + // wxScrolledWindows, the parent might be way too big to fit inside the // scrolled window. If that is the case, then make only the focused window // visible if ( win->GetParent() != m_targetWindow) diff --git a/Externals/wxWidgets3/src/generic/spinctlg.cpp b/Externals/wxWidgets3/src/generic/spinctlg.cpp index 7887529b5a..f8edc709fb 100644 --- a/Externals/wxWidgets3/src/generic/spinctlg.cpp +++ b/Externals/wxWidgets3/src/generic/spinctlg.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 29.01.01 -// RCS-ID: $Id: spinctlg.cpp 67199 2011-03-15 11:10:38Z VZ $ +// RCS-ID: $Id: spinctlg.cpp 70432 2012-01-21 17:03:52Z VZ $ // Copyright: (c) 2001 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -85,13 +85,13 @@ public: void OnChar( wxKeyEvent &event ) { if (m_spin) - m_spin->OnTextChar(event); + m_spin->ProcessWindowEvent(event); } void OnKillFocus(wxFocusEvent& event) { if (m_spin) - m_spin->OnTextLostFocus(); + m_spin->ProcessWindowEvent(event); event.Skip(); } @@ -283,16 +283,24 @@ void wxSpinCtrlGenericBase::SetFocus() m_textCtrl->SetFocus(); } +#ifdef __WXMSW__ + +void wxSpinCtrlGenericBase::DoEnable(bool enable) +{ + // We never enable this control itself, it must stay disabled to avoid + // interfering with the siblings event handling (see e.g. #12045 for the + // kind of problems which arise otherwise). + if ( !enable ) + wxSpinCtrlBase::DoEnable(enable); +} + +#endif // __WXMSW__ + bool wxSpinCtrlGenericBase::Enable(bool enable) { - // Notice that we never enable this control itself, it must stay disabled - // to avoid interfering with the siblings event handling (see e.g. #12045 - // for the kind of problems which arise otherwise). - if ( enable == m_isEnabled ) + if ( !wxSpinCtrlBase::Enable(enable) ) return false; - m_isEnabled = enable; - m_spinButton->Enable(enable); m_textCtrl->Enable(enable); @@ -315,17 +323,6 @@ bool wxSpinCtrlGenericBase::Show(bool show) return true; } -bool wxSpinCtrlGenericBase::Reparent(wxWindowBase *newParent) -{ - if ( m_spinButton ) - { - m_spinButton->Reparent(newParent); - m_textCtrl->Reparent(newParent); - } - - return true; -} - #if wxUSE_TOOLTIPS void wxSpinCtrlGenericBase::DoSetToolTip(wxToolTip *tip) { @@ -357,6 +354,11 @@ void wxSpinCtrlGenericBase::DoSetToolTip(wxToolTip *tip) // Handle sub controls events // ---------------------------------------------------------------------------- +BEGIN_EVENT_TABLE(wxSpinCtrlGenericBase, wxSpinCtrlBase) + EVT_CHAR(wxSpinCtrlGenericBase::OnTextChar) + EVT_KILL_FOCUS(wxSpinCtrlGenericBase::OnTextLostFocus) +END_EVENT_TABLE() + void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event) { event.Skip(); @@ -388,10 +390,12 @@ void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event) DoSendEvent(); } -void wxSpinCtrlGenericBase::OnTextLostFocus() +void wxSpinCtrlGenericBase::OnTextLostFocus(wxFocusEvent& event) { SyncSpinToText(); DoSendEvent(); + + event.Skip(); } void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event) diff --git a/Externals/wxWidgets3/src/generic/splash.cpp b/Externals/wxWidgets3/src/generic/splash.cpp index 2798ae4451..2fad3c6014 100644 --- a/Externals/wxWidgets3/src/generic/splash.cpp +++ b/Externals/wxWidgets3/src/generic/splash.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 28/6/2000 -// RCS-ID: $Id: splash.cpp 60558 2009-05-09 12:22:45Z VZ $ +// RCS-ID: $Id: splash.cpp 69796 2011-11-22 13:18:55Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -42,6 +42,13 @@ BEGIN_EVENT_TABLE(wxSplashScreen, wxFrame) EVT_CLOSE(wxSplashScreen::OnCloseWindow) END_EVENT_TABLE() +void wxSplashScreen::Init() +{ + m_window = NULL; + + wxEvtHandler::AddFilter(this); +} + /* Note that unless we pass a non-default size to the frame, SetClientSize * won't work properly under Windows, and the splash screen frame is sized * slightly too small. @@ -50,8 +57,11 @@ END_EVENT_TABLE() wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style) - : wxFrame(parent, id, wxEmptyString, wxPoint(0,0), wxSize(100, 100), style) + : wxFrame(parent, id, wxEmptyString, wxPoint(0,0), wxSize(100, 100), + style | wxFRAME_TOOL_WINDOW | wxFRAME_NO_TASKBAR) { + Init(); + // splash screen must not be used as parent by the other windows because it // is going to disappear soon, indicate it by giving it this special style SetExtraStyle(GetExtraStyle() | wxWS_EX_TRANSIENT); @@ -61,7 +71,6 @@ wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int mil GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); #endif - m_window = NULL; m_splashStyle = splashStyle; m_milliseconds = milliseconds; @@ -94,6 +103,20 @@ wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int mil wxSplashScreen::~wxSplashScreen() { m_timer.Stop(); + + wxEvtHandler::RemoveFilter(this); +} + +int wxSplashScreen::FilterEvent(wxEvent& event) +{ + const wxEventType t = event.GetEventType(); + if ( t == wxEVT_KEY_DOWN || + t == wxEVT_LEFT_DOWN || + t == wxEVT_RIGHT_DOWN || + t == wxEVT_MIDDLE_DOWN ) + Close(true); + + return -1; } void wxSplashScreen::OnNotify(wxTimerEvent& WXUNUSED(event)) @@ -116,8 +139,6 @@ BEGIN_EVENT_TABLE(wxSplashScreenWindow, wxWindow) EVT_PAINT(wxSplashScreenWindow::OnPaint) #endif EVT_ERASE_BACKGROUND(wxSplashScreenWindow::OnEraseBackground) - EVT_CHAR(wxSplashScreenWindow::OnChar) - EVT_MOUSE_EVENTS(wxSplashScreenWindow::OnMouseEvent) END_EVENT_TABLE() wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* parent, @@ -171,35 +192,22 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x) void wxSplashScreenWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc(this); - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) wxDrawSplashBitmap(dc, m_bitmap, 0, 0); } void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event) { - if (event.GetDC() && m_bitmap.Ok()) + if (event.GetDC() && m_bitmap.IsOk()) { wxDrawSplashBitmap(* event.GetDC(), m_bitmap, 0, 0); } else { wxClientDC dc(this); - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) wxDrawSplashBitmap(dc, m_bitmap, 0, 0); } } -void wxSplashScreenWindow::OnMouseEvent(wxMouseEvent& event) -{ - if (event.LeftDown() || event.RightDown()) - GetParent()->Close(true); - else - event.Skip(); -} - -void wxSplashScreenWindow::OnChar(wxKeyEvent& WXUNUSED(event)) -{ - GetParent()->Close(true); -} - #endif // wxUSE_SPLASH diff --git a/Externals/wxWidgets3/src/generic/splitter.cpp b/Externals/wxWidgets3/src/generic/splitter.cpp index 9af2f66b4e..10a97054ed 100644 --- a/Externals/wxWidgets3/src/generic/splitter.cpp +++ b/Externals/wxWidgets3/src/generic/splitter.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: splitter.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: splitter.cpp 70840 2012-03-08 13:23:39Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -66,12 +66,8 @@ BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow) #if defined( __WXMSW__ ) || defined( __WXMAC__) EVT_SET_CURSOR(wxSplitterWindow::OnSetCursor) #endif // wxMSW - - WX_EVENT_TABLE_CONTROL_CONTAINER(wxSplitterWindow) END_EVENT_TABLE() -WX_DELEGATE_TO_CONTROL_CONTAINER(wxSplitterWindow, wxWindow) - static bool IsLive(wxSplitterWindow* wnd) { // with wxSP_LIVE_UPDATE style the splitter windows are always resized @@ -97,10 +93,7 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id, if ( !wxWindow::Create(parent, id, pos, size, style, name) ) return false; - if (size.x >= 0) - m_lastSize.x = size.x; - if (size.y >= 0) - m_lastSize.y = size.y; + m_lastSize = GetClientSize(); m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0; @@ -117,8 +110,6 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id, void wxSplitterWindow::Init() { - WX_INIT_CONTROL_CONTAINER(); - m_splitMode = wxSPLIT_VERTICAL; m_permitUnsplitAlways = true; m_windowOne = NULL; @@ -127,10 +118,10 @@ void wxSplitterWindow::Init() m_oldX = 0; m_oldY = 0; m_sashStart = 0; - m_sashPosition = m_requestedSashPosition = 0; + m_sashPosition = 0; + m_requestedSashPosition = INT_MAX; m_sashGravity = 0.0; m_lastSize = wxSize(0,0); - m_checkRequestedSashPosition = false; m_minimumPaneSize = 0; m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE); m_sashCursorNS = wxCursor(wxCURSOR_SIZENS); @@ -202,17 +193,21 @@ void wxSplitterWindow::OnInternalIdle() { wxWindow::OnInternalIdle(); - // if this is the first idle time after a sash position has potentially - // been set, allow SizeWindows to check for a requested size. - if (!m_checkRequestedSashPosition) + // We may need to update the children sizes in two cases: either because + // we're in the middle of a live update as indicated by m_needUpdating or + // because we have a requested but not yet set sash position as indicated + // by m_requestedSashPosition having a valid value. + if ( m_needUpdating ) { - m_checkRequestedSashPosition = true; - SizeWindows(); - return; // it won't needUpdating in this case + m_needUpdating = false; + } + else if ( m_requestedSashPosition == INT_MAX ) + { + // We don't need to resize the children. + return; } - if (m_needUpdating) - SizeWindows(); + SizeWindows(); } void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) @@ -440,31 +435,44 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event) return; } - if ( m_windowTwo ) - { - int w, h; - GetClientSize(&w, &h); + const wxSize curSize = event.GetSize(); - int size = m_splitMode == wxSPLIT_VERTICAL ? w : h; + // Update the sash position if needed. + // + // Notice that we shouldn't do this if the sash position requested by user + // couldn't be set yet as it would never be taken into account at all if we + // modified it before this happens. + if ( m_windowTwo && m_requestedSashPosition == INT_MAX ) + { + int size = m_splitMode == wxSPLIT_VERTICAL ? curSize.x : curSize.y; int old_size = m_splitMode == wxSPLIT_VERTICAL ? m_lastSize.x : m_lastSize.y; - if ( old_size != 0 ) + + // Don't do anything if the size didn't really change. + if ( size != old_size ) { + int newPosition = -1; + + // Apply gravity if we use it. int delta = (int) ( (size - old_size)*m_sashGravity ); if ( delta != 0 ) { - int newPosition = m_sashPosition + delta; + newPosition = m_sashPosition + delta; if( newPosition < m_minimumPaneSize ) newPosition = m_minimumPaneSize; - SetSashPositionAndNotify(newPosition); } - } - if ( m_sashPosition >= size - 5 ) - SetSashPositionAndNotify(wxMax(10, size - 40)); - m_lastSize = wxSize(w,h); + // Also check if the second window became too small. + newPosition = AdjustSashPosition(newPosition == -1 + ? m_sashPosition + : newPosition); + if ( newPosition != m_sashPosition ) + SetSashPositionAndNotify(newPosition); + } } + m_lastSize = curSize; + SizeWindows(); } @@ -488,7 +496,18 @@ bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance) return z >= hitMin && z <= hitMax; } +void wxSplitterWindow::SetSashInvisible(bool invisible) +{ + if ( IsSashInvisible() != invisible ) + ToggleWindowStyle(wxSP_NOSASH); +} + int wxSplitterWindow::GetSashSize() const +{ + return IsSashInvisible() ? 0 : GetDefaultSashSize(); +} + +int wxSplitterWindow::GetDefaultSashSize() const { return wxRendererNative::Get().GetSplitterParams(this).widthSash; } @@ -514,7 +533,7 @@ void wxSplitterWindow::DrawSash(wxDC& dc) return; // nor if we're configured to not show it - if ( HasFlag(wxSP_NOSASH) ) + if ( IsSashInvisible() ) return; wxRendererNative::Get().DrawSplitterSash @@ -646,7 +665,7 @@ void wxSplitterWindow::SetSashPositionAndNotify(int sashPos) void wxSplitterWindow::SizeWindows() { // check if we have delayed setting the real sash position - if ( m_checkRequestedSashPosition && m_requestedSashPosition != INT_MAX ) + if ( m_requestedSashPosition != INT_MAX ) { int newSashPosition = ConvertSashPosition(m_requestedSashPosition); if ( newSashPosition != m_sashPosition ) @@ -712,8 +731,6 @@ void wxSplitterWindow::SizeWindows() wxClientDC dc(this); DrawSash(dc); - - SetNeedUpdating(false); } // Set pane for unsplit window @@ -849,7 +866,6 @@ void wxSplitterWindow::SetSashPosition(int position, bool redraw) // remember the sash position we want to set for later if we can't set it // right now (e.g. because the window is too small) m_requestedSashPosition = position; - m_checkRequestedSashPosition = false; DoSetSashPosition(ConvertSashPosition(position)); @@ -864,9 +880,7 @@ void wxSplitterWindow::SetSashPosition(int position, bool redraw) // window is shown, if you know the overall size is correct. void wxSplitterWindow::UpdateSize() { - m_checkRequestedSashPosition = true; SizeWindows(); - m_checkRequestedSashPosition = false; } bool wxSplitterWindow::DoSendEvent(wxSplitterEvent& event) diff --git a/Externals/wxWidgets3/src/generic/srchctlg.cpp b/Externals/wxWidgets3/src/generic/srchctlg.cpp index 2de709df0d..1965d6e0b7 100644 --- a/Externals/wxWidgets3/src/generic/srchctlg.cpp +++ b/Externals/wxWidgets3/src/generic/srchctlg.cpp @@ -3,7 +3,7 @@ // Purpose: implements wxSearchCtrl as a composite control // Author: Vince Harron // Created: 2006-02-19 -// RCS-ID: $Id: srchctlg.cpp 66310 2010-12-03 12:40:08Z VZ $ +// RCS-ID: $Id: srchctlg.cpp 69284 2011-10-02 11:28:40Z VZ $ // Copyright: Vince Harron // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -61,30 +61,16 @@ class wxSearchTextCtrl : public wxTextCtrl public: wxSearchTextCtrl(wxSearchCtrl *search, const wxString& value, int style) : wxTextCtrl(search, wxID_ANY, value, wxDefaultPosition, wxDefaultSize, - style | wxNO_BORDER) + (style & ~wxBORDER_MASK) | wxNO_BORDER) { m_search = search; - m_defaultFG = GetForegroundColour(); + + SetHint(_("Search")); // remove the default minsize, the searchctrl will have one instead SetSizeHints(wxDefaultCoord,wxDefaultCoord); } - void SetDescriptiveText(const wxString& text) - { - if ( GetValue() == m_descriptiveText ) - { - ChangeValue(wxEmptyString); - } - - m_descriptiveText = text; - } - - wxString GetDescriptiveText() const - { - return m_descriptiveText; - } - // provide access to the base class protected methods to wxSearchCtrl which // needs to forward to them @@ -128,30 +114,34 @@ protected: m_search->GetEventHandler()->ProcessEvent(event); } - void OnIdle(wxIdleEvent& WXUNUSED(event)) +#ifdef __WXMSW__ + // We increase the text control height to be the same as for the controls + // with border as this is what we actually need here because even though + // this control itself is borderless, it's inside wxSearchCtrl which does + // have the border and so should have the same height as the normal text + // entries with border. + // + // This is a bit ugly and it would arguably be better to use whatever size + // the base class version returns and just centre the text vertically in + // the search control but I failed to modify the code in LayoutControls() + // to do this easily and as there is much in that code I don't understand + // (notably what is the logic for buttons sizing?) I prefer to not touch it + // at all. + virtual wxSize DoGetBestSize() const { - if ( IsEmpty() && !(wxWindow::FindFocus() == this) ) - { - ChangeValue(m_descriptiveText); - SetInsertionPoint(0); - SetForegroundColour(m_defaultFG.ChangeLightness (LIGHT_STEP)); - } - } + const long flags = GetWindowStyleFlag(); + wxSearchTextCtrl* const self = const_cast(this); - void OnFocus(wxFocusEvent& event) - { - event.Skip(); - if ( GetValue() == m_descriptiveText ) - { - ChangeValue(wxEmptyString); - SetForegroundColour(m_defaultFG); - } + self->SetWindowStyleFlag((flags & ~wxBORDER_MASK) | wxBORDER_DEFAULT); + const wxSize size = wxTextCtrl::DoGetBestSize(); + self->SetWindowStyleFlag(flags); + + return size; } +#endif // __WXMSW__ private: wxSearchCtrl* m_search; - wxString m_descriptiveText; - wxColour m_defaultFG; DECLARE_EVENT_TABLE() }; @@ -161,8 +151,6 @@ BEGIN_EVENT_TABLE(wxSearchTextCtrl, wxTextCtrl) EVT_TEXT_ENTER(wxID_ANY, wxSearchTextCtrl::OnText) EVT_TEXT_URL(wxID_ANY, wxSearchTextCtrl::OnTextUrl) EVT_TEXT_MAXLEN(wxID_ANY, wxSearchTextCtrl::OnText) - EVT_IDLE(wxSearchTextCtrl::OnIdle) - EVT_SET_FOCUS(wxSearchTextCtrl::OnFocus) END_EVENT_TABLE() // ---------------------------------------------------------------------------- @@ -181,6 +169,13 @@ public: void SetBitmapLabel(const wxBitmap& label) { m_bmp = label; } + // The buttons in wxSearchCtrl shouldn't accept focus from keyboard because + // this would interfere with the usual TAB processing: the user expects + // that pressing TAB in the search control should switch focus to the next + // control and not give it to the button inside the same control. Besides, + // the search button can be already activated by pressing "Enter" so there + // is really no reason for it to be able to get focus from keyboard. + virtual bool AcceptsFocusFromKeyboard() const { return false; } protected: wxSize DoGetBestSize() const @@ -317,8 +312,7 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id, return false; } - m_text = new wxSearchTextCtrl(this, value, style & ~wxBORDER_MASK); - m_text->SetDescriptiveText(_("Search")); + m_text = new wxSearchTextCtrl(this, value, style); m_searchButton = new wxSearchButton(this, wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, @@ -328,12 +322,7 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id, m_cancelBitmap); SetForegroundColour( m_text->GetForegroundColour() ); - m_searchButton->SetForegroundColour( m_text->GetForegroundColour() ); - m_cancelButton->SetForegroundColour( m_text->GetForegroundColour() ); - SetBackgroundColour( m_text->GetBackgroundColour() ); - m_searchButton->SetBackgroundColour( m_text->GetBackgroundColour() ); - m_cancelButton->SetBackgroundColour( m_text->GetBackgroundColour() ); RecalcBitmaps(); @@ -434,12 +423,12 @@ bool wxSearchCtrl::IsCancelButtonVisible() const void wxSearchCtrl::SetDescriptiveText(const wxString& text) { - m_text->SetDescriptiveText(text); + m_text->SetHint(text); } wxString wxSearchCtrl::GetDescriptiveText() const { - return m_text->GetDescriptiveText(); + return m_text->GetHint(); } // ---------------------------------------------------------------------------- @@ -532,17 +521,21 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height) y + ICON_OFFSET - 1, sizeCancel.x, height); } +wxWindowList wxSearchCtrl::GetCompositeWindowParts() const +{ + wxWindowList parts; + parts.push_back(m_text); + parts.push_back(m_searchButton); + parts.push_back(m_cancelButton); + return parts; +} // accessors // --------- wxString wxSearchCtrl::DoGetValue() const { - wxString value = m_text->GetValue(); - if (value == m_text->GetDescriptiveText()) - return wxEmptyString; - else - return value; + return m_text->GetValue(); } wxString wxSearchCtrl::GetRange(long from, long to) const { @@ -786,20 +779,32 @@ void wxSearchCtrl::SetEditable(bool editable) bool wxSearchCtrl::SetFont(const wxFont& font) { - bool result = wxSearchCtrlBase::SetFont(font); - if ( result && m_text ) - { - result = m_text->SetFont(font); - } + if ( !wxSearchCtrlBase::SetFont(font) ) + return false; + + // Recreate the bitmaps as their size may have changed. RecalcBitmaps(); - return result; + + return true; +} + +bool wxSearchCtrl::SetBackgroundColour(const wxColour& colour) +{ + if ( !wxSearchCtrlBase::SetBackgroundColour(colour) ) + return false; + + // When the background changes, re-render the bitmaps so that the correct + // colour shows in their "transparent" area. + RecalcBitmaps(); + + return true; } // search control generic only void wxSearchCtrl::SetSearchBitmap( const wxBitmap& bitmap ) { m_searchBitmap = bitmap; - m_searchBitmapUser = bitmap.Ok(); + m_searchBitmapUser = bitmap.IsOk(); if ( m_searchBitmapUser ) { if ( m_searchButton && !HasMenu() ) @@ -819,7 +824,7 @@ void wxSearchCtrl::SetSearchBitmap( const wxBitmap& bitmap ) void wxSearchCtrl::SetSearchMenuBitmap( const wxBitmap& bitmap ) { m_searchMenuBitmap = bitmap; - m_searchMenuBitmapUser = bitmap.Ok(); + m_searchMenuBitmapUser = bitmap.IsOk(); if ( m_searchMenuBitmapUser ) { if ( m_searchButton && m_menu ) @@ -839,7 +844,7 @@ void wxSearchCtrl::SetSearchMenuBitmap( const wxBitmap& bitmap ) void wxSearchCtrl::SetCancelBitmap( const wxBitmap& bitmap ) { m_cancelBitmap = bitmap; - m_cancelBitmapUser = bitmap.Ok(); + m_cancelBitmapUser = bitmap.IsOk(); if ( m_cancelBitmapUser ) { if ( m_cancelButton ) @@ -1119,7 +1124,7 @@ void wxSearchCtrl::RecalcBitmaps() if ( !m_searchBitmapUser ) { if ( - !m_searchBitmap.Ok() || + !m_searchBitmap.IsOk() || m_searchBitmap.GetHeight() != bitmapHeight || m_searchBitmap.GetWidth() != bitmapWidth ) @@ -1137,7 +1142,7 @@ void wxSearchCtrl::RecalcBitmaps() if ( !m_searchMenuBitmapUser ) { if ( - !m_searchMenuBitmap.Ok() || + !m_searchMenuBitmap.IsOk() || m_searchMenuBitmap.GetHeight() != bitmapHeight || m_searchMenuBitmap.GetWidth() != bitmapWidth ) @@ -1155,7 +1160,7 @@ void wxSearchCtrl::RecalcBitmaps() if ( !m_cancelBitmapUser ) { if ( - !m_cancelBitmap.Ok() || + !m_cancelBitmap.IsOk() || m_cancelBitmap.GetHeight() != bitmapHeight || m_cancelBitmap.GetWidth() != bitmapHeight ) diff --git a/Externals/wxWidgets3/src/generic/statusbr.cpp b/Externals/wxWidgets3/src/generic/statusbr.cpp index 7031967e24..df0391e226 100644 --- a/Externals/wxWidgets3/src/generic/statusbr.cpp +++ b/Externals/wxWidgets3/src/generic/statusbr.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: Francesco Montorsi // Created: 01/02/97 -// RCS-ID: $Id: statusbr.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: statusbr.cpp 70625 2012-02-19 14:49:37Z SN $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -275,7 +275,7 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i, int textHeight) GetFieldRect(i, rect); if (rect.GetWidth() <= 0) - return; // happens when the status bar is shrinked in a very small area! + return; // happens when the status bar is shrunk in a very small area! int style = m_panes[i].GetStyle(); if (style != wxSB_FLAT) @@ -414,9 +414,9 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) ) GdkWindowEdge edge = GetLayoutDirection() == wxLayout_RightToLeft ? GDK_WINDOW_EDGE_SOUTH_WEST : GDK_WINDOW_EDGE_SOUTH_EAST; - gtk_paint_resize_grip( m_widget->style, + gtk_paint_resize_grip(gtk_widget_get_style(m_widget), GTKGetDrawingWindow(), - (GtkStateType) GTK_WIDGET_STATE (m_widget), + gtk_widget_get_state(m_widget), NULL, m_widget, "statusbar", diff --git a/Externals/wxWidgets3/src/generic/timectrlg.cpp b/Externals/wxWidgets3/src/generic/timectrlg.cpp new file mode 100644 index 0000000000..a54b002918 --- /dev/null +++ b/Externals/wxWidgets3/src/generic/timectrlg.cpp @@ -0,0 +1,668 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: src/generic/timectrl.cpp +// Purpose: Generic implementation of wxTimePickerCtrl. +// Author: Paul Breen, Vadim Zeitlin +// Created: 2011-09-22 +// RCS-ID: $Id: timectrlg.cpp 69991 2011-12-12 14:01:23Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#if wxUSE_TIMEPICKCTRL + +#ifndef WX_PRECOMP + #include "wx/textctrl.h" +#endif // WX_PRECOMP + +#include "wx/timectrl.h" + +// This class is only compiled if there is no native version or if we +// explicitly want to use both the native and generic one (this is useful for +// testing but not much otherwise and so by default we don't use the generic +// implementation if a native one is available). +#if !defined(wxHAS_NATIVE_TIMEPICKERCTRL) || wxUSE_TIMEPICKCTRL_GENERIC + +#include "wx/generic/timectrl.h" + +#include "wx/dateevt.h" +#include "wx/spinbutt.h" + +#ifndef wxHAS_NATIVE_TIMEPICKERCTRL + IMPLEMENT_DYNAMIC_CLASS(wxTimePickerCtrl, wxControl) +#endif + +// ---------------------------------------------------------------------------- +// Constants +// ---------------------------------------------------------------------------- + +enum +{ + // Horizontal margin between the text and spin control. + HMARGIN_TEXT_SPIN = 2 +}; + +// ---------------------------------------------------------------------------- +// wxTimePickerGenericImpl: used to implement wxTimePickerCtrlGeneric +// ---------------------------------------------------------------------------- + +class wxTimePickerGenericImpl : public wxEvtHandler +{ +public: + wxTimePickerGenericImpl(wxTimePickerCtrlGeneric* ctrl) + { + m_text = new wxTextCtrl(ctrl, wxID_ANY, wxString()); + + // As this text can't be edited, don't use the standard cursor for it + // to avoid misleading the user. Ideally we'd also hide the caret but + // this is not currently supported by wxTextCtrl. + m_text->SetCursor(wxCURSOR_ARROW); + + m_btn = new wxSpinButton(ctrl, wxID_ANY, + wxDefaultPosition, wxDefaultSize, + wxSP_VERTICAL | wxSP_WRAP); + + m_currentField = Field_Hour; + m_isFirstDigit = true; + + // We don't support arbitrary formats currently as this requires + // significantly more work both here and also in wxLocale::GetInfo(). + // + // For now just use either "%H:%M:%S" or "%I:%M:%S %p". It would be + // nice to add support to "%k" and "%l" (hours with leading blanks + // instead of zeros) too as this is the most common unsupported case in + // practice. + m_useAMPM = wxLocale::GetInfo(wxLOCALE_TIME_FMT).Contains("%p"); + + m_text->Connect + ( + wxEVT_SET_FOCUS, + wxFocusEventHandler(wxTimePickerGenericImpl::OnTextSetFocus), + NULL, + this + ); + m_text->Connect + ( + wxEVT_KEY_DOWN, + wxKeyEventHandler(wxTimePickerGenericImpl::OnTextKeyDown), + NULL, + this + ); + m_text->Connect + ( + wxEVT_LEFT_DOWN, + wxMouseEventHandler(wxTimePickerGenericImpl::OnTextClick), + NULL, + this + ); + + m_btn->Connect + ( + wxEVT_SPIN_UP, + wxSpinEventHandler(wxTimePickerGenericImpl::OnArrowUp), + NULL, + this + ); + m_btn->Connect + ( + wxEVT_SPIN_DOWN, + wxSpinEventHandler(wxTimePickerGenericImpl::OnArrowDown), + NULL, + this + ); + } + + // Set the new value. + void SetValue(const wxDateTime& time) + { + m_time = time.IsValid() ? time : wxDateTime::Now(); + + UpdateTextWithoutEvent(); + } + + + // The text part of the control. + wxTextCtrl* m_text; + + // The spin button used to change the text fields. + wxSpinButton* m_btn; + + // The current time (date part is ignored). + wxDateTime m_time; + +private: + // The logical fields of the text control (AM/PM one may not be present). + enum Field + { + Field_Hour, + Field_Min, + Field_Sec, + Field_AMPM, + Field_Max + }; + + // Direction of change of time fields. + enum Direction + { + // Notice that the enum elements values matter. + Dir_Down = -1, + Dir_Up = +1 + }; + + // A range of character positions ("from" is inclusive, "to" -- exclusive). + struct CharRange + { + int from, + to; + }; + + // Event handlers for various events in our controls. + void OnTextSetFocus(wxFocusEvent& event) + { + HighlightCurrentField(); + + event.Skip(); + } + + // Keyboard interface here is modelled over MSW native control and may need + // adjustments for other platforms. + void OnTextKeyDown(wxKeyEvent& event) + { + const int key = event.GetKeyCode(); + + switch ( key ) + { + case WXK_DOWN: + ChangeCurrentFieldBy1(Dir_Down); + break; + + case WXK_UP: + ChangeCurrentFieldBy1(Dir_Up); + break; + + case WXK_LEFT: + CycleCurrentField(Dir_Down); + break; + + case WXK_RIGHT: + CycleCurrentField(Dir_Up); + break; + + case WXK_HOME: + ResetCurrentField(Dir_Down); + break; + + case WXK_END: + ResetCurrentField(Dir_Up); + break; + + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + // The digits work in all keys except AM/PM. + if ( m_currentField != Field_AMPM ) + { + AppendDigitToCurrentField(key - '0'); + } + break; + + case 'A': + case 'P': + // These keys only work to toggle AM/PM field. + if ( m_currentField == Field_AMPM ) + { + unsigned hour = m_time.GetHour(); + if ( key == 'A' ) + { + if ( hour >= 12 ) + hour -= 12; + } + else // PM + { + if ( hour < 12 ) + hour += 12; + } + + if ( hour != m_time.GetHour() ) + { + m_time.SetHour(hour); + UpdateText(); + } + } + break; + + // Do not skip the other events, just consume them to prevent the + // user from editing the text directly. + } + } + + void OnTextClick(wxMouseEvent& event) + { + Field field wxDUMMY_INITIALIZE(Field_Max); + long pos; + switch ( m_text->HitTest(event.GetPosition(), &pos) ) + { + case wxTE_HT_UNKNOWN: + // Don't do anything, it's better than doing something wrong. + return; + + case wxTE_HT_BEFORE: + // Select the first field. + field = Field_Hour; + break; + + case wxTE_HT_ON_TEXT: + // Find the field containing this position. + for ( field = Field_Hour; field <= GetLastField(); ) + { + const CharRange range = GetFieldRange(field); + + // Normally the "to" end is exclusive but we want to give + // focus to some field when the user clicks between them so + // count it as part of the preceding field here. + if ( range.from <= pos && pos <= range.to ) + break; + + field = static_cast(field + 1); + } + break; + + case wxTE_HT_BELOW: + // This shouldn't happen for single line control. + wxFAIL_MSG( "Unreachable" ); + // fall through + + case wxTE_HT_BEYOND: + // Select the last field. + field = GetLastField(); + break; + } + + ChangeCurrentField(field); + } + + void OnArrowUp(wxSpinEvent& WXUNUSED(event)) + { + ChangeCurrentFieldBy1(Dir_Up); + } + + void OnArrowDown(wxSpinEvent& WXUNUSED(event)) + { + ChangeCurrentFieldBy1(Dir_Down); + } + + + // Get the range of the given field in character positions ("from" is + // inclusive, "to" exclusive). + static CharRange GetFieldRange(Field field) + { + // Currently we can just hard code the ranges as they are the same for + // both supported formats, if we want to support arbitrary formats in + // the future, we'd need to determine them dynamically by examining the + // format here. + static const CharRange ranges[] = + { + { 0, 2 }, + { 3, 5 }, + { 6, 8 }, + { 9, 11}, + }; + + wxCOMPILE_TIME_ASSERT( WXSIZEOF(ranges) == Field_Max, + FieldRangesMismatch ); + + return ranges[field]; + } + + // Get the last field used depending on m_useAMPM. + Field GetLastField() const + { + return m_useAMPM ? Field_AMPM : Field_Sec; + } + + // Change the current field. For convenience, accept int field here as this + // allows us to use arithmetic operations in the caller. + void ChangeCurrentField(int field) + { + if ( field == m_currentField ) + return; + + wxCHECK_RET( field <= GetLastField(), "Invalid field" ); + + m_currentField = static_cast(field); + m_isFirstDigit = true; + + HighlightCurrentField(); + } + + // Go to the next (Dir_Up) or previous (Dir_Down) field, wrapping if + // necessary. + void CycleCurrentField(Direction dir) + { + const unsigned numFields = GetLastField() + 1; + + ChangeCurrentField((m_currentField + numFields + dir) % numFields); + } + + // Select the currently actively field. + void HighlightCurrentField() + { + m_text->SetFocus(); + + const CharRange range = GetFieldRange(m_currentField); + + m_text->SetSelection(range.from, range.to); + } + + // Decrement or increment the value of the current field (wrapping if + // necessary). + void ChangeCurrentFieldBy1(Direction dir) + { + switch ( m_currentField ) + { + case Field_Hour: + m_time.SetHour((m_time.GetHour() + 24 + dir) % 24); + break; + + case Field_Min: + m_time.SetMinute((m_time.GetMinute() + 60 + dir) % 60); + break; + + case Field_Sec: + m_time.SetSecond((m_time.GetSecond() + 60 + dir) % 60); + break; + + case Field_AMPM: + m_time.SetHour((m_time.GetHour() + 12) % 24); + break; + + case Field_Max: + wxFAIL_MSG( "Invalid field" ); + } + + UpdateText(); + } + + // Set the current field to its minimal or maximal value. + void ResetCurrentField(Direction dir) + { + switch ( m_currentField ) + { + case Field_Hour: + case Field_AMPM: + // In 12-hour mode setting the hour to the minimal value + // also changes the suffix to AM and, correspondingly, + // setting it to the maximal one changes the suffix to PM. + // And, for consistency with the native MSW behaviour, we + // also do the same thing when changing AM/PM field itself, + // so change hours in any case. + m_time.SetHour(dir == Dir_Down ? 0 : 23); + break; + + case Field_Min: + m_time.SetMinute(dir == Dir_Down ? 0 : 59); + break; + + case Field_Sec: + m_time.SetSecond(dir == Dir_Down ? 0 : 59); + break; + + case Field_Max: + wxFAIL_MSG( "Invalid field" ); + } + + UpdateText(); + } + + // Append the given digit (from 0 to 9) to the current value of the current + // field. + void AppendDigitToCurrentField(int n) + { + bool moveToNextField = false; + + if ( !m_isFirstDigit ) + { + // The first digit simply replaces the existing field contents, + // but the second one should be combined with the previous one, + // otherwise entering 2-digit numbers would be impossible. + int currentValue wxDUMMY_INITIALIZE(0), + maxValue wxDUMMY_INITIALIZE(0); + + switch ( m_currentField ) + { + case Field_Hour: + currentValue = m_time.GetHour(); + maxValue = 23; + break; + + case Field_Min: + currentValue = m_time.GetMinute(); + maxValue = 59; + break; + + case Field_Sec: + currentValue = m_time.GetSecond(); + maxValue = 59; + break; + + case Field_AMPM: + case Field_Max: + wxFAIL_MSG( "Invalid field" ); + } + + // Check if the new value is acceptable. If not, we just handle + // this digit as if it were the first one. + int newValue = currentValue*10 + n; + if ( newValue < maxValue ) + { + n = newValue; + + // If we're not on the seconds field, advance to the next one. + // This makes it more convenient to enter times as you can just + // press all digits one after one without touching the cursor + // arrow keys at all. + // + // Notice that MSW native control doesn't do this but it seems + // so useful that we intentionally diverge from it here. + moveToNextField = true; + + // We entered both digits so the next one will be "first" again. + m_isFirstDigit = true; + } + } + else // First digit entered. + { + // The next one won't be first any more. + m_isFirstDigit = false; + } + + switch ( m_currentField ) + { + case Field_Hour: + m_time.SetHour(n); + break; + + case Field_Min: + m_time.SetMinute(n); + break; + + case Field_Sec: + m_time.SetSecond(n); + break; + + case Field_AMPM: + case Field_Max: + wxFAIL_MSG( "Invalid field" ); + } + + if ( moveToNextField && m_currentField < Field_Sec ) + CycleCurrentField(Dir_Up); + + UpdateText(); + } + + // Update the text value to correspond to the current time. By default also + // generate an event but this can be avoided by calling the "WithoutEvent" + // variant. + void UpdateText() + { + UpdateTextWithoutEvent(); + + wxWindow* const ctrl = m_text->GetParent(); + + wxDateEvent event(ctrl, m_time, wxEVT_TIME_CHANGED); + ctrl->HandleWindowEvent(event); + } + + void UpdateTextWithoutEvent() + { + m_text->SetValue(m_time.Format(m_useAMPM ? "%I:%M:%S %p" : "%H:%M:%S")); + + HighlightCurrentField(); + } + + + // The current field of the text control: this is the one affected by + // pressing arrow keys or spin button. + Field m_currentField; + + // Flag indicating whether we use AM/PM indicator or not. + bool m_useAMPM; + + // Flag indicating whether the next digit pressed by user will be the first + // digit of the current field or the second one. This is necessary because + // the first digit replaces the current field contents while the second one + // is appended to it (if possible, e.g. pressing '7' in a field already + // containing '8' will still replace it as "78" would be invalid). + bool m_isFirstDigit; + + wxDECLARE_NO_COPY_CLASS(wxTimePickerGenericImpl); +}; + +// ============================================================================ +// wxTimePickerCtrlGeneric implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxTimePickerCtrlGeneric creation +// ---------------------------------------------------------------------------- + +void wxTimePickerCtrlGeneric::Init() +{ + m_impl = NULL; +} + +bool +wxTimePickerCtrlGeneric::Create(wxWindow *parent, + wxWindowID id, + const wxDateTime& date, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) +{ + // The text control we use already has a border, so we don't need one + // ourselves. + style &= ~wxBORDER_MASK; + style |= wxBORDER_NONE; + + if ( !Base::Create(parent, id, pos, size, style, validator, name) ) + return false; + + m_impl = new wxTimePickerGenericImpl(this); + m_impl->SetValue(date); + + InvalidateBestSize(); + SetInitialSize(size); + + return true; +} + +wxTimePickerCtrlGeneric::~wxTimePickerCtrlGeneric() +{ + delete m_impl; +} + +wxWindowList wxTimePickerCtrlGeneric::GetCompositeWindowParts() const +{ + wxWindowList parts; + if ( m_impl ) + { + parts.push_back(m_impl->m_text); + parts.push_back(m_impl->m_btn); + } + return parts; +} + +// ---------------------------------------------------------------------------- +// wxTimePickerCtrlGeneric value +// ---------------------------------------------------------------------------- + +void wxTimePickerCtrlGeneric::SetValue(const wxDateTime& date) +{ + wxCHECK_RET( m_impl, "Must create first" ); + + m_impl->SetValue(date); +} + +wxDateTime wxTimePickerCtrlGeneric::GetValue() const +{ + wxCHECK_MSG( m_impl, wxDateTime(), "Must create first" ); + + return m_impl->m_time; +} + +// ---------------------------------------------------------------------------- +// wxTimePickerCtrlGeneric geometry +// ---------------------------------------------------------------------------- + +void wxTimePickerCtrlGeneric::DoMoveWindow(int x, int y, int width, int height) +{ + Base::DoMoveWindow(x, y, width, height); + + if ( !m_impl ) + return; + + const int widthBtn = m_impl->m_btn->GetSize().x; + const int widthText = width - widthBtn - HMARGIN_TEXT_SPIN; + + m_impl->m_text->SetSize(0, 0, widthText, height); + m_impl->m_btn->SetSize(widthText + HMARGIN_TEXT_SPIN, 0, widthBtn, height); +} + +wxSize wxTimePickerCtrlGeneric::DoGetBestSize() const +{ + if ( !m_impl ) + return Base::DoGetBestSize(); + + wxSize size = m_impl->m_text->GetBestSize(); + size.x += m_impl->m_btn->GetBestSize().x + HMARGIN_TEXT_SPIN; + + return size; +} + +#endif // !wxHAS_NATIVE_TIMEPICKERCTRL || wxUSE_TIMEPICKCTRL_GENERIC + +#endif // wxUSE_TIMEPICKCTRL diff --git a/Externals/wxWidgets3/src/generic/timer.cpp b/Externals/wxWidgets3/src/generic/timer.cpp index e7d67f9942..2b45a5d092 100644 --- a/Externals/wxWidgets3/src/generic/timer.cpp +++ b/Externals/wxWidgets3/src/generic/timer.cpp @@ -2,7 +2,7 @@ // Name: src/generic/timer.cpp // Purpose: wxTimer implementation // Author: Vaclav Slavik -// Id: $Id: timer.cpp 67280 2011-03-22 14:17:38Z DS $ +// Id: $Id: timer.cpp 70353 2012-01-15 14:46:41Z VZ $ // Copyright: (c) Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -34,58 +34,22 @@ // Time input function // ---------------------------------------------------------------------------- -#ifdef __WXMGL__ - // We take advantage of wxMGL's _EVT_getTicks because it is faster - // (especially under MS-DOS!) and more precise than wxGetLocalTimeMillis - // if we are unlucky and the latter combines information from two sources. - #include "wx/mgl/private.h" - extern "C" ulong _EVT_getTicks(); - #define GetMillisecondsTime _EVT_getTicks +#define GetMillisecondsTime wxGetLocalTimeMillis - typedef ulong wxTimerTick_t; +typedef wxLongLong wxTimerTick_t; - #define wxTimerTickFmtSpec wxT("lu") - #define wxTimerTickPrintfArg(tt) (tt) +#if wxUSE_LONGLONG_WX + #define wxTimerTickFmtSpec wxLongLongFmtSpec "d" + #define wxTimerTickPrintfArg(tt) (tt.GetValue()) +#else // using native wxLongLong + #define wxTimerTickFmtSpec wxT("s") + #define wxTimerTickPrintfArg(tt) (tt.ToString().c_str()) +#endif // wx/native long long - #ifdef __DOS__ - // Under DOS the MGL timer has a 24hr period, so consider the 12 hours - // before y to be 'less' and the 12 hours after 'greater' modulo - // 24 hours. - inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y) - { - // _EVT_getTicks wraps at 1573040 * 55 - const wxTimerTick_t modulus = 1573040 * 55; - return (2 * modulus + x - y) % modulus < modulus / 2; - } - #else - // If wxTimerTick_t is 32-bits then it'll wrap in around 50 days. So - // let the 25 days before y be 'less' and 25 days after be 'greater'. - inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y) - { - // This code assumes wxTimerTick_t is an unsigned type. - // Set half_modulus with top bit set and the rest zeros. - const wxTimerTick_t half_modulus = ~((~(wxTimerTick_t)0) >> 1); - return x - y < half_modulus; - } - #endif -#else // !__WXMGL__ - #define GetMillisecondsTime wxGetLocalTimeMillis - - typedef wxLongLong wxTimerTick_t; - - #if wxUSE_LONGLONG_WX - #define wxTimerTickFmtSpec wxLongLongFmtSpec "d" - #define wxTimerTickPrintfArg(tt) (tt.GetValue()) - #else // using native wxLongLong - #define wxTimerTickFmtSpec wxT("s") - #define wxTimerTickPrintfArg(tt) (tt.ToString().c_str()) - #endif // wx/native long long - - inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y) - { - return x >= y; - } -#endif // __WXMGL__/!__WXMGL__ +inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y) +{ + return x >= y; +} // ---------------------------------------------------------------------------- // helper structures and wxTimerScheduler diff --git a/Externals/wxWidgets3/src/generic/tipwin.cpp b/Externals/wxWidgets3/src/generic/tipwin.cpp index 42bd966eeb..6164e216c0 100644 --- a/Externals/wxWidgets3/src/generic/tipwin.cpp +++ b/Externals/wxWidgets3/src/generic/tipwin.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 10.09.00 -// RCS-ID: $Id: tipwin.cpp 61508 2009-07-23 20:30:22Z VZ $ +// RCS-ID: $Id: tipwin.cpp 70843 2012-03-08 16:45:17Z PC $ // Copyright: (c) 2000 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -167,7 +167,7 @@ wxTipWindow::~wxTipWindow() { *m_windowPtr = NULL; } - #ifdef wxUSE_POPUPWIN + #if wxUSE_POPUPWIN #ifdef __WXGTK__ if ( m_view->HasCapture() ) m_view->ReleaseMouse(); diff --git a/Externals/wxWidgets3/src/generic/treectlg.cpp b/Externals/wxWidgets3/src/generic/treectlg.cpp index 72a6b5b8d0..b17ec147a5 100644 --- a/Externals/wxWidgets3/src/generic/treectlg.cpp +++ b/Externals/wxWidgets3/src/generic/treectlg.cpp @@ -4,7 +4,7 @@ // Author: Robert Roebling // Created: 01/02/97 // Modified: 22/10/98 - almost total rewrite, simpler interface (VZ) -// Id: $Id: treectlg.cpp 67280 2011-03-22 14:17:38Z DS $ +// Id: $Id: treectlg.cpp 70625 2012-02-19 14:49:37Z SN $ // Copyright: (c) 1998 Robert Roebling and Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -441,7 +441,7 @@ wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl *owner, rect.y -= 2; rect.width += 8; rect.height += 4; -#elif defined(__WXMAC__) +#elif defined(wxOSX_USE_CARBON) && wxOSX_USE_CARBON int bestHeight = GetBestSize().y - 8; if ( rect.height > bestHeight ) { @@ -997,7 +997,7 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent, #endif if ( !wxControl::Create( parent, id, pos, size, - style|wxHSCROLL|wxVSCROLL, + style|wxHSCROLL|wxVSCROLL|wxWANTS_CHARS, validator, name ) ) return false; @@ -2054,7 +2054,8 @@ wxGenericTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem *crt_item, if (crt_item==last_item) return true; - if (crt_item->HasChildren()) + // We should leave the not shown children of collapsed items alone. + if (crt_item->HasChildren() && crt_item->IsExpanded()) { wxArrayGenericTreeItems& children = crt_item->GetChildren(); size_t count = children.GetCount(); @@ -2878,7 +2879,7 @@ wxGenericTreeCtrl::PaintLevel(wxGenericTreeItem *item, yOrigin = abs(yOrigin); GetClientSize(&width, &height); - // Move end points to the begining/end of the view? + // Move end points to the beginning/end of the view? if (y_mid < yOrigin) y_mid = yOrigin; if (oldY > yOrigin + height) diff --git a/Externals/wxWidgets3/src/generic/treelist.cpp b/Externals/wxWidgets3/src/generic/treelist.cpp new file mode 100644 index 0000000000..deedad6351 --- /dev/null +++ b/Externals/wxWidgets3/src/generic/treelist.cpp @@ -0,0 +1,1677 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: src/generic/treelist.cpp +// Purpose: Generic wxTreeListCtrl implementation. +// Author: Vadim Zeitlin +// Created: 2011-08-19 +// RCS-ID: $Id: treelist.cpp 69805 2011-11-23 23:58:54Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +// ============================================================================ +// Declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// Headers +// ---------------------------------------------------------------------------- + +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#if wxUSE_TREELISTCTRL + +#ifndef WX_PRECOMP + #include "wx/dc.h" +#endif // WX_PRECOMP + +#include "wx/treelist.h" + +#include "wx/dataview.h" +#include "wx/renderer.h" +#include "wx/scopedarray.h" +#include "wx/scopedptr.h" + +// ---------------------------------------------------------------------------- +// Constants +// ---------------------------------------------------------------------------- + +const char wxTreeListCtrlNameStr[] = "wxTreeListCtrl"; + +const wxTreeListItem wxTLI_FIRST(reinterpret_cast(-1)); +const wxTreeListItem wxTLI_LAST(reinterpret_cast(-2)); + +// ---------------------------------------------------------------------------- +// wxTreeListModelNode: a node in the internal tree representation. +// ---------------------------------------------------------------------------- + +class wxTreeListModelNode +{ +public: + wxTreeListModelNode(wxTreeListModelNode* parent, + const wxString& text = wxString(), + int imageClosed = wxWithImages::NO_IMAGE, + int imageOpened = wxWithImages::NO_IMAGE, + wxClientData* data = NULL) + : m_text(text), + m_parent(parent) + { + m_child = + m_next = NULL; + + m_imageClosed = imageClosed; + m_imageOpened = imageOpened; + + m_checkedState = wxCHK_UNCHECKED; + + m_data = data; + + m_columnsTexts = NULL; + } + + // Destroying the node also (recursively) destroys its children. + ~wxTreeListModelNode() + { + for ( wxTreeListModelNode* node = m_child; node; ) + { + wxTreeListModelNode* child = node; + node = node->m_next; + delete child; + } + + delete m_data; + + delete [] m_columnsTexts; + } + + + // Public fields for the first column text and other simple attributes: + // there is no need to have accessors/mutators for those as there is no + // encapsulation anyhow, all of those are exposed in our public API. + wxString m_text; + + int m_imageClosed, + m_imageOpened; + + wxCheckBoxState m_checkedState; + + + // Accessors for the fields that are not directly exposed. + + // Client data is owned by us so delete the old value when setting the new + // one. + wxClientData* GetClientData() const { return m_data; } + void SetClientData(wxClientData* data) { delete m_data; m_data = data; } + + // Setting or getting the non-first column text. Getting is simple but you + // need to call HasColumnsTexts() first as the column data is only + // allocated on demand. And when setting the text we require to be given + // the total number of columns as we allocate the entire array at once, + // this is more efficient than using dynamically-expandable wxVector that + // we know won't be needed as the number of columns is usually fixed. But + // if it does change, our OnInsertColumn() must be called. + // + // Notice the presence of -1 everywhere in these methods: this is because + // the text for the first column is always stored in m_text and so we don't + // store it in m_columnsTexts. + + bool HasColumnsTexts() const { return m_columnsTexts != NULL; } + const wxString& GetColumnText(unsigned col) const + { + return m_columnsTexts[col - 1]; + } + + void SetColumnText(const wxString& text, unsigned col, unsigned numColumns) + { + if ( !m_columnsTexts ) + m_columnsTexts = new wxString[numColumns - 1]; + + m_columnsTexts[col - 1] = text; + } + + void OnInsertColumn(unsigned col, unsigned numColumns) + { + wxASSERT_MSG( col, "Shouldn't be called for the first column" ); + + // Nothing to do if we don't have any text. + if ( !m_columnsTexts ) + return; + + wxScopedArray oldTexts(m_columnsTexts); + m_columnsTexts = new wxString[numColumns - 1]; + + // In the loop below n is the index in the new column texts array and m + // is the index in the old one. + for ( unsigned n = 1, m = 1; n < numColumns - 1; n++, m++ ) + { + if ( n == col ) + { + // Leave the new array text initially empty and just adjust the + // index (to compensate for "m++" done by the loop anyhow). + m--; + } + else // Not the newly inserted column. + { + // Copy the old text value. + m_columnsTexts[n - 1] = oldTexts[m - 1]; + } + } + } + + void OnDeleteColumn(unsigned col, unsigned numColumns) + { + wxASSERT_MSG( col, "Shouldn't be called for the first column" ); + + if ( !m_columnsTexts ) + return; + + wxScopedArray oldTexts(m_columnsTexts); + m_columnsTexts = new wxString[numColumns - 2]; + for ( unsigned n = 1, m = 1; n < numColumns - 1; n++, m++ ) + { + if ( n == col ) + { + n--; + } + else // Not the deleted column. + { + m_columnsTexts[n - 1] = oldTexts[m - 1]; + } + } + } + + void OnClearColumns() + { + if ( m_columnsTexts ) + { + delete [] m_columnsTexts; + m_columnsTexts = NULL; + } + } + + + // Functions for modifying the tree. + + // Insert the given item as the first child of this one. The parent pointer + // must have been already set correctly at creation and we take ownership + // of the pointer and will delete it later. + void InsertChild(wxTreeListModelNode* child) + { + wxASSERT( child->m_parent == this ); + + // Our previous first child becomes the next sibling of the new child. + child->m_next = m_child; + m_child = child; + } + + // Insert the given item as our next sibling. As above, the item must have + // the correct parent pointer and we take ownership of it. + void InsertNext(wxTreeListModelNode* next) + { + wxASSERT( next->m_parent == m_parent ); + + next->m_next = m_next; + m_next = next; + } + + // Remove the first child of this item from the tree and delete it. + void DeleteChild() + { + wxTreeListModelNode* const oldChild = m_child; + m_child = m_child->m_next; + delete oldChild; + } + + // Remove the next sibling of this item from the tree and deletes it. + void DeleteNext() + { + wxTreeListModelNode* const oldNext = m_next; + m_next = m_next->m_next; + delete oldNext; + } + + + // Functions for tree traversal. All of them can return NULL. + + // Only returns NULL when called on the root item. + wxTreeListModelNode* GetParent() const { return m_parent; } + + // Returns the first child of this item. + wxTreeListModelNode* GetChild() const { return m_child; } + + // Returns the next sibling of this item. + wxTreeListModelNode* GetNext() const { return m_next; } + + // Unlike the previous two functions, this one is not a simple accessor + // (hence it's not called "GetSomething") but computes the next node after + // this one in tree order. + wxTreeListModelNode* NextInTree() const + { + if ( m_child ) + return m_child; + + if ( m_next ) + return m_next; + + // Recurse upwards until we find the next sibling. + for ( wxTreeListModelNode* node = m_parent; node; node = node->m_parent ) + { + if ( node->m_next ) + return node->m_next; + } + + return NULL; + } + + +private: + // The (never changing after creation) parent of this node and the possibly + // NULL pointers to its first child and next sibling. + wxTreeListModelNode* const m_parent; + wxTreeListModelNode* m_child; + wxTreeListModelNode* m_next; + + // Client data pointer owned by the control. May be NULL. + wxClientData* m_data; + + // Array of column values for all the columns except the first one. May be + // NULL if no values had been set for them. + wxString* m_columnsTexts; +}; + +// ---------------------------------------------------------------------------- +// wxTreeListModel: wxDataViewModel implementation used by wxTreeListCtrl. +// ---------------------------------------------------------------------------- + +class wxTreeListModel : public wxDataViewModel +{ +public: + typedef wxTreeListModelNode Node; + + // Unlike a general wxDataViewModel, this model can only be used with a + // single control at once. The main reason for this is that we need to + // support different icons for opened and closed items and the item state + // is associated with the control, not the model, so our GetValue() is also + // bound to it (otherwise, what would it return for an item expanded in one + // associated control and collapsed in another one?). + wxTreeListModel(wxTreeListCtrl* treelist); + virtual ~wxTreeListModel(); + + + // Helpers for converting between wxDataViewItem and wxTreeListItem. These + // methods simply cast the pointer to/from wxDataViewItem except for the + // root node that we handle specially unless explicitly disabled. + // + // The advantage of using them is that they're greppable and stand out + // better, hopefully making the code more clear. + Node* FromNonRootDVI(wxDataViewItem dvi) const + { + return static_cast(dvi.GetID()); + } + + Node* FromDVI(wxDataViewItem dvi) const + { + if ( !dvi.IsOk() ) + return m_root; + + return FromNonRootDVI(dvi); + } + + wxDataViewItem ToNonRootDVI(Node* node) const + { + return wxDataViewItem(node); + } + + wxDataViewItem ToDVI(Node* node) const + { + // Our root item must be represented as NULL at wxDVC level to map to + // its own invisible root. + if ( !node->GetParent() ) + return wxDataViewItem(); + + return ToNonRootDVI(node); + } + + + // Methods called by wxTreeListCtrl. + void InsertColumn(unsigned col); + void DeleteColumn(unsigned col); + void ClearColumns(); + + Node* InsertItem(Node* parent, + Node* previous, + const wxString& text, + int imageClosed, + int imageOpened, + wxClientData* data); + void DeleteItem(Node* item); + void DeleteAllItems(); + + Node* GetRootItem() const { return m_root; } + + const wxString& GetItemText(Node* item, unsigned col) const; + void SetItemText(Node* item, unsigned col, const wxString& text); + void SetItemImage(Node* item, int closed, int opened); + wxClientData* GetItemData(Node* item) const; + void SetItemData(Node* item, wxClientData* data); + + void CheckItem(Node* item, wxCheckBoxState checkedState); + void ToggleItem(wxDataViewItem item); + + + // Implement the base class pure virtual methods. + virtual unsigned GetColumnCount() const; + virtual wxString GetColumnType(unsigned col) const; + virtual void GetValue(wxVariant& variant, + const wxDataViewItem& item, + unsigned col) const; + virtual bool SetValue(const wxVariant& variant, + const wxDataViewItem& item, + unsigned col); + virtual wxDataViewItem GetParent(const wxDataViewItem& item) const; + virtual bool IsContainer(const wxDataViewItem& item) const; + virtual bool HasContainerColumns(const wxDataViewItem& item) const; + virtual unsigned GetChildren(const wxDataViewItem& item, + wxDataViewItemArray& children) const; + virtual bool IsListModel() const { return m_isFlat; } + virtual int Compare(const wxDataViewItem& item1, + const wxDataViewItem& item2, + unsigned col, + bool ascending) const; + +private: + // The control we're associated with. + wxTreeListCtrl* const m_treelist; + + // The unique invisible root element. + Node* const m_root; + + // Number of columns we maintain. + unsigned m_numColumns; + + // Set to false as soon as we have more than one level, i.e. as soon as any + // items with non-root item as parent are added (and currently never reset + // after this). + bool m_isFlat; +}; + +// ============================================================================ +// wxDataViewCheckIconText[Renderer]: special renderer for our first column. +// ============================================================================ + +// Currently this class is private but it could be extracted and made part of +// public API later as could be used directly with wxDataViewCtrl as well. +namespace +{ + +const char* CHECK_ICON_TEXT_TYPE = "wxDataViewCheckIconText"; + +// The value used by wxDataViewCheckIconTextRenderer +class wxDataViewCheckIconText : public wxDataViewIconText +{ +public: + wxDataViewCheckIconText(const wxString& text = wxString(), + const wxIcon& icon = wxNullIcon, + wxCheckBoxState checkedState = wxCHK_UNDETERMINED) + : wxDataViewIconText(text, icon), + m_checkedState(checkedState) + { + } + + wxDataViewCheckIconText(const wxDataViewCheckIconText& other) + : wxDataViewIconText(other), + m_checkedState(other.m_checkedState) + { + } + + bool IsSameAs(const wxDataViewCheckIconText& other) const + { + return wxDataViewIconText::IsSameAs(other) && + m_checkedState == other.m_checkedState; + } + + // There is no encapsulation anyhow, so just expose this field directly. + wxCheckBoxState m_checkedState; + + +private: + wxDECLARE_DYNAMIC_CLASS(wxDataViewCheckIconText); +}; + +wxIMPLEMENT_DYNAMIC_CLASS(wxDataViewCheckIconText, wxDataViewIconText); + +DECLARE_VARIANT_OBJECT(wxDataViewCheckIconText) +IMPLEMENT_VARIANT_OBJECT(wxDataViewCheckIconText) + + +class wxDataViewCheckIconTextRenderer : public wxDataViewCustomRenderer +{ +public: + wxDataViewCheckIconTextRenderer() + : wxDataViewCustomRenderer(CHECK_ICON_TEXT_TYPE, + wxDATAVIEW_CELL_ACTIVATABLE) + { + } + + virtual bool SetValue(const wxVariant& value) + { + m_value << value; + return true; + } + + virtual bool GetValue(wxVariant& WXUNUSED(value)) const + { + return false; + } + + wxSize GetSize() const + { + wxSize size = GetCheckSize(); + size.x += MARGIN_CHECK_ICON; + + if ( m_value.GetIcon().IsOk() ) + { + const wxSize sizeIcon = m_value.GetIcon().GetSize(); + if ( sizeIcon.y > size.y ) + size.y = sizeIcon.y; + + size.x += sizeIcon.x + MARGIN_ICON_TEXT; + } + + wxString text = m_value.GetText(); + if ( text.empty() ) + text = "Dummy"; + + const wxSize sizeText = GetTextExtent(text); + if ( sizeText.y > size.y ) + size.y = sizeText.y; + + size.x += sizeText.x; + + return size; + } + + virtual bool Render(wxRect cell, wxDC* dc, int state) + { + // Draw the checkbox first. + int renderFlags = 0; + switch ( m_value.m_checkedState ) + { + case wxCHK_UNCHECKED: + break; + + case wxCHK_CHECKED: + renderFlags |= wxCONTROL_CHECKED; + break; + + case wxCHK_UNDETERMINED: + renderFlags |= wxCONTROL_UNDETERMINED; + break; + } + + if ( state & wxDATAVIEW_CELL_PRELIT ) + renderFlags |= wxCONTROL_CURRENT; + + const wxSize sizeCheck = GetCheckSize(); + + wxRect rectCheck(cell.GetPosition(), sizeCheck); + rectCheck = rectCheck.CentreIn(cell, wxVERTICAL); + + wxRendererNative::Get().DrawCheckBox + ( + GetView(), *dc, rectCheck, renderFlags + ); + + // Then the icon, if any. + int xoffset = sizeCheck.x + MARGIN_CHECK_ICON; + + const wxIcon& icon = m_value.GetIcon(); + if ( icon.IsOk() ) + { + const wxSize sizeIcon = icon.GetSize(); + wxRect rectIcon(cell.GetPosition(), sizeIcon); + rectIcon.x += xoffset; + rectIcon = rectIcon.CentreIn(cell, wxVERTICAL); + + dc->DrawIcon(icon, rectIcon.GetPosition()); + + xoffset += sizeIcon.x + MARGIN_ICON_TEXT; + } + + // Finally the text. + RenderText(m_value.GetText(), xoffset, cell, dc, state); + + return true; + } + + // Event handlers toggling the items checkbox if it was clicked. + virtual bool ActivateCell(const wxRect& WXUNUSED(cell), + wxDataViewModel *model, + const wxDataViewItem & item, + unsigned int WXUNUSED(col), + const wxMouseEvent *mouseEvent) + { + if ( mouseEvent ) + { + if ( !wxRect(GetCheckSize()).Contains(mouseEvent->GetPosition()) ) + return false; + } + + static_cast(model)->ToggleItem(item); + return true; + } + +protected: + wxSize GetCheckSize() const + { + return wxRendererNative::Get().GetCheckBoxSize(GetView()); + } + +private: + // Just some arbitrary constants defining margins, in pixels. + enum + { + MARGIN_CHECK_ICON = 3, + MARGIN_ICON_TEXT = 4 + }; + + wxDataViewCheckIconText m_value; +}; + +} // anonymous namespace + +// ============================================================================ +// wxTreeListModel implementation +// ============================================================================ + +wxTreeListModel::wxTreeListModel(wxTreeListCtrl* treelist) + : m_treelist(treelist), + m_root(new Node(NULL)) +{ + m_numColumns = 0; + m_isFlat = true; +} + +wxTreeListModel::~wxTreeListModel() +{ + delete m_root; +} + +void wxTreeListModel::InsertColumn(unsigned col) +{ + m_numColumns++; + + // There is no need to update anything when inserting the first column. + if ( m_numColumns == 1 ) + return; + + // Update all the items as they may have texts for the old columns. + for ( Node* node = m_root->GetChild(); node; node = node->NextInTree() ) + { + node->OnInsertColumn(col, m_numColumns); + } +} + +void wxTreeListModel::DeleteColumn(unsigned col) +{ + wxCHECK_RET( col < m_numColumns, "Invalid column index" ); + + // Update all the items to remove the text for the non first columns. + if ( col > 0 ) + { + for ( Node* node = m_root->GetChild(); node; node = node->NextInTree() ) + { + node->OnDeleteColumn(col, m_numColumns); + } + } + + m_numColumns--; +} + +void wxTreeListModel::ClearColumns() +{ + m_numColumns = 0; + + for ( Node* node = m_root->GetChild(); node; node = node->NextInTree() ) + { + node->OnClearColumns(); + } +} + +wxTreeListModelNode* +wxTreeListModel::InsertItem(Node* parent, + Node* previous, + const wxString& text, + int imageClosed, + int imageOpened, + wxClientData* data) +{ + wxCHECK_MSG( parent, NULL, + "Must have a valid parent (maybe GetRootItem()?)" ); + + wxCHECK_MSG( previous, NULL, + "Must have a valid previous item (maybe wxTLI_FIRST/LAST?)" ); + + if ( m_isFlat && parent != m_root ) + { + // Not flat any more, this is a second level child. + m_isFlat = false; + } + + wxScopedPtr + newItem(new Node(parent, text, imageClosed, imageOpened, data)); + + // FIXME-VC6: This compiler refuses to compare "Node* previous" with + // wxTLI_XXX without some help. + const wxTreeListItem previousItem(previous); + + // If we have no children at all, then inserting as last child is the same + // as inserting as the first one so check for it here too. + if ( previousItem == wxTLI_FIRST || + (previousItem == wxTLI_LAST && !parent->GetChild()) ) + { + parent->InsertChild(newItem.get()); + } + else // Not the first item, find the previous one. + { + if ( previousItem == wxTLI_LAST ) + { + previous = parent->GetChild(); + + // Find the last child. + for ( ;; ) + { + Node* const next = previous->GetNext(); + if ( !next ) + break; + + previous = next; + } + } + else // We already have the previous item. + { + // Just check it's under the correct parent. + wxCHECK_MSG( previous->GetParent() == parent, NULL, + "Previous item is not under the right parent" ); + } + + previous->InsertNext(newItem.get()); + } + + ItemAdded(ToDVI(parent), ToDVI(newItem.get())); + + // The item was successfully inserted in the tree and so will be deleted by + // it, we can detach it now. + return newItem.release(); +} + +void wxTreeListModel::DeleteItem(Node* item) +{ + wxCHECK_RET( item, "Invalid item" ); + + wxCHECK_RET( item != m_root, "Can't delete the root item" ); + + Node* const parent = item->GetParent(); + + ItemDeleted(ToDVI(parent), ToDVI(item)); + + Node* previous = parent->GetChild(); + if ( previous == item ) + { + parent->DeleteChild(); + } + else // Not the first child of its parent. + { + // Find the sibling just before it. + for ( ;; ) + { + Node* const next = previous->GetNext(); + if ( next == item ) + break; + + wxCHECK_RET( next, "Item not a child of its parent?" ); + + previous = next; + } + + previous->DeleteNext(); + } +} + +void wxTreeListModel::DeleteAllItems() +{ + while ( m_root->GetChild() ) + { + m_root->DeleteChild(); + } + + Cleared(); +} + +const wxString& wxTreeListModel::GetItemText(Node* item, unsigned col) const +{ + // Returning root item text here is bogus, it just happens to be an always + // empty string we can return reference to. + wxCHECK_MSG( item, m_root->m_text, "Invalid item" ); + + // Notice that asking for the text of a column of an item that doesn't have + // any column texts is not an error so we simply return an empty string in + // this case. + return col == 0 ? item->m_text + : item->HasColumnsTexts() ? item->GetColumnText(col) + : m_root->m_text; +} + +void wxTreeListModel::SetItemText(Node* item, unsigned col, const wxString& text) +{ + wxCHECK_RET( item, "Invalid item" ); + + if ( col == 0 ) + item->m_text = text; + else + item->SetColumnText(text, col, m_numColumns); + + ValueChanged(ToDVI(item), col); +} + +void wxTreeListModel::SetItemImage(Node* item, int closed, int opened) +{ + wxCHECK_RET( item, "Invalid item" ); + + item->m_imageClosed = closed; + item->m_imageOpened = opened; + + ValueChanged(ToDVI(item), 0); +} + +wxClientData* wxTreeListModel::GetItemData(Node* item) const +{ + wxCHECK_MSG( item, NULL, "Invalid item" ); + + return item->GetClientData(); +} + +void wxTreeListModel::SetItemData(Node* item, wxClientData* data) +{ + wxCHECK_RET( item, "Invalid item" ); + + item->SetClientData(data); +} + +void wxTreeListModel::CheckItem(Node* item, wxCheckBoxState checkedState) +{ + wxCHECK_RET( item, "Invalid item" ); + + item->m_checkedState = checkedState; + + ItemChanged(ToDVI(item)); +} + +void wxTreeListModel::ToggleItem(wxDataViewItem dvi) +{ + Node* const item = FromDVI(dvi); + + wxCHECK_RET( item, "Invalid item" ); + + const wxCheckBoxState stateOld = item->m_checkedState; + + // If the 3rd state is user-settable then the cycle is + // unchecked->checked->undetermined. + switch ( stateOld ) + { + case wxCHK_CHECKED: + item->m_checkedState = m_treelist->HasFlag(wxTL_USER_3STATE) + ? wxCHK_UNDETERMINED + : wxCHK_UNCHECKED; + break; + + case wxCHK_UNDETERMINED: + // Whether 3rd state is user-settable or not, the next state is + // unchecked. + item->m_checkedState = wxCHK_UNCHECKED; + break; + + case wxCHK_UNCHECKED: + item->m_checkedState = wxCHK_CHECKED; + break; + } + + ItemChanged(ToDVI(item)); + + m_treelist->OnItemToggled(item, stateOld); +} + +unsigned wxTreeListModel::GetColumnCount() const +{ + return m_numColumns; +} + +wxString wxTreeListModel::GetColumnType(unsigned col) const +{ + if ( col == 0 ) + { + return m_treelist->HasFlag(wxTL_CHECKBOX) + ? wxS("wxDataViewCheckIconText") + : wxS("wxDataViewIconText"); + } + else // All the other columns contain just text. + { + return wxS("string"); + } +} + +void +wxTreeListModel::GetValue(wxVariant& variant, + const wxDataViewItem& item, + unsigned col) const +{ + Node* const node = FromDVI(item); + + if ( col == 0 ) + { + // Determine the correct image to use depending on the item state. + int image = wxWithImages::NO_IMAGE; + if ( m_treelist->IsExpanded(node) ) + image = node->m_imageOpened; + + if ( image == wxWithImages::NO_IMAGE ) + image = node->m_imageClosed; + + wxIcon icon = m_treelist->GetImage(image); + + if ( m_treelist->HasFlag(wxTL_CHECKBOX) ) + variant << wxDataViewCheckIconText(node->m_text, icon, + node->m_checkedState); + else + variant << wxDataViewIconText(node->m_text, icon); + } + else + { + // Notice that we must still assign wxString to wxVariant to ensure + // that it at least has the correct type. + wxString text; + if ( node->HasColumnsTexts() ) + text = node->GetColumnText(col); + + variant = text; + } +} + +bool +wxTreeListModel::SetValue(const wxVariant& WXUNUSED(variant), + const wxDataViewItem& WXUNUSED(item), + unsigned WXUNUSED(col)) +{ + // We are not editable currently. + return false; +} + +wxDataViewItem wxTreeListModel::GetParent(const wxDataViewItem& item) const +{ + Node* const node = FromDVI(item); + + return ToDVI(node->GetParent()); +} + +bool wxTreeListModel::IsContainer(const wxDataViewItem& item) const +{ + // FIXME: In the generic (and native OS X) versions we implement this + // method normally, i.e. only items with children are containers. + // But for the native GTK version we must pretend that all items are + // containers because otherwise adding children to them later would + // fail because wxGTK code calls IsContainer() too early (when + // adding the item itself) and we can't know whether we're container + // or not by then. Luckily, always returning true doesn't have any + // serious drawbacks for us. +#ifdef __WXGTK__ + wxUnusedVar(item); + + return true; +#else + Node* const node = FromDVI(item); + + return node->GetChild() != NULL; +#endif +} + +bool +wxTreeListModel::HasContainerColumns(const wxDataViewItem& WXUNUSED(item)) const +{ + return true; +} + +unsigned +wxTreeListModel::GetChildren(const wxDataViewItem& item, + wxDataViewItemArray& children) const +{ + Node* const node = FromDVI(item); + + unsigned numChildren = 0; + for ( Node* child = node->GetChild(); child; child = child->GetNext() ) + { + children.push_back(ToDVI(child)); + numChildren++; + } + + return numChildren; +} + +int +wxTreeListModel::Compare(const wxDataViewItem& item1, + const wxDataViewItem& item2, + unsigned col, + bool ascending) const +{ + // Compare using default alphabetical order if no custom comparator. + wxTreeListItemComparator* const comp = m_treelist->m_comparator; + if ( !comp ) + return wxDataViewModel::Compare(item1, item2, col, ascending); + + // Forward comparison to the comparator: + int result = comp->Compare(m_treelist, col, FromDVI(item1), FromDVI(item2)); + + // And adjust by the sort order if necessary. + if ( !ascending ) + result = -result; + + return result; +} + +// ============================================================================ +// wxTreeListCtrl implementation +// ============================================================================ + +BEGIN_EVENT_TABLE(wxTreeListCtrl, wxWindow) + EVT_DATAVIEW_SELECTION_CHANGED(wxID_ANY, wxTreeListCtrl::OnSelectionChanged) + EVT_DATAVIEW_ITEM_EXPANDING(wxID_ANY, wxTreeListCtrl::OnItemExpanding) + EVT_DATAVIEW_ITEM_EXPANDED(wxID_ANY, wxTreeListCtrl::OnItemExpanded) + EVT_DATAVIEW_ITEM_ACTIVATED(wxID_ANY, wxTreeListCtrl::OnItemActivated) + EVT_DATAVIEW_ITEM_CONTEXT_MENU(wxID_ANY, wxTreeListCtrl::OnItemContextMenu) + EVT_DATAVIEW_COLUMN_SORTED(wxID_ANY, wxTreeListCtrl::OnColumnSorted) + + EVT_SIZE(wxTreeListCtrl::OnSize) +END_EVENT_TABLE() + +// ---------------------------------------------------------------------------- +// Creation +// ---------------------------------------------------------------------------- + +void wxTreeListCtrl::Init() +{ + m_view = NULL; + m_model = NULL; + m_comparator = NULL; +} + +bool wxTreeListCtrl::Create(wxWindow* parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) +{ + if ( style & wxTL_USER_3STATE ) + style |= wxTL_3STATE; + + if ( style & wxTL_3STATE ) + style |= wxTL_CHECKBOX; + + // Create the window itself and wxDataViewCtrl used by it. + if ( !wxWindow::Create(parent, id, + pos, size, + style, name) ) + { + return false; + } + + m_view = new wxDataViewCtrl; + if ( !m_view->Create(this, wxID_ANY, + wxPoint(0, 0), GetClientSize(), + HasFlag(wxTL_MULTIPLE) ? wxDV_MULTIPLE + : wxDV_SINGLE) ) + { + delete m_view; + m_view = NULL; + + return false; + } + + + // Set up the model for wxDataViewCtrl. + m_model = new wxTreeListModel(this); + m_view->AssociateModel(m_model); + + return true; +} + +wxTreeListCtrl::~wxTreeListCtrl() +{ + if ( m_model ) + m_model->DecRef(); +} + +wxWindowList wxTreeListCtrl::GetCompositeWindowParts() const +{ + wxWindowList parts; + parts.push_back(m_view); + return parts; +} + +// ---------------------------------------------------------------------------- +// Columns +// ---------------------------------------------------------------------------- + +int +wxTreeListCtrl::DoInsertColumn(const wxString& title, + int pos, + int width, + wxAlignment align, + int flags) +{ + wxCHECK_MSG( m_view, wxNOT_FOUND, "Must Create() first" ); + + const unsigned oldNumColumns = m_view->GetColumnCount(); + + if ( pos == wxNOT_FOUND ) + pos = oldNumColumns; + + wxDataViewRenderer* renderer; + if ( pos == 0 ) + { + // Inserting the first column which is special as it uses a different + // renderer. + + // Also, currently it can be done only once. + wxCHECK_MSG( !oldNumColumns, wxNOT_FOUND, + "Inserting column at position 0 currently not supported" ); + + if ( HasFlag(wxTL_CHECKBOX) ) + { + // Use our custom renderer to show the checkbox. + renderer = new wxDataViewCheckIconTextRenderer; + } + else // We still need a special renderer to show the icons. + { + renderer = new wxDataViewIconTextRenderer; + } + } + else // Not the first column. + { + // All the other ones use a simple text renderer. + renderer = new wxDataViewTextRenderer; + } + + wxDataViewColumn* + column = new wxDataViewColumn(title, renderer, pos, width, align, flags); + + m_model->InsertColumn(pos); + + m_view->InsertColumn(pos, column); + + return pos; +} + +unsigned wxTreeListCtrl::GetColumnCount() const +{ + return m_view ? m_view->GetColumnCount() : 0u; +} + +bool wxTreeListCtrl::DeleteColumn(unsigned col) +{ + wxCHECK_MSG( col < GetColumnCount(), false, "Invalid column index" ); + + if ( !m_view->DeleteColumn(m_view->GetColumn(col)) ) + return false; + + m_model->DeleteColumn(col); + + return true; +} + +void wxTreeListCtrl::ClearColumns() +{ + // Don't assert here, clearing columns of the control before it's created + // can be considered valid (just useless). + if ( !m_model ) + return; + + m_view->ClearColumns(); + + m_model->ClearColumns(); +} + +void wxTreeListCtrl::SetColumnWidth(unsigned col, int width) +{ + wxCHECK_RET( col < GetColumnCount(), "Invalid column index" ); + + wxDataViewColumn* const column = m_view->GetColumn(col); + wxCHECK_RET( column, "No such column?" ); + + column->SetWidth(width); +} + +int wxTreeListCtrl::GetColumnWidth(unsigned col) const +{ + wxCHECK_MSG( col < GetColumnCount(), -1, "Invalid column index" ); + + wxDataViewColumn* column = m_view->GetColumn(col); + wxCHECK_MSG( column, -1, "No such column?" ); + + return column->GetWidth(); +} + +int wxTreeListCtrl::WidthFor(const wxString& text) const +{ + return GetTextExtent(text).x; +} + +// ---------------------------------------------------------------------------- +// Items +// ---------------------------------------------------------------------------- + +wxTreeListItem +wxTreeListCtrl::DoInsertItem(wxTreeListItem parent, + wxTreeListItem previous, + const wxString& text, + int imageClosed, + int imageOpened, + wxClientData* data) +{ + wxCHECK_MSG( m_model, wxTreeListItem(), "Must create first" ); + + return wxTreeListItem(m_model->InsertItem(parent, previous, text, + imageClosed, imageOpened, data)); +} + +void wxTreeListCtrl::DeleteItem(wxTreeListItem item) +{ + wxCHECK_RET( m_model, "Must create first" ); + + m_model->DeleteItem(item); +} + +void wxTreeListCtrl::DeleteAllItems() +{ + if ( m_model ) + m_model->DeleteAllItems(); +} + +// ---------------------------------------------------------------------------- +// Tree navigation +// ---------------------------------------------------------------------------- + +// The simple accessors in this section are implemented directly using +// wxTreeListModelNode methods, without passing by the model. This is just a +// shortcut and avoids us the trouble of defining more trivial methods in +// wxTreeListModel. + +wxTreeListItem wxTreeListCtrl::GetRootItem() const +{ + wxCHECK_MSG( m_model, wxTreeListItem(), "Must create first" ); + + return m_model->GetRootItem(); +} + +wxTreeListItem wxTreeListCtrl::GetItemParent(wxTreeListItem item) const +{ + wxCHECK_MSG( item.IsOk(), wxTreeListItem(), "Invalid item" ); + + return item->GetParent(); +} + +wxTreeListItem wxTreeListCtrl::GetFirstChild(wxTreeListItem item) const +{ + wxCHECK_MSG( item.IsOk(), wxTreeListItem(), "Invalid item" ); + + return item->GetChild(); +} + +wxTreeListItem +wxTreeListCtrl::GetNextSibling(wxTreeListItem item) const +{ + wxCHECK_MSG( item.IsOk(), wxTreeListItem(), "Invalid item" ); + + return item->GetNext(); +} + +wxTreeListItem wxTreeListCtrl::GetNextItem(wxTreeListItem item) const +{ + wxCHECK_MSG( item.IsOk(), wxTreeListItem(), "Invalid item" ); + + return item->NextInTree(); +} + +// ---------------------------------------------------------------------------- +// Item attributes +// ---------------------------------------------------------------------------- + +const wxString& +wxTreeListCtrl::GetItemText(wxTreeListItem item, unsigned col) const +{ + // We can't use wxCHECK_MSG() here because we don't have any empty string + // reference to return so we use a static variable that exists just for the + // purpose of this check -- and so we put it in its own scope so that it's + // never even created during normal program execution. + if ( !m_model || col >= m_model->GetColumnCount() ) + { + static wxString s_empty; + + if ( !m_model ) + { + wxFAIL_MSG( "Must create first" ); + } + else if ( col >= m_model->GetColumnCount() ) + { + wxFAIL_MSG( "Invalid column index" ); + } + + return s_empty; + } + + return m_model->GetItemText(item, col); +} + +void +wxTreeListCtrl::SetItemText(wxTreeListItem item, + unsigned col, + const wxString& text) +{ + wxCHECK_RET( m_model, "Must create first" ); + wxCHECK_RET( col < m_model->GetColumnCount(), "Invalid column index" ); + + m_model->SetItemText(item, col, text); +} + +void wxTreeListCtrl::SetItemImage(wxTreeListItem item, int closed, int opened) +{ + wxCHECK_RET( m_model, "Must create first" ); + + if ( closed != NO_IMAGE || opened != NO_IMAGE ) + { + wxImageList* const imageList = GetImageList(); + wxCHECK_RET( imageList, "Can't set images without image list" ); + + const int imageCount = imageList->GetImageCount(); + + wxCHECK_RET( closed < imageCount, "Invalid image index" ); + wxCHECK_RET( opened < imageCount, "Invalid opened image index" ); + } + + m_model->SetItemImage(item, closed, opened); +} + +wxClientData* wxTreeListCtrl::GetItemData(wxTreeListItem item) const +{ + wxCHECK_MSG( m_model, NULL, "Must create first" ); + + return m_model->GetItemData(item); +} + +void wxTreeListCtrl::SetItemData(wxTreeListItem item, wxClientData* data) +{ + wxCHECK_RET( m_model, "Must create first" ); + + m_model->SetItemData(item, data); +} + +// ---------------------------------------------------------------------------- +// Expanding and collapsing +// ---------------------------------------------------------------------------- + +void wxTreeListCtrl::Expand(wxTreeListItem item) +{ + wxCHECK_RET( m_view, "Must create first" ); + + m_view->Expand(m_model->ToDVI(item)); +} + +void wxTreeListCtrl::Collapse(wxTreeListItem item) +{ + wxCHECK_RET( m_view, "Must create first" ); + + m_view->Collapse(m_model->ToDVI(item)); +} + +bool wxTreeListCtrl::IsExpanded(wxTreeListItem item) const +{ + wxCHECK_MSG( m_view, false, "Must create first" ); + + return m_view->IsExpanded(m_model->ToDVI(item)); +} + +// ---------------------------------------------------------------------------- +// Selection +// ---------------------------------------------------------------------------- + +wxTreeListItem wxTreeListCtrl::GetSelection() const +{ + wxCHECK_MSG( m_view, wxTreeListItem(), "Must create first" ); + + wxCHECK_MSG( !HasFlag(wxTL_MULTIPLE), wxTreeListItem(), + "Must use GetSelections() with multi-selection controls!" ); + + const wxDataViewItem dvi = m_view->GetSelection(); + + return m_model->FromNonRootDVI(dvi); +} + +unsigned wxTreeListCtrl::GetSelections(wxTreeListItems& selections) const +{ + wxCHECK_MSG( m_view, 0, "Must create first" ); + + wxDataViewItemArray selectionsDV; + const unsigned numSelected = m_view->GetSelections(selectionsDV); + selections.resize(numSelected); + for ( unsigned n = 0; n < numSelected; n++ ) + selections[n] = m_model->FromNonRootDVI(selectionsDV[n]); + + return numSelected; +} + +void wxTreeListCtrl::Select(wxTreeListItem item) +{ + wxCHECK_RET( m_view, "Must create first" ); + + m_view->Select(m_model->ToNonRootDVI(item)); +} + +void wxTreeListCtrl::Unselect(wxTreeListItem item) +{ + wxCHECK_RET( m_view, "Must create first" ); + + m_view->Unselect(m_model->ToNonRootDVI(item)); +} + +bool wxTreeListCtrl::IsSelected(wxTreeListItem item) const +{ + wxCHECK_MSG( m_view, false, "Must create first" ); + + return m_view->IsSelected(m_model->ToNonRootDVI(item)); +} + +void wxTreeListCtrl::SelectAll() +{ + wxCHECK_RET( m_view, "Must create first" ); + + m_view->SelectAll(); +} + +void wxTreeListCtrl::UnselectAll() +{ + wxCHECK_RET( m_view, "Must create first" ); + + m_view->UnselectAll(); +} + +// ---------------------------------------------------------------------------- +// Checkbox handling +// ---------------------------------------------------------------------------- + +void wxTreeListCtrl::CheckItem(wxTreeListItem item, wxCheckBoxState state) +{ + wxCHECK_RET( m_model, "Must create first" ); + + m_model->CheckItem(item, state); +} + +void +wxTreeListCtrl::CheckItemRecursively(wxTreeListItem item, wxCheckBoxState state) +{ + wxCHECK_RET( m_model, "Must create first" ); + + m_model->CheckItem(item, state); + + for ( wxTreeListItem child = GetFirstChild(item); + child.IsOk(); + child = GetNextSibling(child) ) + { + CheckItemRecursively(child, state); + } +} + +void wxTreeListCtrl::UpdateItemParentStateRecursively(wxTreeListItem item) +{ + wxCHECK_RET( item.IsOk(), "Invalid item" ); + + wxASSERT_MSG( HasFlag(wxTL_3STATE), "Can only be used with wxTL_3STATE" ); + + for ( ;; ) + { + wxTreeListItem parent = GetItemParent(item); + if ( parent == GetRootItem() ) + { + // There is no checked state associated with the root item. + return; + } + + // Set parent state to the state of this item if all the other children + // have the same state too. Otherwise make it indeterminate. + const wxCheckBoxState stateItem = GetCheckedState(item); + CheckItem(parent, AreAllChildrenInState(parent, stateItem) + ? stateItem + : wxCHK_UNDETERMINED); + + // And do the same thing with the parent's parent too. + item = parent; + } +} + +wxCheckBoxState wxTreeListCtrl::GetCheckedState(wxTreeListItem item) const +{ + wxCHECK_MSG( item.IsOk(), wxCHK_UNDETERMINED, "Invalid item" ); + + return item->m_checkedState; +} + +bool +wxTreeListCtrl::AreAllChildrenInState(wxTreeListItem item, + wxCheckBoxState state) const +{ + wxCHECK_MSG( item.IsOk(), false, "Invalid item" ); + + for ( wxTreeListItem child = GetFirstChild(item); + child.IsOk(); + child = GetNextSibling(child) ) + { + if ( GetCheckedState(child) != state ) + return false; + } + + return true; +} + +// ---------------------------------------------------------------------------- +// Sorting +// ---------------------------------------------------------------------------- + +void wxTreeListCtrl::SetSortColumn(unsigned col, bool ascendingOrder) +{ + wxCHECK_RET( col < m_view->GetColumnCount(), "Invalid column index" ); + + m_view->GetColumn(col)->SetSortOrder(ascendingOrder); +} + +bool wxTreeListCtrl::GetSortColumn(unsigned* col, bool* ascendingOrder) +{ + const unsigned numColumns = m_view->GetColumnCount(); + for ( unsigned n = 0; n < numColumns; n++ ) + { + wxDataViewColumn* const column = m_view->GetColumn(n); + if ( column->IsSortKey() ) + { + if ( col ) + *col = n; + + if ( ascendingOrder ) + *ascendingOrder = column->IsSortOrderAscending(); + + return true; + } + } + + return false; +} + +void wxTreeListCtrl::SetItemComparator(wxTreeListItemComparator* comparator) +{ + m_comparator = comparator; +} + +// ---------------------------------------------------------------------------- +// Events +// ---------------------------------------------------------------------------- + +void wxTreeListCtrl::SendItemEvent(wxEventType evt, wxDataViewEvent& eventDV) +{ + wxTreeListEvent eventTL(evt, this, m_model->FromDVI(eventDV.GetItem())); + + if ( !ProcessWindowEvent(eventTL) ) + { + eventDV.Skip(); + return; + } + + if ( !eventTL.IsAllowed() ) + { + eventDV.Veto(); + } +} + +void wxTreeListCtrl::SendColumnEvent(wxEventType evt, wxDataViewEvent& eventDV) +{ + wxTreeListEvent eventTL(evt, this, wxTreeListItem()); + eventTL.SetColumn(eventDV.GetColumn()); + + if ( !ProcessWindowEvent(eventTL) ) + { + eventDV.Skip(); + return; + } + + if ( !eventTL.IsAllowed() ) + { + eventDV.Veto(); + } +} + +void +wxTreeListCtrl::OnItemToggled(wxTreeListItem item, wxCheckBoxState stateOld) +{ + wxTreeListEvent event(wxEVT_COMMAND_TREELIST_ITEM_CHECKED, this, item); + event.SetOldCheckedState(stateOld); + + ProcessWindowEvent(event); +} + +void wxTreeListCtrl::OnSelectionChanged(wxDataViewEvent& event) +{ + SendItemEvent(wxEVT_COMMAND_TREELIST_SELECTION_CHANGED, event); +} + +void wxTreeListCtrl::OnItemExpanding(wxDataViewEvent& event) +{ + SendItemEvent(wxEVT_COMMAND_TREELIST_ITEM_EXPANDING, event); +} + +void wxTreeListCtrl::OnItemExpanded(wxDataViewEvent& event) +{ + SendItemEvent(wxEVT_COMMAND_TREELIST_ITEM_EXPANDED, event); +} + +void wxTreeListCtrl::OnItemActivated(wxDataViewEvent& event) +{ + SendItemEvent(wxEVT_COMMAND_TREELIST_ITEM_ACTIVATED, event); +} + +void wxTreeListCtrl::OnItemContextMenu(wxDataViewEvent& event) +{ + SendItemEvent(wxEVT_COMMAND_TREELIST_ITEM_CONTEXT_MENU, event); +} + +void wxTreeListCtrl::OnColumnSorted(wxDataViewEvent& event) +{ + SendColumnEvent(wxEVT_COMMAND_TREELIST_COLUMN_SORTED, event); +} + +// ---------------------------------------------------------------------------- +// Geometry +// ---------------------------------------------------------------------------- + +void wxTreeListCtrl::OnSize(wxSizeEvent& event) +{ + event.Skip(); + + if ( m_view ) + { + // Resize the real control to cover our entire client area. + const wxRect rect = GetClientRect(); + m_view->SetSize(rect); + +#ifdef wxHAS_GENERIC_DATAVIEWCTRL + // The generic implementation doesn't refresh itself immediately which + // is annoying during "live resizing", so do it forcefully here to + // ensure that the items are re-laid out and the focus rectangle is + // redrawn correctly (instead of leaving traces) while our size is + // being changed. + wxWindow* const view = GetView(); + view->Refresh(); + view->Update(); +#endif // wxHAS_GENERIC_DATAVIEWCTRL + + // Resize the first column to take the remaining available space. + const unsigned numColumns = GetColumnCount(); + if ( !numColumns ) + return; + + // There is a bug in generic wxDataViewCtrl: if the column width sums + // up to the total size, horizontal scrollbar (unnecessarily) appears, + // so subtract a bit to ensure this doesn't happen. + int remainingWidth = rect.width - 5; + for ( unsigned n = 1; n < GetColumnCount(); n++ ) + { + remainingWidth -= GetColumnWidth(n); + if ( remainingWidth <= 0 ) + { + // There is not enough space, as we're not going to give the + // first column negative width anyhow, just don't do anything. + return; + } + } + + SetColumnWidth(0, remainingWidth); + } +} + +wxWindow* wxTreeListCtrl::GetView() const +{ +#ifdef wxHAS_GENERIC_DATAVIEWCTRL + return m_view->GetMainWindow(); +#else + return m_view; +#endif +} + +// ============================================================================ +// wxTreeListEvent implementation +// ============================================================================ + +wxIMPLEMENT_DYNAMIC_CLASS(wxTreeListEvent, wxNotifyEvent) + +#define wxDEFINE_TREELIST_EVENT(name) \ + wxDEFINE_EVENT(wxEVT_COMMAND_TREELIST_##name, wxTreeListEvent) + +wxDEFINE_TREELIST_EVENT(SELECTION_CHANGED); +wxDEFINE_TREELIST_EVENT(ITEM_EXPANDING); +wxDEFINE_TREELIST_EVENT(ITEM_EXPANDED); +wxDEFINE_TREELIST_EVENT(ITEM_CHECKED); +wxDEFINE_TREELIST_EVENT(ITEM_ACTIVATED); +wxDEFINE_TREELIST_EVENT(ITEM_CONTEXT_MENU); +wxDEFINE_TREELIST_EVENT(COLUMN_SORTED); + +#undef wxDEFINE_TREELIST_EVENT + +#endif // wxUSE_TREELISTCTRL diff --git a/Externals/wxWidgets3/src/generic/vlbox.cpp b/Externals/wxWidgets3/src/generic/vlbox.cpp index 02ccffc367..b0adc14cfa 100644 --- a/Externals/wxWidgets3/src/generic/vlbox.cpp +++ b/Externals/wxWidgets3/src/generic/vlbox.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 31.05.03 -// RCS-ID: $Id: vlbox.cpp 64940 2010-07-13 13:29:13Z VZ $ +// RCS-ID: $Id: vlbox.cpp 69180 2011-09-21 15:08:10Z VZ $ // Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -249,7 +249,10 @@ bool wxVListBox::DoSetCurrent(int current) { // it is, indeed, only partly visible, so scroll it into view to // make it entirely visible + // BUT scrolling down when m_current is first visible makes it + // completely hidden, so that is even worse while ( (size_t)m_current + 1 == GetVisibleRowsEnd() && + (size_t)m_current != GetVisibleRowsBegin() && ScrollToRow(GetVisibleBegin() + 1) ) ; // but in any case refresh it as even if it was only partly visible diff --git a/Externals/wxWidgets3/src/generic/vscroll.cpp b/Externals/wxWidgets3/src/generic/vscroll.cpp index 363e06b31c..53fbaebd66 100644 --- a/Externals/wxWidgets3/src/generic/vscroll.cpp +++ b/Externals/wxWidgets3/src/generic/vscroll.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: Brad Anderson, David Warkentin // Created: 30.05.03 -// RCS-ID: $Id: vscroll.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: vscroll.cpp 69180 2011-09-21 15:08:10Z VZ $ // Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -31,6 +31,8 @@ #include "wx/vscroll.h" +#include "wx/utils.h" // For wxMin/wxMax(). + // ============================================================================ // wxVarScrollHelperEvtHandler declaration // ============================================================================ @@ -308,14 +310,17 @@ size_t wxVarScrollHelperBase::GetNewScrollPosition(wxScrollWinEvent& event) cons } else if ( evtType == wxEVT_SCROLLWIN_PAGEUP ) { - return FindFirstVisibleFromLast(m_unitFirst); + // Page up should do at least as much as line up. + return wxMin(FindFirstVisibleFromLast(m_unitFirst), + m_unitFirst ? m_unitFirst - 1 : 0); } else if ( evtType == wxEVT_SCROLLWIN_PAGEDOWN ) { + // And page down should do at least as much as line down. if ( GetVisibleEnd() ) - return GetVisibleEnd() - 1; + return wxMax(GetVisibleEnd() - 1, m_unitFirst + 1); else - return GetVisibleEnd(); + return wxMax(GetVisibleEnd(), m_unitFirst + 1); } else if ( evtType == wxEVT_SCROLLWIN_THUMBRELEASE ) { diff --git a/Externals/wxWidgets3/src/generic/wizard.cpp b/Externals/wxWidgets3/src/generic/wizard.cpp index e4c8191d13..9256a9ef95 100644 --- a/Externals/wxWidgets3/src/generic/wizard.cpp +++ b/Externals/wxWidgets3/src/generic/wizard.cpp @@ -8,7 +8,7 @@ // 3) Fixed ShowPage() bug on displaying bitmaps // Robert Vazan (sizers) // Created: 15.08.99 -// RCS-ID: $Id: wizard.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: wizard.cpp 70630 2012-02-20 11:38:52Z JS $ // Copyright: (c) 1999 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -83,6 +83,7 @@ private: wxDEFINE_EVENT( wxEVT_WIZARD_PAGE_CHANGED, wxWizardEvent ); wxDEFINE_EVENT( wxEVT_WIZARD_PAGE_CHANGING, wxWizardEvent ); +wxDEFINE_EVENT( wxEVT_WIZARD_BEFORE_PAGE_CHANGED, wxWizardEvent ); wxDEFINE_EVENT( wxEVT_WIZARD_CANCEL, wxWizardEvent ); wxDEFINE_EVENT( wxEVT_WIZARD_FINISHED, wxWizardEvent ); wxDEFINE_EVENT( wxEVT_WIZARD_HELP, wxWizardEvent ); @@ -324,7 +325,7 @@ void wxWizard::AddBitmapRow(wxBoxSizer *mainColumn) ); #if wxUSE_STATBMP - if ( m_bitmap.Ok() ) + if ( m_bitmap.IsOk() ) { wxSize bitmapSize(wxDefaultSize); if (GetBitmapPlacement()) @@ -396,7 +397,7 @@ void wxWizard::AddButtonRow(wxBoxSizer *mainColumn) // to activate the 'next' button first (create the next button before the back button). // The reason is: The user will repeatedly enter information in the wizard pages and then wants to // press 'next'. If a user uses mostly the keyboard, he would have to skip the 'back' button - // everytime. This is annoying. There is a second reason: RETURN acts as TAB. If the 'next' + // every time. This is annoying. There is a second reason: RETURN acts as TAB. If the 'next' // button comes first in the TAB order, the user can enter information very fast using the RETURN // key to TAB to the next entry field and page. This would not be possible, if the 'back' button // was created before the 'next' button. @@ -604,10 +605,10 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) if ( m_statbmp ) { bmp = m_page->GetBitmap(); - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) bmp = m_bitmap; - if ( !bmpPrev.Ok() ) + if ( !bmpPrev.IsOk() ) bmpPrev = m_bitmap; if (!GetBitmapPlacement()) @@ -782,7 +783,7 @@ void wxWizard::OnBackOrNext(wxCommandEvent& event) wxCHECK_RET( m_page, wxT("should have a valid current page") ); // ask the current page first: notice that we do it before calling - // GetNext/Prev() because the data transfered from the controls of the page + // GetNext/Prev() because the data transferred from the controls of the page // may change the value returned by these methods if ( !m_page->Validate() || !m_page->TransferDataFromWindow() ) { @@ -792,6 +793,13 @@ void wxWizard::OnBackOrNext(wxCommandEvent& event) bool forward = event.GetEventObject() == m_btnNext; + // Give the application a chance to set state which may influence GetNext()/GetPrev() + wxWizardEvent eventPreChanged(wxEVT_WIZARD_BEFORE_PAGE_CHANGED, GetId(), forward, m_page); + (void)m_page->GetEventHandler()->ProcessEvent(eventPreChanged); + + if (!eventPreChanged.IsAllowed()) + return; + wxWizardPage *page; if ( forward ) { @@ -928,7 +936,7 @@ bool wxWizard::ResizeBitmap(wxBitmap& bmp) if (!GetBitmapPlacement()) return false; - if (bmp.Ok()) + if (bmp.IsOk()) { wxSize pageSize = m_sizerPage->GetSize(); if (pageSize == wxSize(0,0)) @@ -936,7 +944,7 @@ bool wxWizard::ResizeBitmap(wxBitmap& bmp) int bitmapWidth = wxMax(bmp.GetWidth(), GetMinimumBitmapWidth()); int bitmapHeight = pageSize.y; - if (!m_statbmp->GetBitmap().Ok() || m_statbmp->GetBitmap().GetHeight() != bitmapHeight) + if (!m_statbmp->GetBitmap().IsOk() || m_statbmp->GetBitmap().GetHeight() != bitmapHeight) { wxBitmap bitmap(bitmapWidth, bitmapHeight); { diff --git a/Externals/wxWidgets3/src/gtk/aboutdlg.cpp b/Externals/wxWidgets3/src/gtk/aboutdlg.cpp index 155ecf7859..7340be7935 100644 --- a/Externals/wxWidgets3/src/gtk/aboutdlg.cpp +++ b/Externals/wxWidgets3/src/gtk/aboutdlg.cpp @@ -3,7 +3,7 @@ // Purpose: native GTK+ wxAboutBox() implementation // Author: Vadim Zeitlin // Created: 2006-10-08 -// RCS-ID: $Id: aboutdlg.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: aboutdlg.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 2006 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -126,7 +126,7 @@ void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* WXUNUSED(parent)) gs_aboutDialog = GTK_ABOUT_DIALOG(gtk_about_dialog_new()); GtkAboutDialog * const dlg = gs_aboutDialog; - gtk_about_dialog_set_name(dlg, wxGTK_CONV_SYS(info.GetName())); + gtk_about_dialog_set_program_name(dlg, wxGTK_CONV_SYS(info.GetName())); if ( info.HasVersion() ) gtk_about_dialog_set_version(dlg, wxGTK_CONV_SYS(info.GetVersion())); else @@ -145,7 +145,7 @@ void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* WXUNUSED(parent)) gtk_about_dialog_set_license(dlg, NULL); wxIcon icon = info.GetIcon(); - if ( icon.Ok() ) + if ( icon.IsOk() ) gtk_about_dialog_set_logo(dlg, info.GetIcon().GetPixbuf()); if ( info.HasWebSite() ) diff --git a/Externals/wxWidgets3/src/gtk/animate.cpp b/Externals/wxWidgets3/src/gtk/animate.cpp index 0f8956554e..833c36d9c4 100644 --- a/Externals/wxWidgets3/src/gtk/animate.cpp +++ b/Externals/wxWidgets3/src/gtk/animate.cpp @@ -4,7 +4,7 @@ // Author: Francesco Montorsi // Modified By: // Created: 24/09/2006 -// Id: $Id: animate.cpp 58954 2009-02-16 21:14:12Z FM $ +// Id: $Id: animate.cpp 70756 2012-02-29 18:29:31Z PC $ // Copyright: (c) Francesco Montorsi // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -233,7 +233,6 @@ bool wxAnimationCtrl::Create( wxWindow *parent, wxWindowID id, m_widget = gtk_image_new(); g_object_ref(m_widget); - gtk_widget_show(m_widget); m_parent->DoAddChild( this ); diff --git a/Externals/wxWidgets3/src/gtk/anybutton.cpp b/Externals/wxWidgets3/src/gtk/anybutton.cpp new file mode 100644 index 0000000000..d58e6246ae --- /dev/null +++ b/Externals/wxWidgets3/src/gtk/anybutton.cpp @@ -0,0 +1,422 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: src/gtk/anybutton.cpp +// Purpose: +// Author: Robert Roebling +// Created: 1998-05-20 (extracted from button.cpp) +// Id: $Id: anybutton.cpp 67931 2011-06-14 13:00:42Z VZ $ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef wxHAS_ANY_BUTTON + +#ifndef WX_PRECOMP + #include "wx/anybutton.h" +#endif + +#include "wx/stockitem.h" + +#include "wx/gtk/private.h" + +// ---------------------------------------------------------------------------- +// GTK callbacks +// ---------------------------------------------------------------------------- + +extern "C" +{ + +static void +wxgtk_button_enter_callback(GtkWidget *WXUNUSED(widget), wxAnyButton *button) +{ + if ( button->GTKShouldIgnoreEvent() ) + return; + + button->GTKMouseEnters(); +} + +static void +wxgtk_button_leave_callback(GtkWidget *WXUNUSED(widget), wxAnyButton *button) +{ + if ( button->GTKShouldIgnoreEvent() ) + return; + + button->GTKMouseLeaves(); +} + +static void +wxgtk_button_press_callback(GtkWidget *WXUNUSED(widget), wxAnyButton *button) +{ + if ( button->GTKShouldIgnoreEvent() ) + return; + + button->GTKPressed(); +} + +static void +wxgtk_button_released_callback(GtkWidget *WXUNUSED(widget), wxAnyButton *button) +{ + if ( button->GTKShouldIgnoreEvent() ) + return; + + button->GTKReleased(); +} + +} // extern "C" + +//----------------------------------------------------------------------------- +// wxAnyButton +//----------------------------------------------------------------------------- + +bool wxAnyButton::Enable( bool enable ) +{ + if (!base_type::Enable(enable)) + return false; + + gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable); + + if (enable) + GTKFixSensitivity(); + + GTKUpdateBitmap(); + + return true; +} + +GdkWindow *wxAnyButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const +{ + return GTK_BUTTON(m_widget)->event_window; +} + +// static +wxVisualAttributes +wxAnyButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_button_new); +} + +// ---------------------------------------------------------------------------- +// bitmaps support +// ---------------------------------------------------------------------------- + +void wxAnyButton::GTKMouseEnters() +{ + m_isCurrent = true; + + GTKUpdateBitmap(); +} + +void wxAnyButton::GTKMouseLeaves() +{ + m_isCurrent = false; + + GTKUpdateBitmap(); +} + +void wxAnyButton::GTKPressed() +{ + m_isPressed = true; + + GTKUpdateBitmap(); +} + +void wxAnyButton::GTKReleased() +{ + m_isPressed = false; + + GTKUpdateBitmap(); +} + +void wxAnyButton::GTKOnFocus(wxFocusEvent& event) +{ + event.Skip(); + + GTKUpdateBitmap(); +} + +wxAnyButton::State wxAnyButton::GTKGetCurrentState() const +{ + if ( !IsThisEnabled() ) + return m_bitmaps[State_Disabled].IsOk() ? State_Disabled : State_Normal; + + if ( m_isPressed && m_bitmaps[State_Pressed].IsOk() ) + return State_Pressed; + + if ( m_isCurrent && m_bitmaps[State_Current].IsOk() ) + return State_Current; + + if ( HasFocus() && m_bitmaps[State_Focused].IsOk() ) + return State_Focused; + + return State_Normal; +} + +void wxAnyButton::GTKUpdateBitmap() +{ + // if we don't show bitmaps at all, there is nothing to update + if ( m_bitmaps[State_Normal].IsOk() ) + { + // if we do show them, this will return a state for which we do have a + // valid bitmap + State state = GTKGetCurrentState(); + + GTKDoShowBitmap(m_bitmaps[state]); + } +} + +void wxAnyButton::GTKDoShowBitmap(const wxBitmap& bitmap) +{ + wxASSERT_MSG( bitmap.IsOk(), "invalid bitmap" ); + + GtkWidget *image; + if ( DontShowLabel() ) + { + image = gtk_bin_get_child(GTK_BIN(m_widget)); + } + else // have both label and bitmap + { +#ifdef __WXGTK26__ + if ( !gtk_check_version(2,6,0) ) + { + image = gtk_button_get_image(GTK_BUTTON(m_widget)); + } + else +#endif // __WXGTK26__ + { + // buttons with both label and bitmap are only supported with GTK+ + // 2.6 so far + // + // it shouldn't be difficult to implement them ourselves for the + // previous GTK+ versions by stuffing a container with a label and + // an image inside GtkButton but there doesn't seem to be much + // point in doing this for ancient GTK+ versions + return; + } + } + + wxCHECK_RET( image && GTK_IS_IMAGE(image), "must have image widget" ); + + gtk_image_set_from_pixbuf(GTK_IMAGE(image), bitmap.GetPixbuf()); +} + +wxBitmap wxAnyButton::DoGetBitmap(State which) const +{ + return m_bitmaps[which]; +} + +void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which) +{ + switch ( which ) + { + case State_Normal: + if ( DontShowLabel() ) + { + // we only have the bitmap in this button, never remove it but + // do invalidate the best size when the bitmap (and presumably + // its size) changes + InvalidateBestSize(); + } +#ifdef __WXGTK26__ + // normal image is special: setting it enables images for the button and + // resetting it to nothing disables all of them + else if ( !gtk_check_version(2,6,0) ) + { + GtkWidget *image = gtk_button_get_image(GTK_BUTTON(m_widget)); + if ( image && !bitmap.IsOk() ) + { + gtk_container_remove(GTK_CONTAINER(m_widget), image); + } + else if ( !image && bitmap.IsOk() ) + { + image = gtk_image_new(); + gtk_button_set_image(GTK_BUTTON(m_widget), image); + } + else // image presence or absence didn't change + { + // don't invalidate best size below + break; + } + + InvalidateBestSize(); + } +#endif // GTK+ 2.6+ + break; + + case State_Pressed: + if ( bitmap.IsOk() ) + { + if ( !m_bitmaps[which].IsOk() ) + { + // we need to install the callbacks to be notified about + // the button pressed state change + g_signal_connect + ( + m_widget, + "pressed", + G_CALLBACK(wxgtk_button_press_callback), + this + ); + + g_signal_connect + ( + m_widget, + "released", + G_CALLBACK(wxgtk_button_released_callback), + this + ); + } + } + else // no valid bitmap + { + if ( m_bitmaps[which].IsOk() ) + { + // we don't need to be notified about the button pressed + // state changes any more + g_signal_handlers_disconnect_by_func + ( + m_widget, + (gpointer)wxgtk_button_press_callback, + this + ); + + g_signal_handlers_disconnect_by_func + ( + m_widget, + (gpointer)wxgtk_button_released_callback, + this + ); + + // also make sure we don't remain stuck in pressed state + if ( m_isPressed ) + { + m_isPressed = false; + GTKUpdateBitmap(); + } + } + } + break; + + case State_Current: + // the logic here is the same as above for State_Pressed: we need + // to connect the handlers if we must be notified about the changes + // in the button current state and we disconnect them when/if we + // don't need them any more + if ( bitmap.IsOk() ) + { + if ( !m_bitmaps[which].IsOk() ) + { + g_signal_connect + ( + m_widget, + "enter", + G_CALLBACK(wxgtk_button_enter_callback), + this + ); + + g_signal_connect + ( + m_widget, + "leave", + G_CALLBACK(wxgtk_button_leave_callback), + this + ); + } + } + else // no valid bitmap + { + if ( m_bitmaps[which].IsOk() ) + { + g_signal_handlers_disconnect_by_func + ( + m_widget, + (gpointer)wxgtk_button_enter_callback, + this + ); + + g_signal_handlers_disconnect_by_func + ( + m_widget, + (gpointer)wxgtk_button_leave_callback, + this + ); + + if ( m_isCurrent ) + { + m_isCurrent = false; + GTKUpdateBitmap(); + } + } + } + break; + + case State_Focused: + if ( bitmap.IsOk() ) + { + Connect(wxEVT_SET_FOCUS, + wxFocusEventHandler(wxAnyButton::GTKOnFocus)); + Connect(wxEVT_KILL_FOCUS, + wxFocusEventHandler(wxAnyButton::GTKOnFocus)); + } + else // no valid focused bitmap + { + Disconnect(wxEVT_SET_FOCUS, + wxFocusEventHandler(wxAnyButton::GTKOnFocus)); + Disconnect(wxEVT_KILL_FOCUS, + wxFocusEventHandler(wxAnyButton::GTKOnFocus)); + } + break; + + default: + // no callbacks to connect/disconnect + ; + } + + m_bitmaps[which] = bitmap; + + // update the bitmap immediately if necessary, otherwise it will be done + // when the bitmap for the corresponding state is needed the next time by + // GTKUpdateBitmap() + if ( bitmap.IsOk() && which == GTKGetCurrentState() ) + { + GTKDoShowBitmap(bitmap); + } +} + +void wxAnyButton::DoSetBitmapPosition(wxDirection dir) +{ +#ifdef __WXGTK210__ + if ( !gtk_check_version(2,10,0) ) + { + GtkPositionType gtkpos; + switch ( dir ) + { + default: + wxFAIL_MSG( "invalid position" ); + // fall through + + case wxLEFT: + gtkpos = GTK_POS_LEFT; + break; + + case wxRIGHT: + gtkpos = GTK_POS_RIGHT; + break; + + case wxTOP: + gtkpos = GTK_POS_TOP; + break; + + case wxBOTTOM: + gtkpos = GTK_POS_BOTTOM; + break; + } + + gtk_button_set_image_position(GTK_BUTTON(m_widget), gtkpos); + InvalidateBestSize(); + } +#endif // GTK+ 2.10+ +} + +#endif // wxHAS_ANY_BUTTON diff --git a/Externals/wxWidgets3/src/gtk/app.cpp b/Externals/wxWidgets3/src/gtk/app.cpp index 6601f01bdb..c7c020b558 100644 --- a/Externals/wxWidgets3/src/gtk/app.cpp +++ b/Externals/wxWidgets3/src/gtk/app.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/app.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: app.cpp 67280 2011-03-22 14:17:38Z DS $ +// Id: $Id: app.cpp 70701 2012-02-26 17:18:41Z VZ $ // Copyright: (c) 1998 Robert Roebling, Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -38,7 +38,9 @@ #include #endif // wxUSE_LIBHILDON2 +#ifdef GDK_WINDOWING_X11 #include +#endif //----------------------------------------------------------------------------- // link GnomeVFS diff --git a/Externals/wxWidgets3/src/gtk/artgtk.cpp b/Externals/wxWidgets3/src/gtk/artgtk.cpp index c71ed7c567..8ddb480e04 100644 --- a/Externals/wxWidgets3/src/gtk/artgtk.cpp +++ b/Externals/wxWidgets3/src/gtk/artgtk.cpp @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // Modified by: // Created: 2004-08-22 -// RCS-ID: $Id: artgtk.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: artgtk.cpp 70154 2011-12-28 13:51:29Z VZ $ // Copyright: (c) Vaclav Slavik, 2004 // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -47,7 +47,7 @@ protected: /*static*/ void wxArtProvider::InitNativeProvider() { - Push(new wxGTK2ArtProvider); + PushBack(new wxGTK2ArtProvider); } // ---------------------------------------------------------------------------- @@ -203,7 +203,7 @@ GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size) // with "stock-id" representation (in addition to pixmap and pixbuf // ones) and would convert it to pixbuf when rendered. - GtkStyle* style = wxGTKPrivate::GetButtonWidget()->style; + GtkStyle* style = gtk_widget_get_style(wxGTKPrivate::GetButtonWidget()); GtkIconSet* iconset = gtk_style_lookup_icon_set(style, stockid); if (!iconset) @@ -310,7 +310,7 @@ wxGTK2ArtProvider::CreateIconBundle(const wxArtID& id, const wxString stockid = wxArtIDToStock(id); // try to load the bundle as stock icon first - GtkStyle* style = wxGTKPrivate::GetButtonWidget()->style; + GtkStyle* style = gtk_widget_get_style(wxGTKPrivate::GetButtonWidget()); GtkIconSet* iconset = gtk_style_lookup_icon_set(style, stockid.utf8_str()); if ( iconset ) { diff --git a/Externals/wxWidgets3/src/gtk/assertdlg_gtk.c b/Externals/wxWidgets3/src/gtk/assertdlg_gtk.cpp similarity index 90% rename from Externals/wxWidgets3/src/gtk/assertdlg_gtk.c rename to Externals/wxWidgets3/src/gtk/assertdlg_gtk.cpp index 28269c39e8..91cc8a5bf7 100644 --- a/Externals/wxWidgets3/src/gtk/assertdlg_gtk.c +++ b/Externals/wxWidgets3/src/gtk/assertdlg_gtk.cpp @@ -1,29 +1,19 @@ /* /////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/assertdlg_gtk.c +// Name: src/gtk/assertdlg_gtk.cpp // Purpose: GtkAssertDialog // Author: Francesco Montorsi -// Id: $Id: assertdlg_gtk.c 67254 2011-03-20 00:14:35Z DS $ +// Id: $Id: assertdlg_gtk.cpp 69697 2011-11-08 11:02:02Z VZ $ // Copyright: (c) 2006 Francesco Montorsi // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////// */ -#ifdef VMS -#define XCheckIfEvent XCHECKIFEVENT -#endif - #include "wx/platform.h" -#include "wx/gtk/assertdlg_gtk.h" - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include +#include "wx/gtk/assertdlg_gtk.h" +#include "wx/gtk/private/gtk2-compat.h" -/* For FILE */ #include - /* ---------------------------------------------------------------------------- Constants ---------------------------------------------------------------------------- */ @@ -46,19 +36,16 @@ extern "C" { ---------------------------------------------------------------------------- */ GtkWidget *gtk_assert_dialog_add_button_to (GtkBox *box, const gchar *label, - const gchar *stock, gint response_id) + const gchar *stock) { /* create the button */ GtkWidget *button = gtk_button_new_with_mnemonic (label); - GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, true); + /* add a stock icon inside it */ + GtkWidget *image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON); #if GTK_CHECK_VERSION(2,6,0) - if (!gtk_check_version (2, 6, 0)) - { - /* add a stock icon inside it */ - GtkWidget *image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image (GTK_BUTTON (button), image); - } + gtk_button_set_image (GTK_BUTTON (button), image); #endif /* add to the given (container) widget */ @@ -72,7 +59,7 @@ GtkWidget *gtk_assert_dialog_add_button (GtkAssertDialog *dlg, const gchar *labe const gchar *stock, gint response_id) { /* create the button */ - GtkWidget *button = gtk_assert_dialog_add_button_to (NULL, label, stock, response_id); + GtkWidget* button = gtk_assert_dialog_add_button_to(NULL, label, stock); /* add the button to the dialog's action area */ gtk_dialog_add_action_widget (GTK_DIALOG (dlg), button, response_id); @@ -124,7 +111,7 @@ GtkWidget *gtk_assert_dialog_create_backtrace_list_model () void gtk_assert_dialog_process_backtrace (GtkAssertDialog *dlg) { /* set busy cursor */ - GdkWindow *parent = GTK_WIDGET(dlg)->window; + GdkWindow *parent = gtk_widget_get_window(GTK_WIDGET(dlg)); GdkCursor *cur = gdk_cursor_new (GDK_WATCH); gdk_window_set_cursor (parent, cur); gdk_flush (); @@ -138,11 +125,12 @@ void gtk_assert_dialog_process_backtrace (GtkAssertDialog *dlg) +extern "C" { /* ---------------------------------------------------------------------------- GtkAssertDialog signal handlers ---------------------------------------------------------------------------- */ -void gtk_assert_dialog_expander_callback (GtkWidget *widget, GtkAssertDialog *dlg) +static void gtk_assert_dialog_expander_callback(GtkWidget*, GtkAssertDialog* dlg) { /* status is not yet updated so we need to invert it to get the new one */ gboolean expanded = !gtk_expander_get_expanded (GTK_EXPANDER(dlg->expander)); @@ -157,7 +145,7 @@ void gtk_assert_dialog_expander_callback (GtkWidget *widget, GtkAssertDialog *dl dlg->callback = NULL; } -void gtk_assert_dialog_save_backtrace_callback (GtkWidget *widget, GtkAssertDialog *dlg) +static void gtk_assert_dialog_save_backtrace_callback(GtkWidget*, GtkAssertDialog* dlg) { GtkWidget *dialog; @@ -195,7 +183,7 @@ void gtk_assert_dialog_save_backtrace_callback (GtkWidget *widget, GtkAssertDial gtk_widget_destroy (dialog); } -void gtk_assert_dialog_copy_callback (GtkWidget *widget, GtkAssertDialog *dlg) +static void gtk_assert_dialog_copy_callback(GtkWidget*, GtkAssertDialog* dlg) { char *msg, *backtrace; GtkClipboard *clipboard; @@ -221,7 +209,7 @@ void gtk_assert_dialog_copy_callback (GtkWidget *widget, GtkAssertDialog *dlg) g_string_free (str, TRUE); } -void gtk_assert_dialog_continue_callback (GtkWidget *widget, GtkAssertDialog *dlg) +static void gtk_assert_dialog_continue_callback(GtkWidget*, GtkAssertDialog* dlg) { gint response = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(dlg->shownexttime)) ? @@ -229,7 +217,7 @@ void gtk_assert_dialog_continue_callback (GtkWidget *widget, GtkAssertDialog *dl gtk_dialog_response (GTK_DIALOG(dlg), response); } - +} // extern "C" /* ---------------------------------------------------------------------------- GtkAssertDialogClass implementation @@ -239,9 +227,9 @@ static void gtk_assert_dialog_init (GtkAssertDialog *sel static void gtk_assert_dialog_class_init (GtkAssertDialogClass *klass); -GtkType gtk_assert_dialog_get_type (void) +GType gtk_assert_dialog_get_type() { - static GtkType assert_dialog_type = 0; + static GType assert_dialog_type; if (!assert_dialog_type) { @@ -264,12 +252,12 @@ GtkType gtk_assert_dialog_get_type (void) return assert_dialog_type; } -void gtk_assert_dialog_class_init(GtkAssertDialogClass *klass) +static void gtk_assert_dialog_class_init(GtkAssertDialogClass*) { /* no special initializations required */ } -void gtk_assert_dialog_init(GtkAssertDialog *dlg) +static void gtk_assert_dialog_init(GtkAssertDialog* dlg) { GtkWidget *continuebtn; @@ -280,7 +268,7 @@ void gtk_assert_dialog_init(GtkAssertDialog *dlg) gtk_widget_push_composite_child (); vbox = gtk_vbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER(vbox), 8); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 5); + gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg))), vbox, true, true, 5); /* add the icon+message hbox */ @@ -343,19 +331,19 @@ void gtk_assert_dialog_init(GtkAssertDialog *dlg) /* add the buttons */ button = gtk_assert_dialog_add_button_to (GTK_BOX(hbox), "Save to _file", - GTK_STOCK_SAVE, GTK_RESPONSE_NONE); + GTK_STOCK_SAVE); g_signal_connect (button, "clicked", G_CALLBACK(gtk_assert_dialog_save_backtrace_callback), dlg); button = gtk_assert_dialog_add_button_to (GTK_BOX(hbox), "Copy to clip_board", - GTK_STOCK_COPY, GTK_RESPONSE_NONE); + GTK_STOCK_COPY); g_signal_connect (button, "clicked", G_CALLBACK(gtk_assert_dialog_copy_callback), dlg); } /* add the checkbutton */ dlg->shownexttime = gtk_check_button_new_with_mnemonic("Show this _dialog the next time"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(dlg->shownexttime), TRUE); - gtk_box_pack_end (GTK_BOX(GTK_DIALOG(dlg)->action_area), dlg->shownexttime, FALSE, TRUE, 8); + gtk_box_pack_end(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(dlg))), dlg->shownexttime, false, true, 8); /* add the stop button */ gtk_assert_dialog_add_button (dlg, "_Stop", GTK_STOCK_QUIT, GTK_ASSERT_DIALOG_STOP); @@ -369,8 +357,8 @@ void gtk_assert_dialog_init(GtkAssertDialog *dlg) dlg->callback = NULL; dlg->userdata = NULL; - /* the resizeable property of this window is modified by the expander: - when it's collapsed, the window must be non-resizeable! */ + /* the resizable property of this window is modified by the expander: + when it's collapsed, the window must be non-resizable! */ gtk_window_set_resizable (GTK_WINDOW (dlg), FALSE); gtk_widget_pop_composite_child (); gtk_widget_show_all (GTK_WIDGET(dlg)); @@ -497,11 +485,7 @@ void gtk_assert_dialog_append_stack_frame(GtkAssertDialog *dlg, GtkWidget *gtk_assert_dialog_new(void) { - GtkAssertDialog *dialog = g_object_new (GTK_TYPE_ASSERT_DIALOG, NULL); + void* dialog = g_object_new(GTK_TYPE_ASSERT_DIALOG, NULL); return GTK_WIDGET (dialog); } - -#ifdef __cplusplus -} -#endif /* __cplusplus */ diff --git a/Externals/wxWidgets3/src/gtk/bitmap.cpp b/Externals/wxWidgets3/src/gtk/bitmap.cpp index c5ce2a8b94..aabfa24346 100644 --- a/Externals/wxWidgets3/src/gtk/bitmap.cpp +++ b/Externals/wxWidgets3/src/gtk/bitmap.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/bitmap.cpp // Purpose: // Author: Robert Roebling -// RCS-ID: $Id: bitmap.cpp 66372 2010-12-14 18:43:32Z VZ $ +// RCS-ID: $Id: bitmap.cpp 69617 2011-10-31 16:09:47Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -207,7 +207,7 @@ bool wxMask::InitFromMonoBitmap(const wxBitmap& bitmap) return true; } -GdkBitmap *wxMask::GetBitmap() const +GdkPixmap* wxMask::GetBitmap() const { return m_bitmap; } @@ -324,13 +324,11 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth) UnRef(); wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") ); - wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") ); if (image.GetWidth() <= 0 || image.GetHeight() <= 0) return false; - // create pixbuf if image has alpha and requested depth is compatible - if (image.HasAlpha() && (depth == -1 || depth == 32)) + if (depth == 32 || (depth == -1 && image.HasAlpha())) return CreateFromImageAsPixbuf(image); // otherwise create pixmap, if alpha is present it will be converted to mask @@ -422,8 +420,6 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth) bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image) { - wxASSERT(image.HasAlpha()); - int width = image.GetWidth(); int height = image.GetHeight(); @@ -441,12 +437,13 @@ bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image) for (int y = 0; y < height; y++, out += rowpad) { - for (int x = 0; x < width; x++, alpha++, out += 4, in += 3) + for (int x = 0; x < width; x++, out += 4, in += 3) { out[0] = in[0]; out[1] = in[1]; out[2] = in[2]; - out[3] = *alpha; + if (alpha) + out[3] = *alpha++; } } diff --git a/Externals/wxWidgets3/src/gtk/bmpcbox.cpp b/Externals/wxWidgets3/src/gtk/bmpcbox.cpp index f65bdd9cfa..3a29159b96 100644 --- a/Externals/wxWidgets3/src/gtk/bmpcbox.cpp +++ b/Externals/wxWidgets3/src/gtk/bmpcbox.cpp @@ -3,7 +3,7 @@ // Purpose: wxBitmapComboBox // Author: Jaakko Salli // Created: 2008-05-19 -// RCS-ID: $Id: bmpcbox.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: bmpcbox.cpp 67326 2011-03-28 06:27:49Z PC $ // Copyright: (c) 2008 Jaakko Salli // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -122,8 +122,8 @@ void wxBitmapComboBox::GTKCreateComboBoxWidget() else { m_widget = gtk_combo_box_entry_new_with_model( GTK_TREE_MODEL(store), m_stringCellIndex ); - m_entry = GTK_ENTRY( GTK_BIN(m_widget)->child ); - gtk_entry_set_editable( m_entry, TRUE ); + m_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(m_widget))); + gtk_editable_set_editable(GTK_EDITABLE(m_entry), true); } g_object_ref(m_widget); diff --git a/Externals/wxWidgets3/src/gtk/brush.cpp b/Externals/wxWidgets3/src/gtk/brush.cpp index 06d4d21afe..182b466a03 100644 --- a/Externals/wxWidgets3/src/gtk/brush.cpp +++ b/Externals/wxWidgets3/src/gtk/brush.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/brush.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: brush.cpp 61508 2009-07-23 20:30:22Z VZ $ +// Id: $Id: brush.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -104,21 +104,21 @@ bool wxBrush::operator==(const wxBrush& brush) const wxBrushStyle wxBrush::GetStyle() const { - wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); return M_BRUSHDATA->m_style; } wxColour wxBrush::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") ); return M_BRUSHDATA->m_colour; } wxBitmap *wxBrush::GetStipple() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") ); return &M_BRUSHDATA->m_stipple; } diff --git a/Externals/wxWidgets3/src/gtk/button.cpp b/Externals/wxWidgets3/src/gtk/button.cpp index 59de0fa435..cb5d90973a 100644 --- a/Externals/wxWidgets3/src/gtk/button.cpp +++ b/Externals/wxWidgets3/src/gtk/button.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/button.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: button.cpp 67151 2011-03-08 17:22:15Z VZ $ +// Id: $Id: button.cpp 68842 2011-08-22 12:41:00Z VZ $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,6 +19,7 @@ #include "wx/stockitem.h" #include "wx/gtk/private.h" +#include "wx/gtk/private/list.h" // ---------------------------------------------------------------------------- // GTK callbacks @@ -38,42 +39,6 @@ wxgtk_button_clicked_callback(GtkWidget *WXUNUSED(widget), wxButton *button) button->HandleWindowEvent(event); } -static void -wxgtk_button_enter_callback(GtkWidget *WXUNUSED(widget), wxButton *button) -{ - if ( button->GTKShouldIgnoreEvent() ) - return; - - button->GTKMouseEnters(); -} - -static void -wxgtk_button_leave_callback(GtkWidget *WXUNUSED(widget), wxButton *button) -{ - if ( button->GTKShouldIgnoreEvent() ) - return; - - button->GTKMouseLeaves(); -} - -static void -wxgtk_button_press_callback(GtkWidget *WXUNUSED(widget), wxButton *button) -{ - if ( button->GTKShouldIgnoreEvent() ) - return; - - button->GTKPressed(); -} - -static void -wxgtk_button_released_callback(GtkWidget *WXUNUSED(widget), wxButton *button) -{ - if ( button->GTKShouldIgnoreEvent() ) - return; - - button->GTKReleased(); -} - //----------------------------------------------------------------------------- // "style_set" from m_widget //----------------------------------------------------------------------------- @@ -83,7 +48,7 @@ wxgtk_button_style_set_callback(GtkWidget* widget, GtkStyle*, wxButton* win) { /* the default button has a border around it */ wxWindow* parent = win->GetParent(); - if (parent && parent->m_wxwindow && GTK_WIDGET_CAN_DEFAULT(widget)) + if (parent && parent->m_wxwindow && gtk_widget_get_can_default(widget)) { GtkBorder* border = NULL; gtk_widget_style_get(widget, "default_border", &border, NULL); @@ -181,7 +146,7 @@ wxWindow *wxButton::SetDefault() { wxWindow *oldDefault = wxButtonBase::SetDefault(); - GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default(m_widget, TRUE); gtk_widget_grab_default( m_widget ); // resize for default border @@ -234,7 +199,7 @@ void wxButton::SetLabel( const wxString &lbl ) if (label.empty() && wxIsStockID(m_windowId)) label = wxGetStockLabel(m_windowId); - wxControl::SetLabel(label); + wxAnyButton::SetLabel(label); // don't use label if it was explicitly disabled if ( HasFlag(wxBU_NOTEXT) ) @@ -280,64 +245,45 @@ bool wxButton::DoSetLabelMarkup(const wxString& markup) return true; } -#endif // wxUSE_MARKUP - -bool wxButton::Enable( bool enable ) -{ - if (!base_type::Enable(enable)) - return false; - - gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable); - - if (enable) - GTKFixSensitivity(); - - GTKUpdateBitmap(); - - return true; -} - -GdkWindow *wxButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const -{ - return GTK_BUTTON(m_widget)->event_window; -} GtkLabel *wxButton::GTKGetLabel() const { - GtkWidget *child = GTK_BIN(m_widget)->child; + GtkWidget* child = gtk_bin_get_child(GTK_BIN(m_widget)); if ( GTK_IS_ALIGNMENT(child) ) { - GtkWidget *box = GTK_BIN(child)->child; - for (GList* item = GTK_BOX(box)->children; item; item = item->next) + GtkWidget* box = gtk_bin_get_child(GTK_BIN(child)); + GtkLabel* label = NULL; + wxGtkList list(gtk_container_get_children(GTK_CONTAINER(box))); + for (GList* item = list; item; item = item->next) { - GtkBoxChild* boxChild = static_cast(item->data); - if ( GTK_IS_LABEL(boxChild->widget) ) - return GTK_LABEL(boxChild->widget); + if (GTK_IS_LABEL(item->data)) + label = GTK_LABEL(item->data); } - return NULL; + return label; } return GTK_LABEL(child); } +#endif // wxUSE_MARKUP void wxButton::DoApplyWidgetStyle(GtkRcStyle *style) { gtk_widget_modify_style(m_widget, style); - GtkWidget *child = GTK_BIN(m_widget)->child; + GtkWidget* child = gtk_bin_get_child(GTK_BIN(m_widget)); gtk_widget_modify_style(child, style); // for buttons with images, the path to the label is (at least in 2.12) // GtkButton -> GtkAlignment -> GtkHBox -> GtkLabel if ( GTK_IS_ALIGNMENT(child) ) { - GtkWidget *box = GTK_BIN(child)->child; + GtkWidget* box = gtk_bin_get_child(GTK_BIN(child)); if ( GTK_IS_BOX(box) ) { - for (GList* item = GTK_BOX(box)->children; item; item = item->next) + wxGtkList list(gtk_container_get_children(GTK_CONTAINER(box))); + for (GList* item = list; item; item = item->next) { - GtkBoxChild* boxChild = static_cast(item->data); - gtk_widget_modify_style(boxChild->widget, style); + gtk_widget_modify_style(GTK_WIDGET(item->data), style); } } } @@ -349,19 +295,19 @@ wxSize wxButton::DoGetBestSize() const // extra border around it, but we don't want to take it into account in // our size calculations (otherwise the result is visually ugly), so // always return the size of non default button from here - const bool isDefault = GTK_WIDGET_HAS_DEFAULT(m_widget); + const bool isDefault = gtk_widget_has_default(m_widget); if ( isDefault ) { // temporarily unset default flag - GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default(m_widget, FALSE); } - wxSize ret( wxControl::DoGetBestSize() ); + wxSize ret( wxAnyButton::DoGetBestSize() ); if ( isDefault ) { // set it back again - GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default(m_widget, TRUE); } if (!HasFlag(wxBU_EXACTFIT)) @@ -384,326 +330,4 @@ wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) return GetDefaultAttributesFromGTKWidget(gtk_button_new); } -// ---------------------------------------------------------------------------- -// bitmaps support -// ---------------------------------------------------------------------------- - -void wxButton::GTKMouseEnters() -{ - m_isCurrent = true; - - GTKUpdateBitmap(); -} - -void wxButton::GTKMouseLeaves() -{ - m_isCurrent = false; - - GTKUpdateBitmap(); -} - -void wxButton::GTKPressed() -{ - m_isPressed = true; - - GTKUpdateBitmap(); -} - -void wxButton::GTKReleased() -{ - m_isPressed = false; - - GTKUpdateBitmap(); -} - -void wxButton::GTKOnFocus(wxFocusEvent& event) -{ - event.Skip(); - - GTKUpdateBitmap(); -} - -wxButton::State wxButton::GTKGetCurrentState() const -{ - if ( !IsThisEnabled() ) - return m_bitmaps[State_Disabled].IsOk() ? State_Disabled : State_Normal; - - if ( m_isPressed && m_bitmaps[State_Pressed].IsOk() ) - return State_Pressed; - - if ( m_isCurrent && m_bitmaps[State_Current].IsOk() ) - return State_Current; - - if ( HasFocus() && m_bitmaps[State_Focused].IsOk() ) - return State_Focused; - - return State_Normal; -} - -void wxButton::GTKUpdateBitmap() -{ - // if we don't show bitmaps at all, there is nothing to update - if ( m_bitmaps[State_Normal].IsOk() ) - { - // if we do show them, this will return a state for which we do have a - // valid bitmap - State state = GTKGetCurrentState(); - - GTKDoShowBitmap(m_bitmaps[state]); - } -} - -void wxButton::GTKDoShowBitmap(const wxBitmap& bitmap) -{ - wxASSERT_MSG( bitmap.IsOk(), "invalid bitmap" ); - - GtkWidget *image; - if ( DontShowLabel() ) - { - image = GTK_BIN(m_widget)->child; - } - else // have both label and bitmap - { -#ifdef __WXGTK26__ - if ( !gtk_check_version(2,6,0) ) - { - image = gtk_button_get_image(GTK_BUTTON(m_widget)); - } - else -#endif // __WXGTK26__ - { - // buttons with both label and bitmap are only supported with GTK+ - // 2.6 so far - // - // it shouldn't be difficult to implement them ourselves for the - // previous GTK+ versions by stuffing a container with a label and - // an image inside GtkButton but there doesn't seem to be much - // point in doing this for ancient GTK+ versions - return; - } - } - - wxCHECK_RET( image && GTK_IS_IMAGE(image), "must have image widget" ); - - gtk_image_set_from_pixbuf(GTK_IMAGE(image), bitmap.GetPixbuf()); -} - -wxBitmap wxButton::DoGetBitmap(State which) const -{ - return m_bitmaps[which]; -} - -void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which) -{ - switch ( which ) - { - case State_Normal: - if ( DontShowLabel() ) - { - // we only have the bitmap in this button, never remove it but - // do invalidate the best size when the bitmap (and presumably - // its size) changes - InvalidateBestSize(); - } -#ifdef __WXGTK26__ - // normal image is special: setting it enables images for the button and - // resetting it to nothing disables all of them - else if ( !gtk_check_version(2,6,0) ) - { - GtkWidget *image = gtk_button_get_image(GTK_BUTTON(m_widget)); - if ( image && !bitmap.IsOk() ) - { - gtk_container_remove(GTK_CONTAINER(m_widget), image); - } - else if ( !image && bitmap.IsOk() ) - { - image = gtk_image_new(); - gtk_button_set_image(GTK_BUTTON(m_widget), image); - } - else // image presence or absence didn't change - { - // don't invalidate best size below - break; - } - - InvalidateBestSize(); - } -#endif // GTK+ 2.6+ - break; - - case State_Pressed: - if ( bitmap.IsOk() ) - { - if ( !m_bitmaps[which].IsOk() ) - { - // we need to install the callbacks to be notified about - // the button pressed state change - g_signal_connect - ( - m_widget, - "pressed", - G_CALLBACK(wxgtk_button_press_callback), - this - ); - - g_signal_connect - ( - m_widget, - "released", - G_CALLBACK(wxgtk_button_released_callback), - this - ); - } - } - else // no valid bitmap - { - if ( m_bitmaps[which].IsOk() ) - { - // we don't need to be notified about the button pressed - // state changes any more - g_signal_handlers_disconnect_by_func - ( - m_widget, - (gpointer)wxgtk_button_press_callback, - this - ); - - g_signal_handlers_disconnect_by_func - ( - m_widget, - (gpointer)wxgtk_button_released_callback, - this - ); - - // also make sure we don't remain stuck in pressed state - if ( m_isPressed ) - { - m_isPressed = false; - GTKUpdateBitmap(); - } - } - } - break; - - case State_Current: - // the logic here is the same as above for State_Pressed: we need - // to connect the handlers if we must be notified about the changes - // in the button current state and we disconnect them when/if we - // don't need them any more - if ( bitmap.IsOk() ) - { - if ( !m_bitmaps[which].IsOk() ) - { - g_signal_connect - ( - m_widget, - "enter", - G_CALLBACK(wxgtk_button_enter_callback), - this - ); - - g_signal_connect - ( - m_widget, - "leave", - G_CALLBACK(wxgtk_button_leave_callback), - this - ); - } - } - else // no valid bitmap - { - if ( m_bitmaps[which].IsOk() ) - { - g_signal_handlers_disconnect_by_func - ( - m_widget, - (gpointer)wxgtk_button_enter_callback, - this - ); - - g_signal_handlers_disconnect_by_func - ( - m_widget, - (gpointer)wxgtk_button_leave_callback, - this - ); - - if ( m_isCurrent ) - { - m_isCurrent = false; - GTKUpdateBitmap(); - } - } - } - break; - - case State_Focused: - if ( bitmap.IsOk() ) - { - Connect(wxEVT_SET_FOCUS, - wxFocusEventHandler(wxButton::GTKOnFocus)); - Connect(wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxButton::GTKOnFocus)); - } - else // no valid focused bitmap - { - Disconnect(wxEVT_SET_FOCUS, - wxFocusEventHandler(wxButton::GTKOnFocus)); - Disconnect(wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxButton::GTKOnFocus)); - } - break; - - default: - // no callbacks to connect/disconnect - ; - } - - m_bitmaps[which] = bitmap; - - // update the bitmap immediately if necessary, otherwise it will be done - // when the bitmap for the corresponding state is needed the next time by - // GTKUpdateBitmap() - if ( bitmap.IsOk() && which == GTKGetCurrentState() ) - { - GTKDoShowBitmap(bitmap); - } -} - -void wxButton::DoSetBitmapPosition(wxDirection dir) -{ -#ifdef __WXGTK210__ - if ( !gtk_check_version(2,10,0) ) - { - GtkPositionType gtkpos; - switch ( dir ) - { - default: - wxFAIL_MSG( "invalid position" ); - // fall through - - case wxLEFT: - gtkpos = GTK_POS_LEFT; - break; - - case wxRIGHT: - gtkpos = GTK_POS_RIGHT; - break; - - case wxTOP: - gtkpos = GTK_POS_TOP; - break; - - case wxBOTTOM: - gtkpos = GTK_POS_BOTTOM; - break; - } - - gtk_button_set_image_position(GTK_BUTTON(m_widget), gtkpos); - InvalidateBestSize(); - } -#endif // GTK+ 2.10+ -} - #endif // wxUSE_BUTTON diff --git a/Externals/wxWidgets3/src/gtk/calctrl.cpp b/Externals/wxWidgets3/src/gtk/calctrl.cpp index e0d9f9ebf0..e53190e2fb 100644 --- a/Externals/wxWidgets3/src/gtk/calctrl.cpp +++ b/Externals/wxWidgets3/src/gtk/calctrl.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/calctrl.cpp // Purpose: implementation of the wxGtkCalendarCtrl // Author: Marcin Wojdyr -// RCS-ID: $Id: calctrl.cpp 66568 2011-01-04 11:48:14Z VZ $ +// RCS-ID: $Id: calctrl.cpp 70755 2012-02-29 18:13:06Z PC $ // Copyright: (c) 2008 Marcin Wojdyr // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -13,42 +13,33 @@ #pragma hdrstop #endif +#if wxUSE_CALENDARCTRL + #ifndef WX_PRECOMP #endif //WX_PRECOMP -#if wxUSE_CALENDARCTRL - -#include "wx/gtk/private.h" #include "wx/calctrl.h" -#include "wx/gtk/calctrl.h" +#include extern "C" { static void gtk_day_selected_callback(GtkWidget *WXUNUSED(widget), wxGtkCalendarCtrl *cal) { - wxDateTime date = cal->GetDate(); - if (cal->m_selectedDate == date) - return; - - cal->m_selectedDate = date; - - cal->GenerateEvent(wxEVT_CALENDAR_SEL_CHANGED); - // send deprecated event - cal->GenerateEvent(wxEVT_CALENDAR_DAY_CHANGED); + cal->GTKGenerateEvent(wxEVT_CALENDAR_SEL_CHANGED); } static void gtk_day_selected_double_click_callback(GtkWidget *WXUNUSED(widget), wxGtkCalendarCtrl *cal) { - cal->GenerateEvent(wxEVT_CALENDAR_DOUBLECLICKED); + cal->GTKGenerateEvent(wxEVT_CALENDAR_DOUBLECLICKED); } static void gtk_month_changed_callback(GtkWidget *WXUNUSED(widget), wxGtkCalendarCtrl *cal) { - cal->GenerateEvent(wxEVT_CALENDAR_PAGE_CHANGED); + cal->GTKGenerateEvent(wxEVT_CALENDAR_PAGE_CHANGED); } // callbacks that send deprecated events @@ -56,13 +47,13 @@ static void gtk_month_changed_callback(GtkWidget *WXUNUSED(widget), static void gtk_prev_month_callback(GtkWidget *WXUNUSED(widget), wxGtkCalendarCtrl *cal) { - cal->GenerateEvent(wxEVT_CALENDAR_MONTH_CHANGED); + cal->GTKGenerateEvent(wxEVT_CALENDAR_MONTH_CHANGED); } static void gtk_prev_year_callback(GtkWidget *WXUNUSED(widget), wxGtkCalendarCtrl *cal) { - cal->GenerateEvent(wxEVT_CALENDAR_YEAR_CHANGED); + cal->GTKGenerateEvent(wxEVT_CALENDAR_YEAR_CHANGED); } } @@ -127,6 +118,74 @@ bool wxGtkCalendarCtrl::Create(wxWindow *parent, return true; } +void wxGtkCalendarCtrl::GTKGenerateEvent(wxEventType type) +{ + // First check if the new date is in the specified range. + wxDateTime dt = GetDate(); + if ( !IsInValidRange(dt) ) + { + if ( m_validStart.IsValid() && dt < m_validStart ) + dt = m_validStart; + else + dt = m_validEnd; + + SetDate(dt); + + return; + } + + if ( type == wxEVT_CALENDAR_SEL_CHANGED ) + { + // Don't generate this event if the new date is the same as the old + // one. + if ( m_selectedDate == dt ) + return; + + m_selectedDate = dt; + + GenerateEvent(type); + + // Also send the deprecated event together with the new one. + GenerateEvent(wxEVT_CALENDAR_DAY_CHANGED); + } + else + { + GenerateEvent(type); + } +} + +bool wxGtkCalendarCtrl::IsInValidRange(const wxDateTime& dt) const +{ + return (!m_validStart.IsValid() || m_validStart <= dt) && + (!m_validEnd.IsValid() || dt <= m_validEnd); +} + +bool +wxGtkCalendarCtrl::SetDateRange(const wxDateTime& lowerdate, + const wxDateTime& upperdate) +{ + if ( lowerdate.IsValid() && upperdate.IsValid() && lowerdate >= upperdate ) + return false; + + m_validStart = lowerdate; + m_validEnd = upperdate; + + return true; +} + +bool +wxGtkCalendarCtrl::GetDateRange(wxDateTime *lowerdate, + wxDateTime *upperdate) const +{ + if ( lowerdate ) + *lowerdate = m_validStart; + if ( upperdate ) + *upperdate = m_validEnd; + + return m_validStart.IsValid() || m_validEnd.IsValid(); +} + + bool wxGtkCalendarCtrl::EnableMonthChange(bool enable) { if ( !wxCalendarCtrlBase::EnableMonthChange(enable) ) @@ -140,8 +199,13 @@ bool wxGtkCalendarCtrl::EnableMonthChange(bool enable) bool wxGtkCalendarCtrl::SetDate(const wxDateTime& date) { + if ( date.IsValid() && !IsInValidRange(date) ) + return false; + g_signal_handlers_block_by_func(m_widget, (gpointer) gtk_day_selected_callback, this); + g_signal_handlers_block_by_func(m_widget, + (gpointer) gtk_month_changed_callback, this); m_selectedDate = date; int year = date.GetYear(); @@ -150,6 +214,8 @@ bool wxGtkCalendarCtrl::SetDate(const wxDateTime& date) gtk_calendar_select_month(GTK_CALENDAR(m_widget), month, year); gtk_calendar_select_day(GTK_CALENDAR(m_widget), day); + g_signal_handlers_unblock_by_func( m_widget, + (gpointer) gtk_month_changed_callback, this); g_signal_handlers_unblock_by_func( m_widget, (gpointer) gtk_day_selected_callback, this); @@ -158,9 +224,22 @@ bool wxGtkCalendarCtrl::SetDate(const wxDateTime& date) wxDateTime wxGtkCalendarCtrl::GetDate() const { - guint year, month, day; - gtk_calendar_get_date(GTK_CALENDAR(m_widget), &year, &month, &day); - return wxDateTime(day, (wxDateTime::Month) month, year); + guint year, monthGTK, day; + gtk_calendar_get_date(GTK_CALENDAR(m_widget), &year, &monthGTK, &day); + + // GTK may return an invalid date, this happens at least when switching the + // month (or the year in case of February in a leap year) and the new month + // has fewer days than the currently selected one making the currently + // selected day invalid, e.g. just choosing May 31 and going back a month + // results in the date being (non existent) April 31 when we're called from + // gtk_prev_month_callback(). We need to manually work around this to avoid + // asserts from wxDateTime ctor. + const wxDateTime::Month month = static_cast(monthGTK); + const guint dayMax = wxDateTime::GetNumberOfDays(month, year); + if ( day > dayMax ) + day = dayMax; + + return wxDateTime(day, month, year); } void wxGtkCalendarCtrl::Mark(size_t day, bool mark) diff --git a/Externals/wxWidgets3/src/gtk/checkbox.cpp b/Externals/wxWidgets3/src/gtk/checkbox.cpp index 8681002c00..4d8c63e203 100644 --- a/Externals/wxWidgets3/src/gtk/checkbox.cpp +++ b/Externals/wxWidgets3/src/gtk/checkbox.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/checkbox.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: checkbox.cpp 66555 2011-01-04 08:31:53Z SC $ +// Id: $Id: checkbox.cpp 67326 2011-03-28 06:27:49Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -131,7 +131,7 @@ bool wxCheckBox::Create(wxWindow *parent, else { m_widgetCheckbox = gtk_check_button_new_with_label(""); - m_widgetLabel = GTK_BIN(m_widgetCheckbox)->child; + m_widgetLabel = gtk_bin_get_child(GTK_BIN(m_widgetCheckbox)); m_widget = m_widgetCheckbox; } g_object_ref(m_widget); diff --git a/Externals/wxWidgets3/src/gtk/choice.cpp b/Externals/wxWidgets3/src/gtk/choice.cpp index d153260565..0c7f552a4a 100644 --- a/Externals/wxWidgets3/src/gtk/choice.cpp +++ b/Externals/wxWidgets3/src/gtk/choice.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/choice.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: choice.cpp 66555 2011-01-04 08:31:53Z SC $ +// Id: $Id: choice.cpp 67326 2011-03-28 06:27:49Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -334,7 +334,7 @@ void wxChoice::GTKEnableEvents() GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - return m_widget->window; + return gtk_widget_get_window(m_widget); } // Notice that this method shouldn't be necessary, because GTK calculates @@ -371,7 +371,7 @@ wxSize wxChoice::DoGetBestSize() const void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style) { gtk_widget_modify_style(m_widget, style); - gtk_widget_modify_style(GTK_BIN(m_widget)->child, style); + gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(m_widget)), style); } diff --git a/Externals/wxWidgets3/src/gtk/clipbrd.cpp b/Externals/wxWidgets3/src/gtk/clipbrd.cpp index 678c9d9466..f60a8cc836 100644 --- a/Externals/wxWidgets3/src/gtk/clipbrd.cpp +++ b/Externals/wxWidgets3/src/gtk/clipbrd.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/clipbrd.cpp // Purpose: wxClipboard implementation for wxGTK // Author: Robert Roebling, Vadim Zeitlin -// Id: $Id: clipbrd.cpp 67229 2011-03-18 09:16:19Z VZ $ +// Id: $Id: clipbrd.cpp 69454 2011-10-18 21:54:53Z VZ $ // Copyright: (c) 1998 Robert Roebling // (c) 2007 Vadim Zeitlin // Licence: wxWindows licence @@ -133,11 +133,15 @@ targets_selection_received( GtkWidget *WXUNUSED(widget), wxON_BLOCK_EXIT1(wxClipboardSync::OnDone, clipboard); - if ( !selection_data || selection_data->length <= 0 ) + if (!selection_data) + return; + + const int selection_data_length = gtk_selection_data_get_length(selection_data); + if (selection_data_length <= 0) return; // make sure we got the data in the correct form - GdkAtom type = selection_data->type; + GdkAtom type = gtk_selection_data_get_data_type(selection_data); if ( type != GDK_SELECTION_TYPE_ATOM ) { if ( strcmp(wxGtkString(gdk_atom_name(type)), "TARGETS") != 0 ) @@ -151,14 +155,14 @@ targets_selection_received( GtkWidget *WXUNUSED(widget), // it's not really a format, of course, but we can reuse its GetId() method // to format this atom as string - wxDataFormat clip(selection_data->selection); + wxDataFormat clip(gtk_selection_data_get_selection(selection_data)); wxLogTrace( TRACE_CLIPBOARD, wxT("Received available formats for clipboard %s"), clip.GetId().c_str() ); // the atoms we received, holding a list of targets (= formats) - const GdkAtom * const atoms = (GdkAtom *)selection_data->data; - for ( size_t i = 0; i < selection_data->length/sizeof(GdkAtom); i++ ) + const GdkAtom* const atoms = (GdkAtom*)gtk_selection_data_get_data(selection_data); + for (size_t i = 0; i < selection_data_length / sizeof(GdkAtom); i++) { const wxDataFormat format(atoms[i]); @@ -195,7 +199,7 @@ selection_received( GtkWidget *WXUNUSED(widget), wxON_BLOCK_EXIT1(wxClipboardSync::OnDone, clipboard); - if ( !selection_data || selection_data->length <= 0 ) + if (!selection_data || gtk_selection_data_get_length(selection_data) <= 0) return; clipboard->GTKOnSelectionReceived(*selection_data); @@ -262,7 +266,8 @@ selection_handler( GtkWidget *WXUNUSED(widget), if ( !clipboard ) return; - wxDataObject * const data = clipboard->GTKGetDataObject(selection_data->selection); + wxDataObject * const data = clipboard->GTKGetDataObject( + gtk_selection_data_get_selection(selection_data)); if ( !data ) return; @@ -270,7 +275,7 @@ selection_handler( GtkWidget *WXUNUSED(widget), // In particular, it satisfies Klipper, which polls // TIMESTAMP to see if the clipboards content has changed. // It shall return the time which was used to set the data. - if (selection_data->target == g_timestampAtom) + if (gtk_selection_data_get_target(selection_data) == g_timestampAtom) { guint timestamp = GPOINTER_TO_UINT (signal_data); gtk_selection_data_set(selection_data, @@ -284,14 +289,14 @@ selection_handler( GtkWidget *WXUNUSED(widget), return; } - wxDataFormat format( selection_data->target ); + wxDataFormat format(gtk_selection_data_get_target(selection_data)); wxLogTrace(TRACE_CLIPBOARD, wxT("clipboard data in format %s, GtkSelectionData is target=%s type=%s selection=%s timestamp=%u"), format.GetId().c_str(), - wxString::FromAscii(wxGtkString(gdk_atom_name(selection_data->target))).c_str(), - wxString::FromAscii(wxGtkString(gdk_atom_name(selection_data->type))).c_str(), - wxString::FromAscii(wxGtkString(gdk_atom_name(selection_data->selection))).c_str(), + wxString::FromAscii(wxGtkString(gdk_atom_name(gtk_selection_data_get_target(selection_data)))).c_str(), + wxString::FromAscii(wxGtkString(gdk_atom_name(gtk_selection_data_get_data_type(selection_data)))).c_str(), + wxString::FromAscii(wxGtkString(gdk_atom_name(gtk_selection_data_get_selection(selection_data)))).c_str(), GPOINTER_TO_UINT( signal_data ) ); @@ -335,14 +340,16 @@ void wxClipboard::GTKOnSelectionReceived(const GtkSelectionData& sel) { wxCHECK_RET( m_receivedData, wxT("should be inside GetData()") ); - const wxDataFormat format(sel.target); + const wxDataFormat format(gtk_selection_data_get_target(const_cast(&sel))); wxLogTrace(TRACE_CLIPBOARD, wxT("Received selection %s"), format.GetId().c_str()); - if ( !m_receivedData->IsSupportedFormat(format) ) + if ( !m_receivedData->IsSupportedFormat(format, wxDataObject::Set) ) return; - m_receivedData->SetData(format, sel.length, sel.data); + m_receivedData->SetData(format, + gtk_selection_data_get_length(const_cast(&sel)), + gtk_selection_data_get_data(const_cast(&sel))); m_formatSupported = true; } @@ -366,7 +373,11 @@ async_targets_selection_received( GtkWidget *WXUNUSED(widget), wxClipboardEvent *event = new wxClipboardEvent(wxEVT_CLIPBOARD_CHANGED); event->SetEventObject( clipboard ); - if ( !selection_data || selection_data->length <= 0 ) + int selection_data_length = 0; + if (selection_data) + selection_data_length = gtk_selection_data_get_length(selection_data); + + if (selection_data_length <= 0) { clipboard->m_sink->QueueEvent( event ); clipboard->m_sink.Release(); @@ -374,7 +385,7 @@ async_targets_selection_received( GtkWidget *WXUNUSED(widget), } // make sure we got the data in the correct form - GdkAtom type = selection_data->type; + GdkAtom type = gtk_selection_data_get_data_type(selection_data); if ( type != GDK_SELECTION_TYPE_ATOM ) { if ( strcmp(wxGtkString(gdk_atom_name(type)), "TARGETS") != 0 ) @@ -390,14 +401,14 @@ async_targets_selection_received( GtkWidget *WXUNUSED(widget), // it's not really a format, of course, but we can reuse its GetId() method // to format this atom as string - wxDataFormat clip(selection_data->selection); + wxDataFormat clip(gtk_selection_data_get_selection(selection_data)); wxLogTrace( TRACE_CLIPBOARD, wxT("Received available formats for clipboard %s"), clip.GetId().c_str() ); // the atoms we received, holding a list of targets (= formats) - const GdkAtom * const atoms = (GdkAtom *)selection_data->data; - for ( size_t i = 0; i < selection_data->length/sizeof(GdkAtom); i++ ) + const GdkAtom* const atoms = (GdkAtom*)gtk_selection_data_get_data(selection_data); + for (size_t i = 0; i < selection_data_length / sizeof(GdkAtom); i++) { const wxDataFormat format(atoms[i]); @@ -568,7 +579,7 @@ void wxClipboard::Clear() gtk_selection_clear_targets( m_clipboardWidget, GTKGetClipboardAtom() ); if ( gdk_selection_owner_get(GTKGetClipboardAtom()) == - m_clipboardWidget->window ) + gtk_widget_get_window(m_clipboardWidget) ) { wxClipboardSync sync(*this); diff --git a/Externals/wxWidgets3/src/gtk/clrpicker.cpp b/Externals/wxWidgets3/src/gtk/clrpicker.cpp index 1461f76b94..a70c98c24b 100644 --- a/Externals/wxWidgets3/src/gtk/clrpicker.cpp +++ b/Externals/wxWidgets3/src/gtk/clrpicker.cpp @@ -4,7 +4,7 @@ // Author: Francesco Montorsi // Modified By: // Created: 15/04/2006 -// Id: $Id: clrpicker.cpp 55288 2008-08-26 16:19:23Z PC $ +// Id: $Id: clrpicker.cpp 70756 2012-02-29 18:29:31Z PC $ // Copyright: (c) Francesco Montorsi // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -69,7 +69,6 @@ bool wxColourButton::Create( wxWindow *parent, wxWindowID id, m_colour = col; m_widget = gtk_color_button_new_with_color( m_colour.GetColor() ); g_object_ref(m_widget); - gtk_widget_show(m_widget); // GtkColourButton signals g_signal_connect(m_widget, "color-set", diff --git a/Externals/wxWidgets3/src/gtk/collpane.cpp b/Externals/wxWidgets3/src/gtk/collpane.cpp index d3b31dc144..e943a4c7f0 100644 --- a/Externals/wxWidgets3/src/gtk/collpane.cpp +++ b/Externals/wxWidgets3/src/gtk/collpane.cpp @@ -4,7 +4,7 @@ // Author: Francesco Montorsi // Modified By: // Created: 8/10/2006 -// Id: $Id: collpane.cpp 67280 2011-03-22 14:17:38Z DS $ +// Id: $Id: collpane.cpp 70756 2012-02-29 18:29:31Z PC $ // Copyright: (c) Francesco Montorsi // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -95,7 +95,7 @@ gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object), // 1) need to update our size hints // NB: this function call won't actually do any long operation - // (redraw/relayouting/resizing) so that it's flicker-free + // (redraw/relayout/resize) so that it's flicker-free p->SetMinSize(sz); if (p->HasFlag(wxCP_NO_TLW_RESIZE)) @@ -123,7 +123,7 @@ gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object), // transition. This may be sometimes undesired but *is* // necessary and if you look carefully, all GTK+ programs using // GtkExpander perform this trick (e.g. the standard "open file" - // dialog of GTK+>=2.4 is not resizeable when the expander is + // dialog of GTK+>=2.4 is not resizable when the expander is // collapsed!) gtk_window_set_resizable (GTK_WINDOW (top->m_widget), p->IsExpanded()); @@ -200,7 +200,6 @@ bool wxCollapsiblePane::Create(wxWindow *parent, m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxNO_BORDER, wxS("wxCollapsiblePanePane")); - gtk_widget_show(m_widget); m_parent->DoAddChild( this ); PostCreation(size); @@ -281,8 +280,8 @@ void wxCollapsiblePane::OnSize(wxSizeEvent &ev) GdkWindow *wxCollapsiblePane::GTKGetWindow(wxArrayGdkWindows& windows) const { GtkWidget *label = gtk_expander_get_label_widget( GTK_EXPANDER(m_widget) ); - windows.Add( label->window ); - windows.Add( m_widget->window ); + windows.Add(gtk_widget_get_window(label)); + windows.Add(gtk_widget_get_window(m_widget)); return NULL; } diff --git a/Externals/wxWidgets3/src/gtk/colordlg.cpp b/Externals/wxWidgets3/src/gtk/colordlg.cpp index 3ecc1bb70f..cb01eca93b 100644 --- a/Externals/wxWidgets3/src/gtk/colordlg.cpp +++ b/Externals/wxWidgets3/src/gtk/colordlg.cpp @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // Modified by: // Created: 2004/06/04 -// RCS-ID: $Id: colordlg.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: colordlg.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) Vaclav Slavik, 2004 // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -69,8 +69,9 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) } #if !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 - GtkColorSelection *sel = - GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(m_widget)->colorsel); + GtkColorSelection* sel = GTK_COLOR_SELECTION( + gtk_color_selection_dialog_get_color_selection( + GTK_COLOR_SELECTION_DIALOG(m_widget))); gtk_color_selection_set_has_palette(sel, true); #endif // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 @@ -104,7 +105,7 @@ int wxColourDialog::ShowModal() void wxColourDialog::ColourDataToDialog() { const GdkColor * const - col = m_data.GetColour().Ok() ? m_data.GetColour().GetColor() + col = m_data.GetColour().IsOk() ? m_data.GetColour().GetColor() : NULL; #if wxUSE_LIBHILDON @@ -123,8 +124,9 @@ void wxColourDialog::ColourDataToDialog() hildon_color_chooser_dialog_set_color((HildonColorChooserDialog *)m_widget, &clr); #else // !wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 - GtkColorSelection *sel = - GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(m_widget)->colorsel); + GtkColorSelection* sel = GTK_COLOR_SELECTION( + gtk_color_selection_dialog_get_color_selection( + GTK_COLOR_SELECTION_DIALOG(m_widget))); if ( col ) gtk_color_selection_set_current_color(sel, col); @@ -136,7 +138,7 @@ void wxColourDialog::ColourDataToDialog() for (unsigned i = 0; i < 16; i++) { wxColour c = m_data.GetCustomColour(i); - if (c.Ok()) + if (c.IsOk()) { colors[n_colors] = *c.GetColor(); n_colors++; @@ -159,7 +161,7 @@ void wxColourDialog::DialogToColourData() m_data.SetColour(*clr); #elif wxUSE_LIBHILDON2 // !wxUSE_LIBHILDON const GdkColor * const - col = m_data.GetColour().Ok() ? m_data.GetColour().GetColor() : NULL; + col = m_data.GetColour().IsOk() ? m_data.GetColour().GetColor() : NULL; GdkColor clr; if (col) @@ -176,8 +178,9 @@ void wxColourDialog::DialogToColourData() m_data.SetColour(new_color); #else // !wxUSE_LIBHILDON2 - GtkColorSelection *sel = - GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(m_widget)->colorsel); + GtkColorSelection* sel = GTK_COLOR_SELECTION( + gtk_color_selection_dialog_get_color_selection( + GTK_COLOR_SELECTION_DIALOG(m_widget))); GdkColor clr; gtk_color_selection_get_current_color(sel, &clr); diff --git a/Externals/wxWidgets3/src/gtk/colour.cpp b/Externals/wxWidgets3/src/gtk/colour.cpp index cf39ae149f..71be846325 100644 --- a/Externals/wxWidgets3/src/gtk/colour.cpp +++ b/Externals/wxWidgets3/src/gtk/colour.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/colour.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: colour.cpp 66555 2011-01-04 08:31:53Z SC $ +// Id: $Id: colour.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -127,49 +127,49 @@ void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char bl unsigned char wxColour::Red() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return wxByte(M_COLDATA->m_red >> SHIFT); } unsigned char wxColour::Green() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return wxByte(M_COLDATA->m_green >> SHIFT); } unsigned char wxColour::Blue() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return wxByte(M_COLDATA->m_blue >> SHIFT); } unsigned char wxColour::Alpha() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return M_COLDATA->m_alpha; } void wxColour::CalcPixel( GdkColormap *cmap ) { - if (!Ok()) return; + if (!IsOk()) return; M_COLDATA->AllocColour( cmap ); } int wxColour::GetPixel() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return M_COLDATA->m_color.pixel; } const GdkColor *wxColour::GetColor() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid colour") ); return &M_COLDATA->m_color; } diff --git a/Externals/wxWidgets3/src/gtk/combobox.cpp b/Externals/wxWidgets3/src/gtk/combobox.cpp index 2ff7dd9e1f..de031ff72d 100644 --- a/Externals/wxWidgets3/src/gtk/combobox.cpp +++ b/Externals/wxWidgets3/src/gtk/combobox.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/combobox.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: combobox.cpp 66555 2011-01-04 08:31:53Z SC $ +// Id: $Id: combobox.cpp 70880 2012-03-11 23:55:19Z VZ $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -134,7 +134,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, gtk_entry_set_activates_default( entry, !HasFlag(wxTE_PROCESS_ENTER) ); - gtk_entry_set_editable( entry, TRUE ); + gtk_editable_set_editable(GTK_EDITABLE(entry), true); } Append(n, choices); @@ -155,7 +155,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, // wxMSW and also because it doesn't make sense to have a string // which is not a possible choice in a read-only combobox) SetStringSelection(value); - gtk_entry_set_editable( entry, FALSE ); + gtk_editable_set_editable(GTK_EDITABLE(entry), false); } else // editable combobox { @@ -186,12 +186,12 @@ void wxComboBox::GTKCreateComboBoxWidget() m_widget = gtk_combo_box_entry_new_text(); g_object_ref(m_widget); - m_entry = GTK_ENTRY(GTK_BIN(m_widget)->child); + m_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(m_widget))); } GtkEditable *wxComboBox::GetEditable() const { - return GTK_EDITABLE( GTK_BIN(m_widget)->child ); + return GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(m_widget))); } void wxComboBox::OnChar( wxKeyEvent &event ) @@ -227,12 +227,12 @@ void wxComboBox::EnableTextChangedEvents(bool enable) if ( enable ) { - g_signal_handlers_unblock_by_func(GTK_BIN(m_widget)->child, + g_signal_handlers_unblock_by_func(gtk_bin_get_child(GTK_BIN(m_widget)), (gpointer)gtkcombobox_text_changed_callback, this); } else // disable { - g_signal_handlers_block_by_func(GTK_BIN(m_widget)->child, + g_signal_handlers_block_by_func(gtk_bin_get_child(GTK_BIN(m_widget)), (gpointer)gtkcombobox_text_changed_callback, this); } } @@ -264,7 +264,7 @@ GtkWidget* wxComboBox::GetConnectWidget() GdkWindow* wxComboBox::GTKGetWindow(wxArrayGdkWindows& /* windows */) const { - return GetEntry()->text_area; + return gtk_entry_get_text_window(GetEntry()); } // static @@ -282,6 +282,19 @@ void wxComboBox::SetValue(const wxString& value) wxTextEntry::SetValue(value); } +void wxComboBox::SetString(unsigned int n, const wxString& text) +{ + wxChoice::SetString(n, text); + + if ( static_cast(n) == GetSelection() ) + { + // We also need to update the currently shown text, for consistency + // with wxMSW and also because it makes sense as leaving the old string + // in the text but not in the list would be confusing to the user. + SetValue(text); + } +} + // ---------------------------------------------------------------------------- // standard event handling // ---------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/src/gtk/control.cpp b/Externals/wxWidgets3/src/gtk/control.cpp index 1b1100e15e..22bda642ac 100644 --- a/Externals/wxWidgets3/src/gtk/control.cpp +++ b/Externals/wxWidgets3/src/gtk/control.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/control.cpp // Purpose: wxControl implementation for wxGTK // Author: Robert Roebling -// Id: $Id: control.cpp 67062 2011-02-27 12:48:07Z VZ $ +// Id: $Id: control.cpp 70714 2012-02-27 17:49:33Z PC $ // Copyright: (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -229,9 +229,6 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget, return wxWindow::GetClassDefaultAttributes(wxWINDOW_VARIANT_NORMAL); } - if (state == -1) - state = GTK_STATE_NORMAL; - // get the style's colours attr.colFg = wxColour(style->fg[state]); if (useBase) @@ -245,8 +242,9 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget, if ( style && style->font_desc ) { wxNativeFontInfo info; - info.description = pango_font_description_copy(style->font_desc); + info.description = style->font_desc; attr.font = wxFont(info); + info.description = NULL; } else { diff --git a/Externals/wxWidgets3/src/gtk/cursor.cpp b/Externals/wxWidgets3/src/gtk/cursor.cpp index 23600d0bed..8f4b5f6ea2 100644 --- a/Externals/wxWidgets3/src/gtk/cursor.cpp +++ b/Externals/wxWidgets3/src/gtk/cursor.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/cursor.cpp // Purpose: wxCursor implementation // Author: Robert Roebling -// Id: $Id: cursor.cpp 66371 2010-12-14 18:43:25Z VZ $ +// Id: $Id: cursor.cpp 68685 2011-08-13 16:17:59Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -22,6 +22,7 @@ #include #include "wx/gtk/private/object.h" +#include "wx/gtk/private/gtk2-compat.h" //----------------------------------------------------------------------------- // wxCursorRefData @@ -109,8 +110,10 @@ wxCursor::wxCursor(const char bits[], int width, int height, if (hotSpotY < 0 || hotSpotY >= height) hotSpotY = 0; - GdkBitmap *data = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) bits, width, height ); - GdkBitmap *mask = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) maskBits, width, height); + GdkBitmap* data = gdk_bitmap_create_from_data( + gtk_widget_get_window(wxGetRootWindow()), const_cast(bits), width, height); + GdkBitmap* mask = gdk_bitmap_create_from_data( + gtk_widget_get_window(wxGetRootWindow()), const_cast(maskBits), width, height); m_refData = new wxCursorRefData; M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap( @@ -221,7 +224,7 @@ void wxCursor::InitFromImage( const wxImage & image ) m_refData = new wxCursorRefData; wxImage image_copy(image); - GdkDisplay* display = gdk_drawable_get_display(wxGetRootWindow()->window); + GdkDisplay* display = gdk_drawable_get_display(gtk_widget_get_window(wxGetRootWindow())); if (gdk_display_supports_cursor_color(display)) { if (!image.HasAlpha()) @@ -257,7 +260,7 @@ void wxCursor::InitFromImage( const wxImage & image ) char* bits = new char[size]; memset(bits, 0xff, size); maskRaw = gdk_bitmap_create_from_data( - wxGetRootWindow()->window, bits, w, h); + gtk_widget_get_window(wxGetRootWindow()), bits, w, h); delete[] bits; } @@ -387,16 +390,15 @@ const wxCursor wxBusyCursor::GetBusyCursor() return wxCursor(wxCURSOR_WATCH); } -static void UpdateCursors(const wxWindowList& list, GdkDisplay*& display) +static void UpdateCursors(GdkDisplay** display) { - wxWindowList::const_iterator i = list.begin(); - for (size_t n = list.size(); n--; ++i) + wxWindowList::const_iterator i = wxTopLevelWindows.begin(); + for (size_t n = wxTopLevelWindows.size(); n--; ++i) { wxWindow* win = *i; - if (display == NULL && win->m_widget && win->m_widget->window) - display = gdk_drawable_get_display(win->m_widget->window); - win->GTKUpdateCursor(true, false); - UpdateCursors(win->GetChildren(), display); + win->GTKUpdateCursor(); + if (display && *display == NULL && win->m_widget) + *display = gtk_widget_get_display(win->m_widget); } } @@ -407,8 +409,7 @@ void wxEndBusyCursor() g_globalCursor = gs_savedCursor; gs_savedCursor = wxNullCursor; - GdkDisplay* unused = NULL; - UpdateCursors(wxTopLevelWindows, unused); + UpdateCursors(NULL); } void wxBeginBusyCursor(const wxCursor* cursor) @@ -416,13 +417,13 @@ void wxBeginBusyCursor(const wxCursor* cursor) if (gs_busyCount++ > 0) return; - wxASSERT_MSG( !gs_savedCursor.Ok(), + wxASSERT_MSG( !gs_savedCursor.IsOk(), wxT("forgot to call wxEndBusyCursor, will leak memory") ); gs_savedCursor = g_globalCursor; g_globalCursor = *cursor; GdkDisplay* display = NULL; - UpdateCursors(wxTopLevelWindows, display); + UpdateCursors(&display); if (display) gdk_display_flush(display); } @@ -435,6 +436,5 @@ bool wxIsBusy() void wxSetCursor( const wxCursor& cursor ) { g_globalCursor = cursor; - GdkDisplay* unused = NULL; - UpdateCursors(wxTopLevelWindows, unused); + UpdateCursors(NULL); } diff --git a/Externals/wxWidgets3/src/gtk/dataobj.cpp b/Externals/wxWidgets3/src/gtk/dataobj.cpp index 5637c53213..2003320cbc 100644 --- a/Externals/wxWidgets3/src/gtk/dataobj.cpp +++ b/Externals/wxWidgets3/src/gtk/dataobj.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/dataobj.cpp // Purpose: wxDataObject class // Author: Robert Roebling -// Id: $Id: dataobj.cpp 54741 2008-07-21 03:35:15Z VZ $ +// Id: $Id: dataobj.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -384,12 +384,12 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf) m_bitmap = wxBitmap(image); - return m_bitmap.Ok(); + return m_bitmap.IsOk(); } void wxBitmapDataObject::DoConvertToPng() { - if ( !m_bitmap.Ok() ) + if ( !m_bitmap.IsOk() ) return; wxCHECK_RET( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL, diff --git a/Externals/wxWidgets3/src/gtk/dataview.cpp b/Externals/wxWidgets3/src/gtk/dataview.cpp index 8f63d624fc..138856c567 100644 --- a/Externals/wxWidgets3/src/gtk/dataview.cpp +++ b/Externals/wxWidgets3/src/gtk/dataview.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/dataview.cpp // Purpose: wxDataViewCtrl GTK+2 implementation // Author: Robert Roebling -// Id: $Id: dataview.cpp 67120 2011-03-03 17:51:52Z PC $ +// Id: $Id: dataview.cpp 70457 2012-01-25 00:05:03Z VZ $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -25,7 +25,6 @@ #endif #include "wx/stockitem.h" -#include "wx/calctrl.h" #include "wx/popupwin.h" #include "wx/listimpl.cpp" @@ -34,6 +33,8 @@ #include "wx/gtk/dcclient.h" #include "wx/gtk/private/gdkconv.h" +#include "wx/gtk/private/list.h" +#include "wx/gtk/private/event.h" using namespace wxGTKImpl; class wxGtkDataViewModelNotifier; @@ -98,6 +99,26 @@ private: wxDECLARE_NO_COPY_CLASS(wxGtkTreePath); }; +// ---------------------------------------------------------------------------- +// wxGtkTreePathList: self-destroying list of GtkTreePath objects. +// ---------------------------------------------------------------------------- + +class wxGtkTreePathList : public wxGtkList +{ +public: + // Ctor takes ownership of the list. + explicit wxGtkTreePathList(GList* list) + : wxGtkList(list) + { + } + + ~wxGtkTreePathList() + { + // Delete the list contents, wxGtkList will delete the list itself. + g_list_foreach(m_list, (GFunc)gtk_tree_path_free, NULL); + } +}; + // ---------------------------------------------------------------------------- // wxGtkTreeSelectionLock: prevent selection from changing during the // lifetime of this object @@ -258,7 +279,7 @@ public: // item can be deleted already in the model int GetIndexOf( const wxDataViewItem &parent, const wxDataViewItem &item ); - virtual void OnInternalIdle(); + void OnInternalIdle(); protected: void InitTree(); @@ -300,7 +321,7 @@ private: static int LINKAGEMODE wxGtkTreeModelChildCmp( void** id1, void** id2 ) { - int ret = gs_internal->GetDataViewModel()->Compare( *id1, *id2, + int ret = gs_internal->GetDataViewModel()->Compare( wxDataViewItem(*id1), wxDataViewItem(*id2), gs_internal->GetSortColumn(), (gs_internal->GetSortOrder() == GTK_SORT_ASCENDING) ); return ret; @@ -331,7 +352,7 @@ public: } } - unsigned int AddNode( wxGtkTreeModelNode* child ) + void AddNode( wxGtkTreeModelNode* child ) { m_nodes.Add( child ); @@ -343,24 +364,54 @@ public: { gs_internal = m_internal; m_children.Sort( &wxGtkTreeModelChildCmp ); - return m_children.Index( id ); } - - return m_children.GetCount()-1; } - unsigned int AddLeave( void* id ) + void InsertNode( wxGtkTreeModelNode* child, unsigned pos ) { - m_children.Add( id ); + if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare()) + { + AddNode(child); + return; + } + + void *id = child->GetItem().GetID(); + + // Insert into m_nodes so that the order of nodes in m_nodes is the + // same as the order of their corresponding IDs in m_children: + const unsigned int count = m_nodes.GetCount(); + bool inserted = false; + for (unsigned i = 0; i < count; i++) + { + wxGtkTreeModelNode *node = m_nodes[i]; + int posInChildren = m_children.Index(node->GetItem().GetID()); + if ( (unsigned)posInChildren >= pos ) + { + m_nodes.Insert(child, i); + inserted = true; + break; + } + } + if ( !inserted ) + m_nodes.Add(child); + + m_children.Insert( id, pos ); + } + + void AddLeaf( void* id ) + { + InsertLeaf(id, m_children.size()); + } + + void InsertLeaf( void* id, unsigned pos ) + { + m_children.Insert( id, pos ); if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare()) { gs_internal = m_internal; m_children.Sort( &wxGtkTreeModelChildCmp ); - return m_children.Index( id ); } - - return m_children.GetCount()-1; } void DeleteChild( void* id ) @@ -381,6 +432,20 @@ public: } } + // returns position of child node for given item in children list or wxNOT_FOUND + int FindChildByItem(const wxDataViewItem& item) const + { + const void* itemId = item.GetID(); + const wxGtkTreeModelChildren& nodes = m_children; + const int len = nodes.size(); + for ( int i = 0; i < len; i++ ) + { + if ( nodes[i] == itemId ) + return i; + } + return wxNOT_FOUND; + } + wxGtkTreeModelNode* GetParent() { return m_parent; } wxGtkTreeModelNodes &GetNodes() @@ -419,15 +484,11 @@ extern "C" { #define GTK_TYPE_WX_TREE_MODEL (gtk_wx_tree_model_get_type ()) #define GTK_WX_TREE_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_TREE_MODEL, GtkWxTreeModel)) -#define GTK_WX_TREE_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WX_TREE_MODEL, GtkWxTreeModelClass)) #define GTK_IS_WX_TREE_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_TREE_MODEL)) #define GTK_IS_WX_TREE_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_TREE_MODEL)) -#define GTK_WX_TREE_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WX_TREE_MODEL, GtkWxTreeModelClass)) GType gtk_wx_tree_model_get_type (void); -typedef struct _GtkWxTreeModelClass GtkWxTreeModelClass; - struct _GtkWxTreeModel { GObject parent; @@ -437,21 +498,14 @@ struct _GtkWxTreeModel wxDataViewCtrlInternal *internal; }; -struct _GtkWxTreeModelClass -{ - GObjectClass list_parent_class; -}; - static GtkWxTreeModel *wxgtk_tree_model_new (void); -static void wxgtk_tree_model_init (GtkWxTreeModel *tree_model); -static void wxgtk_tree_model_class_init (GtkWxTreeModelClass *klass); +static void wxgtk_tree_model_init (GTypeInstance* instance, void*); -static void wxgtk_tree_model_tree_model_init (GtkTreeModelIface *iface); -static void wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface); -static void wxgtk_tree_model_drag_source_init(GtkTreeDragSourceIface *iface); -static void wxgtk_tree_model_drag_dest_init (GtkTreeDragDestIface *iface); +static void wxgtk_tree_model_tree_model_init (void* g_iface, void*); +static void wxgtk_tree_model_sortable_init (void* g_iface, void*); +static void wxgtk_tree_model_drag_source_init(void* g_iface, void*); +static void wxgtk_tree_model_drag_dest_init (void* g_iface, void*); -static void wxgtk_tree_model_finalize (GObject *object); static GtkTreeModelFlags wxgtk_tree_model_get_flags (GtkTreeModel *tree_model); static gint wxgtk_tree_model_get_n_columns (GtkTreeModel *tree_model); static GType wxgtk_tree_model_get_column_type (GtkTreeModel *tree_model, @@ -493,11 +547,11 @@ static void wxgtk_tree_model_set_sort_func (GtkTreeSortable *s gint sort_column_id, GtkTreeIterCompareFunc func, gpointer data, - GtkDestroyNotify destroy); + GDestroyNotify destroy); static void wxgtk_tree_model_set_default_sort_func (GtkTreeSortable *sortable, GtkTreeIterCompareFunc func, gpointer data, - GtkDestroyNotify destroy); + GDestroyNotify destroy); static gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable *sortable); /* drag'n'drop */ @@ -515,9 +569,6 @@ static gboolean wxgtk_tree_model_row_drop_possible (GtkTreeDragDest *d GtkTreePath *dest_path, GtkSelectionData *selection_data); - -static GObjectClass *list_parent_class = NULL; - GType gtk_wx_tree_model_get_type (void) { @@ -527,41 +578,41 @@ gtk_wx_tree_model_get_type (void) { const GTypeInfo tree_model_info = { - sizeof (GtkWxTreeModelClass), + sizeof (GObjectClass), NULL, /* base_init */ NULL, /* base_finalize */ - (GClassInitFunc) wxgtk_tree_model_class_init, + NULL, NULL, /* class_finalize */ NULL, /* class_data */ sizeof (GtkWxTreeModel), 0, - (GInstanceInitFunc) wxgtk_tree_model_init, + wxgtk_tree_model_init, }; static const GInterfaceInfo tree_model_iface_info = { - (GInterfaceInitFunc) wxgtk_tree_model_tree_model_init, + wxgtk_tree_model_tree_model_init, NULL, NULL }; static const GInterfaceInfo sortable_iface_info = { - (GInterfaceInitFunc) wxgtk_tree_model_sortable_init, + wxgtk_tree_model_sortable_init, NULL, NULL }; static const GInterfaceInfo drag_source_iface_info = { - (GInterfaceInitFunc) wxgtk_tree_model_drag_source_init, + wxgtk_tree_model_drag_source_init, NULL, NULL }; static const GInterfaceInfo drag_dest_iface_info = { - (GInterfaceInitFunc) wxgtk_tree_model_drag_dest_init, + wxgtk_tree_model_drag_dest_init, NULL, NULL }; @@ -594,16 +645,9 @@ wxgtk_tree_model_new(void) } static void -wxgtk_tree_model_class_init (GtkWxTreeModelClass *klass) -{ - list_parent_class = (GObjectClass*) g_type_class_peek_parent (klass); - GObjectClass *object_class = (GObjectClass*) klass; - object_class->finalize = wxgtk_tree_model_finalize; -} - -static void -wxgtk_tree_model_tree_model_init (GtkTreeModelIface *iface) +wxgtk_tree_model_tree_model_init(void* g_iface, void*) { + GtkTreeModelIface* iface = static_cast(g_iface); iface->get_flags = wxgtk_tree_model_get_flags; iface->get_n_columns = wxgtk_tree_model_get_n_columns; iface->get_column_type = wxgtk_tree_model_get_column_type; @@ -619,8 +663,9 @@ wxgtk_tree_model_tree_model_init (GtkTreeModelIface *iface) } static void -wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface) +wxgtk_tree_model_sortable_init(void* g_iface, void*) { + GtkTreeSortableIface* iface = static_cast(g_iface); iface->get_sort_column_id = wxgtk_tree_model_get_sort_column_id; iface->set_sort_column_id = wxgtk_tree_model_set_sort_column_id; iface->set_sort_func = wxgtk_tree_model_set_sort_func; @@ -629,34 +674,30 @@ wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface) } static void -wxgtk_tree_model_drag_source_init(GtkTreeDragSourceIface *iface) +wxgtk_tree_model_drag_source_init(void* g_iface, void*) { + GtkTreeDragSourceIface* iface = static_cast(g_iface); iface->row_draggable = wxgtk_tree_model_row_draggable; iface->drag_data_delete = wxgtk_tree_model_drag_data_delete; iface->drag_data_get = wxgtk_tree_model_drag_data_get; } static void -wxgtk_tree_model_drag_dest_init (GtkTreeDragDestIface *iface) +wxgtk_tree_model_drag_dest_init(void* g_iface, void*) { + GtkTreeDragDestIface* iface = static_cast(g_iface); iface->drag_data_received = wxgtk_tree_model_drag_data_received; iface->row_drop_possible = wxgtk_tree_model_row_drop_possible; } static void -wxgtk_tree_model_init (GtkWxTreeModel *tree_model) +wxgtk_tree_model_init(GTypeInstance* instance, void*) { + GtkWxTreeModel* tree_model = GTK_WX_TREE_MODEL(instance); tree_model->internal = NULL; tree_model->stamp = g_random_int(); } -static void -wxgtk_tree_model_finalize (GObject *object) -{ - /* must chain up */ - (* list_parent_class->finalize) (object); -} - } // extern "C" //----------------------------------------------------------------------------- @@ -966,7 +1007,7 @@ wxgtk_tree_model_set_sort_func (GtkTreeSortable *sortable, gint WXUNUSED(sort_column_id), GtkTreeIterCompareFunc func, gpointer WXUNUSED(data), - GtkDestroyNotify WXUNUSED(destroy)) + GDestroyNotify WXUNUSED(destroy)) { g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) ); g_return_if_fail (func != NULL); @@ -976,7 +1017,7 @@ static void wxgtk_tree_model_set_default_sort_func (GtkTreeSortable *sortable, GtkTreeIterCompareFunc func, gpointer WXUNUSED(data), - GtkDestroyNotify WXUNUSED(destroy)) + GDestroyNotify WXUNUSED(destroy)) { g_return_if_fail (GTK_IS_WX_TREE_MODEL (sortable) ); g_return_if_fail (func != NULL); @@ -1001,15 +1042,12 @@ extern "C" { #define GTK_TYPE_WX_CELL_RENDERER_TEXT (gtk_wx_cell_renderer_text_get_type ()) #define GTK_WX_CELL_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_RENDERER_TEXT, GtkWxCellRendererText)) -#define GTK_WX_CELL_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WX_CELL_RENDERER_TEXT, GtkWxCellRendererTextClass)) #define GTK_IS_WX_CELL_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_CELL_RENDERER_TEXT)) #define GTK_IS_WX_CELL_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_CELL_RENDERER_TEXT)) -#define GTK_WX_CELL_RENDERER_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WX_CELL_RENDERER_TEXT, GtkWxCellRendererTextClass)) GType gtk_wx_cell_renderer_text_get_type (void); typedef struct _GtkWxCellRendererText GtkWxCellRendererText; -typedef struct _GtkWxCellRendererTextClass GtkWxCellRendererTextClass; struct _GtkWxCellRendererText { @@ -1018,19 +1056,11 @@ struct _GtkWxCellRendererText wxDataViewRenderer *wx_renderer; }; -struct _GtkWxCellRendererTextClass -{ - GtkCellRendererTextClass cell_parent_class; -}; - - static GtkWxCellRendererText *gtk_wx_cell_renderer_text_new (void); static void gtk_wx_cell_renderer_text_init ( - GtkWxCellRendererText *cell ); + GTypeInstance* instance, void*); static void gtk_wx_cell_renderer_text_class_init( - GtkWxCellRendererTextClass *klass ); -static void gtk_wx_cell_renderer_text_finalize ( - GObject *object ); + void* klass, void*); static GtkCellEditable *gtk_wx_cell_renderer_text_start_editing( GtkCellRenderer *cell, GdkEvent *event, @@ -1054,15 +1084,15 @@ gtk_wx_cell_renderer_text_get_type (void) { const GTypeInfo cell_wx_info = { - sizeof (GtkWxCellRendererTextClass), + sizeof (GtkCellRendererTextClass), NULL, /* base_init */ NULL, /* base_finalize */ - (GClassInitFunc) gtk_wx_cell_renderer_text_class_init, + gtk_wx_cell_renderer_text_class_init, NULL, /* class_finalize */ NULL, /* class_data */ sizeof (GtkWxCellRendererText), 0, /* n_preallocs */ - (GInstanceInitFunc) gtk_wx_cell_renderer_text_init, + gtk_wx_cell_renderer_text_init, }; cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER_TEXT, @@ -1073,31 +1103,22 @@ gtk_wx_cell_renderer_text_get_type (void) } static void -gtk_wx_cell_renderer_text_init (GtkWxCellRendererText *cell) +gtk_wx_cell_renderer_text_init(GTypeInstance* instance, void*) { + GtkWxCellRendererText* cell = GTK_WX_CELL_RENDERER_TEXT(instance); cell->wx_renderer = NULL; } static void -gtk_wx_cell_renderer_text_class_init (GtkWxCellRendererTextClass *klass) +gtk_wx_cell_renderer_text_class_init(void* klass, void*) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass); text_cell_parent_class = (GObjectClass*) g_type_class_peek_parent (klass); - object_class->finalize = gtk_wx_cell_renderer_text_finalize; - cell_class->start_editing = gtk_wx_cell_renderer_text_start_editing; } -static void -gtk_wx_cell_renderer_text_finalize (GObject *object) -{ - /* must chain up */ - (* G_OBJECT_CLASS (text_cell_parent_class)->finalize) (object); -} - GtkWxCellRendererText* gtk_wx_cell_renderer_text_new (void) { @@ -1143,15 +1164,12 @@ extern "C" { #define GTK_TYPE_WX_CELL_RENDERER (gtk_wx_cell_renderer_get_type ()) #define GTK_WX_CELL_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRenderer)) -#define GTK_WX_CELL_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRendererClass)) #define GTK_IS_WX_CELL_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_CELL_RENDERER)) #define GTK_IS_WX_CELL_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_CELL_RENDERER)) -#define GTK_WX_CELL_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRendererClass)) GType gtk_wx_cell_renderer_get_type (void); typedef struct _GtkWxCellRenderer GtkWxCellRenderer; -typedef struct _GtkWxCellRendererClass GtkWxCellRendererClass; struct _GtkWxCellRenderer { @@ -1159,22 +1177,13 @@ struct _GtkWxCellRenderer /*< private >*/ wxDataViewCustomRenderer *cell; - guint32 last_click; }; -struct _GtkWxCellRendererClass -{ - GtkCellRendererClass cell_parent_class; -}; - - static GtkCellRenderer *gtk_wx_cell_renderer_new (void); static void gtk_wx_cell_renderer_init ( - GtkWxCellRenderer *cell ); + GTypeInstance* instance, void*); static void gtk_wx_cell_renderer_class_init( - GtkWxCellRendererClass *klass ); -static void gtk_wx_cell_renderer_finalize ( - GObject *object ); + void* klass, void*); static void gtk_wx_cell_renderer_get_size ( GtkCellRenderer *cell, GtkWidget *widget, @@ -1208,9 +1217,6 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing( GdkRectangle *cell_area, GtkCellRendererState flags ); - -static GObjectClass *cell_parent_class = NULL; - } // extern "C" GType @@ -1222,15 +1228,15 @@ gtk_wx_cell_renderer_get_type (void) { const GTypeInfo cell_wx_info = { - sizeof (GtkWxCellRendererClass), + sizeof (GtkCellRendererClass), NULL, /* base_init */ NULL, /* base_finalize */ - (GClassInitFunc) gtk_wx_cell_renderer_class_init, + gtk_wx_cell_renderer_class_init, NULL, /* class_finalize */ NULL, /* class_data */ sizeof (GtkWxCellRenderer), 0, /* n_preallocs */ - (GInstanceInitFunc) gtk_wx_cell_renderer_init, + gtk_wx_cell_renderer_init, }; cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER, @@ -1241,35 +1247,23 @@ gtk_wx_cell_renderer_get_type (void) } static void -gtk_wx_cell_renderer_init (GtkWxCellRenderer *cell) +gtk_wx_cell_renderer_init(GTypeInstance* instance, void*) { + GtkWxCellRenderer* cell = GTK_WX_CELL_RENDERER(instance); cell->cell = NULL; - cell->last_click = 0; } static void -gtk_wx_cell_renderer_class_init (GtkWxCellRendererClass *klass) +gtk_wx_cell_renderer_class_init(void* klass, void*) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass); - cell_parent_class = (GObjectClass*) g_type_class_peek_parent (klass); - - object_class->finalize = gtk_wx_cell_renderer_finalize; - cell_class->get_size = gtk_wx_cell_renderer_get_size; cell_class->render = gtk_wx_cell_renderer_render; cell_class->activate = gtk_wx_cell_renderer_activate; cell_class->start_editing = gtk_wx_cell_renderer_start_editing; } -static void -gtk_wx_cell_renderer_finalize (GObject *object) -{ - /* must chain up */ - (* G_OBJECT_CLASS (cell_parent_class)->finalize) (object); -} - GtkCellRenderer* gtk_wx_cell_renderer_new (void) { @@ -1333,8 +1327,21 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer, wxSize size = cell->GetSize(); - gint calc_width = (gint) renderer->xpad * 2 + size.x; - gint calc_height = (gint) renderer->ypad * 2 + size.y; + wxDataViewCtrl * const ctrl = cell->GetOwner()->GetOwner(); + + // Uniform row height, if specified, overrides the value returned by the + // renderer. + if ( !ctrl->HasFlag(wxDV_VARIABLE_LINE_HEIGHT) ) + { + const int uniformHeight = ctrl->GTKGetUniformRowHeight(); + if ( uniformHeight > 0 ) + size.y = uniformHeight; + } + + int xpad, ypad; + gtk_cell_renderer_get_padding(renderer, &xpad, &ypad); + int calc_width = xpad * 2 + size.x; + int calc_height = ypad * 2 + size.y; if (x_offset) *x_offset = 0; @@ -1343,17 +1350,17 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer, if (cell_area && size.x > 0 && size.y > 0) { + float xalign, yalign; + gtk_cell_renderer_get_alignment(renderer, &xalign, &yalign); if (x_offset) { - *x_offset = (gint)((renderer->xalign * - (cell_area->width - calc_width - 2 * renderer->xpad))); - *x_offset = MAX (*x_offset, 0) + renderer->xpad; + *x_offset = int(xalign * (cell_area->width - calc_width - 2 * xpad)); + *x_offset = MAX(*x_offset, 0) + xpad; } if (y_offset) { - *y_offset = (gint)((renderer->yalign * - (cell_area->height - calc_height - 2 * renderer->ypad))); - *y_offset = MAX (*y_offset, 0) + renderer->ypad; + *y_offset = int(yalign * (cell_area->height - calc_height - 2 * ypad)); + *y_offset = MAX(*y_offset, 0) + ypad; } } @@ -1364,6 +1371,15 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer, *height = calc_height; } +struct wxDataViewCustomRenderer::GTKRenderParams +{ + GdkWindow* window; + GdkRectangle* expose_area; + GtkWidget* widget; + GdkRectangle* background_area; + int flags; +}; + static void gtk_wx_cell_renderer_render (GtkCellRenderer *renderer, GdkWindow *window, @@ -1377,11 +1393,18 @@ gtk_wx_cell_renderer_render (GtkCellRenderer *renderer, GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer; wxDataViewCustomRenderer *cell = wxrenderer->cell; - cell->GTKStashRenderParams(window, widget, - background_area, expose_area, flags); + wxDataViewCustomRenderer::GTKRenderParams renderParams; + renderParams.window = window; + renderParams.expose_area = expose_area; + renderParams.widget = widget; + renderParams.background_area = background_area; + renderParams.flags = flags; + cell->GTKSetRenderParams(&renderParams); wxRect rect(wxRectFromGDKRect(cell_area)); - rect = rect.Deflate(renderer->xpad, renderer->ypad); + int xpad, ypad; + gtk_cell_renderer_get_padding(renderer, &xpad, &ypad); + rect = rect.Deflate(xpad, ypad); wxWindowDC* dc = (wxWindowDC*) cell->GetDC(); wxWindowDCImpl *impl = (wxWindowDCImpl *) dc->GetImpl(); @@ -1407,6 +1430,8 @@ gtk_wx_cell_renderer_render (GtkCellRenderer *renderer, if (flags & GTK_CELL_RENDERER_FOCUSED) state |= wxDATAVIEW_CELL_FOCUSED; cell->WXCallRender( rect, dc, state ); + + cell->GTKSetRenderParams(NULL); } static gboolean @@ -1431,8 +1456,10 @@ gtk_wx_cell_renderer_activate( rect.x += cell_area->x; rect.y += cell_area->y; - rect.width -= renderer->xpad * 2; - rect.height -= renderer->ypad * 2; + int xpad, ypad; + gtk_cell_renderer_get_padding(renderer, &xpad, &ypad); + rect.width -= xpad * 2; + rect.height -= ypad * 2; wxRect renderrect(wxRectFromGDKRect(&rect)); @@ -1443,37 +1470,27 @@ gtk_wx_cell_renderer_activate( unsigned int model_col = cell->GetOwner()->GetModelColumn(); - if (!event) + if ( !event ) { - bool ret = false; - // activated by - if (cell->Activate( renderrect, model, item, model_col )) - ret = true; - - return ret; + return cell->ActivateCell(renderrect, model, item, model_col, NULL); } - else if (event->type == GDK_BUTTON_PRESS) + else if ( event->type == GDK_BUTTON_PRESS ) { - GdkEventButton *button_event = (GdkEventButton*) event; - wxPoint pt( ((int) button_event->x) - renderrect.x, - ((int) button_event->y) - renderrect.y ); - - bool ret = false; - if (button_event->button == 1) + GdkEventButton *button_event = (GdkEventButton*)event; + if ( button_event->button == 1 ) { - if (cell->LeftClick( pt, renderrect, model, item, model_col )) - ret = true; - // TODO: query system double-click time - if (button_event->time - wxrenderer->last_click < 400) - if (cell->Activate( renderrect, model, item, model_col )) - ret = true; - } - wxrenderer->last_click = button_event->time; + wxMouseEvent mouse_event(wxEVT_LEFT_DOWN); + InitMouseEvent(ctrl, mouse_event, button_event); - return ret; + mouse_event.m_x -= renderrect.x; + mouse_event.m_y -= renderrect.y; + + return cell->ActivateCell(renderrect, model, item, model_col, &mouse_event); + } } + wxLogDebug("unexpected event type in gtk_wx_cell_renderer_activate()"); return false; } @@ -1550,12 +1567,14 @@ bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &parent, cons GTK_TREE_MODEL(wxgtk_model), &iter )); #else // so get the path from the parent - GtkTreeIter iter; - iter.stamp = wxgtk_model->stamp; - iter.user_data = (gpointer) parent.GetID(); - wxGtkTreePath path(wxgtk_tree_model_get_path( - GTK_TREE_MODEL(wxgtk_model), &iter )); + GtkTreeIter parentIter; + parentIter.stamp = wxgtk_model->stamp; + parentIter.user_data = (gpointer) parent.GetID(); + wxGtkTreePath parentPath(wxgtk_tree_model_get_path( + GTK_TREE_MODEL(wxgtk_model), &parentIter )); + // and add the final index ourselves + wxGtkTreePath path(gtk_tree_path_copy(parentPath)); int index = m_internal->GetIndexOf( parent, item ); gtk_tree_path_append_index( path, index ); #endif @@ -1565,6 +1584,17 @@ bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &parent, cons m_internal->ItemDeleted( parent, item ); + // Did we remove the last child, causing 'parent' to become a leaf? + if ( !m_wx_model->IsContainer(parent) ) + { + gtk_tree_model_row_has_child_toggled + ( + GTK_TREE_MODEL(wxgtk_model), + parentPath, + &parentIter + ); + } + return true; } @@ -1606,23 +1636,28 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig GtkTreeView *widget = GTK_TREE_VIEW(ctrl->GtkGetTreeView()); GtkTreeViewColumn *gcolumn = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()); - // Get cell area - GtkTreeIter iter; - iter.stamp = wxgtk_model->stamp; - iter.user_data = (gpointer) item.GetID(); - wxGtkTreePath path(wxgtk_tree_model_get_path( - GTK_TREE_MODEL(wxgtk_model), &iter )); - GdkRectangle cell_area; - gtk_tree_view_get_cell_area( widget, path, gcolumn, &cell_area ); + // Don't attempt to refresh not yet realized tree, it is useless + // and results in GTK errors. + if ( gtk_widget_get_realized(ctrl->GtkGetTreeView()) ) + { + // Get cell area + GtkTreeIter iter; + iter.stamp = wxgtk_model->stamp; + iter.user_data = (gpointer) item.GetID(); + wxGtkTreePath path(wxgtk_tree_model_get_path( + GTK_TREE_MODEL(wxgtk_model), &iter )); + GdkRectangle cell_area; + gtk_tree_view_get_cell_area( widget, path, gcolumn, &cell_area ); - GtkAdjustment* hadjust = gtk_tree_view_get_hadjustment( widget ); - double d = gtk_adjustment_get_value( hadjust ); - int xdiff = (int) d; + GtkAdjustment* hadjust = gtk_tree_view_get_hadjustment( widget ); + double d = gtk_adjustment_get_value( hadjust ); + int xdiff = (int) d; - int ydiff = gcolumn->button->allocation.height; - // Redraw - gtk_widget_queue_draw_area( GTK_WIDGET(widget), - cell_area.x - xdiff, ydiff + cell_area.y, cell_area.width, cell_area.height ); + int ydiff = gcolumn->button->allocation.height; + // Redraw + gtk_widget_queue_draw_area( GTK_WIDGET(widget), + cell_area.x - xdiff, ydiff + cell_area.y, cell_area.width, cell_area.height ); + } m_internal->ValueChanged( item, model_column ); @@ -1818,7 +1853,7 @@ wxDataViewCellMode wxDataViewRenderer::GetMode() const return ret; } -void wxDataViewRenderer::GtkUpdateAlignment() +void wxDataViewRenderer::GtkApplyAlignment(GtkCellRenderer *renderer) { int align = m_alignment; @@ -1844,7 +1879,7 @@ void wxDataViewRenderer::GtkUpdateAlignment() GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_FLOAT ); g_value_set_float( &gvalue, xalign ); - g_object_set_property( G_OBJECT(m_renderer), "xalign", &gvalue ); + g_object_set_property( G_OBJECT(renderer), "xalign", &gvalue ); g_value_unset( &gvalue ); // vertical alignment: @@ -1858,7 +1893,7 @@ void wxDataViewRenderer::GtkUpdateAlignment() GValue gvalue2 = { 0, }; g_value_init( &gvalue2, G_TYPE_FLOAT ); g_value_set_float( &gvalue2, yalign ); - g_object_set_property( G_OBJECT(m_renderer), "yalign", &gvalue2 ); + g_object_set_property( G_OBJECT(renderer), "yalign", &gvalue2 ); g_value_unset( &gvalue2 ); } @@ -1919,7 +1954,7 @@ wxEllipsizeMode wxDataViewRenderer::GetEllipsizeMode() const } void -wxDataViewRenderer::GtkOnTextEdited(const gchar *itempath, const wxString& str) +wxDataViewRenderer::GtkOnTextEdited(const char *itempath, const wxString& str) { wxVariant value(str); if (!Validate( value )) @@ -2303,7 +2338,7 @@ public: m_context = window->GTKGetPangoDefaultContext(); m_layout = pango_layout_new( m_context ); - m_fontdesc = pango_font_description_copy( widget->style->font_desc ); + m_fontdesc = pango_font_description_copy(gtk_widget_get_style(widget)->font_desc); m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget ); @@ -2335,6 +2370,7 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, { m_dc = NULL; m_text_renderer = NULL; + m_renderParams = NULL; if (no_init) m_renderer = NULL; @@ -2342,13 +2378,20 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, Init(mode, align); } +void wxDataViewCustomRenderer::GtkInitTextRenderer() +{ + m_text_renderer = GTK_CELL_RENDERER_TEXT(gtk_cell_renderer_text_new()); + g_object_ref_sink(m_text_renderer); + + GtkApplyAlignment(GTK_CELL_RENDERER(m_text_renderer)); +} + GtkCellRendererText *wxDataViewCustomRenderer::GtkGetTextRenderer() const { if ( !m_text_renderer ) { // we create it on demand so need to do it even from a const function - const_cast(this)-> - m_text_renderer = GTK_CELL_RENDERER_TEXT(gtk_cell_renderer_text_new()); + const_cast(this)->GtkInitTextRenderer(); } return m_text_renderer; @@ -2377,12 +2420,12 @@ void wxDataViewCustomRenderer::RenderText( const wxString &text, cell_area.width -= xoffset; gtk_cell_renderer_render( GTK_CELL_RENDERER(textRenderer), - m_renderParams.window, - m_renderParams.widget, - m_renderParams.background_area, + m_renderParams->window, + m_renderParams->widget, + m_renderParams->background_area, &cell_area, - m_renderParams.expose_area, - (GtkCellRendererState) m_renderParams.flags ); + m_renderParams->expose_area, + GtkCellRendererState(m_renderParams->flags)); } bool wxDataViewCustomRenderer::Init(wxDataViewCellMode mode, int align) @@ -2406,7 +2449,7 @@ wxDataViewCustomRenderer::~wxDataViewCustomRenderer() delete m_dc; if (m_text_renderer) - gtk_object_sink( GTK_OBJECT(m_text_renderer) ); + g_object_unref(m_text_renderer); } wxDC *wxDataViewCustomRenderer::GetDC() @@ -2441,15 +2484,20 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label, { m_renderer = (GtkCellRenderer*) gtk_cell_renderer_progress_new(); - GValue gvalue = { 0, }; - g_value_init( &gvalue, G_TYPE_STRING ); - - g_value_set_string( &gvalue, wxGTK_CONV_FONT( m_label, GetOwner()->GetOwner()->GetFont() ) ); - g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); - g_value_unset( &gvalue ); - SetMode(mode); SetAlignment(align); + +#if !wxUSE_UNICODE + // We can't initialize the renderer just yet because we don't have the + // pointer to the column that uses this renderer yet and so attempt to + // dereference GetOwner() to get the font that is used as a source of + // encoding in multibyte-to-Unicode conversion in GTKSetLabel() in + // non-Unicode builds would crash. So simply remember to do it later. + if ( !m_label.empty() ) + m_needsToSetLabel = true; + else +#endif // !wxUSE_UNICODE + GTKSetLabel(); } else #endif @@ -2463,11 +2511,38 @@ wxDataViewProgressRenderer::~wxDataViewProgressRenderer() { } +void wxDataViewProgressRenderer::GTKSetLabel() +{ + GValue gvalue = { 0, }; + g_value_init( &gvalue, G_TYPE_STRING ); + + // Take care to not use GetOwner() here if the label is empty, we can be + // called from ctor when GetOwner() is still NULL in this case. + wxScopedCharBuffer buf; + if ( m_label.empty() ) + buf = wxScopedCharBuffer::CreateNonOwned(""); + else + buf = wxGTK_CONV_FONT(m_label, GetOwner()->GetOwner()->GetFont()); + + g_value_set_string( &gvalue, buf); + g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); + g_value_unset( &gvalue ); + +#if !wxUSE_UNICODE + m_needsToSetLabel = false; +#endif // !wxUSE_UNICODE +} + bool wxDataViewProgressRenderer::SetValue( const wxVariant &value ) { #ifdef __WXGTK26__ if (!gtk_check_version(2,6,0)) { +#if !wxUSE_UNICODE + if ( m_needsToSetLabel ) + GTKSetLabel(); +#endif // !wxUSE_UNICODE + gint tmp = (long) value; GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_INT ); @@ -2645,7 +2720,7 @@ wxDataViewChoiceByIndexRenderer::wxDataViewChoiceByIndexRenderer( const wxArrayS { } -void wxDataViewChoiceByIndexRenderer::GtkOnTextEdited(const gchar *itempath, const wxString& str) +void wxDataViewChoiceByIndexRenderer::GtkOnTextEdited(const char *itempath, const wxString& str) { wxVariant value( (long) GetChoices().Index( str ) ); @@ -2674,108 +2749,6 @@ bool wxDataViewChoiceByIndexRenderer::GetValue( wxVariant &value ) const return true; } -// --------------------------------------------------------- -// wxDataViewDateRenderer -// --------------------------------------------------------- - -class wxDataViewDateRendererPopupTransient: public wxPopupTransientWindow -{ -public: - wxDataViewDateRendererPopupTransient( wxWindow* parent, wxDateTime *value, - wxDataViewModel *model, const wxDataViewItem &item, unsigned int col ) : - wxPopupTransientWindow( parent, wxBORDER_SIMPLE ) - { - m_model = model; - m_item = item; - m_col = col; - m_cal = new wxCalendarCtrl( this, -1, *value ); - wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL ); - sizer->Add( m_cal, 1, wxGROW ); - SetSizer( sizer ); - sizer->Fit( this ); - } - - virtual void OnDismiss() - { - } - - void OnCalendar( wxCalendarEvent &event ); - - wxCalendarCtrl *m_cal; - wxDataViewModel *m_model; - wxDataViewItem m_item; - unsigned int m_col; - -private: - DECLARE_EVENT_TABLE() -}; - -BEGIN_EVENT_TABLE(wxDataViewDateRendererPopupTransient,wxPopupTransientWindow) - EVT_CALENDAR( -1, wxDataViewDateRendererPopupTransient::OnCalendar ) -END_EVENT_TABLE() - -void wxDataViewDateRendererPopupTransient::OnCalendar( wxCalendarEvent &event ) -{ - m_model->ChangeValue( event.GetDate(), m_item, m_col ); - DismissAndNotify(); -} - -IMPLEMENT_CLASS(wxDataViewDateRenderer, wxDataViewCustomRenderer) - -wxDataViewDateRenderer::wxDataViewDateRenderer( const wxString &varianttype, - wxDataViewCellMode mode, int align ) : - wxDataViewCustomRenderer( varianttype, mode, align ) -{ - SetMode(mode); - SetAlignment(align); -} - -bool wxDataViewDateRenderer::SetValue( const wxVariant &value ) -{ - m_date = value.GetDateTime(); - - return true; -} - -bool wxDataViewDateRenderer::GetValue( wxVariant &WXUNUSED(value) ) const -{ - return false; -} - -bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state ) -{ - dc->SetFont( GetOwner()->GetOwner()->GetFont() ); - wxString tmp = m_date.FormatDate(); - RenderText( tmp, 0, cell, dc, state ); - return true; -} - -wxSize wxDataViewDateRenderer::GetSize() const -{ - wxString tmp = m_date.FormatDate(); - wxCoord x,y,d; - GetView()->GetTextExtent( tmp, &x, &y, &d ); - return wxSize(x,y+d); -} - -bool wxDataViewDateRenderer::Activate( const wxRect& WXUNUSED(cell), wxDataViewModel *model, - const wxDataViewItem &item, unsigned int col ) -{ - wxVariant variant; - model->GetValue( variant, item, col ); - wxDateTime value = variant.GetDateTime(); - - wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient( - GetOwner()->GetOwner()->GetParent(), &value, model, item, col ); - wxPoint pos = wxGetMousePosition(); - popup->Move( pos ); - popup->Layout(); - popup->Popup( popup->m_cal ); - - return true; -} - - // --------------------------------------------------------- // wxDataViewIconTextRenderer // --------------------------------------------------------- @@ -3028,7 +3001,7 @@ void wxDataViewColumn::OnInternalIdle() if (m_isConnected) return; - if (GTK_WIDGET_REALIZED(GetOwner()->m_treeview)) + if (gtk_widget_get_realized(GetOwner()->m_treeview)) { GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); if (column->button) @@ -3076,7 +3049,7 @@ void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap ) { wxDataViewColumnBase::SetBitmap( bitmap ); - if (bitmap.Ok()) + if (bitmap.IsOk()) { GtkImage *gtk_image = GTK_IMAGE(m_image); @@ -3107,9 +3080,9 @@ void wxDataViewColumn::SetHidden( bool hidden ) gtk_tree_view_column_set_visible( GTK_TREE_VIEW_COLUMN(m_column), !hidden ); } -void wxDataViewColumn::SetResizeable( bool resizeable ) +void wxDataViewColumn::SetResizeable( bool resizable ) { - gtk_tree_view_column_set_resizable( GTK_TREE_VIEW_COLUMN(m_column), resizeable ); + gtk_tree_view_column_set_resizable( GTK_TREE_VIEW_COLUMN(m_column), resizable ); } void wxDataViewColumn::SetAlignment( wxAlignment align ) @@ -3163,14 +3136,6 @@ bool wxDataViewColumn::IsSortable() const return gtk_tree_view_column_get_clickable( column ); } -void wxDataViewColumn::SetAsSortKey( bool WXUNUSED(sort) ) -{ - // it might not make sense to have this function in wxHeaderColumn at - // all in fact, changing of the sort order should only be done using the - // associated control API - wxFAIL_MSG( "not implemented" ); -} - bool wxDataViewColumn::IsSortKey() const { GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); @@ -3280,7 +3245,7 @@ int wxGtkTreeModelChildWithPosCmp( const void* data1, const void* data2, const v static int LINKAGEMODE wxGtkTreeModelChildPtrCmp( void*** data1, void*** data2 ) { - return gs_internal->GetDataViewModel()->Compare( **data1, **data2, + return gs_internal->GetDataViewModel()->Compare( wxDataViewItem(**data1), wxDataViewItem(**data2), gs_internal->GetSortColumn(), (gs_internal->GetSortOrder() == GTK_SORT_ASCENDING) ); } @@ -3481,7 +3446,7 @@ void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node ) if (m_wx_model->IsContainer( child )) node->AddNode( new wxGtkTreeModelNode( node, child, this ) ); else - node->AddLeave( child.GetID() ); + node->AddLeaf( child.GetID() ); // Don't send any events here } @@ -3524,6 +3489,7 @@ gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag GtkTreePath *path ) { delete m_dragDataObject; + m_dragDataObject = NULL; wxDataViewItem item(GetOwner()->GTKPathToItem(path)); if ( !item ) @@ -3565,21 +3531,22 @@ gboolean wxDataViewCtrlInternal::drag_data_get( GtkTreeDragSource *WXUNUSED(drag if ( !item ) return FALSE; - if (!m_dragDataObject->IsSupported( selection_data->target )) + GdkAtom target = gtk_selection_data_get_target(selection_data); + if (!m_dragDataObject->IsSupported(target)) return FALSE; - size_t size = m_dragDataObject->GetDataSize( selection_data->target ); + size_t size = m_dragDataObject->GetDataSize(target); if (size == 0) return FALSE; void *buf = malloc( size ); gboolean res = FALSE; - if (m_dragDataObject->GetDataHere( selection_data->target, buf )) + if (m_dragDataObject->GetDataHere(target, buf)) { res = TRUE; - gtk_selection_data_set( selection_data, selection_data->target, + gtk_selection_data_set(selection_data, target, 8, (const guchar*) buf, size ); } @@ -3601,9 +3568,9 @@ wxDataViewCtrlInternal::drag_data_received(GtkTreeDragDest *WXUNUSED(drag_dest), event.SetEventObject( m_owner ); event.SetItem( item ); event.SetModel( m_wx_model ); - event.SetDataFormat( selection_data->target ); - event.SetDataSize( selection_data->length ); - event.SetDataBuffer( selection_data->data ); + event.SetDataFormat(gtk_selection_data_get_target(selection_data)); + event.SetDataSize(gtk_selection_data_get_length(selection_data)); + event.SetDataBuffer(const_cast(gtk_selection_data_get_data(selection_data))); if (!m_owner->HandleWindowEvent( event )) return FALSE; @@ -3626,7 +3593,7 @@ wxDataViewCtrlInternal::row_drop_possible(GtkTreeDragDest *WXUNUSED(drag_dest), event.SetEventObject( m_owner ); event.SetItem( item ); event.SetModel( m_wx_model ); - event.SetDataFormat( selection_data->target ); + event.SetDataFormat(gtk_selection_data_get_target(selection_data)); if (!m_owner->HandleWindowEvent( event )) return FALSE; @@ -3666,13 +3633,59 @@ bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDa if (!m_wx_model->IsVirtualListModel()) { wxGtkTreeModelNode *parent_node = FindNode( parent ); - wxASSERT_MSG(parent_node, + wxCHECK_MSG(parent_node, false, "Did you forget a call to ItemAdded()? The parent node is unknown to the wxGtkTreeModel"); - if (m_wx_model->IsContainer( item )) - parent_node->AddNode( new wxGtkTreeModelNode( parent_node, item, this ) ); + wxDataViewItemArray modelSiblings; + m_wx_model->GetChildren(parent, modelSiblings); + const int modelSiblingsSize = modelSiblings.size(); + + int posInModel = modelSiblings.Index(item, /*fromEnd=*/true); + wxCHECK_MSG( posInModel != wxNOT_FOUND, false, "adding non-existent item?" ); + + const wxGtkTreeModelChildren& nodeSiblings = parent_node->GetChildren(); + const int nodeSiblingsSize = nodeSiblings.size(); + + int nodePos = 0; + + if ( posInModel == modelSiblingsSize - 1 ) + { + nodePos = nodeSiblingsSize; + } + else if ( modelSiblingsSize == nodeSiblingsSize + 1 ) + { + // This is the simple case when our node tree already matches the + // model and only this one item is missing. + nodePos = posInModel; + } else - parent_node->AddLeave( item.GetID() ); + { + // It's possible that a larger discrepancy between the model and + // our realization exists. This can happen e.g. when adding a bunch + // of items to the model and then calling ItemsAdded() just once + // afterwards. In this case, we must find the right position by + // looking at sibling items. + + // append to the end if we won't find a better position: + nodePos = nodeSiblingsSize; + + for ( int nextItemPos = posInModel + 1; + nextItemPos < modelSiblingsSize; + nextItemPos++ ) + { + int nextNodePos = parent_node->FindChildByItem(modelSiblings[nextItemPos]); + if ( nextNodePos != wxNOT_FOUND ) + { + nodePos = nextNodePos; + break; + } + } + } + + if (m_wx_model->IsContainer( item )) + parent_node->InsertNode( new wxGtkTreeModelNode( parent_node, item, this ), nodePos ); + else + parent_node->InsertLeaf( item.GetID(), nodePos ); } ScheduleRefresh(); @@ -3749,7 +3762,7 @@ gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path iter->stamp = m_gtk_model->stamp; // user_data is just the index +1 - iter->user_data = (gpointer) (i+1); + iter->user_data = wxUIntToPtr(i+1); return TRUE; } @@ -3852,7 +3865,7 @@ gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter ) } // user_data is just the index +1 (+2 because we need the next) - iter->user_data = (gpointer) (n+2); + iter->user_data = wxUIntToPtr(n+2); } else { @@ -4006,7 +4019,7 @@ gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter iter->stamp = m_gtk_model->stamp; // user_data is just the index +1 - iter->user_data = (gpointer) (n+1); + iter->user_data = wxUIntToPtr(n+1); return TRUE; } @@ -4244,7 +4257,7 @@ wxGtkTreeModelNode *wxDataViewCtrlInternal::FindParentNode( const wxDataViewItem static void wxdataview_selection_changed_callback( GtkTreeSelection* WXUNUSED(selection), wxDataViewCtrl *dv ) { - if (!GTK_WIDGET_REALIZED(dv->m_widget)) + if (!gtk_widget_get_realized(dv->m_widget)) return; wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, dv->GetId() ); @@ -4326,7 +4339,7 @@ void wxDataViewCtrl::AddChildGTK(wxWindowGTK* child) GtkWidget* treeview = GtkGetTreeView(); // Insert widget in GtkTreeView - if (GTK_WIDGET_REALIZED(treeview)) + if (gtk_widget_get_realized(treeview)) gtk_widget_set_parent_window( child->m_widget, gtk_tree_view_get_bin_window( GTK_TREE_VIEW(treeview) ) ); gtk_widget_set_parent( child->m_widget, treeview ); @@ -4414,22 +4427,21 @@ gtk_dataview_button_press_callback( GtkWidget *WXUNUSED(widget), GtkTreeViewColumn *column = NULL; gint cell_x = 0; gint cell_y = 0; - if (gtk_tree_view_get_path_at_pos( + gtk_tree_view_get_path_at_pos + ( GTK_TREE_VIEW(dv->GtkGetTreeView()), (int) gdk_event->x, (int) gdk_event->y, path.ByRef(), &column, &cell_x, - &cell_y)) - { - if (path) - { - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, dv->GetId() ); - event.SetItem(dv->GTKPathToItem(path)); - event.SetModel( dv->GetModel() ); - return dv->HandleWindowEvent( event ); - } - } + &cell_y + ); + + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, dv->GetId() ); + if (path) + event.SetItem(dv->GTKPathToItem(path)); + event.SetModel( dv->GetModel() ); + return dv->HandleWindowEvent( event ); } return FALSE; @@ -4439,6 +4451,22 @@ IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase) wxDataViewCtrl::~wxDataViewCtrl() { + // Stop editing before destroying the control to remove any event handlers + // which are added when editing started: if we didn't do this, the base + // class dtor would assert as it checks for any leftover handlers. + if ( m_treeview ) + { + GtkTreeViewColumn *col; + gtk_tree_view_get_cursor(GTK_TREE_VIEW(m_treeview), NULL, &col); + + wxDataViewColumn * const wxcol = FromGTKColumn(col); + if ( wxcol ) + { + // This won't do anything if we're not editing it + wxcol->GetRenderer()->CancelEditing(); + } + } + m_cols.Clear(); delete m_internal; @@ -4449,6 +4477,8 @@ void wxDataViewCtrl::Init() m_internal = NULL; m_cols.DeleteContents( true ); + + m_uniformRowHeight = -1; } bool wxDataViewCtrl::Create(wxWindow *parent, @@ -4474,6 +4504,8 @@ bool wxDataViewCtrl::Create(wxWindow *parent, m_treeview = gtk_tree_view_new(); gtk_container_add (GTK_CONTAINER (m_widget), m_treeview); + m_focusWidget = GTK_WIDGET(m_treeview); + g_signal_connect (m_treeview, "size_allocate", G_CALLBACK (gtk_dataviewctrl_size_callback), this); @@ -4681,10 +4713,9 @@ unsigned int wxDataViewCtrl::GetColumnCount() const return m_cols.GetCount(); } -wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const +wxDataViewColumn* wxDataViewCtrl::FromGTKColumn(GtkTreeViewColumn *gtk_col) const { - GtkTreeViewColumn *gtk_col = gtk_tree_view_get_column( GTK_TREE_VIEW(m_treeview), pos ); - if (!gtk_col) + if ( !gtk_col ) return NULL; wxDataViewColumnList::const_iterator iter; @@ -4697,9 +4728,18 @@ wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const } } + wxFAIL_MSG( "No matching column?" ); + return NULL; } +wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const +{ + GtkTreeViewColumn *gtk_col = gtk_tree_view_get_column( GTK_TREE_VIEW(m_treeview), pos ); + + return FromGTKColumn(gtk_col); +} + bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) { gtk_tree_view_remove_column( GTK_TREE_VIEW(m_treeview), @@ -4727,15 +4767,11 @@ bool wxDataViewCtrl::ClearColumns() int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const { - GtkTreeViewColumn *gtk_column = GTK_TREE_VIEW_COLUMN(column->GetConstGtkHandle()); + GtkTreeViewColumn *gtk_column = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()); - GList *list = gtk_tree_view_get_columns( GTK_TREE_VIEW(m_treeview) ); + wxGtkList list(gtk_tree_view_get_columns(GTK_TREE_VIEW(m_treeview))); - gint pos = g_list_index( list, (gconstpointer) gtk_column ); - - g_list_free( list ); - - return pos; + return g_list_index( list, (gconstpointer) gtk_column ); } wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const @@ -4804,39 +4840,51 @@ void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item) gtk_tree_view_set_cursor(GTK_TREE_VIEW(m_treeview), path, NULL, FALSE); } -wxDataViewItem wxDataViewCtrl::GetSelection() const +wxDataViewColumn *wxDataViewCtrl::GetCurrentColumn() const +{ + // The tree doesn't have any current item if it hadn't been created yet but + // it's arguably not an error to call this function in this case so just + // return NULL without asserting. + if ( !m_treeview ) + return NULL; + + GtkTreeViewColumn *col; + gtk_tree_view_get_cursor(GTK_TREE_VIEW(m_treeview), NULL, &col); + return FromGTKColumn(col); +} + +void wxDataViewCtrl::EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) +{ + wxCHECK_RET( m_treeview, + "Current item can't be set before creating the control." ); + wxCHECK_RET( item.IsOk(), "invalid item" ); + wxCHECK_RET( column, "no column provided" ); + + // We need to make sure the model knows about this item or the path would + // be invalid and gtk_tree_view_set_cursor() would silently do nothing. + ExpandAncestors(item); + + GtkTreeViewColumn *gcolumn = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle()); + + // We also need to preserve the existing selection from changing. + // Unfortunately the only way to do it seems to use our own selection + // function and forbid any selection changes during set cursor call. + wxGtkTreeSelectionLock + lock(gtk_tree_view_get_selection(GTK_TREE_VIEW(m_treeview))); + + // Do move the cursor now. + GtkTreeIter iter; + iter.user_data = item.GetID(); + wxGtkTreePath path(m_internal->get_path( &iter )); + + gtk_tree_view_set_cursor(GTK_TREE_VIEW(m_treeview), path, gcolumn, TRUE); +} + +int wxDataViewCtrl::GetSelectedItemsCount() const { GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); - if (m_windowStyle & wxDV_MULTIPLE) - { - // Report the first one - GtkTreeModel *model; - GList *list = gtk_tree_selection_get_selected_rows( selection, &model ); - - if (list) - { - GtkTreePath *path = (GtkTreePath*) list->data; - wxDataViewItem item(GTKPathToItem(path)); - - // delete list - g_list_foreach( list, (GFunc) gtk_tree_path_free, NULL ); - g_list_free( list ); - - return item; - } - } - else - { - GtkTreeIter iter; - if (gtk_tree_selection_get_selected( selection, NULL, &iter )) - { - wxDataViewItem item( iter.user_data ); - return item; - } - } - - return wxDataViewItem(0); + return gtk_tree_selection_count_selected_rows(selection); } int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const @@ -4847,38 +4895,25 @@ int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const if (HasFlag(wxDV_MULTIPLE)) { GtkTreeModel *model; - GList *list = gtk_tree_selection_get_selected_rows( selection, &model ); + wxGtkTreePathList list(gtk_tree_selection_get_selected_rows(selection, &model)); - int count = 0; - while (list) + for ( GList* current = list; current; current = g_list_next(current) ) { - GtkTreePath *path = (GtkTreePath*) list->data; + GtkTreePath *path = (GtkTreePath*) current->data; sel.Add(GTKPathToItem(path)); - - list = g_list_next( list ); - count++; } - - // delete list - g_list_foreach( list, (GFunc) gtk_tree_path_free, NULL ); - g_list_free( list ); - - return count; } else { - GtkTreeModel *model; GtkTreeIter iter; - gboolean has_selection = gtk_tree_selection_get_selected( selection, &model, &iter ); - if (has_selection) + if (gtk_tree_selection_get_selected( selection, NULL, &iter )) { - sel.Add( wxDataViewItem( (void*) iter.user_data) ); - return 1; + sel.Add( wxDataViewItem(iter.user_data) ); } } - return 0; + return sel.size(); } void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel ) @@ -4995,7 +5030,8 @@ void wxDataViewCtrl::HitTest(const wxPoint& point, // gtk_tree_view_get_path_at_pos() is the wrong function. It doesn't mind the header but returns column. // See http://mail.gnome.org/archives/gtkmm-list/2005-January/msg00080.html // So we have to use both of them. - // Friedrich Haase 2010-9-20 + item = wxDataViewItem(0); + column = NULL; wxGtkTreePath path, pathScratch; GtkTreeViewColumn* GtkColumn = NULL; GtkTreeViewDropPosition pos = GTK_TREE_VIEW_DROP_INTO_OR_AFTER; @@ -5003,8 +5039,8 @@ void wxDataViewCtrl::HitTest(const wxPoint& point, gint cell_y = 0; // cannot directly call GtkGetTreeView(), HitTest is const and so is this pointer - wxDataViewCtrl* ctrl = (wxDataViewCtrl*)this; // ugly workaround, ctrl is NOT const - GtkTreeView* treeView = GTK_TREE_VIEW(ctrl->GtkGetTreeView()); + wxDataViewCtrl* self = const_cast(this); // ugly workaround, self is NOT const + GtkTreeView* treeView = GTK_TREE_VIEW(self->GtkGetTreeView()); // is there possibly a better suited function to get the column? gtk_tree_view_get_path_at_pos( // and this is the wrong call but it delivers the column @@ -5044,6 +5080,12 @@ wxDataViewCtrl::GetItemRect(const wxDataViewItem& WXUNUSED(item), return wxRect(); } +bool wxDataViewCtrl::SetRowHeight(int rowHeight) +{ + m_uniformRowHeight = rowHeight; + return true; +} + void wxDataViewCtrl::DoSetExpanderColumn() { gtk_tree_view_set_expander_column( GTK_TREE_VIEW(m_treeview), diff --git a/Externals/wxWidgets3/src/gtk/dcclient.cpp b/Externals/wxWidgets3/src/gtk/dcclient.cpp index 8d08b11504..3d392b9ed0 100644 --- a/Externals/wxWidgets3/src/gtk/dcclient.cpp +++ b/Externals/wxWidgets3/src/gtk/dcclient.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/dcclient.cpp // Purpose: wxWindowDCImpl implementation // Author: Robert Roebling -// RCS-ID: $Id: dcclient.cpp 65846 2010-10-18 23:43:20Z VZ $ +// RCS-ID: $Id: dcclient.cpp 70824 2012-03-06 04:51:40Z PC $ // Copyright: (c) 1998 Robert Roebling, Chris Breeze // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -129,7 +129,11 @@ enum wxPoolGCType wxTEXT_SCREEN, wxBG_SCREEN, wxPEN_SCREEN, - wxBRUSH_SCREEN + wxBRUSH_SCREEN, + wxTEXT_COLOUR_ALPHA, + wxBG_COLOUR_ALPHA, + wxPEN_COLOUR_ALPHA, + wxBRUSH_COLOUR_ALPHA }; struct wxGC @@ -295,7 +299,7 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window ) : wxCHECK_RET(widget, "DC needs a widget"); m_gdkwindow = widget->window; - if (GTK_WIDGET_NO_WINDOW(widget)) + if (!gtk_widget_get_has_window(widget)) SetDeviceLocalOrigin(widget->allocation.x, widget->allocation.y); } @@ -375,6 +379,13 @@ void wxWindowDCImpl::SetUpDC( bool isMemDC ) m_textGC = wxGetPoolGC( m_gdkwindow, wxTEXT_SCREEN ); m_bgGC = wxGetPoolGC( m_gdkwindow, wxBG_SCREEN ); } + else if (m_cmap == gdk_screen_get_rgba_colormap(gdk_colormap_get_screen(m_cmap))) + { + m_penGC = wxGetPoolGC( m_gdkwindow, wxPEN_COLOUR_ALPHA ); + m_brushGC = wxGetPoolGC( m_gdkwindow, wxBRUSH_COLOUR_ALPHA ); + m_textGC = wxGetPoolGC( m_gdkwindow, wxTEXT_COLOUR_ALPHA ); + m_bgGC = wxGetPoolGC( m_gdkwindow, wxBG_COLOUR_ALPHA ); + } else { m_penGC = wxGetPoolGC( m_gdkwindow, wxPEN_COLOUR ); @@ -947,7 +958,7 @@ void wxWindowDCImpl::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord // If the pen is transparent pen we increase the size // for better compatibility with other platforms. - if ( m_pen.IsNonTransparent() ) + if (m_pen.IsTransparent()) { ++ww; ++hh; @@ -1372,69 +1383,12 @@ void wxWindowDCImpl::DoDrawText(const wxString& text, gdk_pango_context_set_colormap( m_context, m_cmap ); // not needed in gtk+ >= 2.6 - bool underlined = m_font.IsOk() && m_font.GetUnderlined(); - wxCharBuffer data = wxGTK_CONV(text); if ( !data ) return; - size_t datalen = strlen(data); - // in Pango >= 1.16 the "underline of leading/trailing spaces" bug - // has been fixed and thus the hack implemented below should never be used - static bool pangoOk = !wx_pango_version_check(1, 16, 0); - - bool needshack = underlined && !pangoOk; - - if (needshack) - { - // a PangoLayout which has leading/trailing spaces with underlined font - // is not correctly drawn by this pango version: Pango won't underline the spaces. - // This can be a problem; e.g. wxHTML rendering of underlined text relies on - // this behaviour. To workaround this problem, we use a special hack here - // suggested by pango maintainer Behdad Esfahbod: we prepend and append two - // empty space characters and give them a dummy colour attribute. - // This will force Pango to underline the leading/trailing spaces, too. - - wxCharBuffer data_tmp(datalen + 6); - // copy the leading U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format - memcpy(data_tmp.data(), "\342\200\214", 3); - // copy the user string - memcpy(data_tmp.data() + 3, data, datalen); - // copy the trailing U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format - memcpy(data_tmp.data() + 3 + datalen, "\342\200\214", 3); - - data = data_tmp; - datalen += 6; - } - - pango_layout_set_text(m_layout, data, datalen); - - if (underlined) - { - PangoAttrList *attrs = pango_attr_list_new(); - PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE); - a->start_index = 0; - a->end_index = datalen; - pango_attr_list_insert(attrs, a); - - if (needshack) - { - // dummy colour for the leading space - a = pango_attr_foreground_new (0x0057, 0x52A9, 0xD614); - a->start_index = 0; - a->end_index = 1; - pango_attr_list_insert(attrs, a); - - // dummy colour for the trailing space - a = pango_attr_foreground_new (0x0057, 0x52A9, 0xD614); - a->start_index = datalen - 1; - a->end_index = datalen; - pango_attr_list_insert(attrs, a); - } - - pango_layout_set_attributes(m_layout, attrs); - pango_attr_list_unref(attrs); - } + pango_layout_set_text(m_layout, data, data.length()); + const bool setAttrs = m_font.GTKSetPangoAttrs(m_layout); int oldSize = 0; const bool isScaled = fabs(m_scaleY - 1.0) > 0.00001; @@ -1473,7 +1427,7 @@ void wxWindowDCImpl::DoDrawText(const wxString& text, // actually apply unscaled font pango_layout_set_font_description( m_layout, m_fontdesc ); } - if (underlined) + if (setAttrs) { // undo underline attributes setting: pango_layout_set_attributes(m_layout, NULL); @@ -1492,23 +1446,14 @@ void wxWindowDCImpl::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord wxCHECK_RET( IsOk(), wxT("invalid window dc") ); -#if __WXGTK26__ +#ifdef __WXGTK26__ if (!gtk_check_version(2,6,0)) { x = XLOG2DEV(x); y = YLOG2DEV(y); pango_layout_set_text(m_layout, wxGTK_CONV(text), -1); - - if (m_font.GetUnderlined()) - { - PangoAttrList *attrs = pango_attr_list_new(); - PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE); - pango_attr_list_insert(attrs, a); - pango_layout_set_attributes(m_layout, attrs); - pango_attr_list_unref(attrs); - } - + const bool setAttrs = m_font.GTKSetPangoAttrs(m_layout); int oldSize = 0; const bool isScaled = fabs(m_scaleY - 1.0) > 0.00001; if (isScaled) @@ -1561,7 +1506,7 @@ void wxWindowDCImpl::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord gdk_draw_layout_with_colors(m_gdkwindow, m_textGC, x+minX, y+minY, m_layout, NULL, bg_col); - if (m_font.GetUnderlined()) + if (setAttrs) pango_layout_set_attributes(m_layout, NULL); // clean up the transformation matrix @@ -2304,7 +2249,6 @@ int wxWindowDCImpl::GetDepth() const return gdk_drawable_get_depth(m_gdkwindow); } - //----------------------------------------------------------------------------- // wxClientDCImpl //----------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/src/gtk/dcmemory.cpp b/Externals/wxWidgets3/src/gtk/dcmemory.cpp index 81d4524429..08071cafbd 100644 --- a/Externals/wxWidgets3/src/gtk/dcmemory.cpp +++ b/Externals/wxWidgets3/src/gtk/dcmemory.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/dcmemory.cpp // Purpose: // Author: Robert Roebling -// RCS-ID: $Id: dcmemory.cpp 61724 2009-08-21 10:41:26Z VZ $ +// RCS-ID: $Id: dcmemory.cpp 70809 2012-03-04 23:50:35Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -10,10 +10,8 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/dcmemory.h" #include "wx/gtk/dcmemory.h" -#include #include //----------------------------------------------------------------------------- @@ -65,7 +63,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) Destroy(); m_selected = bitmap; - if (m_selected.Ok()) + if (m_selected.IsOk()) { m_gdkwindow = m_selected.GetPixmap(); @@ -83,7 +81,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) void wxMemoryDCImpl::SetPen( const wxPen& penOrig ) { wxPen pen( penOrig ); - if ( m_selected.Ok() && + if ( m_selected.IsOk() && m_selected.GetDepth() == 1 && (pen != *wxTRANSPARENT_PEN) ) { @@ -96,7 +94,7 @@ void wxMemoryDCImpl::SetPen( const wxPen& penOrig ) void wxMemoryDCImpl::SetBrush( const wxBrush& brushOrig ) { wxBrush brush( brushOrig ); - if ( m_selected.Ok() && + if ( m_selected.IsOk() && m_selected.GetDepth() == 1 && (brush != *wxTRANSPARENT_BRUSH) ) { @@ -110,7 +108,7 @@ void wxMemoryDCImpl::SetBackground( const wxBrush& brushOrig ) { wxBrush brush(brushOrig); - if ( m_selected.Ok() && + if ( m_selected.IsOk() && m_selected.GetDepth() == 1 && (brush != *wxTRANSPARENT_BRUSH) ) { @@ -122,7 +120,7 @@ void wxMemoryDCImpl::SetBackground( const wxBrush& brushOrig ) void wxMemoryDCImpl::SetTextForeground( const wxColour& col ) { - if ( m_selected.Ok() && m_selected.GetDepth() == 1 ) + if ( m_selected.IsOk() && m_selected.GetDepth() == 1 ) wxWindowDCImpl::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE); else wxWindowDCImpl::SetTextForeground( col ); @@ -130,7 +128,7 @@ void wxMemoryDCImpl::SetTextForeground( const wxColour& col ) void wxMemoryDCImpl::SetTextBackground( const wxColour &col ) { - if (m_selected.Ok() && m_selected.GetDepth() == 1) + if (m_selected.IsOk() && m_selected.GetDepth() == 1) wxWindowDCImpl::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE ); else wxWindowDCImpl::SetTextBackground( col ); @@ -138,7 +136,7 @@ void wxMemoryDCImpl::SetTextBackground( const wxColour &col ) void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const { - if (m_selected.Ok()) + if (m_selected.IsOk()) { if (width) (*width) = m_selected.GetWidth(); if (height) (*height) = m_selected.GetHeight(); diff --git a/Externals/wxWidgets3/src/gtk/dcscreen.cpp b/Externals/wxWidgets3/src/gtk/dcscreen.cpp index 93699c6010..c4b015deb0 100644 --- a/Externals/wxWidgets3/src/gtk/dcscreen.cpp +++ b/Externals/wxWidgets3/src/gtk/dcscreen.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/dcscreen.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: dcscreen.cpp 61724 2009-08-21 10:41:26Z VZ $ +// Id: $Id: dcscreen.cpp 70809 2012-03-04 23:50:35Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -10,15 +10,8 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/dcscreen.h" #include "wx/gtk/dcscreen.h" -#ifndef WX_PRECOMP - #include "wx/window.h" -#endif - -#include -#include #include //----------------------------------------------------------------------------- @@ -58,6 +51,8 @@ void wxScreenDCImpl::Init() wxScreenDCImpl::~wxScreenDCImpl() { + g_object_unref(m_context); + gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN ); gdk_gc_set_subwindow( m_brushGC, GDK_CLIP_BY_CHILDREN ); gdk_gc_set_subwindow( m_textGC, GDK_CLIP_BY_CHILDREN ); diff --git a/Externals/wxWidgets3/src/gtk/descrip.mms b/Externals/wxWidgets3/src/gtk/descrip.mms index cf4536a347..207ed4f17d 100644 --- a/Externals/wxWidgets3/src/gtk/descrip.mms +++ b/Externals/wxWidgets3/src/gtk/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 22 September 2009 * +# Date : 13 January 2012 * # * #***************************************************************************** .first @@ -99,7 +99,8 @@ OBJECTS0= \ tglbtn.obj,\ msgdlg.obj,\ treeentry_gtk.obj,textentry.obj,filectrl.obj,print.obj,win_gtk.obj,\ - mnemonics.obj,private.obj,assertdlg_gtk.obj,infobar.obj + mnemonics.obj,private.obj,assertdlg_gtk.obj,infobar.obj,anybutton.obj,\ + nonownedwnd.obj SOURCES =\ animate.cpp,\ @@ -165,22 +166,23 @@ SOURCES =\ utilsgtk.cpp,\ window.cpp,\ treeentry_gtk.c,textentry.cpp,filectrl.cpp,print.cpp,win_gtk.cpp,\ - mnemonics.cpp,private.cpp,assertdlg_gtk.c,infobar.cpp + mnemonics.cpp,private.cpp,assertdlg_gtk.cpp,infobar.cpp,anybutton.cpp,\ + nonownedwnd.cpp all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) .ifdef __WXUNIVERSAL__ library [--.lib]libwx_gtk_univ.olb $(OBJECTS) - library [--.lib]libwx_gtk_univ.olb [.CXX_REPOSITORY]*.obj + If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk_univ.olb [.CXX_REPOSITORY]*.obj .else .ifdef __WXGTK2__ library [--.lib]libwx_gtk2.olb $(OBJECTS) - library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj + If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj $(MMS)$(MMSQUALIFIERS) $(OBJECTS0) library [--.lib]libwx_gtk2.olb $(OBJECTS0) .else library [--.lib]libwx_gtk.olb $(OBJECTS) - library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj + If f$getsyi("HW_MODEL") .le. 2048 then library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj $(MMS)$(MMSQUALIFIERS) $(OBJECTS0) library [--.lib]libwx_gtk.olb $(OBJECTS0) .endif @@ -252,11 +254,14 @@ toplevel.obj : toplevel.cpp utilsgtk.obj : utilsgtk.cpp window.obj : window.cpp treeentry_gtk.obj : treeentry_gtk.c + cc $(CFLAGS)$(CC_DEFINE)/warn=disab=CHAROVERFL $(MMS$TARGET_NAME).c textentry.obj : textentry.cpp filectrl.obj : filectrl.cpp print.obj : print.cpp win_gtk.obj : win_gtk.cpp mnemonics.obj : mnemonics.cpp private.obj : private.cpp -assertdlg_gtk.obj : assertdlg_gtk.c +assertdlg_gtk.obj : assertdlg_gtk.cpp infobar.obj : infobar.cpp +anybutton.obj : anybutton.cpp +nonownedwnd.obj : nonownedwnd.cpp diff --git a/Externals/wxWidgets3/src/gtk/dirdlg.cpp b/Externals/wxWidgets3/src/gtk/dirdlg.cpp index 333a8ccedc..26d793be6d 100644 --- a/Externals/wxWidgets3/src/gtk/dirdlg.cpp +++ b/Externals/wxWidgets3/src/gtk/dirdlg.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/dirdlg.cpp // Purpose: native implementation of wxDirDialog // Author: Robert Roebling, Zbigniew Zagorski, Mart Raudsepp, Francesco Montorsi -// Id: $Id: dirdlg.cpp 64019 2010-04-18 00:05:37Z VZ $ +// Id: $Id: dirdlg.cpp 70898 2012-03-14 12:32:27Z VZ $ // Copyright: (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski, 2005 Mart Raudsepp // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -31,7 +31,9 @@ #include "wx/gtk/private.h" +#ifdef __UNIX__ #include // chdir +#endif //----------------------------------------------------------------------------- // "clicked" for OK-button @@ -96,6 +98,17 @@ wxDirDialog::wxDirDialog(wxWindow* parent, const wxPoint& pos, const wxSize& WXUNUSED(sz), const wxString& WXUNUSED(name)) +{ + Create(parent, title, defaultPath, style, pos); +} + +bool wxDirDialog::Create(wxWindow* parent, + const wxString& title, + const wxString& defaultPath, + long style, + const wxPoint& pos, + const wxSize& WXUNUSED(sz), + const wxString& WXUNUSED(name)) { m_message = title; @@ -106,7 +119,7 @@ wxDirDialog::wxDirDialog(wxWindow* parent, wxDefaultValidator, wxT("dirdialog"))) { wxFAIL_MSG( wxT("wxDirDialog creation failed") ); - return; + return false; } GtkWindow* gtk_parent = NULL; @@ -135,7 +148,7 @@ wxDirDialog::wxDirDialog(wxWindow* parent, // local-only property could be set to false to allow non-local files to be loaded. // In that case get/set_uri(s) should be used instead of get/set_filename(s) everywhere // and the GtkFileChooserDialog should probably also be created with a backend, - // e.g "gnome-vfs", "default", ... (gtk_file_chooser_dialog_new_with_backend). + // e.g. "gnome-vfs", "default", ... (gtk_file_chooser_dialog_new_with_backend). // Currently local-only is kept as the default - true: // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true); @@ -145,6 +158,7 @@ wxDirDialog::wxDirDialog(wxWindow* parent, if ( !defaultPath.empty() ) gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget), defaultPath.fn_str() ); + return true; } void wxDirDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event)) diff --git a/Externals/wxWidgets3/src/gtk/dnd.cpp b/Externals/wxWidgets3/src/gtk/dnd.cpp index eb4534f847..40373313b2 100644 --- a/Externals/wxWidgets3/src/gtk/dnd.cpp +++ b/Externals/wxWidgets3/src/gtk/dnd.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/dnd.cpp // Purpose: wxDropTarget class // Author: Robert Roebling -// Id: $Id: dnd.cpp 65680 2010-09-30 11:44:45Z VZ $ +// Id: $Id: dnd.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -26,6 +26,7 @@ #include "wx/scopeguard.h" #include +#include "wx/gtk/private/gtk2-compat.h" //---------------------------------------------------------------------------- // global data @@ -363,7 +364,7 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), /* Owen Taylor: "call gtk_drag_finish() with success == TRUE" */ - if ((data->length <= 0) || (data->format != 8)) + if (gtk_selection_data_get_length(data) <= 0 || gtk_selection_data_get_format(data) != 8) { /* negative data length and non 8-bit data format qualifies for junk */ @@ -533,12 +534,14 @@ bool wxDropTarget::GetData() if (!m_dataObject) return false; - wxDataFormat dragFormat( m_dragData->target ); + wxDataFormat dragFormat(gtk_selection_data_get_target(m_dragData)); if (!m_dataObject->IsSupportedFormat( dragFormat )) return false; - m_dataObject->SetData( dragFormat, (size_t)m_dragData->length, (const void*)m_dragData->data ); + m_dataObject->SetData(dragFormat, + (size_t)gtk_selection_data_get_length(m_dragData), + (const void*)gtk_selection_data_get_data(m_dragData)); return true; } @@ -605,7 +608,7 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), guint WXUNUSED(time), wxDropSource *drop_source ) { - wxDataFormat format( selection_data->target ); + wxDataFormat format(gtk_selection_data_get_target(selection_data)); wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"), format.GetId().c_str()); @@ -647,7 +650,7 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), drop_source->m_retValue = ConvertFromGTK( context->action ); gtk_selection_data_set( selection_data, - selection_data->target, + gtk_selection_data_get_target(selection_data), 8, // 8-bit d, size ); @@ -734,11 +737,11 @@ void wxDropSource::SetIcons(const wxIcon &iconCopy, m_iconMove = iconMove; m_iconNone = iconNone; - if ( !m_iconCopy.Ok() ) + if ( !m_iconCopy.IsOk() ) m_iconCopy = wxIcon(page_xpm); - if ( !m_iconMove.Ok() ) + if ( !m_iconMove.IsOk() ) m_iconMove = m_iconCopy; - if ( !m_iconNone.Ok() ) + if ( !m_iconNone.IsOk() ) m_iconNone = m_iconCopy; } @@ -783,7 +786,7 @@ void wxDropSource::PrepareIcon( int action, GdkDragContext *context ) g_signal_connect (m_iconWindow, "configure_event", G_CALLBACK (gtk_dnd_window_configure_callback), this); - gdk_window_set_back_pixmap (m_iconWindow->window, pixmap, FALSE); + gdk_window_set_back_pixmap(gtk_widget_get_window(m_iconWindow), pixmap, false); if (mask) gtk_widget_shape_combine_mask (m_iconWindow, mask, 0, 0); diff --git a/Externals/wxWidgets3/src/gtk/filedlg.cpp b/Externals/wxWidgets3/src/gtk/filedlg.cpp index 1c6dd3ef29..b28d54bf98 100644 --- a/Externals/wxWidgets3/src/gtk/filedlg.cpp +++ b/Externals/wxWidgets3/src/gtk/filedlg.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/filedlg.cpp // Purpose: native implementation of wxFileDialog // Author: Robert Roebling, Zbigniew Zagorski, Mart Raudsepp -// Id: $Id: filedlg.cpp 64381 2010-05-22 12:07:54Z VZ $ +// Id: $Id: filedlg.cpp 70898 2012-03-14 12:32:27Z VZ $ // Copyright: (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski, 2005 Mart Raudsepp // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -22,7 +22,9 @@ #include #include "wx/gtk/private.h" +#ifdef __UNIX__ #include // chdir +#endif #include "wx/filename.h" // wxFilename #include "wx/tokenzr.h" // wxStringTokenizer @@ -172,13 +174,24 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, const wxSize& sz, const wxString& name) : wxFileDialogBase() +{ + Create(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name); +} + +bool wxFileDialog::Create(wxWindow *parent, const wxString& message, + const wxString& defaultDir, + const wxString& defaultFileName, + const wxString& wildCard, + long style, const wxPoint& pos, + const wxSize& sz, + const wxString& name) { parent = GetParentForModalDialog(parent, style); if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name)) { - return; + return false; } if (!PreCreation(parent, pos, wxDefaultSize) || @@ -186,7 +199,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, wxDefaultValidator, wxT("filedialog"))) { wxFAIL_MSG( wxT("wxFileDialog creation failed") ); - return; + return false; } GtkFileChooserAction gtk_action; @@ -235,7 +248,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, // local-only property could be set to false to allow non-local files to be // loaded. In that case get/set_uri(s) should be used instead of // get/set_filename(s) everywhere and the GtkFileChooserDialog should - // probably also be created with a backend, e.g "gnome-vfs", "default", ... + // probably also be created with a backend, e.g. "gnome-vfs", "default", ... // (gtk_file_chooser_dialog_new_with_backend). Currently local-only is kept // as the default - true: // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true); @@ -309,6 +322,8 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, G_CALLBACK(gtk_filedialog_update_preview_callback), previewImage); } + + return true; } wxFileDialog::~wxFileDialog() @@ -369,10 +384,17 @@ void wxFileDialog::SetMessage(const wxString& message) void wxFileDialog::SetPath(const wxString& path) { + // Don't do anything if no path is specified, in particular don't set the + // path to m_dir below as this would result in opening the dialog in the + // parent directory of this one instead of m_dir itself. + if ( path.empty() ) + return; + // we need an absolute path for GTK native chooser so ensure that we have - // it + // it: use the initial directory if it was set or just CWD otherwise (this + // is the default behaviour if m_dir is empty) wxFileName fn(path); - fn.MakeAbsolute(); + fn.MakeAbsolute(m_dir); m_fc.SetPath(fn.GetFullPath()); } diff --git a/Externals/wxWidgets3/src/gtk/filepicker.cpp b/Externals/wxWidgets3/src/gtk/filepicker.cpp index 3ae914446a..276bc63eea 100644 --- a/Externals/wxWidgets3/src/gtk/filepicker.cpp +++ b/Externals/wxWidgets3/src/gtk/filepicker.cpp @@ -4,7 +4,7 @@ // Author: Francesco Montorsi // Modified By: // Created: 15/04/2006 -// Id: $Id: filepicker.cpp 61724 2009-08-21 10:41:26Z VZ $ +// Id: $Id: filepicker.cpp 70754 2012-02-29 18:05:03Z PC $ // Copyright: (c) Francesco Montorsi // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -80,9 +80,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id, // use as label the currently selected file m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget ); - g_object_ref(m_widget); - gtk_widget_show(m_widget); // we need to know when the dialog has been dismissed clicking OK... // NOTE: the "clicked" signal is not available for a GtkFileChooserButton @@ -129,6 +127,14 @@ void wxFileButton::SetPath(const wxString &str) UpdateDialogPath(m_dialog); } +void wxFileButton::SetInitialDirectory(const wxString& dir) +{ + if (m_dialog) + DoSetInitialDirectory(static_cast(m_dialog), dir); + else + wxGenericFileButton::SetInitialDirectory(dir); +} + #endif // wxUSE_FILEPICKERCTRL && defined(__WXGTK26__) @@ -136,7 +142,9 @@ void wxFileButton::SetPath(const wxString &str) #if wxUSE_DIRPICKERCTRL && defined(__WXGTK26__) +#ifdef __UNIX__ #include // chdir +#endif //----------------------------------------------------------------------------- // "current-folder-changed" @@ -227,9 +235,6 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id, m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget ); g_object_ref(m_widget); - - gtk_widget_show(m_widget); - // GtkFileChooserButton signals g_signal_connect(m_widget, "current-folder-changed", G_CALLBACK(gtk_dirbutton_currentfolderchanged_callback), this); @@ -274,4 +279,15 @@ void wxDirButton::SetPath(const wxString& str) UpdateDialogPath(m_dialog); } +void wxDirButton::SetInitialDirectory(const wxString& dir) +{ + if (m_dialog) + { + if (m_path.empty()) + static_cast(m_dialog)->SetPath(dir); + } + else + wxGenericDirButton::SetInitialDirectory(dir); +} + #endif // wxUSE_DIRPICKERCTRL && defined(__WXGTK26__) diff --git a/Externals/wxWidgets3/src/gtk/font.cpp b/Externals/wxWidgets3/src/gtk/font.cpp index 822773b38a..b09793a989 100644 --- a/Externals/wxWidgets3/src/gtk/font.cpp +++ b/Externals/wxWidgets3/src/gtk/font.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/font.cpp // Purpose: wxFont for wxGTK // Author: Robert Roebling -// Id: $Id: font.cpp 66641 2011-01-07 22:01:22Z SC $ +// Id: $Id: font.cpp 70476 2012-01-29 08:14:34Z PC $ // Copyright: (c) 1998 Robert Roebling and Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -52,6 +52,7 @@ public: wxFontStyle style = wxFONTSTYLE_NORMAL, wxFontWeight weight = wxFONTWEIGHT_NORMAL, bool underlined = false, + bool strikethrough = false, const wxString& faceName = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); @@ -69,6 +70,7 @@ public: void SetStyle(wxFontStyle style); void SetWeight(wxFontWeight weight); void SetUnderlined(bool underlined); + void SetStrikethrough(bool strikethrough); bool SetFaceName(const wxString& facename); void SetEncoding(wxFontEncoding encoding); @@ -82,6 +84,7 @@ protected: wxFontStyle style, wxFontWeight weight, bool underlined, + bool strikethrough, const wxString& faceName, wxFontEncoding encoding); @@ -90,7 +93,7 @@ protected: private: bool m_underlined; - + bool m_strikethrough; // The native font info: basically a PangoFontDescription wxNativeFontInfo m_nativeFontInfo; @@ -108,6 +111,7 @@ void wxFontRefData::Init(int pointSize, wxFontStyle style, wxFontWeight weight, bool underlined, + bool strikethrough, const wxString& faceName, wxFontEncoding WXUNUSED(encoding)) { @@ -115,6 +119,7 @@ void wxFontRefData::Init(int pointSize, family = wxFONTFAMILY_SWISS; m_underlined = underlined; + m_strikethrough = strikethrough; // Create native font info m_nativeFontInfo.description = pango_font_description_new(); @@ -149,12 +154,14 @@ void wxFontRefData::InitFromNative() // Pango description are never underlined m_underlined = false; + m_strikethrough = false; } wxFontRefData::wxFontRefData( const wxFontRefData& data ) : wxGDIRefData() { m_underlined = data.m_underlined; + m_strikethrough = data.m_strikethrough; // Forces a copy of the internal data. wxNativeFontInfo should probably // have a copy ctor and assignment operator to fix this properly but that @@ -163,11 +170,11 @@ wxFontRefData::wxFontRefData( const wxFontRefData& data ) } wxFontRefData::wxFontRefData(int size, wxFontFamily family, wxFontStyle style, - wxFontWeight weight, bool underlined, + wxFontWeight weight, bool underlined, bool strikethrough, const wxString& faceName, wxFontEncoding encoding) { - Init(size, family, style, weight, underlined, faceName, encoding); + Init(size, family, style, weight, underlined, strikethrough, faceName, encoding); } wxFontRefData::wxFontRefData(const wxString& nativeFontInfoString) @@ -244,6 +251,11 @@ void wxFontRefData::SetUnderlined(bool underlined) // here we just need to save the underlined attribute } +void wxFontRefData::SetStrikethrough(bool strikethrough) +{ + m_strikethrough = strikethrough; +} + bool wxFontRefData::SetFaceName(const wxString& facename) { return m_nativeFontInfo.SetFaceName(facename); @@ -277,6 +289,19 @@ wxFont::wxFont(const wxNativeFontInfo& info) info.GetEncoding() ); } +wxFont::wxFont(int pointSize, + wxFontFamily family, + int flags, + const wxString& face, + wxFontEncoding encoding) +{ + m_refData = new wxFontRefData(pointSize, family, + GetStyleFromFlags(flags), + GetWeightFromFlags(flags), + GetUnderlinedFromFlags(flags), + false, face, encoding); +} + bool wxFont::Create( int pointSize, wxFontFamily family, wxFontStyle style, @@ -288,7 +313,7 @@ bool wxFont::Create( int pointSize, UnRef(); m_refData = new wxFontRefData(pointSize, family, style, weight, - underlined, face, encoding); + underlined, false, face, encoding); return true; } @@ -356,6 +381,13 @@ bool wxFont::GetUnderlined() const return M_FONTDATA->m_underlined; } +bool wxFont::GetStrikethrough() const +{ + wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); + + return M_FONTDATA->m_strikethrough; +} + wxFontEncoding wxFont::GetEncoding() const { wxCHECK_MSG( IsOk(), wxFONTENCODING_SYSTEM, wxT("invalid font") ); @@ -425,6 +457,13 @@ void wxFont::SetUnderlined(bool underlined) M_FONTDATA->SetUnderlined(underlined); } +void wxFont::SetStrikethrough(bool strikethrough) +{ + AllocExclusive(); + + M_FONTDATA->SetStrikethrough(strikethrough); +} + void wxFont::SetEncoding(wxFontEncoding encoding) { AllocExclusive(); @@ -448,3 +487,66 @@ wxGDIRefData* wxFont::CloneGDIRefData(const wxGDIRefData* data) const { return new wxFontRefData(*static_cast(data)); } + +bool wxFont::GTKSetPangoAttrs(PangoLayout* layout) const +{ + if (!IsOk() || !(GetUnderlined() || GetStrikethrough())) + return false; + + PangoAttrList* attrs = pango_attr_list_new(); + PangoAttribute* a; + + if (wx_pango_version_check(1,16,0)) + { + // a PangoLayout which has leading/trailing spaces with underlined font + // is not correctly drawn by this pango version: Pango won't underline the spaces. + // This can be a problem; e.g. wxHTML rendering of underlined text relies on + // this behaviour. To workaround this problem, we use a special hack here + // suggested by pango maintainer Behdad Esfahbod: we prepend and append two + // empty space characters and give them a dummy colour attribute. + // This will force Pango to underline the leading/trailing spaces, too. + + const char* text = pango_layout_get_text(layout); + const size_t n = strlen(text); + if ((n > 0 && text[0] == ' ') || (n > 1 && text[n - 1] == ' ')) + { + wxCharBuffer buf(n + 6); + // copy the leading U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format + memcpy(buf.data(), "\342\200\214", 3); + // copy the user string + memcpy(buf.data() + 3, text, n); + // copy the trailing U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format + memcpy(buf.data() + 3 + n, "\342\200\214", 3); + + pango_layout_set_text(layout, buf, n + 6); + + // Add dummy attributes (use colour as it's invisible anyhow for 0 + // width spaces) to ensure that the spaces in the beginning/end of the + // string are underlined too. + a = pango_attr_foreground_new(0x0057, 0x52A9, 0xD614); + a->start_index = 0; + a->end_index = 3; + pango_attr_list_insert(attrs, a); + + a = pango_attr_foreground_new(0x0057, 0x52A9, 0xD614); + a->start_index = n + 3; + a->end_index = n + 6; + pango_attr_list_insert(attrs, a); + } + } + if (GetUnderlined()) + { + a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE); + pango_attr_list_insert(attrs, a); + } + if (GetStrikethrough()) + { + a = pango_attr_strikethrough_new(true); + pango_attr_list_insert(attrs, a); + } + + pango_layout_set_attributes(layout, attrs); + pango_attr_list_unref(attrs); + + return true; +} diff --git a/Externals/wxWidgets3/src/gtk/fontdlg.cpp b/Externals/wxWidgets3/src/gtk/fontdlg.cpp index 716ee14615..0b58429526 100644 --- a/Externals/wxWidgets3/src/gtk/fontdlg.cpp +++ b/Externals/wxWidgets3/src/gtk/fontdlg.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/fontdlg.cpp // Purpose: wxFontDialog // Author: Robert Roebling -// Id: $Id: fontdlg.cpp 64019 2010-04-18 00:05:37Z VZ $ +// Id: $Id: fontdlg.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -106,17 +106,17 @@ bool wxFontDialog::DoCreate(wxWindow *parent) GtkFontSelectionDialog *sel = GTK_FONT_SELECTION_DIALOG(m_widget); - g_signal_connect (sel->ok_button, "clicked", + g_signal_connect (gtk_font_selection_dialog_get_ok_button(sel), "clicked", G_CALLBACK (gtk_fontdialog_ok_callback), this); - g_signal_connect (sel->cancel_button, "clicked", + g_signal_connect (gtk_font_selection_dialog_get_cancel_button(sel), "clicked", G_CALLBACK (gtk_fontdialog_cancel_callback), this); g_signal_connect (m_widget, "delete_event", G_CALLBACK (gtk_fontdialog_delete_callback), this); wxFont font = m_fontData.GetInitialFont(); - if( font.Ok() ) + if( font.IsOk() ) { const wxNativeFontInfo *info = font.GetNativeFontInfo(); diff --git a/Externals/wxWidgets3/src/gtk/fontpicker.cpp b/Externals/wxWidgets3/src/gtk/fontpicker.cpp index fb4fa24047..11b34cddea 100644 --- a/Externals/wxWidgets3/src/gtk/fontpicker.cpp +++ b/Externals/wxWidgets3/src/gtk/fontpicker.cpp @@ -4,7 +4,7 @@ // Author: Francesco Montorsi // Modified By: // Created: 15/04/2006 -// Id: $Id: fontpicker.cpp 61724 2009-08-21 10:41:26Z VZ $ +// Id: $Id: fontpicker.cpp 70756 2012-02-29 18:29:31Z PC $ // Copyright: (c) Francesco Montorsi // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -81,8 +81,6 @@ bool wxFontButton::Create( wxWindow *parent, wxWindowID id, gtk_font_button_set_use_size(GTK_FONT_BUTTON(m_widget), usefont); gtk_font_button_set_use_font(GTK_FONT_BUTTON(m_widget), usefont); - gtk_widget_show(m_widget); - // GtkFontButton signals g_signal_connect(m_widget, "font-set", G_CALLBACK(gtk_fontbutton_setfont_callback), this); diff --git a/Externals/wxWidgets3/src/gtk/frame.cpp b/Externals/wxWidgets3/src/gtk/frame.cpp index 96893aa87d..40b32c37d2 100644 --- a/Externals/wxWidgets3/src/gtk/frame.cpp +++ b/Externals/wxWidgets3/src/gtk/frame.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/frame.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: frame.cpp 66648 2011-01-08 06:42:41Z PC $ +// Id: $Id: frame.cpp 67326 2011-03-28 06:27:49Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -271,7 +271,7 @@ void wxFrame::DetachMenuBar() #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 hildon_window_set_menu(HILDON_WINDOW(m_widget), NULL); #else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 - gtk_widget_ref( m_frameMenuBar->m_widget ); + g_object_ref( m_frameMenuBar->m_widget ); gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget ); #endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 @@ -332,7 +332,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar) { // Vertical toolbar and m_wxwindow go into an hbox, inside the // vbox (m_mainWidget). hbox is created on demand. - GtkWidget* hbox = m_wxwindow->parent; + GtkWidget* hbox = gtk_widget_get_parent(m_wxwindow); if (!GTK_IS_HBOX(hbox)) { hbox = gtk_hbox_new(false, 0); diff --git a/Externals/wxWidgets3/src/gtk/glcanvas.cpp b/Externals/wxWidgets3/src/gtk/glcanvas.cpp index 2dcab7e1dc..8e892ad967 100644 --- a/Externals/wxWidgets3/src/gtk/glcanvas.cpp +++ b/Externals/wxWidgets3/src/gtk/glcanvas.cpp @@ -4,7 +4,7 @@ // Author: Robert Roebling // Modified by: // Created: 17/08/98 -// RCS-ID: $Id: glcanvas.cpp 66657 2011-01-08 18:05:33Z PC $ +// RCS-ID: $Id: glcanvas.cpp 67333 2011-03-29 05:17:00Z PC $ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -18,6 +18,7 @@ #include #include +#include "wx/gtk/private/gtk2-compat.h" #if WXWIN_COMPATIBILITY_2_8 @@ -231,11 +232,11 @@ bool wxGLCanvas::Create(wxWindow *parent, // if our parent window is already visible, we had been realized before we // connected to the "realize" signal and hence our m_glContext hasn't been // initialized yet and we have to do it now - if (GTK_WIDGET_REALIZED(m_wxwindow)) + if (gtk_widget_get_realized(m_wxwindow)) gtk_glwindow_realized_callback( m_wxwindow, this ); #endif // WXWIN_COMPATIBILITY_2_8 - if (GTK_WIDGET_MAPPED(m_wxwindow)) + if (gtk_widget_get_mapped(m_wxwindow)) gtk_glwindow_map_callback( m_wxwindow, this ); return true; diff --git a/Externals/wxWidgets3/src/gtk/gnome/gprint.cpp b/Externals/wxWidgets3/src/gtk/gnome/gprint.cpp index 439aef3de6..01900ebf31 100644 --- a/Externals/wxWidgets3/src/gtk/gnome/gprint.cpp +++ b/Externals/wxWidgets3/src/gtk/gnome/gprint.cpp @@ -3,7 +3,7 @@ // Author: Robert Roebling // Purpose: Implement GNOME printing support // Created: 09/20/04 -// RCS-ID: $Id: gprint.cpp 65820 2010-10-15 23:46:46Z VZ $ +// RCS-ID: $Id: gprint.cpp 70478 2012-01-29 08:49:01Z PC $ // Copyright: Robert Roebling // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -1534,7 +1534,7 @@ wxGnomePrinterDCImpl::DoDrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool WXUNUSED(useMask)) { - if (!bitmap.Ok()) return; + if (!bitmap.IsOk()) return; if (bitmap.HasPixbuf()) { @@ -1565,7 +1565,7 @@ wxGnomePrinterDCImpl::DoDrawBitmap(const wxBitmap& bitmap, { wxImage image = bitmap.ConvertToImage(); - if (!image.Ok()) return; + if (!image.IsOk()) return; gs_libGnomePrint->gnome_print_gsave( m_gpc ); double matrix[6]; @@ -1592,25 +1592,12 @@ void wxGnomePrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wx double xx = XLOG2DEV(x); double yy = YLOG2DEV(y); - bool underlined = m_font.Ok() && m_font.GetUnderlined(); - const wxScopedCharBuffer data(text.utf8_str()); - size_t datalen = strlen(data); - pango_layout_set_text( m_layout, data, datalen); + pango_layout_set_text(m_layout, data, data.length()); + const bool setAttrs = m_font.GTKSetPangoAttrs(m_layout); - if (underlined) - { - PangoAttrList *attrs = pango_attr_list_new(); - PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE); - a->start_index = 0; - a->end_index = datalen; - pango_attr_list_insert(attrs, a); - pango_layout_set_attributes(m_layout, attrs); - pango_attr_list_unref(attrs); - } - - if (m_textForegroundColour.Ok()) + if (m_textForegroundColour.IsOk()) { unsigned char red = m_textForegroundColour.Red(); unsigned char blue = m_textForegroundColour.Blue(); @@ -1656,7 +1643,7 @@ void wxGnomePrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wx gs_libGnomePrint->gnome_print_grestore( m_gpc ); - if (underlined) + if (setAttrs) { // undo underline attributes setting: pango_layout_set_attributes(m_layout, NULL); @@ -1674,7 +1661,7 @@ void wxGnomePrinterDCImpl::SetFont( const wxFont& font ) { m_font = font; - if (m_font.Ok()) + if (m_font.IsOk()) { if (m_fontdesc) pango_font_description_free( m_fontdesc ); @@ -1691,7 +1678,7 @@ void wxGnomePrinterDCImpl::SetFont( const wxFont& font ) void wxGnomePrinterDCImpl::SetPen( const wxPen& pen ) { - if (!pen.Ok()) return; + if (!pen.IsOk()) return; m_pen = pen; @@ -1757,7 +1744,7 @@ void wxGnomePrinterDCImpl::SetPen( const wxPen& pen ) void wxGnomePrinterDCImpl::SetBrush( const wxBrush& brush ) { - if (!brush.Ok()) return; + if (!brush.IsOk()) return; m_brush = brush; diff --git a/Externals/wxWidgets3/src/gtk/hyperlink.cpp b/Externals/wxWidgets3/src/gtk/hyperlink.cpp index 93ee1bf705..2ea8b35ef8 100644 --- a/Externals/wxWidgets3/src/gtk/hyperlink.cpp +++ b/Externals/wxWidgets3/src/gtk/hyperlink.cpp @@ -3,7 +3,7 @@ // Purpose: Hyperlink control // Author: Francesco Montorsi // Created: 14/2/2007 -// RCS-ID: $Id: hyperlink.cpp 65334 2010-08-17 16:55:32Z VZ $ +// RCS-ID: $Id: hyperlink.cpp 70756 2012-02-29 18:29:31Z PC $ // Copyright: (c) 2007 Francesco Montorsi // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -82,7 +82,6 @@ bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id, m_widget = gtk_link_button_new("asdfsaf asdfdsaf asdfdsa"); g_object_ref(m_widget); - gtk_widget_show(m_widget); // alignment float x_alignment = 0.5; @@ -123,6 +122,13 @@ wxSize wxHyperlinkCtrl::DoGetBestSize() const return wxGenericHyperlinkCtrl::DoGetBestSize(); } +wxSize wxHyperlinkCtrl::DoGetBestClientSize() const +{ + if ( UseNative() ) + return wxControl::DoGetBestClientSize(); + return wxGenericHyperlinkCtrl::DoGetBestClientSize(); +} + void wxHyperlinkCtrl::SetLabel(const wxString &label) { if ( UseNative() ) diff --git a/Externals/wxWidgets3/src/gtk/listbox.cpp b/Externals/wxWidgets3/src/gtk/listbox.cpp index 8fa3e1d46d..5b4f36e76e 100644 --- a/Externals/wxWidgets3/src/gtk/listbox.cpp +++ b/Externals/wxWidgets3/src/gtk/listbox.cpp @@ -3,7 +3,7 @@ // Purpose: // Author: Robert Roebling // Modified By: Ryan Norton (GtkTreeView implementation) -// Id: $Id: listbox.cpp 67136 2011-03-06 18:22:23Z VS $ +// Id: $Id: listbox.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -433,7 +433,7 @@ void wxListBox::Update() wxWindow::Update(); if (m_treeview) - gdk_window_process_updates(GTK_WIDGET(m_treeview)->window, TRUE); + gdk_window_process_updates(gtk_widget_get_window(GTK_WIDGET(m_treeview)), true); } // ---------------------------------------------------------------------------- @@ -773,7 +773,7 @@ void wxListBox::DoScrollToCell(int n, float alignY, float alignX) wxCHECK_RET( IsValid(n), wxT("invalid index")); //RN: I have no idea why this line is needed... - if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (m_treeview)) + if (gdk_pointer_is_grabbed () && gtk_widget_has_grab(GTK_WIDGET(m_treeview))) return; GtkTreeIter iter; @@ -841,23 +841,6 @@ int wxListBox::DoListHitTest(const wxPoint& point) const // helpers // ---------------------------------------------------------------------------- -#if wxUSE_TOOLTIPS -void wxListBox::GTKApplyToolTip( GtkTooltips *tips, const gchar *tip ) -{ -#if GTK_CHECK_VERSION(2, 12, 0) - if (!gtk_check_version(2, 12, 0)) - { - gtk_widget_set_tooltip_text(GTK_WIDGET( m_treeview ), tip); - } - else -#endif - { - // RN: Is this needed anymore? - gtk_tooltips_set_tip( tips, GTK_WIDGET( m_treeview ), tip, NULL ); - } -} -#endif // wxUSE_TOOLTIPS - GtkWidget *wxListBox::GetConnectWidget() { // the correct widget for listbox events (such as mouse clicks for example) @@ -872,7 +855,7 @@ GdkWindow *wxListBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) { - if (m_hasBgCol && m_backgroundColour.Ok()) + if (m_hasBgCol && m_backgroundColour.IsOk()) { GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview); if (window) diff --git a/Externals/wxWidgets3/src/gtk/mdi.cpp b/Externals/wxWidgets3/src/gtk/mdi.cpp index 6b3a4db2fc..2f665e0312 100644 --- a/Externals/wxWidgets3/src/gtk/mdi.cpp +++ b/Externals/wxWidgets3/src/gtk/mdi.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/mdi.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: mdi.cpp 64127 2010-04-24 15:08:00Z VZ $ +// Id: $Id: mdi.cpp 69528 2011-10-25 16:56:57Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -27,10 +27,7 @@ extern "C" { static void -gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget), - GtkNotebookPage *page, - gint WXUNUSED(page_num), - wxMDIParentFrame *parent ) +switch_page(GtkNotebook* widget, GtkNotebookPage*, guint page_num, wxMDIParentFrame* parent) { // send deactivate event to old child @@ -49,6 +46,7 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget), return; child = NULL; + GtkWidget* page = gtk_notebook_get_nth_page(widget, page_num); wxWindowList::compatibility_iterator node = client_window->GetChildren().GetFirst(); while ( node ) @@ -58,7 +56,7 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget), // child_frame can be NULL when this is called from dtor, probably // because g_signal_connect (m_widget, "switch_page", (see below) // isn't deleted early enough - if ( child_frame && child_frame->m_page == page ) + if (child_frame && child_frame->m_widget == page) { child = child_frame; break; @@ -114,7 +112,7 @@ void wxMDIParentFrame::OnInternalIdle() if (m_justInserted) { GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget); - gtk_notebook_set_current_page( notebook, g_list_length( notebook->children ) - 1 ); + gtk_notebook_set_current_page(notebook, -1); /* need to set the menubar of the child */ wxMDIChildFrame *active_child_frame = GetActiveChild(); @@ -220,7 +218,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const gint i = gtk_notebook_get_current_page( notebook ); if (i < 0) return NULL; - GtkNotebookPage* page = (GtkNotebookPage*) (g_list_nth(notebook->children,i)->data); + GtkWidget* page = gtk_notebook_get_nth_page(notebook, i); if (!page) return NULL; wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst(); @@ -234,7 +232,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const if (!child_frame) return NULL; - if (child_frame->m_page == page) + if (child_frame->m_widget == page) return child_frame; node = node->GetNext(); @@ -269,7 +267,6 @@ END_EVENT_TABLE() void wxMDIChildFrame::Init() { m_menuBar = NULL; - m_page = NULL; } bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, @@ -297,6 +294,12 @@ wxMDIChildFrame::~wxMDIChildFrame() gtk_widget_queue_draw(m_parent->m_widget); } +void wxMDIChildFrame::GTKHandleRealized() +{ + // since m_widget is not a GtkWindow, must bypass wxTopLevelWindowGTK + wxTopLevelWindowBase::GTKHandleRealized(); +} + void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) { wxASSERT_MSG( m_menuBar == NULL, "Only one menubar allowed" ); @@ -391,9 +394,7 @@ wxMDIClientWindow::~wxMDIClientWindow() // a call to gtk_mdi_page_change_callback with an invalid parent // (because gtk_mdi_page_change_callback expects a wxMDIClientWindow but // at that point of the dtor chain we are a simple wxWindow!) - g_signal_handlers_disconnect_by_func(m_widget, - (gpointer)gtk_mdi_page_change_callback, - GetParent()); + g_signal_handlers_disconnect_by_func(m_widget, (void*)switch_page, GetParent()); } bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style) @@ -409,8 +410,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style) m_widget = gtk_notebook_new(); g_object_ref(m_widget); - g_signal_connect (m_widget, "switch_page", - G_CALLBACK (gtk_mdi_page_change_callback), parent); + g_signal_connect(m_widget, "switch_page", G_CALLBACK(switch_page), parent); gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); @@ -437,8 +437,6 @@ void wxMDIClientWindow::AddChildGTK(wxWindowGTK* child) gtk_notebook_append_page( notebook, child->m_widget, label_widget ); - child_frame->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data); - wxMDIParentFrame* parent_frame = static_cast(GetParent()); parent_frame->m_justInserted = true; } diff --git a/Externals/wxWidgets3/src/gtk/menu.cpp b/Externals/wxWidgets3/src/gtk/menu.cpp index 659d2dc498..3e4f6425f6 100644 --- a/Externals/wxWidgets3/src/gtk/menu.cpp +++ b/Externals/wxWidgets3/src/gtk/menu.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/menu.cpp // Purpose: implementation of wxMenuBar and wxMenu classes for wxGTK // Author: Robert Roebling -// Id: $Id: menu.cpp 66637 2011-01-07 21:36:17Z SC $ +// Id: $Id: menu.cpp 70350 2012-01-15 13:41:17Z VZ $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -230,13 +230,15 @@ void wxMenuBar::Detach() bool wxMenuBar::Append( wxMenu *menu, const wxString &title ) { - if ( !wxMenuBarBase::Append( menu, title ) ) - return false; - - return GtkAppend(menu, title); + if (wxMenuBarBase::Append(menu, title)) + { + GtkAppend(menu, title); + return true; + } + return false; } -bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos) +void wxMenuBar::GtkAppend(wxMenu* menu, const wxString& title, int pos) { menu->SetLayoutDirection(GetLayoutDirection()); @@ -251,7 +253,10 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos) const wxString str(wxStripMenuCodes(item->GetItemLabel())); if ( item->IsSubMenu() ) - return GtkAppend(item->GetSubMenu(), str, pos); + { + GtkAppend(item->GetSubMenu(), str, pos); + return; + } menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) ); @@ -282,21 +287,16 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos) if ( m_menuBarFrame ) AttachToFrame( menu, m_menuBarFrame ); - - return true; } bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) { - if ( !wxMenuBarBase::Insert(pos, menu, title) ) - return false; - - // TODO - - if ( !GtkAppend(menu, title, (int)pos) ) - return false; - - return true; + if (wxMenuBarBase::Insert(pos, menu, title)) + { + GtkAppend(menu, title, int(pos)); + return true; + } + return false; } wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) @@ -416,6 +416,15 @@ void wxMenuBar::EnableTop( size_t pos, bool flag ) gtk_widget_set_sensitive( menu->m_owner, flag ); } +bool wxMenuBar::IsEnabledTop(size_t pos) const +{ + wxMenuList::compatibility_iterator node = m_menus.Item( pos ); + wxCHECK_MSG( node, false, wxS("invalid index in IsEnabledTop") ); + wxMenu* const menu = node->GetData(); + wxCHECK_MSG( menu->m_owner, true, wxS("no menu owner?") ); + return gtk_widget_get_sensitive( menu->m_owner ); +} + wxString wxMenuBar::GetMenuLabel( size_t pos ) const { wxMenuList::compatibility_iterator node = m_menus.Item( pos ); @@ -440,7 +449,7 @@ void wxMenuBar::SetMenuLabel( size_t pos, const wxString& label ) menu->SetTitle( str ); if (menu->m_owner) - gtk_label_set_text_with_mnemonic( GTK_LABEL( GTK_BIN(menu->m_owner)->child), wxGTK_CONV(str) ); + gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menu->m_owner))), wxGTK_CONV(str)); } //----------------------------------------------------------------------------- @@ -581,7 +590,7 @@ void wxMenuItem::SetItemLabel( const wxString& str ) void wxMenuItem::SetGtkLabel() { const wxString text = wxConvertMnemonicsToGTK(m_text.BeforeFirst('\t')); - GtkLabel* label = GTK_LABEL(GTK_BIN(m_menuItem)->child); + GtkLabel* label = GTK_LABEL(gtk_bin_get_child(GTK_BIN(m_menuItem))); gtk_label_set_text_with_mnemonic(label, wxGTK_CONV_SYS(text)); #if wxUSE_ACCEL guint accel_key; @@ -601,7 +610,9 @@ void wxMenuItem::SetBitmap(const wxBitmap& bitmap) if (m_kind == wxITEM_NORMAL) m_bitmap = bitmap; else + { wxFAIL_MSG("only normal menu items can have bitmaps"); + } } void wxMenuItem::Check( bool check ) @@ -640,7 +651,7 @@ bool wxMenuItem::IsChecked() const wxCHECK_MSG( IsCheckable(), false, wxT("can't get state of uncheckable item!") ); - return ((GtkCheckMenuItem*)m_menuItem)->active != 0; + return gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(m_menuItem)) != 0; } //----------------------------------------------------------------------------- @@ -682,8 +693,7 @@ void wxMenu::Init() m_menu = gtk_menu_new(); // NB: keep reference to the menu so that it is not destroyed behind // our back by GTK+ e.g. when it is removed from menubar: - g_object_ref(m_menu); - gtk_object_sink(GTK_OBJECT(m_menu)); + g_object_ref_sink(m_menu); m_owner = NULL; @@ -697,8 +707,6 @@ void wxMenu::Init() gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), tearoff); } - m_prevRadio = NULL; - // append the title as the very first entry if we have it if ( !m_title.empty() ) { @@ -746,11 +754,9 @@ wxString wxMenu::GetTitle() const return wxConvertMnemonicsFromGTK(wxMenuBase::GetTitle()); } -bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) +void wxMenu::GtkAppend(wxMenuItem* mitem, int pos) { GtkWidget *menuItem; - GtkWidget* prevRadio = m_prevRadio; - m_prevRadio = NULL; switch (mitem->GetKind()) { case wxITEM_SEPARATOR: @@ -761,11 +767,44 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) break; case wxITEM_RADIO: { + // See if we need to create a new radio group for this item or + // add it to an existing one. + wxMenuItem* radioGroupItem = NULL; + + const size_t numItems = GetMenuItemCount(); + const size_t n = pos == -1 ? numItems - 1 : size_t(pos); + + if (n != 0) + { + wxMenuItem* const itemPrev = FindItemByPosition(n - 1); + if ( itemPrev->GetKind() == wxITEM_RADIO ) + { + // Appending an item after an existing radio item puts + // it into the same radio group. + radioGroupItem = itemPrev; + } + } + + if (radioGroupItem == NULL && n != numItems - 1) + { + wxMenuItem* const itemNext = FindItemByPosition(n + 1); + if ( itemNext->GetKind() == wxITEM_RADIO ) + { + // Inserting an item before an existing radio item + // also puts it into the existing radio group. + radioGroupItem = itemNext; + } + } + GSList* group = NULL; - if (prevRadio) - group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(prevRadio)); + if ( radioGroupItem ) + { + group = gtk_radio_menu_item_get_group( + GTK_RADIO_MENU_ITEM(radioGroupItem->GetMenuItem()) + ); + } + menuItem = gtk_radio_menu_item_new_with_label(group, ""); - m_prevRadio = menuItem; } break; default: @@ -820,28 +859,26 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) mitem); } } - - return true; } wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem) { - if (!GtkAppend(mitem)) - return NULL; - - return wxMenuBase::DoAppend(mitem); + if (wxMenuBase::DoAppend(mitem)) + { + GtkAppend(mitem); + return mitem; + } + return NULL; } wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) { - if ( !wxMenuBase::DoInsert(pos, item) ) - return NULL; - - // TODO - if ( !GtkAppend(item, (int)pos) ) - return NULL; - - return item; + if (wxMenuBase::DoInsert(pos, item)) + { + GtkAppend(item, int(pos)); + return item; + } + return NULL; } wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) @@ -850,14 +887,21 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) return NULL; GtkWidget * const mitem = item->GetMenuItem(); - if ( m_prevRadio == mitem ) + if (!gtk_check_version(2,12,0)) { - // deleting an item starts a new radio group (has to as we shouldn't - // keep a deleted pointer anyhow) - m_prevRadio = NULL; + // gtk_menu_item_remove_submenu() is deprecated since 2.12, but + // gtk_menu_item_set_submenu() can now be used with NULL submenu now so + // just do use it. + gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL); + } + else // GTK+ < 2.12 + { + // In 2.10 calling gtk_menu_item_set_submenu() with NULL submenu + // results in critical GTK+ error messages so use the old function + // instead. + gtk_menu_item_remove_submenu(GTK_MENU_ITEM(mitem)); } - gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL); gtk_widget_destroy(mitem); item->SetMenuItem(NULL); diff --git a/Externals/wxWidgets3/src/gtk/minifram.cpp b/Externals/wxWidgets3/src/gtk/minifram.cpp index f01a2f986f..92bdfe77ff 100644 --- a/Externals/wxWidgets3/src/gtk/minifram.cpp +++ b/Externals/wxWidgets3/src/gtk/minifram.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/minifram.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: minifram.cpp 64404 2010-05-26 17:37:55Z RR $ +// Id: $Id: minifram.cpp 67326 2011-03-28 06:27:49Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -23,6 +23,7 @@ #include "wx/gtk/dcclient.h" #include +#include "wx/gtk/private/gtk2-compat.h" //----------------------------------------------------------------------------- // data @@ -61,13 +62,13 @@ extern "C" { static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose* gdk_event, wxMiniFrame* win) { if (!win->m_hasVMT || gdk_event->count > 0 || - gdk_event->window != widget->window) + gdk_event->window != gtk_widget_get_window(widget)) { return false; } - gtk_paint_shadow (widget->style, - widget->window, + gtk_paint_shadow (gtk_widget_get_style(widget), + gtk_widget_get_window(widget), GTK_STATE_NORMAL, GTK_SHADOW_OUT, NULL, NULL, NULL, // FIXME: No clipping? @@ -80,7 +81,7 @@ static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose wxDCImpl *impl = dc.GetImpl(); wxClientDCImpl *gtk_impl = wxDynamicCast( impl, wxClientDCImpl ); - gtk_impl->m_gdkwindow = widget->window; // Hack alert + gtk_impl->m_gdkwindow = gtk_widget_get_window(widget); // Hack alert if (style & wxRESIZE_BORDER) { @@ -120,7 +121,7 @@ extern "C" { static gboolean gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, wxMiniFrame* win) { - if (!win->m_hasVMT || gdk_event->window != widget->window) + if (!win->m_hasVMT || gdk_event->window != gtk_widget_get_window(widget)) return false; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; @@ -137,7 +138,7 @@ gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, w { GtkWidget *ancestor = gtk_widget_get_toplevel( widget ); - GdkWindow *source = widget->window; + GdkWindow *source = gtk_widget_get_window(widget); int org_x = 0; int org_y = 0; @@ -165,9 +166,9 @@ gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, w if (y >= win->m_miniEdge + win->m_miniTitle) return true; - gdk_window_raise( win->m_widget->window ); + gdk_window_raise(gtk_widget_get_window(win->m_widget)); - gdk_pointer_grab( widget->window, FALSE, + gdk_pointer_grab( gtk_widget_get_window(widget), false, (GdkEventMask) (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | @@ -198,7 +199,7 @@ extern "C" { static gboolean gtk_window_button_release_callback(GtkWidget* widget, GdkEventButton* gdk_event, wxMiniFrame* win) { - if (!win->m_hasVMT || gdk_event->window != widget->window) + if (!win->m_hasVMT || gdk_event->window != gtk_widget_get_window(widget)) return false; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; @@ -212,7 +213,7 @@ gtk_window_button_release_callback(GtkWidget* widget, GdkEventButton* gdk_event, gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME ); int org_x = 0; int org_y = 0; - gdk_window_get_origin( widget->window, &org_x, &org_y ); + gdk_window_get_origin(gtk_widget_get_window(widget), &org_x, &org_y); x += org_x - win->m_diffX; y += org_y - win->m_diffY; win->m_x = x; @@ -235,10 +236,10 @@ gtk_window_leave_callback(GtkWidget *widget, { if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; - if (gdk_event->window != widget->window) + if (gdk_event->window != gtk_widget_get_window(widget)) return false; - gdk_window_set_cursor( widget->window, NULL ); + gdk_window_set_cursor(gtk_widget_get_window(widget), NULL); return FALSE; } @@ -252,7 +253,7 @@ extern "C" { static gboolean gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win ) { - if (!win->m_hasVMT || gdk_event->window != widget->window) + if (!win->m_hasVMT || gdk_event->window != gtk_widget_get_window(widget)) return false; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; @@ -278,9 +279,9 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, if (style & wxRESIZE_BORDER) { if ((x > win->m_width-14) && (y > win->m_height-14)) - gdk_window_set_cursor( widget->window, gdk_cursor_new( GDK_BOTTOM_RIGHT_CORNER ) ); + gdk_window_set_cursor(gtk_widget_get_window(widget), gdk_cursor_new(GDK_BOTTOM_RIGHT_CORNER)); else - gdk_window_set_cursor( widget->window, NULL ); + gdk_window_set_cursor(gtk_widget_get_window(widget), NULL); win->GTKUpdateCursor(false); } return TRUE; @@ -291,7 +292,7 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, int org_x = 0; int org_y = 0; - gdk_window_get_origin( widget->window, &org_x, &org_y ); + gdk_window_get_origin(gtk_widget_get_window(widget), &org_x, &org_y); x += org_x - win->m_diffX; y += org_y - win->m_diffY; win->m_x = x; @@ -423,9 +424,9 @@ void wxMiniFrame::SetTitle( const wxString &title ) { wxFrame::SetTitle( title ); - GtkWidget* widget = GTK_BIN(m_widget)->child; - if (widget->window) - gdk_window_invalidate_rect(widget->window, NULL, false); + GdkWindow* window = gtk_widget_get_window(gtk_bin_get_child(GTK_BIN(m_widget))); + if (window) + gdk_window_invalidate_rect(window, NULL, false); } #endif // wxUSE_MINIFRAME diff --git a/Externals/wxWidgets3/src/gtk/msgdlg.cpp b/Externals/wxWidgets3/src/gtk/msgdlg.cpp index a8606ef32a..b09210711e 100644 --- a/Externals/wxWidgets3/src/gtk/msgdlg.cpp +++ b/Externals/wxWidgets3/src/gtk/msgdlg.cpp @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // Modified by: // Created: 2003/02/28 -// RCS-ID: $Id: msgdlg.cpp 65812 2010-10-15 23:45:58Z VZ $ +// RCS-ID: $Id: msgdlg.cpp 68537 2011-08-04 22:53:42Z VZ $ // Copyright: (c) Vaclav Slavik, 2003 // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -74,6 +74,11 @@ wxString wxMessageDialog::GetDefaultCancelLabel() const return GTK_STOCK_CANCEL; } +wxString wxMessageDialog::GetDefaultHelpLabel() const +{ + return GTK_STOCK_HELP; +} + void wxMessageDialog::DoSetCustomLabel(wxString& var, const ButtonLabel& label) { int stockId = label.GetStockId(); @@ -135,16 +140,21 @@ void wxMessageDialog::GTKCreateMsgDialog() // when using custom labels, we have to add all the buttons ourselves if ( !HasCustomLabels() ) { - if ( m_dialogStyle & wxYES_NO ) + // "Help" button is not supported by predefined combinations so we + // always need to create the buttons manually when it's used. + if ( !(m_dialogStyle & wxHELP) ) { - if ( !(m_dialogStyle & wxCANCEL) ) - buttons = GTK_BUTTONS_YES_NO; - //else: no standard GTK_BUTTONS_YES_NO_CANCEL so leave as NONE - } - else if ( m_dialogStyle & wxOK ) - { - buttons = m_dialogStyle & wxCANCEL ? GTK_BUTTONS_OK_CANCEL - : GTK_BUTTONS_OK; + if ( m_dialogStyle & wxYES_NO ) + { + if ( !(m_dialogStyle & wxCANCEL) ) + buttons = GTK_BUTTONS_YES_NO; + //else: no standard GTK_BUTTONS_YES_NO_CANCEL so leave as NONE + } + else if ( m_dialogStyle & wxOK ) + { + buttons = m_dialogStyle & wxCANCEL ? GTK_BUTTONS_OK_CANCEL + : GTK_BUTTONS_OK; + } } } @@ -211,9 +221,16 @@ void wxMessageDialog::GTKCreateMsgDialog() const bool addButtons = buttons == GTK_BUTTONS_NONE; #endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON - if ( m_dialogStyle & wxYES_NO ) // Yes/No or Yes/No/Cancel dialog + + if ( addButtons ) { - if ( addButtons ) + if ( m_dialogStyle & wxHELP ) + { + gtk_dialog_add_button(dlg, wxGTK_CONV(GetHelpLabel()), + GTK_RESPONSE_HELP); + } + + if ( m_dialogStyle & wxYES_NO ) // Yes/No or Yes/No/Cancel dialog { // Add the buttons in the correct order which is, according to // http://library.gnome.org/devel/hig-book/stable/windows-alert.html.en @@ -233,32 +250,29 @@ void wxMessageDialog::GTKCreateMsgDialog() gtk_dialog_add_button(dlg, wxGTK_CONV(GetYesLabel()), GTK_RESPONSE_YES); } - - // it'd probably be harmless to call gtk_dialog_set_default_response() - // twice but why do it if we're going to change the default below - // anyhow - if ( !(m_dialogStyle & wxCANCEL_DEFAULT) ) + else // Ok or Ok/Cancel dialog { - gtk_dialog_set_default_response(dlg, - m_dialogStyle & wxNO_DEFAULT - ? GTK_RESPONSE_NO - : GTK_RESPONSE_YES); - } - } - else if ( addButtons ) // Ok or Ok/Cancel dialog - { - gtk_dialog_add_button(dlg, wxGTK_CONV(GetOKLabel()), GTK_RESPONSE_OK); - if ( m_dialogStyle & wxCANCEL ) - { - gtk_dialog_add_button(dlg, wxGTK_CONV(GetCancelLabel()), - GTK_RESPONSE_CANCEL); + gtk_dialog_add_button(dlg, wxGTK_CONV(GetOKLabel()), GTK_RESPONSE_OK); + if ( m_dialogStyle & wxCANCEL ) + { + gtk_dialog_add_button(dlg, wxGTK_CONV(GetCancelLabel()), + GTK_RESPONSE_CANCEL); + } } } + gint defaultButton; if ( m_dialogStyle & wxCANCEL_DEFAULT ) - { - gtk_dialog_set_default_response(dlg, GTK_RESPONSE_CANCEL); - } + defaultButton = GTK_RESPONSE_CANCEL; + else if ( m_dialogStyle & wxNO_DEFAULT ) + defaultButton = GTK_RESPONSE_NO; + else if ( m_dialogStyle & wxYES_NO ) + defaultButton = GTK_RESPONSE_YES; + else // No need to change the default value, whatever it is. + defaultButton = GTK_RESPONSE_NONE; + + if ( defaultButton != GTK_RESPONSE_NONE ) + gtk_dialog_set_default_response(dlg, defaultButton); } int wxMessageDialog::ShowModal() @@ -302,6 +316,8 @@ int wxMessageDialog::ShowModal() return wxID_YES; case GTK_RESPONSE_NO: return wxID_NO; + case GTK_RESPONSE_HELP: + return wxID_HELP; } } diff --git a/Externals/wxWidgets3/src/gtk/nativewin.cpp b/Externals/wxWidgets3/src/gtk/nativewin.cpp index a0c585e82c..f14e137ced 100644 --- a/Externals/wxWidgets3/src/gtk/nativewin.cpp +++ b/Externals/wxWidgets3/src/gtk/nativewin.cpp @@ -3,7 +3,7 @@ // Purpose: wxNativeWindow implementation // Author: Vadim Zeitlin // Created: 2008-03-05 -// RCS-ID: $Id: nativewin.cpp 52437 2008-03-11 00:03:46Z VZ $ +// RCS-ID: $Id: nativewin.cpp 67326 2011-03-28 06:27:49Z PC $ // Copyright: (c) 2008 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -29,6 +29,7 @@ #include "wx/nativewin.h" #include +#include "wx/gtk/private/gtk2-compat.h" #ifdef GDK_WINDOWING_X11 #include @@ -71,7 +72,7 @@ bool wxNativeContainerWindow::Create(wxNativeContainerWindowHandle win) // we need to realize the window first before reparenting it gtk_widget_realize(m_widget); - gdk_window_reparent(m_widget->window, win, 0, 0); + gdk_window_reparent(gtk_widget_get_window(m_widget), win, 0, 0); #ifdef GDK_WINDOWING_X11 // if the native window is destroyed, our own window will be destroyed too @@ -79,7 +80,7 @@ bool wxNativeContainerWindow::Create(wxNativeContainerWindowHandle win) // destroyed" GdkWindow, so intercept to DestroyNotify ourselves to fix // this and also destroy the associated C++ object when its window is // destroyed - gdk_window_add_filter(m_widget->window, wxNativeContainerWindowFilter, this); + gdk_window_add_filter(gtk_widget_get_window(m_widget), wxNativeContainerWindowFilter, this); #endif // GDK_WINDOWING_X11 // we should be initially visible as we suppose that the native window we diff --git a/Externals/wxWidgets3/src/gtk/nonownedwnd.cpp b/Externals/wxWidgets3/src/gtk/nonownedwnd.cpp new file mode 100644 index 0000000000..efba8cf874 --- /dev/null +++ b/Externals/wxWidgets3/src/gtk/nonownedwnd.cpp @@ -0,0 +1,308 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: src/gtk/nonownedwnd.cpp +// Purpose: wxGTK implementation of wxNonOwnedWindow. +// Author: Vadim Zeitlin +// Created: 2011-10-12 +// RCS-ID: $Id: nonownedwnd.cpp 69465 2011-10-18 22:59:16Z VZ $ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#ifndef WX_PRECOMP + #include "wx/dcclient.h" + #include "wx/dcmemory.h" + #include "wx/nonownedwnd.h" + #include "wx/region.h" +#endif // WX_PRECOMP + +#include "wx/gtk/private.h" + +#include + +#include "wx/graphics.h" + +// ---------------------------------------------------------------------------- +// wxNonOwnedWindowShapeImpl: base class for region and path-based classes. +// ---------------------------------------------------------------------------- + +// This class provides behaviour common to both region and path-based +// implementations and defines SetShape() method and virtual dtor that can be +// called by wxNonOwnedWindow when it's realized leaving just the +// implementation of DoSetShape() to the derived classes. +class wxNonOwnedWindowShapeImpl : public wxEvtHandler +{ +public: + wxNonOwnedWindowShapeImpl(wxWindow* win) : m_win(win) + { + } + + virtual ~wxNonOwnedWindowShapeImpl() { } + + bool SetShape() + { + if ( m_win->m_wxwindow ) + SetShapeIfNonNull(gtk_widget_get_window(m_win->m_wxwindow)); + + return SetShapeIfNonNull(gtk_widget_get_window(m_win->m_widget)); + } + + // Must be overridden to indicate if the data object must stay around or if + // it can be deleted once SetShape() was called. + virtual bool CanBeDeleted() const = 0; + +protected: + wxWindow* const m_win; + +private: + // SetShape to the given GDK window by calling DoSetShape() if it's non-NULL. + bool SetShapeIfNonNull(GdkWindow* window) + { + return window && DoSetShape(window); + } + + // SetShape the shape to the given GDK window which can be either the window + // of m_widget or m_wxwindow of the wxWindow we're used with. + virtual bool DoSetShape(GdkWindow* window) = 0; + + wxDECLARE_NO_COPY_CLASS(wxNonOwnedWindowShapeImpl); +}; + +// Version not using any custom shape. +class wxNonOwnedWindowShapeImplNone : public wxNonOwnedWindowShapeImpl +{ +public: + wxNonOwnedWindowShapeImplNone(wxWindow* win) : + wxNonOwnedWindowShapeImpl(win) + { + } + + virtual bool CanBeDeleted() const { return true; } + +private: + virtual bool DoSetShape(GdkWindow* window) + { + gdk_window_shape_combine_mask(window, NULL, 0, 0); + + return true; + } +}; + +// Version using simple wxRegion. +class wxNonOwnedWindowShapeImplRegion : public wxNonOwnedWindowShapeImpl +{ +public: + wxNonOwnedWindowShapeImplRegion(wxWindow* win, const wxRegion& region) : + wxNonOwnedWindowShapeImpl(win), + m_region(region) + { + } + + virtual bool CanBeDeleted() const { return true; } + +private: + virtual bool DoSetShape(GdkWindow* window) + { + gdk_window_shape_combine_region(window, m_region.GetRegion(), 0, 0); + + return true; + } + + wxRegion m_region; +}; + +#if wxUSE_GRAPHICS_CONTEXT + +// Version using more complex wxGraphicsPath. +class wxNonOwnedWindowShapeImplPath : public wxNonOwnedWindowShapeImpl +{ +public: + wxNonOwnedWindowShapeImplPath(wxWindow* win, const wxGraphicsPath& path) : + wxNonOwnedWindowShapeImpl(win), + m_path(path), + m_mask(CreateShapeBitmap(path), *wxBLACK) + { + + m_win->Connect + ( + wxEVT_PAINT, + wxPaintEventHandler(wxNonOwnedWindowShapeImplPath::OnPaint), + NULL, + this + ); + } + + virtual ~wxNonOwnedWindowShapeImplPath() + { + m_win->Disconnect + ( + wxEVT_PAINT, + wxPaintEventHandler(wxNonOwnedWindowShapeImplPath::OnPaint), + NULL, + this + ); + } + + // Currently we always return false from here, if drawing the border + // becomes optional, we could return true if we don't need to draw it. + virtual bool CanBeDeleted() const { return false; } + +private: + wxBitmap CreateShapeBitmap(const wxGraphicsPath& path) + { + // Draw the path on a bitmap to get the mask we need. + // + // Notice that using monochrome bitmap here doesn't work because of an + // apparent wxGraphicsContext bug in wxGTK, so use a bitmap of screen + // depth even if this is wasteful. + wxBitmap bmp(m_win->GetSize()); + + wxMemoryDC dc(bmp); + + dc.SetBackground(*wxBLACK); + dc.Clear(); + + wxScopedPtr context(wxGraphicsContext::Create(dc)); + context->SetBrush(*wxWHITE); + context->FillPath(path); + + return bmp; + } + + virtual bool DoSetShape(GdkWindow *window) + { + GdkBitmap* bitmap = m_mask.GetBitmap(); + if ( !bitmap ) + return false; + + gdk_window_shape_combine_mask(window, bitmap, 0, 0); + + return true; + } + + // Draw a shaped window border. + void OnPaint(wxPaintEvent& event) + { + event.Skip(); + + wxPaintDC dc(m_win); + wxScopedPtr context(wxGraphicsContext::Create(dc)); + context->SetPen(wxPen(*wxLIGHT_GREY, 2)); + context->StrokePath(m_path); + } + + wxGraphicsPath m_path; + wxMask m_mask; +}; + +#endif // wxUSE_GRAPHICS_CONTEXT + +// ============================================================================ +// wxNonOwnedWindow implementation +// ============================================================================ + +wxNonOwnedWindow::~wxNonOwnedWindow() +{ + delete m_shapeImpl; +} + +void wxNonOwnedWindow::GTKHandleRealized() +{ + wxNonOwnedWindowBase::GTKHandleRealized(); + + if ( m_shapeImpl ) + { + m_shapeImpl->SetShape(); + + // We can destroy wxNonOwnedWindowShapeImplRegion immediately but need + // to keep wxNonOwnedWindowShapeImplPath around as it draws the border + // on every repaint. + if ( m_shapeImpl->CanBeDeleted() ) + { + delete m_shapeImpl; + m_shapeImpl = NULL; + } + } +} + +bool wxNonOwnedWindow::DoClearShape() +{ + if ( !m_shapeImpl ) + { + // Nothing to do, we don't have any custom shape. + return true; + } + + if ( gtk_widget_get_realized(m_widget) ) + { + // Reset the existing shape immediately. + wxNonOwnedWindowShapeImplNone data(this); + data.SetShape(); + } + //else: just do nothing, deleting m_shapeImpl is enough to ensure that we + // don't set the custom shape later when we're realized. + + delete m_shapeImpl; + m_shapeImpl = NULL; + + return true; +} + +bool wxNonOwnedWindow::DoSetRegionShape(const wxRegion& region) +{ + // In any case get rid of the old data. + delete m_shapeImpl; + m_shapeImpl = NULL; + + if ( gtk_widget_get_realized(m_widget) ) + { + // We can avoid an unnecessary heap allocation and just set the shape + // immediately. + wxNonOwnedWindowShapeImplRegion data(this, region); + return data.SetShape(); + } + else // Create an object that will set shape when we're realized. + { + m_shapeImpl = new wxNonOwnedWindowShapeImplRegion(this, region); + + // In general we don't know whether we are going to succeed or not, so + // be optimistic. + return true; + } +} + +#if wxUSE_GRAPHICS_CONTEXT + +bool wxNonOwnedWindow::DoSetPathShape(const wxGraphicsPath& path) +{ + // The logic here is simpler than above because we always create + // wxNonOwnedWindowShapeImplPath on the heap as we must keep it around, + // even if we're already realized + + delete m_shapeImpl; + m_shapeImpl = new wxNonOwnedWindowShapeImplPath(this, path); + + if ( gtk_widget_get_realized(m_widget) ) + { + return m_shapeImpl->SetShape(); + } + //else: will be done later from GTKHandleRealized(). + + return true; +} + +#endif // wxUSE_GRAPHICS_CONTEXT diff --git a/Externals/wxWidgets3/src/gtk/notebook.cpp b/Externals/wxWidgets3/src/gtk/notebook.cpp index 8ebb6fed28..a12ca0f1b5 100644 --- a/Externals/wxWidgets3/src/gtk/notebook.cpp +++ b/Externals/wxWidgets3/src/gtk/notebook.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/notebook.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: notebook.cpp 66643 2011-01-07 22:31:26Z SC $ +// Id: $Id: notebook.cpp 70112 2011-12-24 18:19:26Z VZ $ // Copyright: (c) 1998 Robert Roebling, Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -277,8 +277,8 @@ bool wxNotebook::SetPageImage( size_t page, int image ) wxGtkNotebookPage* pageData = GetNotebookPage(page); if (image >= 0) { - wxCHECK_MSG(m_imageList, false, "invalid notebook imagelist"); - const wxBitmap* bitmap = m_imageList->GetBitmapPtr(image); + wxCHECK_MSG(HasImageList(), false, "invalid notebook imagelist"); + const wxBitmap* bitmap = GetImageList()->GetBitmapPtr(image); if (bitmap == NULL) return false; if (pageData->m_image) @@ -304,9 +304,34 @@ bool wxNotebook::SetPageImage( size_t page, int image ) return true; } -void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) ) +wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const { - wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") ); + // Compute the max size of the tab labels. + wxSize sizeTabMax; + const size_t pageCount = GetPageCount(); + for ( size_t n = 0; n < pageCount; n++ ) + { + GtkRequisition req; + gtk_widget_size_request(GetNotebookPage(n)->m_box, &req); + sizeTabMax.IncTo(wxSize(req.width, req.height)); + } + + // Unfortunately this doesn't account for the real tab size and I don't + // know how to find it, e.g. where do the margins below come from. + const int PAGE_MARGIN = 3; + const int TAB_MARGIN = 4; + + sizeTabMax.IncBy(3*TAB_MARGIN); + + wxSize sizeFull(sizePage); + if ( IsVertical() ) + sizeFull.y += sizeTabMax.y; + else + sizeFull.x += sizeTabMax.x; + + sizeFull.IncBy(2*PAGE_MARGIN); + + return sizeFull; } void wxNotebook::SetPadding( const wxSize &padding ) @@ -352,8 +377,6 @@ wxNotebookPage *wxNotebook::DoRemovePage( size_t page ) if ( !client ) return NULL; - gtk_widget_unrealize( client->m_widget ); - // we don't need to unparent the client->m_widget; GTK+ will do // that for us (and will throw a warning if we do it!) gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page ); @@ -410,15 +433,17 @@ bool wxNotebook::InsertPage( size_t position, pageData->m_image = NULL; if (imageId != -1) { - if (m_imageList) + if (HasImageList()) { - const wxBitmap* bitmap = m_imageList->GetBitmapPtr(imageId); + const wxBitmap* bitmap = GetImageList()->GetBitmapPtr(imageId); pageData->m_image = gtk_image_new_from_pixbuf(bitmap->GetPixbuf()); gtk_box_pack_start(GTK_BOX(pageData->m_box), pageData->m_image, false, false, m_padding); } else + { wxFAIL_MSG("invalid notebook imagelist"); + } } /* set the label text */ @@ -434,7 +459,7 @@ bool wxNotebook::InsertPage( size_t position, if ( style ) { gtk_widget_modify_style(pageData->m_label, style); - gtk_rc_style_unref(style); + g_object_unref(style); } if (select && GetPageCount() > 1) @@ -453,24 +478,30 @@ static bool IsPointInsideWidget(const wxPoint& pt, GtkWidget *w, gint x, gint y, gint border = 0) { + GtkAllocation a; + gtk_widget_get_allocation(w, &a); return - (pt.x >= w->allocation.x - x - border) && - (pt.x <= w->allocation.x - x + border + w->allocation.width) && - (pt.y >= w->allocation.y - y - border) && - (pt.y <= w->allocation.y - y + border + w->allocation.height); + (pt.x >= a.x - x - border) && + (pt.x <= a.x - x + border + a.width) && + (pt.y >= a.y - y - border) && + (pt.y <= a.y - y + border + a.height); } int wxNotebook::HitTest(const wxPoint& pt, long *flags) const { - const gint x = m_widget->allocation.x; - const gint y = m_widget->allocation.y; + GtkAllocation a; + gtk_widget_get_allocation(m_widget, &a); + const int x = a.x; + const int y = a.y; const size_t count = GetPageCount(); size_t i = 0; +#if !GTK_CHECK_VERSION(3,0,0) && !defined(GSEAL_ENABLE) GtkNotebook * notebook = GTK_NOTEBOOK(m_widget); if (gtk_notebook_get_scrollable(notebook)) i = g_list_position( notebook->children, notebook->first_tab ); +#endif for ( ; i < count; i++ ) { @@ -556,7 +587,7 @@ void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style) GdkWindow *wxNotebook::GTKGetWindow(wxArrayGdkWindows& windows) const { - windows.push_back(m_widget->window); + windows.push_back(gtk_widget_get_window(m_widget)); windows.push_back(GTK_NOTEBOOK(m_widget)->event_window); return NULL; diff --git a/Externals/wxWidgets3/src/gtk/pen.cpp b/Externals/wxWidgets3/src/gtk/pen.cpp index fce20a1ea3..2748925065 100644 --- a/Externals/wxWidgets3/src/gtk/pen.cpp +++ b/Externals/wxWidgets3/src/gtk/pen.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/pen.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: pen.cpp 58227 2009-01-19 13:55:27Z VZ $ +// Id: $Id: pen.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -182,7 +182,7 @@ void wxPen::SetWidth( int width ) int wxPen::GetDashes( wxDash **ptr ) const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); *ptr = (wxDash*)M_PENDATA->m_dash; return M_PENDATA->m_countDashes; @@ -190,49 +190,49 @@ int wxPen::GetDashes( wxDash **ptr ) const int wxPen::GetDashCount() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return (M_PENDATA->m_countDashes); } wxDash* wxPen::GetDash() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") ); return (wxDash*)M_PENDATA->m_dash; } wxPenCap wxPen::GetCap() const { - wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxCAP_INVALID, wxT("invalid pen") ); return M_PENDATA->m_capStyle; } wxPenJoin wxPen::GetJoin() const { - wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxJOIN_INVALID, wxT("invalid pen") ); return M_PENDATA->m_joinStyle; } wxPenStyle wxPen::GetStyle() const { - wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen") ); return M_PENDATA->m_style; } int wxPen::GetWidth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return M_PENDATA->m_width; } wxColour wxPen::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") ); return M_PENDATA->m_colour; } diff --git a/Externals/wxWidgets3/src/gtk/popupwin.cpp b/Externals/wxWidgets3/src/gtk/popupwin.cpp index 68d71d985e..26b11badc0 100644 --- a/Externals/wxWidgets3/src/gtk/popupwin.cpp +++ b/Externals/wxWidgets3/src/gtk/popupwin.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/popupwin.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: popupwin.cpp 62754 2009-12-01 16:23:48Z PC $ +// Id: $Id: popupwin.cpp 70739 2012-02-28 17:25:59Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -46,7 +46,7 @@ static gint gtk_popup_button_press (GtkWidget *widget, GdkEvent *gdk_event, wxPo { if (child == widget) return FALSE; - child = child->parent; + child = gtk_widget_get_parent(child); } } @@ -73,14 +73,6 @@ bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED } } -void wxPopupWindow::AddChildGTK(wxWindowGTK* child) -{ - gtk_widget_set_size_request( - child->m_widget, child->m_width, child->m_height); - gtk_fixed_put( - GTK_FIXED(m_wxwindow), child->m_widget, child->m_x, child->m_y); -} - //----------------------------------------------------------------------------- // wxPopupWindow //----------------------------------------------------------------------------- diff --git a/Externals/wxWidgets3/src/gtk/print.cpp b/Externals/wxWidgets3/src/gtk/print.cpp index 7fada93d7f..a1f51a3f1f 100644 --- a/Externals/wxWidgets3/src/gtk/print.cpp +++ b/Externals/wxWidgets3/src/gtk/print.cpp @@ -3,7 +3,7 @@ // Author: Anthony Bretaudeau // Purpose: GTK printing support // Created: 2007-08-25 -// RCS-ID: $Id: print.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: print.cpp 70669 2012-02-22 13:41:11Z VZ $ // Copyright: (c) 2007 wxWidgets development team // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -31,7 +31,6 @@ #endif #include "wx/fontutil.h" -#include "wx/gtk/private.h" #include "wx/dynlib.h" #include "wx/paper.h" @@ -57,7 +56,7 @@ wxFORCE_LINK_THIS_MODULE(gtk_print) #include "wx/gtk/private/object.h" -// Usefull to convert angles from/to Rad to/from Deg. +// Useful to convert angles from/to Rad to/from Deg. static const double RAD2DEG = 180.0 / M_PI; static const double DEG2RAD = M_PI / 180.0; @@ -620,8 +619,6 @@ wxGtkPrintDialog::~wxGtkPrintDialog() // This is called even if we actually don't want the dialog to appear. int wxGtkPrintDialog::ShowModal() { - GtkPrintOperationResult response; - // We need to restore the settings given in the constructor. wxPrintData data = m_printDialogData.GetPrintData(); wxGtkPrintNativeData *native = @@ -655,10 +652,17 @@ int wxGtkPrintDialog::ShowModal() // Show the dialog if needed. GError* gError = NULL; - if (GetShowDialog()) - response = gtk_print_operation_run (printOp, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW(gtk_widget_get_toplevel(m_parent->m_widget) ), &gError); - else - response = gtk_print_operation_run (printOp, GTK_PRINT_OPERATION_ACTION_PRINT, GTK_WINDOW(gtk_widget_get_toplevel(m_parent->m_widget)), &gError); + GtkPrintOperationResult response = gtk_print_operation_run + ( + printOp, + GetShowDialog() + ? GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG + : GTK_PRINT_OPERATION_ACTION_PRINT, + m_parent + ? GTK_WINDOW(gtk_widget_get_toplevel(m_parent->m_widget)) + : NULL, + &gError + ); // Does everything went well? if (response == GTK_PRINT_OPERATION_RESULT_CANCEL) @@ -667,8 +671,8 @@ int wxGtkPrintDialog::ShowModal() } else if (response == GTK_PRINT_OPERATION_RESULT_ERROR) { + wxLogError(_("Error while printing: ") + wxString(gError ? gError->message : "???")); g_error_free (gError); - wxLogError(_("Error while printing: ") + wxString::Format(_("%s"), gError->message)); return wxID_NO; // We use wxID_NO because there is no wxID_ERROR available } @@ -771,7 +775,9 @@ int wxGtkPageSetupDialog::ShowModal() title = _("Page Setup"); GtkWidget * dlg = gtk_page_setup_unix_dialog_new(title.utf8_str(), - GTK_WINDOW(m_parent->m_widget)); + m_parent + ? GTK_WINDOW(m_parent->m_widget) + : NULL); gtk_page_setup_unix_dialog_set_print_settings( GTK_PAGE_SETUP_UNIX_DIALOG(dlg), nativeData); @@ -1738,25 +1744,12 @@ void wxGtkPrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wxCo angle = -angle; - bool underlined = m_font.Ok() && m_font.GetUnderlined(); - const wxScopedCharBuffer data = text.utf8_str(); - size_t datalen = strlen(data); - pango_layout_set_text( m_layout, data, datalen); + pango_layout_set_text(m_layout, data, data.length()); - if (underlined) - { - PangoAttrList *attrs = pango_attr_list_new(); - PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE); - a->start_index = 0; - a->end_index = datalen; - pango_attr_list_insert(attrs, a); - pango_layout_set_attributes(m_layout, attrs); - pango_attr_list_unref(attrs); - } - - if (m_textForegroundColour.Ok()) + const bool setAttrs = m_font.GTKSetPangoAttrs(m_layout); + if (m_textForegroundColour.IsOk()) { unsigned char red = m_textForegroundColour.Red(); unsigned char blue = m_textForegroundColour.Blue(); @@ -1816,7 +1809,7 @@ void wxGtkPrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wxCo cairo_restore( m_cairo ); - if (underlined) + if (setAttrs) { // Undo underline attributes setting pango_layout_set_attributes(m_layout, NULL); @@ -1844,7 +1837,7 @@ void wxGtkPrinterDCImpl::SetFont( const wxFont& font ) { m_font = font; - if (m_font.Ok()) + if (m_font.IsOk()) { if (m_fontdesc) pango_font_description_free( m_fontdesc ); @@ -1861,7 +1854,7 @@ void wxGtkPrinterDCImpl::SetFont( const wxFont& font ) void wxGtkPrinterDCImpl::SetPen( const wxPen& pen ) { - if (!pen.Ok()) return; + if (!pen.IsOk()) return; m_pen = pen; @@ -1940,7 +1933,7 @@ void wxGtkPrinterDCImpl::SetPen( const wxPen& pen ) void wxGtkPrinterDCImpl::SetBrush( const wxBrush& brush ) { - if (!brush.Ok()) return; + if (!brush.IsOk()) return; m_brush = brush; @@ -2149,8 +2142,8 @@ void wxGtkPrinterDCImpl::DoGetTextExtent(const wxString& string, wxCoord *width, { // scale the font and apply it PangoFontDescription *desc = theFont->GetNativeFontInfo()->description; - float size = pango_font_description_get_size(desc); - size = size * GetFontPointSizeAdjustment(72.0); + oldSize = pango_font_description_get_size(desc); + const float size = oldSize * GetFontPointSizeAdjustment(72.0); pango_font_description_set_size(desc, (gint)size); pango_layout_set_font_description(m_layout, desc); diff --git a/Externals/wxWidgets3/src/gtk/radiobox.cpp b/Externals/wxWidgets3/src/gtk/radiobox.cpp index 715c2fdb08..267c7c9f4c 100644 --- a/Externals/wxWidgets3/src/gtk/radiobox.cpp +++ b/Externals/wxWidgets3/src/gtk/radiobox.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/radiobox.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: radiobox.cpp 67136 2011-03-06 18:22:23Z VS $ +// Id: $Id: radiobox.cpp 67331 2011-03-29 05:15:54Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -59,7 +59,7 @@ static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBo if (!rb->m_hasVMT) return; if (g_blockEventsOnDrag) return; - if (!button->active) return; + if (!gtk_toggle_button_get_active(button)) return; wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, rb->GetId() ); event.SetInt( rb->GetSelection() ); @@ -379,7 +379,7 @@ int wxRadioBox::GetSelection(void) const while (node) { GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData()->button ); - if (button->active) return count; + if (gtk_toggle_button_get_active(button)) return count; count++; node = node->GetNext(); } @@ -397,7 +397,7 @@ wxString wxRadioBox::GetString(unsigned int n) const wxCHECK_MSG( node, wxEmptyString, wxT("radiobox wrong index") ); - GtkLabel *label = GTK_LABEL(GTK_BIN(node->GetData()->button)->child); + GtkLabel* label = GTK_LABEL(gtk_bin_get_child(GTK_BIN(node->GetData()->button))); wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); @@ -419,7 +419,7 @@ void wxRadioBox::SetString(unsigned int item, const wxString& label) wxCHECK_RET( node, wxT("radiobox wrong index") ); - GtkLabel *g_label = GTK_LABEL(GTK_BIN(node->GetData()->button)->child); + GtkLabel* g_label = GTK_LABEL(gtk_bin_get_child(GTK_BIN(node->GetData()->button))); gtk_label_set_text( g_label, wxGTK_CONV( label ) ); } @@ -433,7 +433,7 @@ bool wxRadioBox::Enable( bool enable ) while (node) { GtkButton *button = GTK_BUTTON( node->GetData()->button ); - GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child); + GtkLabel *label = GTK_LABEL(gtk_bin_get_child(GTK_BIN(button))); gtk_widget_set_sensitive( GTK_WIDGET(button), enable ); gtk_widget_set_sensitive( GTK_WIDGET(label), enable ); @@ -455,7 +455,7 @@ bool wxRadioBox::Enable(unsigned int item, bool enable) wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); GtkButton *button = GTK_BUTTON( node->GetData()->button ); - GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child); + GtkLabel *label = GTK_LABEL(gtk_bin_get_child(GTK_BIN(button))); gtk_widget_set_sensitive( GTK_WIDGET(button), enable ); gtk_widget_set_sensitive( GTK_WIDGET(label), enable ); @@ -475,7 +475,7 @@ bool wxRadioBox::IsItemEnabled(unsigned int item) const // don't use GTK_WIDGET_IS_SENSITIVE() here, we want to return true even if // the parent radiobox is disabled - return GTK_WIDGET_SENSITIVE(GTK_WIDGET(button)); + return gtk_widget_get_sensitive(GTK_WIDGET(button)); } bool wxRadioBox::Show(unsigned int item, bool show) @@ -506,7 +506,7 @@ bool wxRadioBox::IsItemShown(unsigned int item) const GtkButton *button = GTK_BUTTON( node->GetData()->button ); - return GTK_WIDGET_VISIBLE(GTK_WIDGET(button)); + return gtk_widget_get_visible(GTK_WIDGET(button)); } unsigned int wxRadioBox::GetCount() const @@ -548,7 +548,7 @@ void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style) GtkWidget *widget = GTK_WIDGET( node->GetData()->button ); gtk_widget_modify_style( widget, style ); - gtk_widget_modify_style(GTK_BIN(widget)->child, style); + gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(widget)), style); node = node->GetNext(); } @@ -565,7 +565,7 @@ void wxRadioBox::GTKWidgetDoSetMnemonic(GtkWidget* w) } #if wxUSE_TOOLTIPS -void wxRadioBox::GTKApplyToolTip(GtkTooltips * WXUNUSED(tips), const gchar *tip) +void wxRadioBox::GTKApplyToolTip(const char* tip) { // set this tooltip for all radiobuttons which don't have their own tips unsigned n = 0; @@ -595,7 +595,7 @@ void wxRadioBox::DoSetItemToolTip(unsigned int n, wxToolTip *tooltip) GdkWindow *wxRadioBox::GTKGetWindow(wxArrayGdkWindows& windows) const { - windows.push_back(m_widget->window); + windows.push_back(gtk_widget_get_window(m_widget)); wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) @@ -603,8 +603,8 @@ GdkWindow *wxRadioBox::GTKGetWindow(wxArrayGdkWindows& windows) const GtkWidget *button = GTK_WIDGET( node->GetData()->button ); // don't put NULL pointers in the 'windows' array! - if (button->window) - windows.push_back(button->window); + if (gtk_widget_get_window(button)) + windows.push_back(gtk_widget_get_window(button)); node = node->GetNext(); } diff --git a/Externals/wxWidgets3/src/gtk/radiobut.cpp b/Externals/wxWidgets3/src/gtk/radiobut.cpp index eedf1d2204..78a6f2e736 100644 --- a/Externals/wxWidgets3/src/gtk/radiobut.cpp +++ b/Externals/wxWidgets3/src/gtk/radiobut.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/radiobut.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: radiobut.cpp 67254 2011-03-20 00:14:35Z DS $ +// Id: $Id: radiobut.cpp 67326 2011-03-28 06:27:49Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -34,7 +34,7 @@ void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *r if (g_blockEventsOnDrag) return; - if (!button->active) return; + if (!gtk_toggle_button_get_active(button)) return; wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId()); event.SetInt( rb->GetValue() ); @@ -102,7 +102,7 @@ void wxRadioButton::SetLabel( const wxString& label ) // save the original label wxControlBase::SetLabel(label); - GTKSetLabelForLabel(GTK_LABEL(GTK_BIN(m_widget)->child), label); + GTKSetLabelForLabel(GTK_LABEL(gtk_bin_get_child(GTK_BIN(m_widget))), label); } void wxRadioButton::SetValue( bool val ) @@ -134,7 +134,7 @@ bool wxRadioButton::GetValue() const { wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobutton") ); - return GTK_TOGGLE_BUTTON(m_widget)->active; + return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widget)) != 0; } bool wxRadioButton::Enable( bool enable ) @@ -142,7 +142,7 @@ bool wxRadioButton::Enable( bool enable ) if (!base_type::Enable(enable)) return false; - gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable); + gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable); if (enable) GTKFixSensitivity(); @@ -153,7 +153,7 @@ bool wxRadioButton::Enable( bool enable ) void wxRadioButton::DoApplyWidgetStyle(GtkRcStyle *style) { gtk_widget_modify_style(m_widget, style); - gtk_widget_modify_style(GTK_BIN(m_widget)->child, style); + gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(m_widget)), style); } GdkWindow * diff --git a/Externals/wxWidgets3/src/gtk/region.cpp b/Externals/wxWidgets3/src/gtk/region.cpp index 0ddde4ec8d..6832d60d7b 100644 --- a/Externals/wxWidgets3/src/gtk/region.cpp +++ b/Externals/wxWidgets3/src/gtk/region.cpp @@ -3,7 +3,7 @@ // Purpose: // Author: Robert Roebling // Modified: VZ at 05.10.00: use AllocExclusive(), comparison fixed -// Id: $Id: region.cpp 61724 2009-08-21 10:41:26Z VZ $ +// Id: $Id: region.cpp 69817 2011-11-25 01:01:26Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -179,26 +179,24 @@ bool wxRegion::DoUnionWithRect(const wxRect& r) bool wxRegion::DoUnionWithRegion( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, wxT("invalid region") ); + wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") ); if (!m_refData) { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); + m_refData = new wxRegionRefData(*M_REGIONDATA_OF(region)); } else { AllocExclusive(); + gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() ); } - gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() ); - return true; } bool wxRegion::DoIntersect( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, wxT("invalid region") ); + wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") ); if (!m_refData) { @@ -215,7 +213,7 @@ bool wxRegion::DoIntersect( const wxRegion& region ) bool wxRegion::DoSubtract( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, wxT("invalid region") ); + wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") ); if (!m_refData) { @@ -232,24 +230,27 @@ bool wxRegion::DoSubtract( const wxRegion& region ) bool wxRegion::DoXor( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, wxT("invalid region") ); + wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") ); if (!m_refData) { - return false; + // XOR-ing with an invalid region is the same as XOR-ing with an empty + // one, i.e. it is simply a copy. + m_refData = new wxRegionRefData(*M_REGIONDATA_OF(region)); } + else + { + AllocExclusive(); - AllocExclusive(); - - gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() ); + gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() ); + } return true; } bool wxRegion::DoOffset( wxCoord x, wxCoord y ) { - if (!m_refData) - return false; + wxCHECK_MSG( m_refData, false, wxS("invalid region") ); AllocExclusive(); @@ -369,15 +370,13 @@ void wxRegionIterator::CreateRects( const wxRegion& region ) if (!gdkregion) return; - GdkRectangle *gdkrects = NULL; - gint numRects = 0; - gdk_region_get_rectangles( gdkregion, &gdkrects, &numRects ); + GdkRectangle* gdkrects; + gdk_region_get_rectangles(gdkregion, &gdkrects, &m_numRects); - m_numRects = numRects; - if (numRects) + if (m_numRects) { m_rects = new wxRect[m_numRects]; - for (size_t i=0; i < m_numRects; ++i) + for (int i = 0; i < m_numRects; ++i) { GdkRectangle &gr = gdkrects[i]; wxRect &wr = m_rects[i]; @@ -459,20 +458,17 @@ wxRect wxRegionIterator::GetRect() const wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& ri) { - wxDELETEA(m_rects); - - m_current = ri.m_current; - m_numRects = ri.m_numRects; - if ( m_numRects ) + if (this != &ri) { - m_rects = new wxRect[m_numRects]; - for ( unsigned int n = 0; n < m_numRects; n++ ) - m_rects[n] = ri.m_rects[n]; - } - else - { - m_rects = NULL; - } + wxDELETEA(m_rects); + m_current = ri.m_current; + m_numRects = ri.m_numRects; + if ( m_numRects ) + { + m_rects = new wxRect[m_numRects]; + memcpy(m_rects, ri.m_rects, m_numRects * sizeof m_rects[0]); + } + } return *this; } diff --git a/Externals/wxWidgets3/src/gtk/renderer.cpp b/Externals/wxWidgets3/src/gtk/renderer.cpp index a233bc14dc..f3bb23681a 100644 --- a/Externals/wxWidgets3/src/gtk/renderer.cpp +++ b/Externals/wxWidgets3/src/gtk/renderer.cpp @@ -4,7 +4,7 @@ // Author: Vadim Zeitlin // Modified by: // Created: 20.07.2003 -// RCS-ID: $Id: renderer.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: renderer.cpp 69741 2011-11-12 16:50:37Z PC $ // Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -205,7 +205,7 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, gtk_paint_box ( - button->style, + gtk_widget_get_style(button), gdk_window, state, GTK_SHADOW_OUT, @@ -256,18 +256,17 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win, if (win->GetLayoutDirection() == wxLayout_RightToLeft) x_diff = rect.width; - // VZ: I don't know how to get the size of the expander so as to centre it - // in the given rectangle, +2/3 below is just what looks good here... + // x and y parameters specify the center of the expander gtk_paint_expander ( - tree->style, + gtk_widget_get_style(tree), gdk_window, state, NULL, tree, "treeview", - dc.LogicalToDeviceX(rect.x) + 6 - x_diff, - dc.LogicalToDeviceY(rect.y) + 3, + dc.LogicalToDeviceX(rect.x) + rect.width / 2 - x_diff, + dc.LogicalToDeviceY(rect.y) + rect.height / 2, flags & wxCONTROL_EXPANDED ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED ); @@ -315,7 +314,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow* win, wxOrientation orient, int flags) { - if ( !win->m_wxwindow->window ) + if (gtk_widget_get_window(win->m_wxwindow) == NULL) { // window not realized yet return; @@ -353,7 +352,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow* win, gtk_paint_handle ( - win->m_wxwindow->style, + gtk_widget_get_style(win->m_wxwindow), gdk_window, flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL, GTK_SHADOW_NONE, @@ -409,7 +408,7 @@ wxRendererGTK::DrawDropArrow(wxWindow* win, // draw arrow on button gtk_paint_arrow ( - button->style, + gtk_widget_get_style(button), gdk_window, state, flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT, @@ -488,7 +487,7 @@ wxRendererGTK::DrawCheckBox(wxWindow* win, gtk_paint_check ( - button->style, + gtk_widget_get_style(button), gdk_window, state, shadow_type, @@ -527,7 +526,7 @@ wxRendererGTK::DrawPushButton(wxWindow* win, gtk_paint_box ( - button->style, + gtk_widget_get_style(button), gdk_window, state, flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT, @@ -559,7 +558,7 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win, // the wxCONTROL_FOCUSED state is deduced // directly from the m_wxwindow by GTK+ - gtk_paint_flat_box(wxGTKPrivate::GetTreeWidget()->style, + gtk_paint_flat_box(gtk_widget_get_style(wxGTKPrivate::GetTreeWidget()), gdk_window, GTK_STATE_SELECTED, GTK_SHADOW_NONE, @@ -588,7 +587,7 @@ void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, i else state = GTK_STATE_NORMAL; - gtk_paint_focus( win->m_widget->style, + gtk_paint_focus( gtk_widget_get_style(win->m_widget), gdk_window, state, NULL, @@ -611,14 +610,11 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in if ( flags & wxCONTROL_DISABLED ) state = GTK_STATE_INSENSITIVE; - if (flags & wxCONTROL_CURRENT ) - GTK_WIDGET_SET_FLAGS( entry, GTK_HAS_FOCUS ); - else - GTK_WIDGET_UNSET_FLAGS( entry, GTK_HAS_FOCUS ); + gtk_widget_set_can_focus(entry, (flags & wxCONTROL_CURRENT) != 0); gtk_paint_shadow ( - entry->style, + gtk_widget_get_style(entry), gdk_window, state, GTK_SHADOW_OUT, @@ -643,14 +639,11 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in if ( flags & wxCONTROL_DISABLED ) state = GTK_STATE_INSENSITIVE; - if (flags & wxCONTROL_CURRENT ) - GTK_WIDGET_SET_FLAGS( combo, GTK_HAS_FOCUS ); - else - GTK_WIDGET_UNSET_FLAGS( combo, GTK_HAS_FOCUS ); + gtk_widget_set_can_focus(combo, (flags & wxCONTROL_CURRENT) != 0); gtk_paint_shadow ( - combo->style, + gtk_widget_get_style(combo), gdk_window, state, GTK_SHADOW_OUT, @@ -672,7 +665,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in gtk_paint_arrow ( - combo->style, + gtk_widget_get_style(combo), gdk_window, state, GTK_SHADOW_OUT, @@ -693,7 +686,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in gtk_paint_box ( - combo->style, + gtk_widget_get_style(combo), gdk_window, state, GTK_SHADOW_ETCHED_OUT, @@ -740,7 +733,7 @@ void wxRendererGTK::DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, gtk_paint_option ( - button->style, + gtk_widget_get_style(button), gdk_window, state, shadow_type, diff --git a/Externals/wxWidgets3/src/gtk/scrolbar.cpp b/Externals/wxWidgets3/src/gtk/scrolbar.cpp index c5df1186b3..87e5615a33 100644 --- a/Externals/wxWidgets3/src/gtk/scrolbar.cpp +++ b/Externals/wxWidgets3/src/gtk/scrolbar.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/scrolbar.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: scrolbar.cpp 66555 2011-01-04 08:31:53Z SC $ +// Id: $Id: scrolbar.cpp 67326 2011-03-28 06:27:49Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -167,26 +167,25 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, int wxScrollBar::GetThumbPosition() const { - GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment; - return int(adj->value + 0.5); + return wxRound(gtk_range_get_value(GTK_RANGE(m_widget))); } int wxScrollBar::GetThumbSize() const { - GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment; - return int(adj->page_size); + GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_widget)); + return int(gtk_adjustment_get_page_size(adj)); } int wxScrollBar::GetPageSize() const { - GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment; - return int(adj->page_increment); + GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_widget)); + return int(gtk_adjustment_get_page_increment(adj)); } int wxScrollBar::GetRange() const { - GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment; - return int(adj->upper); + GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_widget)); + return int(gtk_adjustment_get_upper(adj)); } void wxScrollBar::SetThumbPosition( int viewStart ) @@ -212,14 +211,13 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS range = thumbSize = 1; } - GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment; - adj->step_increment = 1; - adj->page_increment = pageSize; - adj->page_size = thumbSize; - adj->value = position; g_signal_handlers_block_by_func(m_widget, (void*)gtk_value_changed, this); - gtk_range_set_range((GtkRange*)m_widget, 0, range); - m_scrollPos[0] = adj->value; + GtkRange* widget = GTK_RANGE(m_widget); + gtk_adjustment_set_page_size(gtk_range_get_adjustment(widget), thumbSize); + gtk_range_set_increments(widget, 1, pageSize); + gtk_range_set_range(widget, 0, range); + gtk_range_set_value(widget, position); + m_scrollPos[0] = gtk_range_get_value(widget); g_signal_handlers_unblock_by_func(m_widget, (void*)gtk_value_changed, this); } @@ -233,11 +231,6 @@ void wxScrollBar::SetRange(int range) SetScrollbar(GetThumbPosition(), GetThumbSize(), range, GetPageSize()); } -GdkWindow *wxScrollBar::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const -{ - return m_widget->window; -} - // static wxVisualAttributes wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) diff --git a/Externals/wxWidgets3/src/gtk/scrolwin.cpp b/Externals/wxWidgets3/src/gtk/scrolwin.cpp index 363cb56312..9a50e5dc12 100644 --- a/Externals/wxWidgets3/src/gtk/scrolwin.cpp +++ b/Externals/wxWidgets3/src/gtk/scrolwin.cpp @@ -5,7 +5,7 @@ // Modified by: Ron Lee // Vadim Zeitlin: removed 90% of duplicated common code // Created: 01/02/97 -// RCS-ID: $Id: scrolwin.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: scrolwin.cpp 68121 2011-07-01 17:44:49Z PC $ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -20,6 +20,7 @@ #include "wx/scrolwin.h" #include +#include "wx/gtk/private/gtk2-compat.h" // ---------------------------------------------------------------------------- // wxScrollHelper implementation @@ -30,10 +31,10 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, int xPos, int yPos, bool noRefresh) { - m_win->m_scrollPos[wxWindow::ScrollDir_Horz] = - m_win->m_scrollBar[wxWindow::ScrollDir_Horz]->adjustment->value = xPos; - m_win->m_scrollPos[wxWindow::ScrollDir_Vert] = - m_win->m_scrollBar[wxWindow::ScrollDir_Vert]->adjustment->value = yPos; + // prevent programmatic position changes from causing scroll events + m_win->SetScrollPos(wxHORIZONTAL, xPos); + m_win->SetScrollPos(wxVERTICAL, yPos); + base_type::SetScrollbars( pixelsPerUnitX, pixelsPerUnitY, noUnitsX, noUnitsY, xPos, yPos, noRefresh); } @@ -68,10 +69,8 @@ void wxScrollHelper::DoAdjustScrollbar(GtkRange* range, *linesPerPage = 0; } - GtkAdjustment* adj = range->adjustment; - adj->step_increment = 1; - adj->page_increment = - adj->page_size = page_size; + gtk_range_set_increments(range, 1, page_size); + gtk_adjustment_set_page_size(gtk_range_get_adjustment(range), page_size); gtk_range_set_range(range, 0, upper); // ensure that the scroll position is always in valid range diff --git a/Externals/wxWidgets3/src/gtk/settings.cpp b/Externals/wxWidgets3/src/gtk/settings.cpp index e28d6ec8c9..9544fb9bc5 100644 --- a/Externals/wxWidgets3/src/gtk/settings.cpp +++ b/Externals/wxWidgets3/src/gtk/settings.cpp @@ -3,7 +3,7 @@ // Purpose: // Author: Robert Roebling // Modified by: Mart Raudsepp (GetMetric) -// Id: $Id: settings.cpp 67018 2011-02-25 09:38:35Z JS $ +// Id: $Id: settings.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -22,6 +22,7 @@ #include #include "wx/gtk/private/win_gtk.h" +#include "wx/gtk/private/gtk2-compat.h" bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom); @@ -60,7 +61,7 @@ static const GtkStyle* ButtonStyle() gtk_widget_ensure_style(s_widget); g_signal_connect(s_widget, "style_set", G_CALLBACK(style_set), NULL); } - return s_widget->style; + return gtk_widget_get_style(s_widget); } static const GtkStyle* ListStyle() @@ -73,7 +74,7 @@ static const GtkStyle* ListStyle() gtk_container_add(ContainerWidget(), s_widget); gtk_widget_ensure_style(s_widget); } - return s_widget->style; + return gtk_widget_get_style(s_widget); } static const GtkStyle* TextCtrlStyle() @@ -85,7 +86,7 @@ static const GtkStyle* TextCtrlStyle() gtk_container_add(ContainerWidget(), s_widget); gtk_widget_ensure_style(s_widget); } - return s_widget->style; + return gtk_widget_get_style(s_widget); } static const GtkStyle* MenuItemStyle() @@ -97,7 +98,7 @@ static const GtkStyle* MenuItemStyle() gtk_container_add(ContainerWidget(), s_widget); gtk_widget_ensure_style(s_widget); } - return s_widget->style; + return gtk_widget_get_style(s_widget); } static const GtkStyle* MenuBarStyle() @@ -109,7 +110,7 @@ static const GtkStyle* MenuBarStyle() gtk_container_add(ContainerWidget(), s_widget); gtk_widget_ensure_style(s_widget); } - return s_widget->style; + return gtk_widget_get_style(s_widget); } static const GtkStyle* ToolTipStyle() @@ -124,7 +125,7 @@ static const GtkStyle* ToolTipStyle() gtk_widget_set_name(s_widget, name); gtk_widget_ensure_style(s_widget); } - return s_widget->style; + return gtk_widget_get_style(s_widget); } wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) @@ -257,7 +258,7 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) case wxSYS_SYSTEM_FONT: case wxSYS_DEVICE_DEFAULT_FONT: case wxSYS_DEFAULT_GUI_FONT: - if (!gs_fontSystem.Ok()) + if (!gs_fontSystem.IsOk()) { wxNativeFontInfo info; info.description = ButtonStyle()->font_desc; @@ -316,8 +317,8 @@ static int GetBorderWidth(wxSystemMetric index, wxWindow* win) int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) { GdkWindow *window = NULL; - if(win && GTK_WIDGET_REALIZED(win->GetHandle())) - window = win->GetHandle()->window; + if (win) + window = gtk_widget_get_window(win->GetHandle()); switch (index) { diff --git a/Externals/wxWidgets3/src/gtk/slider.cpp b/Externals/wxWidgets3/src/gtk/slider.cpp index 92b3a46990..694184cf3d 100644 --- a/Externals/wxWidgets3/src/gtk/slider.cpp +++ b/Externals/wxWidgets3/src/gtk/slider.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/slider.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: slider.cpp 66555 2011-01-04 08:31:53Z SC $ +// Id: $Id: slider.cpp 70756 2012-02-29 18:29:31Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -20,6 +20,7 @@ #endif #include +#include "wx/gtk/private/gtk2-compat.h" //----------------------------------------------------------------------------- // data @@ -124,10 +125,9 @@ extern "C" { static void gtk_value_changed(GtkRange* range, wxSlider* win) { - GtkAdjustment* adj = gtk_range_get_adjustment (range); - const int pos = wxRound(adj->value); + const double value = gtk_range_get_value(range); const double oldPos = win->m_pos; - win->m_pos = adj->value; + win->m_pos = value; if (!win->m_hasVMT || g_blockEventsOnDrag) return; @@ -151,18 +151,19 @@ gtk_value_changed(GtkRange* range, wxSlider* win) else if (win->m_mouseButtonDown) { // Difference from last change event - const double diff = adj->value - oldPos; + const double diff = value - oldPos; const bool isDown = diff > 0; - if (IsScrollIncrement(adj->page_increment, diff)) + GtkAdjustment* adj = gtk_range_get_adjustment(range); + if (IsScrollIncrement(gtk_adjustment_get_page_increment(adj), diff)) { eventType = isDown ? wxEVT_SCROLL_PAGEDOWN : wxEVT_SCROLL_PAGEUP; } - else if (wxIsSameDouble(adj->value, 0)) + else if (wxIsSameDouble(value, 0)) { eventType = wxEVT_SCROLL_PAGEUP; } - else if (wxIsSameDouble(adj->value, adj->upper)) + else if (wxIsSameDouble(value, gtk_adjustment_get_upper(adj))) { eventType = wxEVT_SCROLL_PAGEDOWN; } @@ -178,7 +179,7 @@ gtk_value_changed(GtkRange* range, wxSlider* win) win->m_scrollEventType = GTK_SCROLL_NONE; // If integral position has changed - if (wxRound(oldPos) != pos) + if (wxRound(oldPos) != wxRound(value)) { ProcessScrollEvent(win, eventType); win->m_needThumbRelease = eventType == wxEVT_SCROLL_THUMBTRACK; @@ -317,7 +318,6 @@ bool wxSlider::Create(wxWindow *parent, else m_widget = gtk_vbox_new(false, 0); g_object_ref(m_widget); - gtk_widget_show( m_widget ); gtk_container_add( GTK_CONTAINER(m_widget), m_scale ); GtkWidget *box; @@ -438,6 +438,8 @@ void wxSlider::GTKSetValue(int value) { GTKDisableEvents(); gtk_range_set_value(GTK_RANGE (m_scale), value); + // GTK only updates value label if handle moves at least 1 pixel + gtk_widget_queue_draw(m_scale); GTKEnableEvents(); } @@ -471,12 +473,14 @@ void wxSlider::SetRange( int minValue, int maxValue ) int wxSlider::GetMin() const { - return int(gtk_range_get_adjustment (GTK_RANGE (m_scale))->lower); + GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_scale)); + return int(gtk_adjustment_get_lower(adj)); } int wxSlider::GetMax() const { - return int(gtk_range_get_adjustment (GTK_RANGE (m_scale))->upper); + GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_scale)); + return int(gtk_adjustment_get_upper(adj)); } void wxSlider::SetPageSize( int pageSize ) @@ -488,7 +492,8 @@ void wxSlider::SetPageSize( int pageSize ) int wxSlider::GetPageSize() const { - return int(gtk_range_get_adjustment (GTK_RANGE (m_scale))->page_increment); + GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_scale)); + return int(gtk_adjustment_get_page_increment(adj)); } // GTK does not support changing the size of the slider @@ -510,7 +515,8 @@ void wxSlider::SetLineSize( int lineSize ) int wxSlider::GetLineSize() const { - return int(gtk_range_get_adjustment (GTK_RANGE (m_scale))->step_increment); + GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_scale)); + return int(gtk_adjustment_get_step_increment(adj)); } GdkWindow *wxSlider::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const diff --git a/Externals/wxWidgets3/src/gtk/sockgtk.cpp b/Externals/wxWidgets3/src/gtk/sockgtk.cpp index 62ac793e29..5ba3ab13b9 100644 --- a/Externals/wxWidgets3/src/gtk/sockgtk.cpp +++ b/Externals/wxWidgets3/src/gtk/sockgtk.cpp @@ -3,7 +3,7 @@ // Purpose: implementation of wxGTK-specific socket event handling // Author: Guilhem Lavaux, Vadim Zeitlin // Created: 1999 -// RCS-ID: $Id: sockgtk.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: sockgtk.cpp 67326 2011-03-28 06:27:49Z PC $ // Copyright: (c) 1999, 2007 wxWidgets dev team // (c) 2009 Vadim Zeitlin // Licence: wxWindows licence @@ -17,17 +17,14 @@ #include "wx/apptrait.h" #include "wx/private/fdiomanager.h" -#include +#include extern "C" { -static -void wxSocket_GDK_Input(gpointer data, - gint WXUNUSED(source), - GdkInputCondition condition) +static gboolean wxSocket_Input(GIOChannel*, GIOCondition condition, gpointer data) { wxFDIOHandler * const handler = static_cast(data); - if ( condition & GDK_INPUT_READ ) + if (condition & G_IO_IN) { handler->OnReadWaiting(); @@ -35,11 +32,13 @@ void wxSocket_GDK_Input(gpointer data, // shouldn't call OnWriteWaiting() as the socket is now closed and it // would assert if ( !handler->IsOk() ) - return; + return true; } - if ( condition & GDK_INPUT_WRITE ) + if (condition & G_IO_OUT) handler->OnWriteWaiting(); + + return true; } } @@ -48,19 +47,17 @@ class GTKFDIOManager : public wxFDIOManager public: virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d) { - return gdk_input_add - ( - fd, - d == OUTPUT ? GDK_INPUT_WRITE : GDK_INPUT_READ, - wxSocket_GDK_Input, - handler - ); + return g_io_add_watch( + g_io_channel_unix_new(fd), + d == OUTPUT ? G_IO_OUT : G_IO_IN, + wxSocket_Input, + handler); } virtual void RemoveInput(wxFDIOHandler* WXUNUSED(handler), int fd, Direction WXUNUSED(d)) { - gdk_input_remove(fd); + g_source_remove(fd); } }; diff --git a/Externals/wxWidgets3/src/gtk/spinctrl.cpp b/Externals/wxWidgets3/src/gtk/spinctrl.cpp index 48ff350c70..a1f3f0f9dd 100644 --- a/Externals/wxWidgets3/src/gtk/spinctrl.cpp +++ b/Externals/wxWidgets3/src/gtk/spinctrl.cpp @@ -3,7 +3,7 @@ // Purpose: wxSpinCtrl // Author: Robert // Modified by: -// RCS-ID: $Id: spinctrl.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: spinctrl.cpp 67326 2011-03-28 06:27:49Z PC $ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -152,12 +152,14 @@ double wxSpinCtrlGTKBase::DoGetValue() const g_signal_emit(m_widget, sig_id, 0, &value, &handled); if (!handled) value = g_strtod(gtk_entry_get_text(GTK_ENTRY(m_widget)), NULL); - const GtkAdjustment* adj = + GtkAdjustment* adj = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(m_widget)); - if (value < adj->lower) - value = adj->lower; - else if (value > adj->upper) - value = adj->upper; + const double lower = gtk_adjustment_get_lower(adj); + const double upper = gtk_adjustment_get_upper(adj); + if (value < lower) + value = lower; + else if (value > upper) + value = upper; return value; } @@ -297,7 +299,7 @@ void wxSpinCtrlGTKBase::OnChar( wxKeyEvent &event ) GtkWindow *window = GTK_WINDOW(top_frame->m_widget); if ( window ) { - GtkWidget *widgetDef = window->default_widget; + GtkWidget* widgetDef = gtk_window_get_default_widget(window); if ( widgetDef ) { diff --git a/Externals/wxWidgets3/src/gtk/statbmp.cpp b/Externals/wxWidgets3/src/gtk/statbmp.cpp index 115f3627ee..6ef20ec877 100644 --- a/Externals/wxWidgets3/src/gtk/statbmp.cpp +++ b/Externals/wxWidgets3/src/gtk/statbmp.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/statbmp.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: statbmp.cpp 67254 2011-03-20 00:14:35Z DS $ +// Id: $Id: statbmp.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -47,7 +47,7 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi m_widget = gtk_image_new(); g_object_ref(m_widget); - if (bitmap.Ok()) + if (bitmap.IsOk()) SetBitmap(bitmap); PostCreation(size); @@ -60,7 +60,7 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) { m_bitmap = bitmap; - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { // always use pixbuf, because pixmap mask does not // work with disabled images in some themes diff --git a/Externals/wxWidgets3/src/gtk/statbox.cpp b/Externals/wxWidgets3/src/gtk/statbox.cpp index 4f2e9d88d6..da884716f9 100644 --- a/Externals/wxWidgets3/src/gtk/statbox.cpp +++ b/Externals/wxWidgets3/src/gtk/statbox.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/statbox.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: statbox.cpp 67254 2011-03-20 00:14:35Z DS $ +// Id: $Id: statbox.cpp 67326 2011-03-28 06:27:49Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -16,6 +16,7 @@ #include "wx/gtk/private/win_gtk.h" // for wxPizza #include +#include "wx/gtk/private/gtk2-compat.h" // constants taken from GTK sources #define LABEL_PAD 1 @@ -31,15 +32,16 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc, void*) // clip label as GTK >= 2.12 does GtkWidget* label_widget = gtk_frame_get_label_widget(GTK_FRAME(widget)); int w = alloc->width - - 2 * widget->style->xthickness - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD; + 2 * gtk_widget_get_style(widget)->xthickness - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD; if (w < 0) w = 0; - if (label_widget->allocation.width > w) + GtkAllocation a; + gtk_widget_get_allocation(label_widget, &a); + if (a.width > w) { - GtkAllocation alloc2 = label_widget->allocation; - alloc2.width = w; - gtk_widget_size_allocate(label_widget, &alloc2); + a.width = w; + gtk_widget_size_allocate(label_widget, &a); } } } diff --git a/Externals/wxWidgets3/src/gtk/stattext.cpp b/Externals/wxWidgets3/src/gtk/stattext.cpp index d152499e2b..ff4bd25251 100644 --- a/Externals/wxWidgets3/src/gtk/stattext.cpp +++ b/Externals/wxWidgets3/src/gtk/stattext.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/stattext.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: stattext.cpp 67254 2011-03-20 00:14:35Z DS $ +// Id: $Id: stattext.cpp 70446 2012-01-23 11:28:28Z VZ $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -153,31 +153,48 @@ bool wxStaticText::DoSetLabelMarkup(const wxString& markup) bool wxStaticText::SetFont( const wxFont &font ) { const bool wasUnderlined = GetFont().GetUnderlined(); + const bool wasStrickenThrough = GetFont().GetStrikethrough(); bool ret = wxControl::SetFont(font); - if ( font.GetUnderlined() != wasUnderlined ) - { - // the underlines for mnemonics are incompatible with using attributes - // so turn them off when setting underlined font and restore them when - // unsetting it - gtk_label_set_use_underline(GTK_LABEL(m_widget), wasUnderlined); + const bool isUnderlined = GetFont().GetUnderlined(); + const bool isStrickenThrough = GetFont().GetStrikethrough(); - if ( wasUnderlined ) + if ( (isUnderlined != wasUnderlined) || + (isStrickenThrough != wasStrickenThrough) ) + { + // We need to update the Pango attributes used for the text. + if ( isUnderlined || isStrickenThrough ) { - // it's not underlined any more, remove the attributes we set - gtk_label_set_attributes(GTK_LABEL(m_widget), NULL); - } - else // the text is underlined now - { - PangoAttrList *attrs = pango_attr_list_new(); - PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE); - a->start_index = 0; - a->end_index = (guint)-1; - pango_attr_list_insert(attrs, a); + PangoAttrList* const attrs = pango_attr_list_new(); + if ( isUnderlined ) + { + PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE); + a->start_index = 0; + a->end_index = (guint)-1; + pango_attr_list_insert(attrs, a); + } + + if ( isStrickenThrough ) + { + PangoAttribute *a = pango_attr_strikethrough_new( TRUE ); + a->start_index = 0; + a->end_index = (guint) -1; + pango_attr_list_insert(attrs, a); + } + gtk_label_set_attributes(GTK_LABEL(m_widget), attrs); pango_attr_list_unref(attrs); } + else // No special attributes any more. + { + // Just remove any attributes we had set. + gtk_label_set_attributes(GTK_LABEL(m_widget), NULL); + } + + // The underlines for mnemonics are incompatible with using attributes + // so turn them off when setting underlined font. + gtk_label_set_use_underline(GTK_LABEL(m_widget), !isUnderlined); } // adjust the label size to the new label unless disabled diff --git a/Externals/wxWidgets3/src/gtk/taskbar.cpp b/Externals/wxWidgets3/src/gtk/taskbar.cpp index 76b99b45bd..d92e0d0cae 100644 --- a/Externals/wxWidgets3/src/gtk/taskbar.cpp +++ b/Externals/wxWidgets3/src/gtk/taskbar.cpp @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // Modified by: Paul Cornett // Created: 2004/05/29 -// RCS-ID: $Id: taskbar.cpp 58822 2009-02-10 03:43:30Z PC $ +// RCS-ID: $Id: taskbar.cpp 70701 2012-02-26 17:18:41Z VZ $ // Copyright: (c) Vaclav Slavik, 2004 // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////// @@ -116,6 +116,7 @@ status_icon_popup_menu(GtkStatusIcon*, guint, guint, wxTaskBarIcon* taskBarIcon) bool wxTaskBarIconBase::IsAvailable() { +#ifdef GDK_WINDOWING_X11 char name[32]; g_snprintf(name, sizeof(name), "_NET_SYSTEM_TRAY_S%d", gdk_x11_get_default_screen()); @@ -124,6 +125,9 @@ bool wxTaskBarIconBase::IsAvailable() Window manager = XGetSelectionOwner(gdk_x11_get_default_xdisplay(), atom); return manager != None; +#else + return true; +#endif } //----------------------------------------------------------------------------- @@ -180,7 +184,7 @@ void wxTaskBarIcon::Private::SetIcon() m_size = 0; if (m_eggTrayIcon) { - GtkWidget* image = GTK_BIN(m_eggTrayIcon)->child; + GtkWidget* image = gtk_bin_get_child(GTK_BIN(m_eggTrayIcon)); gtk_image_set_from_pixbuf(GTK_IMAGE(image), m_bitmap.GetPixbuf()); } else @@ -207,10 +211,22 @@ void wxTaskBarIcon::Private::SetIcon() #if GTK_CHECK_VERSION(2,10,0) if (m_statusIcon) - gtk_status_icon_set_tooltip(m_statusIcon, tip_text); - else -#endif { +#if GTK_CHECK_VERSION(2,16,0) + if (GTK_CHECK_VERSION(3,0,0) || gtk_check_version(2,16,0) == NULL) + gtk_status_icon_set_tooltip_text(m_statusIcon, tip_text); + else +#endif + { +#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED) + gtk_status_icon_set_tooltip(m_statusIcon, tip_text); +#endif + } + } + else +#endif // GTK_CHECK_VERSION(2,10,0) + { +#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED) if (tip_text && m_tooltips == NULL) { m_tooltips = gtk_tooltips_new(); @@ -219,6 +235,7 @@ void wxTaskBarIcon::Private::SetIcon() } if (m_tooltips) gtk_tooltips_set_tip(m_tooltips, m_eggTrayIcon, tip_text, ""); +#endif } #endif // wxUSE_TOOLTIPS } @@ -240,7 +257,7 @@ void wxTaskBarIcon::Private::size_allocate(int width, int height) if (h > size) h = size; GdkPixbuf* pixbuf = gdk_pixbuf_scale_simple(m_bitmap.GetPixbuf(), w, h, GDK_INTERP_BILINEAR); - GtkImage* image = GTK_IMAGE(GTK_BIN(m_eggTrayIcon)->child); + GtkImage* image = GTK_IMAGE(gtk_bin_get_child(GTK_BIN(m_eggTrayIcon))); gtk_image_set_from_pixbuf(image, pixbuf); g_object_unref(pixbuf); } diff --git a/Externals/wxWidgets3/src/gtk/textctrl.cpp b/Externals/wxWidgets3/src/gtk/textctrl.cpp index ef032998c6..2a9dc26663 100644 --- a/Externals/wxWidgets3/src/gtk/textctrl.cpp +++ b/Externals/wxWidgets3/src/gtk/textctrl.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/textctrl.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: textctrl.cpp 66555 2011-01-04 08:31:53Z SC $ +// Id: $Id: textctrl.cpp 70674 2012-02-23 13:56:14Z VZ $ // Copyright: (c) 1998 Robert Roebling, Vadim Zeitlin, 2005 Mart Raudsepp // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -110,6 +110,18 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text, NULL ); gtk_text_buffer_apply_tag (text_buffer, tag, start, end); } + if ( font.GetStrikethrough() ) + { + g_snprintf(buf, sizeof(buf), "WXFONTSTRIKETHROUGH"); + tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ), + buf ); + if (!tag) + tag = gtk_text_buffer_create_tag( text_buffer, buf, + "strikethrough-set", TRUE, + "strikethrough", TRUE, + NULL ); + gtk_text_buffer_apply_tag (text_buffer, tag, start, end); + } } if (attr.HasTextColour()) @@ -391,7 +403,7 @@ au_check_word( GtkTextIter *s, GtkTextIter *e ) for( n = 0; n < WXSIZEOF(URIPrefixes); ++n ) { prefix_len = strlen(URIPrefixes[n]); - if((len > prefix_len) && !strncasecmp(text, URIPrefixes[n], prefix_len)) + if((len > prefix_len) && !wxStrnicmp(text, URIPrefixes[n], prefix_len)) break; } @@ -579,6 +591,18 @@ gtk_paste_clipboard_callback( GtkWidget *widget, wxTextCtrl *win ) } } +//----------------------------------------------------------------------------- +// "mark_set" +//----------------------------------------------------------------------------- + +extern "C" { +static void mark_set(GtkTextBuffer*, GtkTextIter*, GtkTextMark* mark, GSList** markList) +{ + if (gtk_text_mark_get_name(mark) == NULL) + *markList = g_slist_prepend(*markList, mark); +} +} + //----------------------------------------------------------------------------- // wxTextCtrl //----------------------------------------------------------------------------- @@ -620,10 +644,13 @@ void wxTextCtrl::Init() m_text = NULL; m_showPositionOnThaw = NULL; + m_anonymousMarkList = NULL; } wxTextCtrl::~wxTextCtrl() { + if (m_anonymousMarkList) + g_slist_free(m_anonymousMarkList); } wxTextCtrl::wxTextCtrl( wxWindow *parent, @@ -660,10 +687,13 @@ bool wxTextCtrl::Create( wxWindow *parent, if (multi_line) { + m_buffer = gtk_text_buffer_new(NULL); + gulong sig_id = g_signal_connect(m_buffer, "mark_set", G_CALLBACK(mark_set), &m_anonymousMarkList); // Create view - m_text = gtk_text_view_new(); - - m_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); + m_text = gtk_text_view_new_with_buffer(m_buffer); + // gtk_text_view_set_buffer adds its own reference + g_object_unref(m_buffer); + g_signal_handler_disconnect(m_buffer, sig_id); // create "ShowPosition" marker GtkTextIter iter; @@ -678,7 +708,7 @@ bool wxTextCtrl::Create( wxWindow *parent, ? GTK_POLICY_NEVER : GTK_POLICY_AUTOMATIC ); // for ScrollLines/Pages - m_scrollBar[1] = (GtkRange*)((GtkScrolledWindow*)m_widget)->vscrollbar; + m_scrollBar[1] = GTK_RANGE(gtk_scrolled_window_get_vscrollbar(GTK_SCROLLED_WINDOW(m_widget))); // Insert view into scrolled window gtk_container_add( GTK_CONTAINER(m_widget), m_text ); @@ -689,7 +719,7 @@ bool wxTextCtrl::Create( wxWindow *parent, gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK ); - GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); + gtk_widget_set_can_focus(m_widget, FALSE); } else { @@ -1082,13 +1112,19 @@ void wxTextCtrl::WriteText( const wxString &text ) // Insert the text wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer ); - GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(m_widget) ); // Scroll to cursor, but only if scrollbar thumb is at the very bottom // won't work when frozen, text view is not using m_buffer then - if (!IsFrozen() && wxIsSameDouble(adj->value, adj->upper - adj->page_size)) + if (!IsFrozen()) { - gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text), - gtk_text_buffer_get_insert( m_buffer ), 0.0, FALSE, 0.0, 1.0 ); + GtkAdjustment* adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(m_widget)); + const double value = gtk_adjustment_get_value(adj); + const double upper = gtk_adjustment_get_upper(adj); + const double page_size = gtk_adjustment_get_page_size(adj); + if (wxIsSameDouble(value, upper - page_size)) + { + gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(m_text), + gtk_text_buffer_get_insert(m_buffer), 0, false, 0, 1); + } } } @@ -1141,7 +1177,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const } else // single line control { - if ( pos <= GTK_ENTRY(m_text)->text_length ) + if (pos <= gtk_entry_get_text_length(GTK_ENTRY(m_text))) { if ( y ) *y = 0; @@ -1194,6 +1230,37 @@ int wxTextCtrl::GetLineLength(long lineNo) const } } +wxPoint wxTextCtrl::DoPositionToCoords(long pos) const +{ + if ( !IsMultiLine() ) + { + // Single line text entry (GtkTextEntry) doesn't have support for + // getting the coordinates for the given offset. Perhaps we could + // find them ourselves by using GetTextExtent() but for now just leave + // it unimplemented, this function is more useful for multiline + // controls anyhow. + return wxDefaultPosition; + } + + // Window coordinates for the given position is calculated by getting + // the buffer coordinates and converting them to window coordinates. + GtkTextView *textview = GTK_TEXT_VIEW(m_text); + + GtkTextIter iter; + gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos); + + GdkRectangle bufferCoords; + gtk_text_view_get_iter_location(textview, &iter, &bufferCoords); + + gint winCoordX = 0, + winCoordY = 0; + gtk_text_view_buffer_to_window_coords(textview, GTK_TEXT_WINDOW_WIDGET, + bufferCoords.x, bufferCoords.y, + &winCoordX, &winCoordY); + + return wxPoint(winCoordX, winCoordY); +} + int wxTextCtrl::GetNumberOfLines() const { if ( IsMultiLine() ) @@ -1265,7 +1332,7 @@ void wxTextCtrl::OnEnabled(bool WXUNUSED(enable)) // disabled and enabled mode, or we end up with a different colour under the // text. wxColour oldColour = GetBackgroundColour(); - if (oldColour.Ok()) + if (oldColour.IsOk()) { // Need to set twice or it'll optimize the useful stuff out if (oldColour == * wxWHITE) @@ -1578,7 +1645,7 @@ GdkWindow *wxTextCtrl::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const } else { - return GTK_ENTRY(m_text)->text_area; + return gtk_entry_get_text_window(GTK_ENTRY(m_text)); } } @@ -1642,7 +1709,7 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour ) if ( !wxControl::SetBackgroundColour( colour ) ) return false; - if (!m_backgroundColour.Ok()) + if (!m_backgroundColour.IsOk()) return false; // change active background color too @@ -1698,7 +1765,7 @@ bool wxTextCtrl::GetStyle(long position, wxTextAttr& style) // Obtain a copy of the default attributes GtkTextAttributes * const pattr = gtk_text_view_get_default_attributes(GTK_TEXT_VIEW(m_text)); - wxON_BLOCK_EXIT1( g_free, pattr ); + wxON_BLOCK_EXIT1(gtk_text_attributes_unref, pattr); // And query GTK for the attributes at the given position using it as base if ( !gtk_text_iter_get_attributes(&positioni, pattr) ) @@ -1804,16 +1871,24 @@ void wxTextCtrl::DoFreeze() // removing buffer dramatically speeds up insertion: g_object_ref(m_buffer); GtkTextBuffer* buf_new = gtk_text_buffer_new(NULL); - GtkTextMark* mark = GTK_TEXT_VIEW(m_text)->first_para_mark; gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), buf_new); // gtk_text_view_set_buffer adds its own reference g_object_unref(buf_new); - // This mark should be deleted when the buffer is changed, - // but it's not (in GTK+ up to at least 2.10.6). + // These marks should be deleted when the buffer is changed, + // but they are not (in GTK+ up to at least 3.0.1). // Otherwise these anonymous marks start to build up in the buffer, // and Freeze takes longer and longer each time it is called. - if (GTK_IS_TEXT_MARK(mark) && !gtk_text_mark_get_deleted(mark)) - gtk_text_buffer_delete_mark(m_buffer, mark); + if (m_anonymousMarkList) + { + for (GSList* item = m_anonymousMarkList; item; item = item->next) + { + GtkTextMark* mark = static_cast(item->data); + if (GTK_IS_TEXT_MARK(mark) && !gtk_text_mark_get_deleted(mark)) + gtk_text_buffer_delete_mark(m_buffer, mark); + } + g_slist_free(m_anonymousMarkList); + m_anonymousMarkList = NULL; + } } } @@ -1822,8 +1897,10 @@ void wxTextCtrl::DoThaw() if ( HasFlag(wxTE_MULTILINE) ) { // reattach buffer: + gulong sig_id = g_signal_connect(m_buffer, "mark_set", G_CALLBACK(mark_set), &m_anonymousMarkList); gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), m_buffer); g_object_unref(m_buffer); + g_signal_handler_disconnect(m_buffer, sig_id); if (m_showPositionOnThaw != NULL) { diff --git a/Externals/wxWidgets3/src/gtk/textentry.cpp b/Externals/wxWidgets3/src/gtk/textentry.cpp index bf1042235b..234232a05c 100644 --- a/Externals/wxWidgets3/src/gtk/textentry.cpp +++ b/Externals/wxWidgets3/src/gtk/textentry.cpp @@ -3,7 +3,7 @@ // Purpose: wxTextEntry implementation for wxGTK // Author: Vadim Zeitlin // Created: 2007-09-24 -// RCS-ID: $Id: textentry.cpp 61836 2009-09-05 13:23:03Z JMS $ +// RCS-ID: $Id: textentry.cpp 67509 2011-04-16 17:27:04Z VZ $ // Copyright: (c) 2007 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -52,13 +52,19 @@ wx_gtk_insert_text_callback(GtkEditable *editable, // we should only be called if we have a max len limit at all GtkEntry *entry = GTK_ENTRY (editable); - wxCHECK_RET( entry->text_max_length, wxT("shouldn't be called") ); + const int text_length = gtk_entry_get_text_length(entry); +#if GTK_CHECK_VERSION(3,0,0) || defined(GSEAL_ENABLE) + const int text_max_length = gtk_entry_buffer_get_max_length(gtk_entry_get_buffer(entry)); +#else + const int text_max_length = entry->text_max_length; +#endif + wxCHECK_RET(text_max_length, "shouldn't be called"); // check that we don't overflow the max length limit // // FIXME: this doesn't work when we paste a string which is going to be // truncated - if ( entry->text_length == entry->text_max_length ) + if (text_length == text_max_length) { // we don't need to run the base class version at all g_signal_stop_emission_by_name (editable, "insert_text"); @@ -179,7 +185,7 @@ long wxTextEntry::GetLastPosition() const // GtkEntries GtkEntry * const entry = GTK_ENTRY(GetEditable()); - return entry ? entry->text_length : - 1; + return entry ? gtk_entry_get_text_length(entry) : -1; } // ---------------------------------------------------------------------------- @@ -231,7 +237,7 @@ void wxTextEntry::GetSelection(long *from, long *to) const // auto completion // ---------------------------------------------------------------------------- -bool wxTextEntry::AutoComplete(const wxArrayString& choices) +bool wxTextEntry::DoAutoCompleteStrings(const wxArrayString& choices) { GtkEntry * const entry = GTK_ENTRY(GetEditable()); wxCHECK_MSG(entry, false, "auto completion doesn't work with this control"); diff --git a/Externals/wxWidgets3/src/gtk/tglbtn.cpp b/Externals/wxWidgets3/src/gtk/tglbtn.cpp index 83f349d7d5..7590fd23cb 100644 --- a/Externals/wxWidgets3/src/gtk/tglbtn.cpp +++ b/Externals/wxWidgets3/src/gtk/tglbtn.cpp @@ -5,7 +5,7 @@ // Author: John Norris, minor changes by Axel Schlueter // Modified by: // Created: 08.02.01 -// RCS-ID: $Id: tglbtn.cpp 64940 2010-07-13 13:29:13Z VZ $ +// RCS-ID: $Id: tglbtn.cpp 69830 2011-11-27 19:49:54Z VZ $ // Copyright: (c) 2000 Johnny C. Norris II // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -45,157 +45,30 @@ wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent ); // wxBitmapToggleButton // ------------------------------------------------------------------------ -IMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton) bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id, - const wxBitmap &label, const wxPoint &pos, + const wxBitmap &bitmap, const wxPoint &pos, const wxSize &size, long style, const wxValidator& validator, const wxString &name) { - if (!PreCreation(parent, pos, size) || - !CreateBase(parent, id, pos, size, style, validator, name )) - { - wxFAIL_MSG(wxT("wxBitmapToggleButton creation failed")); - return false; - } - - // Create the gtk widget. - m_widget = gtk_toggle_button_new(); - g_object_ref(m_widget); - - if (style & wxNO_BORDER) - gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE ); - - m_bitmap = label; - OnSetBitmap(); - - g_signal_connect (m_widget, "clicked", - G_CALLBACK (gtk_togglebutton_clicked_callback), - this); - - m_parent->DoAddChild(this); - - PostCreation(size); - - return true; -} - -void wxBitmapToggleButton::GTKDisableEvents() -{ - g_signal_handlers_block_by_func(m_widget, - (gpointer) gtk_togglebutton_clicked_callback, this); -} - -void wxBitmapToggleButton::GTKEnableEvents() -{ - g_signal_handlers_unblock_by_func(m_widget, - (gpointer) gtk_togglebutton_clicked_callback, this); -} - -// void SetValue(bool state) -// Set the value of the toggle button. -void wxBitmapToggleButton::SetValue(bool state) -{ - wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button")); - - if (state == GetValue()) - return; - - GTKDisableEvents(); - - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state); - - GTKEnableEvents(); -} - -// bool GetValue() const -// Get the value of the toggle button. -bool wxBitmapToggleButton::GetValue() const -{ - wxCHECK_MSG(m_widget != NULL, false, wxT("invalid toggle button")); - - return gtk_toggle_button_get_active((GtkToggleButton*)m_widget); -} - -void wxBitmapToggleButton::SetLabel(const wxBitmap& label) -{ - wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button")); - - m_bitmap = label; - InvalidateBestSize(); - - OnSetBitmap(); -} - -void wxBitmapToggleButton::OnSetBitmap() -{ - if (!m_bitmap.Ok()) return; - - GtkWidget* image = ((GtkBin*)m_widget)->child; - if (image == NULL) - { - image = gtk_image_new(); - gtk_widget_show(image); - gtk_container_add((GtkContainer*)m_widget, image); - } - // always use pixbuf, because pixmap mask does not - // work with disabled images in some themes - gtk_image_set_from_pixbuf((GtkImage*)image, m_bitmap.GetPixbuf()); -} - -bool wxBitmapToggleButton::Enable(bool enable /*=true*/) -{ - bool isEnabled = IsEnabled(); - - if (!wxControl::Enable(enable)) + if ( !wxToggleButton::Create(parent, id, wxEmptyString, pos, size, style | wxBU_NOTEXT | wxBU_EXACTFIT, + validator, name) ) return false; - gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable); - - if (!isEnabled && enable) + if ( bitmap.IsOk() ) { - GTKFixSensitivity(); + SetBitmapLabel(bitmap); + + // we need to adjust the size after setting the bitmap as it may be too + // big for the default button size + SetInitialSize(size); } return true; } -void wxBitmapToggleButton::DoApplyWidgetStyle(GtkRcStyle *style) -{ - gtk_widget_modify_style(m_widget, style); - gtk_widget_modify_style(GTK_BIN(m_widget)->child, style); -} - -GdkWindow * -wxBitmapToggleButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const -{ - return GTK_BUTTON(m_widget)->event_window; -} - -// Get the "best" size for this control. -wxSize wxBitmapToggleButton::DoGetBestSize() const -{ - wxSize best; - - if (m_bitmap.Ok()) - { - int border = HasFlag(wxNO_BORDER) ? 4 : 10; - best.x = m_bitmap.GetWidth()+border; - best.y = m_bitmap.GetHeight()+border; - } - CacheBestSize(best); - return best; -} - - -// static -wxVisualAttributes -wxBitmapToggleButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) -{ - return GetDefaultAttributesFromGTKWidget(gtk_toggle_button_new); -} - // ------------------------------------------------------------------------ // wxToggleButton @@ -216,11 +89,28 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id, return false; } - // Create the gtk widget. - m_widget = gtk_toggle_button_new_with_mnemonic(""); + // create either a standard toggle button with text label (which may still contain + // an image under GTK+ 2.6+) or a bitmap-only toggle button if we don't have any + // label + const bool + useLabel = !(style & wxBU_NOTEXT) && !label.empty(); + if ( useLabel ) + { + m_widget = gtk_toggle_button_new_with_mnemonic(""); + } + else // no label, suppose we will have a bitmap + { + m_widget = gtk_toggle_button_new(); + + GtkWidget *image = gtk_image_new(); + gtk_widget_show(image); + gtk_container_add(GTK_CONTAINER(m_widget), image); + } + g_object_ref(m_widget); - SetLabel(label); + if ( useLabel ) + SetLabel(label); g_signal_connect (m_widget, "clicked", G_CALLBACK (gtk_togglebutton_clicked_callback), @@ -267,14 +157,22 @@ bool wxToggleButton::GetValue() const { wxCHECK_MSG(m_widget != NULL, false, wxT("invalid toggle button")); - return GTK_TOGGLE_BUTTON(m_widget)->active; + return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widget)) != 0; } void wxToggleButton::SetLabel(const wxString& label) { wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button")); - wxControl::SetLabel(label); + wxAnyButton::SetLabel(label); + + if ( HasFlag(wxBU_NOTEXT) ) + { + // Don't try to update the label for a button not showing it, this is + // unnecessary and can also actually replace the image we show with the + // label entirely breaking the button code, see #13693. + return; + } const wxString labelGTK = GTKConvertMnemonics(label); @@ -283,35 +181,45 @@ void wxToggleButton::SetLabel(const wxString& label) GTKApplyWidgetStyle( false ); } -bool wxToggleButton::Enable(bool enable /*=true*/) +#if wxUSE_MARKUP +bool wxToggleButton::DoSetLabelMarkup(const wxString& markup) { - if (!base_type::Enable(enable)) + wxCHECK_MSG( m_widget != NULL, false, "invalid toggle button" ); + + const wxString stripped = RemoveMarkup(markup); + if ( stripped.empty() && !markup.empty() ) return false; - gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable); + wxControl::SetLabel(stripped); - if (enable) - GTKFixSensitivity(); + if ( !HasFlag(wxBU_NOTEXT) ) + { + GtkLabel * const label = GTKGetLabel(); + wxCHECK_MSG( label, false, "no label in this toggle button?" ); + + GTKSetLabelWithMarkupForLabel(label, markup); + } return true; } +#endif // wxUSE_MARKUP + +GtkLabel *wxToggleButton::GTKGetLabel() const +{ + GtkWidget* child = gtk_bin_get_child(GTK_BIN(m_widget)); + return GTK_LABEL(child); +} void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style) { gtk_widget_modify_style(m_widget, style); - gtk_widget_modify_style(GTK_BIN(m_widget)->child, style); -} - -GdkWindow * -wxToggleButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const -{ - return GTK_BUTTON(m_widget)->event_window; + gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(m_widget)), style); } // Get the "best" size for this control. wxSize wxToggleButton::DoGetBestSize() const { - wxSize ret(wxControl::DoGetBestSize()); + wxSize ret(wxAnyButton::DoGetBestSize()); if (!HasFlag(wxBU_EXACTFIT)) { diff --git a/Externals/wxWidgets3/src/gtk/toolbar.cpp b/Externals/wxWidgets3/src/gtk/toolbar.cpp index 5e6949d45c..464f45dd8a 100644 --- a/Externals/wxWidgets3/src/gtk/toolbar.cpp +++ b/Externals/wxWidgets3/src/gtk/toolbar.cpp @@ -3,7 +3,7 @@ // Purpose: GTK toolbar // Author: Robert Roebling // Modified: 13.12.99 by VZ to derive from wxToolBarBase -// RCS-ID: $Id: toolbar.cpp 66633 2011-01-07 18:15:21Z PC $ +// RCS-ID: $Id: toolbar.cpp 70510 2012-02-05 01:20:03Z VZ $ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -195,12 +195,15 @@ image_expose_event(GtkWidget* widget, GdkEventExpose*, wxToolBarTool* tool) return false; // draw disabled bitmap ourselves, GtkImage has no way to specify it - const GtkAllocation& alloc = widget->allocation; + GtkAllocation alloc; + gtk_widget_get_allocation(widget, &alloc); + GtkRequisition req; + gtk_widget_get_requisition(widget, &req); gdk_draw_pixbuf( - widget->window, widget->style->black_gc, bitmap.GetPixbuf(), + gtk_widget_get_window(widget), gtk_widget_get_style(widget)->black_gc, bitmap.GetPixbuf(), 0, 0, - alloc.x + (alloc.width - widget->requisition.width) / 2, - alloc.y + (alloc.height - widget->requisition.height) / 2, + alloc.x + (alloc.width - req.width) / 2, + alloc.y + (alloc.height - req.height) / 2, -1, -1, GDK_RGB_DITHER_NORMAL, 0, 0); return true; } @@ -250,7 +253,7 @@ void wxToolBar::AddChildGTK(wxWindowGTK* child) GtkToolItem* item = gtk_tool_item_new(); gtk_container_add(GTK_CONTAINER(item), align); // position will be corrected in DoInsertTool if necessary - gtk_toolbar_insert(GTK_TOOLBAR(GTK_BIN(m_widget)->child), item, -1); + gtk_toolbar_insert(GTK_TOOLBAR(gtk_bin_get_child(GTK_BIN(m_widget))), item, -1); } // ---------------------------------------------------------------------------- @@ -284,7 +287,7 @@ void wxToolBarTool::CreateDropDown() box = gtk_hbox_new(false, 0); arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE); } - GtkWidget* tool_button = GTK_BIN(m_item)->child; + GtkWidget* tool_button = gtk_bin_get_child(GTK_BIN(m_item)); gtk_widget_reparent(tool_button, box); GtkWidget* arrow_button = gtk_toggle_button_new(); gtk_button_set_relief(GTK_BUTTON(arrow_button), @@ -308,7 +311,8 @@ void wxToolBarTool::ShowDropdown(GtkToggleButton* button) wxMenu* menu = GetDropdownMenu(); if (menu) { - const GtkAllocation& alloc = GTK_WIDGET(button)->allocation; + GtkAllocation alloc; + gtk_widget_get_allocation(GTK_WIDGET(button), &alloc); int x = alloc.x; int y = alloc.y; if (toolbar->HasFlag(wxTB_LEFT | wxTB_RIGHT)) @@ -376,12 +380,14 @@ bool wxToolBar::Create( wxWindow *parent, FixupStyle(); m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() ); +#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED) if (gtk_check_version(2, 12, 0)) { m_tooltips = gtk_tooltips_new(); g_object_ref(m_tooltips); gtk_object_sink(GTK_OBJECT(m_tooltips)); } +#endif GtkSetStyle(); if (style & wxTB_DOCKABLE) @@ -417,7 +423,7 @@ bool wxToolBar::Create( wxWindow *parent, GdkWindow *wxToolBar::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - return GTK_WIDGET(m_toolbar)->window; + return gtk_widget_get_window(GTK_WIDGET(m_toolbar)); } void wxToolBar::GtkSetStyle() @@ -436,7 +442,11 @@ void wxToolBar::GtkSetStyle() style = GTK_TOOLBAR_BOTH_HORIZ; } +#if GTK_CHECK_VERSION(3,0,0) || defined(GTK_DISABLE_DEPRECATED) + gtk_orientable_set_orientation(GTK_ORIENTABLE(m_toolbar), orient); +#else gtk_toolbar_set_orientation(m_toolbar, orient); +#endif gtk_toolbar_set_style(m_toolbar, style); } @@ -479,6 +489,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) wxToolBarTool* tool = static_cast(toolBase); GSList* radioGroup; + GtkWidget* bin_child; switch ( tool->GetStyle() ) { case wxTOOL_STYLE_BUTTON: @@ -491,7 +502,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) break; case wxITEM_RADIO: radioGroup = GetRadioGroup(pos); - if (radioGroup) + if (!radioGroup) { // this is the first button in the radio button group, // it will be toggled automatically by GTK so bring the @@ -532,7 +543,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) if (!HasFlag(wxTB_NO_TOOLTIPS) && !tool->GetShortHelp().empty()) { #if GTK_CHECK_VERSION(2, 12, 0) - if (!gtk_check_version(2, 12, 0)) + if (GTK_CHECK_VERSION(3,0,0) || gtk_check_version(2,12,0) == NULL) { gtk_tool_item_set_tooltip_text(tool->m_item, wxGTK_CONV(tool->GetShortHelp())); @@ -540,15 +551,18 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) else #endif { +#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED) gtk_tool_item_set_tooltip(tool->m_item, m_tooltips, wxGTK_CONV(tool->GetShortHelp()), ""); +#endif } } - g_signal_connect(GTK_BIN(tool->m_item)->child, "button_press_event", + bin_child = gtk_bin_get_child(GTK_BIN(tool->m_item)); + g_signal_connect(bin_child, "button_press_event", G_CALLBACK(button_press_event), tool); - g_signal_connect(tool->m_item, "enter_notify_event", + g_signal_connect(bin_child, "enter_notify_event", G_CALLBACK(enter_notify_event), tool); - g_signal_connect(tool->m_item, "leave_notify_event", + g_signal_connect(bin_child, "leave_notify_event", G_CALLBACK(enter_notify_event), tool); if (tool->GetKind() == wxITEM_DROPDOWN) @@ -572,9 +586,9 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) case wxTOOL_STYLE_CONTROL: wxWindow* control = tool->GetControl(); - if (control->m_widget->parent == NULL) + if (gtk_widget_get_parent(control->m_widget) == NULL) AddChildGTK(control); - tool->m_item = GTK_TOOL_ITEM(control->m_widget->parent->parent); + tool->m_item = GTK_TOOL_ITEM(gtk_widget_get_parent(gtk_widget_get_parent(control->m_widget))); if (gtk_toolbar_get_item_index(m_toolbar, tool->m_item) != int(pos)) { g_object_ref(tool->m_item); @@ -609,7 +623,7 @@ bool wxToolBar::DoDeleteTool(size_t /* pos */, wxToolBarToolBase* toolBase) // while if we're called from DeleteTool() the control will // be destroyed when wxToolBarToolBase itself is deleted GtkWidget* widget = tool->GetControl()->m_widget; - gtk_container_remove(GTK_CONTAINER(widget->parent), widget); + gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(widget)), widget); } gtk_object_destroy(GTK_OBJECT(tool->m_item)); tool->m_item = NULL; @@ -709,7 +723,7 @@ void wxToolBar::SetToolShortHelp( int id, const wxString& helpString ) if (tool->m_item) { #if GTK_CHECK_VERSION(2, 12, 0) - if (!gtk_check_version(2, 12, 0)) + if (GTK_CHECK_VERSION(3,0,0) || gtk_check_version(2,12,0) == NULL) { gtk_tool_item_set_tooltip_text(tool->m_item, wxGTK_CONV(helpString)); @@ -717,8 +731,10 @@ void wxToolBar::SetToolShortHelp( int id, const wxString& helpString ) else #endif { +#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED) gtk_tool_item_set_tooltip(tool->m_item, m_tooltips, wxGTK_CONV(helpString), ""); +#endif } } } diff --git a/Externals/wxWidgets3/src/gtk/tooltip.cpp b/Externals/wxWidgets3/src/gtk/tooltip.cpp index d82bfc03f2..214d0e0784 100644 --- a/Externals/wxWidgets3/src/gtk/tooltip.cpp +++ b/Externals/wxWidgets3/src/gtk/tooltip.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/tooltip.cpp // Purpose: wxToolTip implementation // Author: Robert Roebling -// Id: $Id: tooltip.cpp 66431 2010-12-22 13:57:28Z VZ $ +// Id: $Id: tooltip.cpp 67326 2011-03-28 06:27:49Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -24,7 +24,9 @@ // global data //----------------------------------------------------------------------------- +#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED) static GtkTooltips *gs_tooltips = NULL; +#endif //----------------------------------------------------------------------------- // wxToolTip @@ -33,98 +35,85 @@ static GtkTooltips *gs_tooltips = NULL; IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject) wxToolTip::wxToolTip( const wxString &tip ) + : m_text(tip) { - m_text = tip; m_window = NULL; } void wxToolTip::SetTip( const wxString &tip ) { m_text = tip; - GTKApply( m_window ); + if (m_window) + m_window->GTKApplyToolTip(wxGTK_CONV_SYS(m_text)); } -void wxToolTip::GTKApply( wxWindow *win ) +void wxToolTip::GTKSetWindow(wxWindow* win) { - if (!win) - return; - - if ( !gs_tooltips ) - gs_tooltips = gtk_tooltips_new(); - + wxASSERT(win); m_window = win; - - if (m_text.empty()) - m_window->GTKApplyToolTip( gs_tooltips, NULL ); - else - m_window->GTKApplyToolTip( gs_tooltips, wxGTK_CONV_SYS(m_text) ); + m_window->GTKApplyToolTip(wxGTK_CONV_SYS(m_text)); } /* static */ -void wxToolTip::GTKApply(GtkWidget *w, const gchar *tip) +void wxToolTip::GTKApply(GtkWidget* widget, const char* tip) { #if GTK_CHECK_VERSION(2, 12, 0) - if (!gtk_check_version(2, 12, 0)) - { - gtk_widget_set_tooltip_text(w, tip); - } + if (GTK_CHECK_VERSION(3,0,0) || gtk_check_version(2,12,0) == NULL) + gtk_widget_set_tooltip_text(widget, tip); else #endif { +#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED) if ( !gs_tooltips ) gs_tooltips = gtk_tooltips_new(); - gtk_tooltips_set_tip(gs_tooltips, w, tip, NULL); + gtk_tooltips_set_tip(gs_tooltips, widget, tip, NULL); +#endif } } void wxToolTip::Enable( bool flag ) { #if GTK_CHECK_VERSION(2, 12, 0) - if (!gtk_check_version(2, 12, 0)) + if (GTK_CHECK_VERSION(3,0,0) || gtk_check_version(2,12,0) == NULL) { GtkSettings* settings = gtk_settings_get_default(); - if(!settings) - return; - gtk_settings_set_long_property(settings, "gtk-enable-tooltips", flag?TRUE:FALSE, NULL); + if (settings) + gtk_settings_set_long_property(settings, "gtk-enable-tooltips", flag, NULL); } else #endif { +#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED) if (!gs_tooltips) - return; + gs_tooltips = gtk_tooltips_new(); if (flag) gtk_tooltips_enable( gs_tooltips ); else gtk_tooltips_disable( gs_tooltips ); +#endif } } -G_BEGIN_DECLS -void gtk_tooltips_set_delay (GtkTooltips *tooltips, - guint delay); -G_END_DECLS - void wxToolTip::SetDelay( long msecs ) { #if GTK_CHECK_VERSION(2, 12, 0) - if (!gtk_check_version(2, 12, 0)) + if (GTK_CHECK_VERSION(3,0,0) || gtk_check_version(2,12,0) == NULL) { GtkSettings* settings = gtk_settings_get_default(); - if(!settings) - return; - gtk_settings_set_long_property(settings, "gtk-tooltip-timeout", msecs, NULL); + if (settings) + gtk_settings_set_long_property(settings, "gtk-tooltip-timeout", msecs, NULL); } else #endif { +#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED) if (!gs_tooltips) - return; + gs_tooltips = gtk_tooltips_new(); - // FIXME: This is a deprecated function and might not even have an effect. - // Try to not use it, after which remove the prototype above. gtk_tooltips_set_delay( gs_tooltips, (int)msecs ); +#endif } } diff --git a/Externals/wxWidgets3/src/gtk/toplevel.cpp b/Externals/wxWidgets3/src/gtk/toplevel.cpp index 7c3f467f53..cd796e4bed 100644 --- a/Externals/wxWidgets3/src/gtk/toplevel.cpp +++ b/Externals/wxWidgets3/src/gtk/toplevel.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/toplevel.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: toplevel.cpp 67164 2011-03-09 17:22:43Z PC $ +// Id: $Id: toplevel.cpp 70733 2012-02-28 04:40:15Z PC $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -36,15 +36,21 @@ #include "wx/sysopt.h" #include +#ifdef GDK_WINDOWING_X11 #include +#endif #include "wx/gtk/private/win_gtk.h" +#ifdef GDK_WINDOWING_X11 + #include "wx/unix/utilsx11.h" // XA_CARDINAL #include +#endif // GDK_WINDOWING_X11 + #if wxUSE_LIBHILDON #include #include @@ -72,40 +78,52 @@ static wxTopLevelWindowGTK *g_lastActiveFrame = NULL; // send any activate events at all static int g_sendActivateEvent = -1; +// Whether _NET_REQUEST_FRAME_EXTENTS support is working +// 0 == not tested yet, 1 == working, 2 == broken +static int gs_requestFrameExtentsStatus; + //----------------------------------------------------------------------------- // RequestUserAttention related functions //----------------------------------------------------------------------------- -extern "C" { +#ifndef __WXGTK30__ static void wxgtk_window_set_urgency_hint (GtkWindow *win, gboolean setting) -{ - wxASSERT_MSG( GTK_WIDGET_REALIZED(win), wxT("wxgtk_window_set_urgency_hint: GdkWindow not realized") ); - GdkWindow *window = GTK_WIDGET(win)->window; - XWMHints *wm_hints; - - wm_hints = XGetWMHints(GDK_WINDOW_XDISPLAY(window), GDK_WINDOW_XWINDOW(window)); - - if (!wm_hints) - wm_hints = XAllocWMHints(); - - if (setting) - wm_hints->flags |= XUrgencyHint; - else - wm_hints->flags &= ~XUrgencyHint; - - XSetWMHints(GDK_WINDOW_XDISPLAY(window), GDK_WINDOW_XWINDOW(window), wm_hints); - XFree(wm_hints); -} - -static gboolean gtk_frame_urgency_timer_callback( wxTopLevelWindowGTK *win ) { #if GTK_CHECK_VERSION(2,7,0) - if(!gtk_check_version(2,7,0)) - gtk_window_set_urgency_hint(GTK_WINDOW( win->m_widget ), FALSE); + if (gtk_check_version(2,7,0) == NULL) + gtk_window_set_urgency_hint(win, setting); else #endif - wxgtk_window_set_urgency_hint(GTK_WINDOW( win->m_widget ), FALSE); + { +#ifdef GDK_WINDOWING_X11 + GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(win)); + wxCHECK_RET(window, "wxgtk_window_set_urgency_hint: GdkWindow not realized"); + + Display* dpy = GDK_WINDOW_XDISPLAY(window); + Window xid = GDK_WINDOW_XID(window); + XWMHints* wm_hints = XGetWMHints(dpy, xid); + + if (!wm_hints) + wm_hints = XAllocWMHints(); + + if (setting) + wm_hints->flags |= XUrgencyHint; + else + wm_hints->flags &= ~XUrgencyHint; + + XSetWMHints(dpy, xid, wm_hints); + XFree(wm_hints); +#endif // GDK_WINDOWING_X11 + } +} +#define gtk_window_set_urgency_hint wxgtk_window_set_urgency_hint +#endif + +extern "C" { +static gboolean gtk_frame_urgency_timer_callback( wxTopLevelWindowGTK *win ) +{ + gtk_window_set_urgency_hint(GTK_WINDOW(win->m_widget), false); win->m_urgency_hint = -2; return FALSE; @@ -147,15 +165,7 @@ static gboolean gtk_frame_focus_in_callback( GtkWidget *widget, g_source_remove( win->m_urgency_hint ); // no break, fallthrough to remove hint too case -1: -#if GTK_CHECK_VERSION(2,7,0) - if(!gtk_check_version(2,7,0)) - gtk_window_set_urgency_hint(GTK_WINDOW( widget ), FALSE); - else -#endif - { - wxgtk_window_set_urgency_hint(GTK_WINDOW( widget ), FALSE); - } - + gtk_window_set_urgency_hint(GTK_WINDOW(widget), false); win->m_urgency_hint = -2; break; @@ -218,8 +228,9 @@ size_allocate(GtkWidget*, GtkAllocation* alloc, wxTopLevelWindowGTK* win) win->m_oldClientWidth = alloc->width; win->m_oldClientHeight = alloc->height; - wxSize size(win->m_widget->allocation.width, - win->m_widget->allocation.height); + GtkAllocation a; + gtk_widget_get_allocation(win->m_widget, &a); + wxSize size(a.width, a.height); size += win->m_decorSize; win->m_width = size.x; win->m_height = size.y; @@ -303,29 +314,26 @@ gtk_frame_configure_callback( GtkWidget* widget, // we cannot the WM hints and icons before the widget has been realized, // so we do this directly after realization -extern "C" { -static void -gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget), - wxTopLevelWindowGTK *win ) +void wxTopLevelWindowGTK::GTKHandleRealized() { - gdk_window_set_decorations(win->m_widget->window, - (GdkWMDecoration)win->m_gdkDecor); - gdk_window_set_functions(win->m_widget->window, - (GdkWMFunction)win->m_gdkFunc); + wxNonOwnedWindow::GTKHandleRealized(); + + gdk_window_set_decorations(gtk_widget_get_window(m_widget), + (GdkWMDecoration)m_gdkDecor); + gdk_window_set_functions(gtk_widget_get_window(m_widget), + (GdkWMFunction)m_gdkFunc); // GTK's shrinking/growing policy - if ( !(win->m_gdkFunc & GDK_FUNC_RESIZE) ) - gtk_window_set_resizable(GTK_WINDOW(win->m_widget), FALSE); + if ( !(m_gdkFunc & GDK_FUNC_RESIZE) ) + gtk_window_set_resizable(GTK_WINDOW(m_widget), FALSE); +#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED) else - gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1); + gtk_window_set_policy(GTK_WINDOW(m_widget), 1, 1, 1); +#endif - const wxIconBundle& icons = win->GetIcons(); + const wxIconBundle& icons = GetIcons(); if (icons.GetIconCount()) - win->SetIcons(icons); - - if (win->HasFlag(wxFRAME_SHAPED)) - win->SetShape(win->m_shape); // it will really set the window shape now -} + SetIcons(icons); } //----------------------------------------------------------------------------- @@ -399,6 +407,7 @@ gtk_frame_window_state_callback( GtkWidget* WXUNUSED(widget), bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom) { +#ifdef GDK_WINDOWING_X11 static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false); Atom xproperty = gdk_x11_atom_to_xatom_for_display( gdk_drawable_get_display(window), property); @@ -424,6 +433,9 @@ bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* if (data) XFree(data); return success; +#else + return false; +#endif } //----------------------------------------------------------------------------- @@ -438,6 +450,14 @@ static gboolean property_notify_event( static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false); if (event->state == GDK_PROPERTY_NEW_VALUE && event->atom == property) { + if (win->m_netFrameExtentsTimerId) + { + // WM support for _NET_REQUEST_FRAME_EXTENTS is working + gs_requestFrameExtentsStatus = 1; + g_source_remove(win->m_netFrameExtentsTimerId); + win->m_netFrameExtentsTimerId = 0; + } + wxSize decorSize = win->m_decorSize; int left, right, top, bottom; if (wxGetFrameExtents(event->window, &left, &right, &top, &bottom)) @@ -449,6 +469,24 @@ static gboolean property_notify_event( } } +extern "C" { +static gboolean request_frame_extents_timeout(void* data) +{ + // WM support for _NET_REQUEST_FRAME_EXTENTS is broken + gs_requestFrameExtentsStatus = 2; + gdk_threads_enter(); + wxTopLevelWindowGTK* win = static_cast(data); + win->m_netFrameExtentsTimerId = 0; + wxSize decorSize = win->m_decorSize; + int left, right, top, bottom; + if (wxGetFrameExtents(gtk_widget_get_window(win->m_widget), &left, &right, &top, &bottom)) + decorSize.Set(left + right, top + bottom); + win->GTKUpdateDecorSize(decorSize); + gdk_threads_leave(); + return false; +} +} + // ---------------------------------------------------------------------------- // wxTopLevelWindowGTK creation // ---------------------------------------------------------------------------- @@ -465,6 +503,7 @@ void wxTopLevelWindowGTK::Init() m_deferShow = true; m_deferShowAllowed = true; m_updateDecorSize = true; + m_netFrameExtentsTimerId = 0; m_urgency_hint = -2; } @@ -564,7 +603,7 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, #endif gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) ); - GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); + gtk_widget_set_can_focus(m_widget, false); g_signal_connect (m_widget, "delete_event", G_CALLBACK (gtk_frame_delete_callback), this); @@ -572,7 +611,7 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, // m_mainWidget is a GtkVBox, holding the bars and client area (m_wxwindow) m_mainWidget = gtk_vbox_new(false, 0); gtk_widget_show( m_mainWidget ); - GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS ); + gtk_widget_set_can_focus(m_mainWidget, false); gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget ); // m_wxwindow is the client area @@ -582,7 +621,7 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, // we donm't allow the frame to get the focus as otherwise // the frame will grab it at arbitrary focus changes - GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS ); + gtk_widget_set_can_focus(m_wxwindow, false); if (m_parent) m_parent->AddChild( this ); @@ -593,13 +632,10 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, G_CALLBACK (wxgtk_tlw_size_request_callback), this); PostCreation(); +#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED) if ((m_x != -1) || (m_y != -1)) gtk_widget_set_uposition( m_widget, m_x, m_y ); - - // we cannot set MWM hints and icons before the widget has - // been realized, so we do this directly after realization - g_signal_connect (m_widget, "realize", - G_CALLBACK (gtk_frame_realized_callback), this); +#endif // for some reported size corrections g_signal_connect (m_widget, "map_event", @@ -677,6 +713,13 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, wxTopLevelWindowGTK::~wxTopLevelWindowGTK() { + if ( m_netFrameExtentsTimerId ) + { + // Don't let the timer callback fire as the window pointer passed to it + // will become invalid very soon. + g_source_remove(m_netFrameExtentsTimerId); + } + #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 // it can also be a (standard) dialog if ( HILDON_IS_WINDOW(m_widget) ) @@ -713,8 +756,9 @@ bool wxTopLevelWindowGTK::EnableCloseButton( bool enable ) else m_gdkFunc &= ~GDK_FUNC_CLOSE; - if (GTK_WIDGET_REALIZED(m_widget) && (m_widget->window)) - gdk_window_set_functions( m_widget->window, (GdkWMFunction)m_gdkFunc ); + GdkWindow* window = gtk_widget_get_window(m_widget); + if (window) + gdk_window_set_functions(window, (GdkWMFunction)m_gdkFunc); return true; } @@ -726,6 +770,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long) m_fsIsShowing = show; +#ifdef GDK_WINDOWING_X11 wxX11FullScreenMethod method = wxGetFullScreenMethodX11((WXDisplay*)GDK_DISPLAY(), (WXWindow)GDK_ROOT_WINDOW()); @@ -735,15 +780,17 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long) // check if WM supports the spec and use legacy methods if it // doesn't. if ( method == wxX11_FS_WMSPEC ) +#endif // GDK_WINDOWING_X11 { if (show) gtk_window_fullscreen( GTK_WINDOW( m_widget ) ); else gtk_window_unfullscreen( GTK_WINDOW( m_widget ) ); } +#ifdef GDK_WINDOWING_X11 else { - GdkWindow *window = m_widget->window; + GdkWindow* window = gtk_widget_get_window(m_widget); if (show) { @@ -762,12 +809,11 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long) gdk_window_set_decorations(window, (GdkWMDecoration)0); gdk_window_set_functions(window, (GdkWMFunction)0); - gdk_window_get_origin (m_widget->window, &root_x, &root_y); - gdk_window_get_geometry (m_widget->window, &client_x, &client_y, - &width, &height, NULL); + gdk_window_get_origin(window, &root_x, &root_y); + gdk_window_get_geometry(window, &client_x, &client_y, &width, &height, NULL); - gdk_window_move_resize (m_widget->window, -client_x, -client_y, - screen_width + 1, screen_height + 1); + gdk_window_move_resize( + window, -client_x, -client_y, screen_width + 1, screen_height + 1); wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(), (WXWindow)GDK_ROOT_WINDOW(), @@ -790,6 +836,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long) m_fsSaveFrame.width, m_fsSaveFrame.height); } } +#endif // GDK_WINDOWING_X11 // documented behaviour is to show the window if it's still hidden when // showing it full screen @@ -809,8 +856,11 @@ void wxTopLevelWindowGTK::Refresh( bool WXUNUSED(eraseBackground), const wxRect gtk_widget_queue_draw( m_widget ); - if (m_wxwindow && m_wxwindow->window) - gdk_window_invalidate_rect( m_wxwindow->window, NULL, TRUE ); + GdkWindow* window = NULL; + if (m_wxwindow) + window = gtk_widget_get_window(m_wxwindow); + if (window) + gdk_window_invalidate_rect(window, NULL, true); } bool wxTopLevelWindowGTK::Show( bool show ) @@ -820,7 +870,8 @@ bool wxTopLevelWindowGTK::Show( bool show ) bool deferShow = show && !m_isShown && m_deferShow; if (deferShow) { - deferShow = m_deferShowAllowed && !GTK_WIDGET_REALIZED(m_widget); + deferShow = gs_requestFrameExtentsStatus != 2 && + m_deferShowAllowed && !gtk_widget_get_realized(m_widget); if (deferShow) { deferShow = g_signal_handler_find(m_widget, @@ -831,22 +882,19 @@ bool wxTopLevelWindowGTK::Show( bool show ) GdkScreen* screen = NULL; if (deferShow) { +#ifdef GDK_WINDOWING_X11 screen = gtk_widget_get_screen(m_widget); GdkAtom atom = gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false); deferShow = gdk_x11_screen_supports_net_wm_hint(screen, atom) != 0; +#else + deferShow = false; +#endif // If _NET_REQUEST_FRAME_EXTENTS not supported, don't allow changes // to m_decorSize, it breaks saving/restoring window size with // GetSize()/SetSize() because it makes window bigger between each // restore and save. m_updateDecorSize = deferShow; } - if (deferShow) - { - // Fluxbox support for _NET_REQUEST_FRAME_EXTENTS is broken - const char* name = gdk_x11_screen_get_window_manager_name(screen); - deferShow = strcmp(name, "Fluxbox") != 0; - m_updateDecorSize = deferShow; - } m_deferShow = deferShow; } @@ -863,33 +911,52 @@ bool wxTopLevelWindowGTK::Show( bool show ) // causes the widget tree to be size_allocated, which generates size // events in the wrong order. However, the size_allocates will not be // done if the allocation is not the default (1,1). - const int alloc_width = m_widget->allocation.width; + GtkAllocation alloc; + gtk_widget_get_allocation(m_widget, &alloc); + const int alloc_width = alloc.width; if (alloc_width == 1) - m_widget->allocation.width = 2; + { + alloc.width = 2; + gtk_widget_set_allocation(m_widget, &alloc); + } gtk_widget_realize(m_widget); if (alloc_width == 1) - m_widget->allocation.width = 1; + { + alloc.width = 1; + gtk_widget_set_allocation(m_widget, &alloc); + } +#ifdef GDK_WINDOWING_X11 // send _NET_REQUEST_FRAME_EXTENTS XClientMessageEvent xevent; memset(&xevent, 0, sizeof(xevent)); xevent.type = ClientMessage; - xevent.window = gdk_x11_drawable_get_xid(m_widget->window); + GdkWindow* window = gtk_widget_get_window(m_widget); + xevent.window = gdk_x11_drawable_get_xid(window); xevent.message_type = gdk_x11_atom_to_xatom_for_display( - gdk_drawable_get_display(m_widget->window), + gdk_drawable_get_display(window), gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false)); xevent.format = 32; - Display* display = gdk_x11_drawable_get_xdisplay(m_widget->window); + Display* display = gdk_x11_drawable_get_xdisplay(window); XSendEvent(display, DefaultRootWindow(display), false, SubstructureNotifyMask | SubstructureRedirectMask, (XEvent*)&xevent); +#endif // GDK_WINDOWING_X11 + + if (gs_requestFrameExtentsStatus == 0) + { + // if WM does not respond to request within 1 second, + // we assume support for _NET_REQUEST_FRAME_EXTENTS is not working + m_netFrameExtentsTimerId = + g_timeout_add(1000, request_frame_extents_timeout, this); + } // defer calling gtk_widget_show() m_isShown = true; return true; } - if (show && !GTK_WIDGET_REALIZED(m_widget)) + if (show && !gtk_widget_get_realized(m_widget)) { // size_allocate signals occur in reverse order (bottom to top). // Things work better if the initial wxSizeEvents are sent (from the @@ -1194,7 +1261,7 @@ void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons ) // Setting icons before window is realized can cause a GTK assertion if // another TLW is realized before this one, and it has this one as it's // transient parent. The life demo exibits this problem. - if (GTK_WIDGET_REALIZED(m_widget)) + if (gtk_widget_get_realized(m_widget)) { GList* list = NULL; for (size_t i = icons.GetIconCount(); i--;) @@ -1218,8 +1285,10 @@ void wxTopLevelWindowGTK::Maximize(bool maximize) bool wxTopLevelWindowGTK::IsMaximized() const { - return m_widget->window && - (gdk_window_get_state(m_widget->window) & GDK_WINDOW_STATE_MAXIMIZED); + GdkWindow* window = NULL; + if (m_widget) + window = gtk_widget_get_window(m_widget); + return window && (gdk_window_get_state(window) & GDK_WINDOW_STATE_MAXIMIZED); } void wxTopLevelWindowGTK::Restore() @@ -1270,49 +1339,6 @@ void wxTopLevelWindowGTK::RemoveGrab() } } - -// helper -static bool do_shape_combine_region(GdkWindow* window, const wxRegion& region) -{ - if (window) - { - if (region.IsEmpty()) - { - gdk_window_shape_combine_mask(window, NULL, 0, 0); - } - else - { - gdk_window_shape_combine_region(window, region.GetRegion(), 0, 0); - return true; - } - } - return false; -} - - -bool wxTopLevelWindowGTK::SetShape(const wxRegion& region) -{ - wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false, - wxT("Shaped windows must be created with the wxFRAME_SHAPED style.")); - - if ( GTK_WIDGET_REALIZED(m_widget) ) - { - if ( m_wxwindow ) - do_shape_combine_region(m_wxwindow->window, region); - - return do_shape_combine_region(m_widget->window, region); - } - else // not realized yet - { - // store the shape to set, it will be really set once we're realized - m_shape = region; - - // we don't know if we're going to succeed or fail, be optimistic by - // default - return true; - } -} - bool wxTopLevelWindowGTK::IsActive() { return (this == (wxTopLevelWindowGTK*)g_activeFrame); @@ -1334,7 +1360,7 @@ void wxTopLevelWindowGTK::RequestUserAttention(int flags) m_urgency_hint = -2; - if( GTK_WIDGET_REALIZED(m_widget) && !IsActive() ) + if( gtk_widget_get_realized(m_widget) && !IsActive() ) { new_hint_value = true; @@ -1346,12 +1372,7 @@ void wxTopLevelWindowGTK::RequestUserAttention(int flags) } } -#if GTK_CHECK_VERSION(2,7,0) - if(!gtk_check_version(2,7,0)) - gtk_window_set_urgency_hint(GTK_WINDOW( m_widget ), new_hint_value); - else -#endif - wxgtk_window_set_urgency_hint(GTK_WINDOW( m_widget ), new_hint_value); + gtk_window_set_urgency_hint(GTK_WINDOW(m_widget), new_hint_value); } void wxTopLevelWindowGTK::SetWindowStyleFlag( long style ) @@ -1380,6 +1401,7 @@ void wxTopLevelWindowGTK::SetWindowStyleFlag( long style ) } } +#ifdef GDK_WINDOWING_X11 /* Get the X Window between child and the root window. This should usually be the WM managed XID */ static Window wxGetTopmostWindowX11(Display *dpy, Window child) @@ -1399,17 +1421,22 @@ static Window wxGetTopmostWindowX11(Display *dpy, Window child) return child; } +#endif // GDK_WINDOWING_X11 bool wxTopLevelWindowGTK::SetTransparent(wxByte alpha) { - if (!m_widget || !m_widget->window) + GdkWindow* window = NULL; + if (m_widget) + window = gtk_widget_get_window(m_widget); + if (window == NULL) return false; - Display* dpy = GDK_WINDOW_XDISPLAY (m_widget->window); +#ifdef GDK_WINDOWING_X11 + Display* dpy = GDK_WINDOW_XDISPLAY(window); // We need to get the X Window that has the root window as the immediate parent // and m_widget->window as a child. This should be the X Window that the WM manages and // from which the opacity property is checked from. - Window win = wxGetTopmostWindowX11(dpy, GDK_WINDOW_XID (m_widget->window)); + Window win = wxGetTopmostWindowX11(dpy, GDK_WINDOW_XID(window)); // Using pure Xlib to not have a GTK version check mess due to gtk2.0 not having GdkDisplay @@ -1424,6 +1451,9 @@ bool wxTopLevelWindowGTK::SetTransparent(wxByte alpha) } XSync(dpy, False); return true; +#else // !GDK_WINDOWING_X11 + return false; +#endif // GDK_WINDOWING_X11 / !GDK_WINDOWING_X11 } bool wxTopLevelWindowGTK::CanSetTransparent() diff --git a/Externals/wxWidgets3/src/gtk/treeentry_gtk.c b/Externals/wxWidgets3/src/gtk/treeentry_gtk.c index 7a87b39b2f..63d8c234ac 100644 --- a/Externals/wxWidgets3/src/gtk/treeentry_gtk.c +++ b/Externals/wxWidgets3/src/gtk/treeentry_gtk.c @@ -2,7 +2,7 @@ // Name: src/gtk/treeentry_gtk.c // Purpose: GtkTreeEntry implementation // Author: Ryan Norton -// Id: $Id: treeentry_gtk.c 65341 2010-08-18 21:28:11Z RR $ +// Id: $Id: treeentry_gtk.c 67433 2011-04-11 09:36:56Z JJ $ // Copyright: (c) 2006 Ryan Norton // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////// */ @@ -46,10 +46,10 @@ gtk_tree_entry_new() return GTK_TREE_ENTRY(g_object_new(GTK_TYPE_TREE_ENTRY, NULL)); } -GtkType +GType gtk_tree_entry_get_type () { - static GtkType tree_entry_type = 0; + static GType tree_entry_type = 0; if (!tree_entry_type) { diff --git a/Externals/wxWidgets3/src/gtk/utilsgtk.cpp b/Externals/wxWidgets3/src/gtk/utilsgtk.cpp index 70a7c04f9f..bf5e770bb6 100644 --- a/Externals/wxWidgets3/src/gtk/utilsgtk.cpp +++ b/Externals/wxWidgets3/src/gtk/utilsgtk.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/utilsgtk.cpp // Purpose: // Author: Robert Roebling -// Id: $Id: utilsgtk.cpp 66657 2011-01-08 18:05:33Z PC $ +// Id: $Id: utilsgtk.cpp 70704 2012-02-27 00:40:16Z VZ $ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -26,6 +26,14 @@ #include "wx/gtk/private/timer.h" #include "wx/evtloop.h" +#include +#ifdef GDK_WINDOWING_WIN32 +#include +#endif +#ifdef GDK_WINDOWING_X11 +#include +#endif + #if wxDEBUG_LEVEL #include "wx/gtk/assertdlg_gtk.h" #if wxUSE_STACKWALKER @@ -37,11 +45,9 @@ #include #include #include -#include // for WNOHANG +#ifdef __UNIX__ #include - -#include -#include +#endif #if wxUSE_DETECT_SM #include @@ -90,7 +96,7 @@ void wxDisplaySizeMM( int *width, int *height ) void wxGetMousePosition( int* x, int* y ) { - gdk_window_get_pointer( NULL, x, y, NULL ); + gdk_window_get_pointer(gtk_widget_get_root_window(wxGetRootWindow()), x, y, NULL); } bool wxColourDisplay() @@ -100,7 +106,7 @@ bool wxColourDisplay() int wxDisplayDepth() { - return gdk_drawable_get_visual( wxGetRootWindow()->window )->depth; + return gtk_widget_get_visual(wxGetRootWindow())->depth; } wxWindow* wxFindWindowAtPoint(const wxPoint& pt) @@ -186,31 +192,28 @@ const gchar *wx_pango_version_check (int major, int minor, int micro) // ---------------------------------------------------------------------------- extern "C" { -static -void GTK_EndProcessDetector(gpointer data, gint source, - GdkInputCondition WXUNUSED(condition)) +static gboolean EndProcessDetector(GIOChannel* source, GIOCondition, void* data) { wxEndProcessData * const proc_data = static_cast(data); // child exited, end waiting - close(source); - - // don't call us again! - gdk_input_remove(proc_data->tag); + close(g_io_channel_unix_get_fd(source)); wxHandleProcessTermination(proc_data); + + // don't call us again! + return false; } } int wxGUIAppTraits::AddProcessCallback(wxEndProcessData *proc_data, int fd) { - int tag = gdk_input_add(fd, - GDK_INPUT_READ, - GTK_EndProcessDetector, - (gpointer)proc_data); - - return tag; + GIOChannel* channel = g_io_channel_unix_new(fd); + GIOCondition cond = GIOCondition(G_IO_IN | G_IO_HUP | G_IO_ERR); + unsigned id = g_io_add_watch(channel, cond, EndProcessDetector, proc_data); + g_io_channel_unref(channel); + return int(id); } @@ -328,14 +331,11 @@ private: GtkAssertDialog *m_dlg; }; -// the callback functions must be extern "C" to comply with GTK+ declarations -extern "C" +static void get_stackframe_callback(void* p) { - void get_stackframe_callback(StackDump *dump) - { - // skip over frames up to including wxOnAssert() - dump->ProcessFrames(3); - } + StackDump* dump = static_cast(p); + // skip over frames up to including wxOnAssert() + dump->ProcessFrames(3); } #endif // wxDEBUG_LEVEL && wxUSE_STACKWALKER @@ -362,7 +362,7 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg) gtk_assert_dialog_set_backtrace_callback ( GTK_ASSERT_DIALOG(dialog), - (GtkAssertDialogStackFrameCallback)get_stackframe_callback, + get_stackframe_callback, &dump ); #endif // wxUSE_STACKWALKER @@ -472,11 +472,11 @@ wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names, { // since GTK>=2.6, we can use the glib_check_version() symbol... - // check whether GLib version is greater than 2.6 but also lower than 2.19 + // check whether GLib version is greater than 2.6 but also lower than 2.31 // because, as we use the undocumented _GOptionGroup struct, we don't want - // to run this code with future versions which might change it (2.19 is the + // to run this code with future versions which might change it (2.30 is the // latest one at the time of this writing) - if (!glib_check_version(2,6,0) && glib_check_version(2,20,0)) + if (glib_check_version(2,6,0) == NULL && glib_check_version(2,31,0)) { usage << _("The following standard GTK+ options are also supported:\n"); diff --git a/Externals/wxWidgets3/src/gtk/webview_webkit.cpp b/Externals/wxWidgets3/src/gtk/webview_webkit.cpp new file mode 100644 index 0000000000..d4b9528193 --- /dev/null +++ b/Externals/wxWidgets3/src/gtk/webview_webkit.cpp @@ -0,0 +1,924 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: src/gtk/webview_webkit.cpp +// Purpose: GTK WebKit backend for web view component +// Author: Marianne Gagnon, Robert Roebling +// Id: $Id: webview_webkit.cpp 70768 2012-03-01 16:44:31Z PC $ +// Copyright: (c) 2010 Marianne Gagnon, 1998 Robert Roebling +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT + +#include "wx/stockitem.h" +#include "wx/gtk/webview_webkit.h" +#include "wx/gtk/control.h" +#include "wx/gtk/private.h" +#include "wx/filesys.h" +#include "wx/base64.h" +#include + +// ---------------------------------------------------------------------------- +// GTK callbacks +// ---------------------------------------------------------------------------- + +extern "C" +{ + +static void +wxgtk_webview_webkit_load_status(GtkWidget* widget, + GParamSpec*, + wxWebViewWebKit *webKitCtrl) +{ + wxString url = webKitCtrl->GetCurrentURL(); + + WebKitLoadStatus status; + g_object_get(G_OBJECT(widget), "load-status", &status, NULL); + + wxString target; // TODO: get target (if possible) + + if (status == WEBKIT_LOAD_FINISHED) + { + WebKitWebBackForwardList* hist = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(widget)); + WebKitWebHistoryItem* item = webkit_web_back_forward_list_get_current_item(hist); + //We have to check if we are actually storing history + //If the item isn't added we add it ourselves, it isn't added otherwise + //with a custom scheme. + if(WEBKIT_IS_WEB_HISTORY_ITEM(item) && webkit_web_history_item_get_uri(item) != url) + { + WebKitWebHistoryItem* + newitem = webkit_web_history_item_new_with_data + ( + url.utf8_str(), + webKitCtrl->GetCurrentTitle().utf8_str() + ); + webkit_web_back_forward_list_add_item(hist, newitem); + } + + webKitCtrl->m_busy = false; + wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED, + webKitCtrl->GetId(), + url, target); + + if (webKitCtrl && webKitCtrl->GetEventHandler()) + webKitCtrl->GetEventHandler()->ProcessEvent(event); + } + else if (status == WEBKIT_LOAD_COMMITTED) + { + webKitCtrl->m_busy = true; + wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED, + webKitCtrl->GetId(), + url, target); + + if (webKitCtrl && webKitCtrl->GetEventHandler()) + webKitCtrl->GetEventHandler()->ProcessEvent(event); + } +} + +static gboolean +wxgtk_webview_webkit_navigation(WebKitWebView *, + WebKitWebFrame *frame, + WebKitNetworkRequest *request, + WebKitWebNavigationAction *, + WebKitWebPolicyDecision *policy_decision, + wxWebViewWebKit *webKitCtrl) +{ + if(webKitCtrl->m_guard) + { + webKitCtrl->m_guard = false; + //We set this to make sure that we don't try to load the page again from + //the resource request callback + webKitCtrl->m_vfsurl = webkit_network_request_get_uri(request); + webkit_web_policy_decision_use(policy_decision); + return FALSE; + } + + webKitCtrl->m_busy = true; + + const gchar* uri = webkit_network_request_get_uri(request); + + wxString target = webkit_web_frame_get_name (frame); + wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING, + webKitCtrl->GetId(), + wxString( uri, wxConvUTF8 ), + target); + + if (webKitCtrl && webKitCtrl->GetEventHandler()) + webKitCtrl->GetEventHandler()->ProcessEvent(event); + + if (!event.IsAllowed()) + { + webKitCtrl->m_busy = false; + webkit_web_policy_decision_ignore(policy_decision); + return TRUE; + } + else + { + wxString wxuri = uri; + wxSharedPtr handler; + wxVector > hanlders = webKitCtrl->GetHandlers(); + //We are not vetoed so see if we match one of the additional handlers + for(wxVector >::iterator it = hanlders.begin(); + it != hanlders.end(); ++it) + { + if(wxuri.substr(0, (*it)->GetName().length()) == (*it)->GetName()) + { + handler = (*it); + } + } + //If we found a handler we can then use it to load the file directly + //ourselves + if(handler) + { + webKitCtrl->m_guard = true; + wxFSFile* file = handler->GetFile(wxuri); + if(file) + { + webKitCtrl->SetPage(*file->GetStream(), wxuri); + } + //We need to throw some sort of error here if file is NULL + webkit_web_policy_decision_ignore(policy_decision); + return TRUE; + } + return FALSE; + } +} + +static gboolean +wxgtk_webview_webkit_error(WebKitWebView*, + WebKitWebFrame*, + gchar *uri, + gpointer web_error, + wxWebViewWebKit* webKitWindow) +{ + webKitWindow->m_busy = false; + wxWebViewNavigationError type = wxWEB_NAV_ERR_OTHER; + + GError* error = (GError*)web_error; + wxString description(error->message, wxConvUTF8); + + if (strcmp(g_quark_to_string(error->domain), "soup_http_error_quark") == 0) + { + switch (error->code) + { + case SOUP_STATUS_CANCELLED: + type = wxWEB_NAV_ERR_USER_CANCELLED; + break; + + case SOUP_STATUS_CANT_RESOLVE: + case SOUP_STATUS_NOT_FOUND: + type = wxWEB_NAV_ERR_NOT_FOUND; + break; + + case SOUP_STATUS_CANT_RESOLVE_PROXY: + case SOUP_STATUS_CANT_CONNECT: + case SOUP_STATUS_CANT_CONNECT_PROXY: + case SOUP_STATUS_SSL_FAILED: + case SOUP_STATUS_IO_ERROR: + type = wxWEB_NAV_ERR_CONNECTION; + break; + + case SOUP_STATUS_MALFORMED: + //case SOUP_STATUS_TOO_MANY_REDIRECTS: + type = wxWEB_NAV_ERR_REQUEST; + break; + + //case SOUP_STATUS_NO_CONTENT: + //case SOUP_STATUS_RESET_CONTENT: + + case SOUP_STATUS_BAD_REQUEST: + type = wxWEB_NAV_ERR_REQUEST; + break; + + case SOUP_STATUS_UNAUTHORIZED: + case SOUP_STATUS_FORBIDDEN: + type = wxWEB_NAV_ERR_AUTH; + break; + + case SOUP_STATUS_METHOD_NOT_ALLOWED: + case SOUP_STATUS_NOT_ACCEPTABLE: + type = wxWEB_NAV_ERR_SECURITY; + break; + + case SOUP_STATUS_PROXY_AUTHENTICATION_REQUIRED: + type = wxWEB_NAV_ERR_AUTH; + break; + + case SOUP_STATUS_REQUEST_TIMEOUT: + type = wxWEB_NAV_ERR_CONNECTION; + break; + + //case SOUP_STATUS_PAYMENT_REQUIRED: + case SOUP_STATUS_REQUEST_ENTITY_TOO_LARGE: + case SOUP_STATUS_REQUEST_URI_TOO_LONG: + case SOUP_STATUS_UNSUPPORTED_MEDIA_TYPE: + type = wxWEB_NAV_ERR_REQUEST; + break; + + case SOUP_STATUS_BAD_GATEWAY: + case SOUP_STATUS_SERVICE_UNAVAILABLE: + case SOUP_STATUS_GATEWAY_TIMEOUT: + type = wxWEB_NAV_ERR_CONNECTION; + break; + + case SOUP_STATUS_HTTP_VERSION_NOT_SUPPORTED: + type = wxWEB_NAV_ERR_REQUEST; + break; + //case SOUP_STATUS_INSUFFICIENT_STORAGE: + //case SOUP_STATUS_NOT_EXTENDED: + } + } + else if (strcmp(g_quark_to_string(error->domain), + "webkit-network-error-quark") == 0) + { + switch (error->code) + { + //WEBKIT_NETWORK_ERROR_FAILED: + //WEBKIT_NETWORK_ERROR_TRANSPORT: + + case WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL: + type = wxWEB_NAV_ERR_REQUEST; + break; + + case WEBKIT_NETWORK_ERROR_CANCELLED: + type = wxWEB_NAV_ERR_USER_CANCELLED; + break; + + case WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST: + type = wxWEB_NAV_ERR_NOT_FOUND; + break; + } + } + else if (strcmp(g_quark_to_string(error->domain), + "webkit-policy-error-quark") == 0) + { + switch (error->code) + { + //case WEBKIT_POLICY_ERROR_FAILED: + //case WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE: + //case WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL: + //case WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE: + case WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT: + type = wxWEB_NAV_ERR_SECURITY; + break; + } + } + /* + webkit_plugin_error_quark + else + { + printf("Error domain %s\n", g_quark_to_string(error->domain)); + } + */ + + wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR, + webKitWindow->GetId(), + uri, ""); + event.SetString(description); + event.SetInt(type); + + if (webKitWindow && webKitWindow->GetEventHandler()) + { + webKitWindow->GetEventHandler()->ProcessEvent(event); + } + + return FALSE; +} + +static gboolean +wxgtk_webview_webkit_new_window(WebKitWebView*, + WebKitWebFrame *frame, + WebKitNetworkRequest *request, + WebKitWebNavigationAction*, + WebKitWebPolicyDecision *policy_decision, + wxWebViewWebKit *webKitCtrl) +{ + const gchar* uri = webkit_network_request_get_uri(request); + + wxString target = webkit_web_frame_get_name (frame); + wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, + webKitCtrl->GetId(), + wxString( uri, wxConvUTF8 ), + target); + + if (webKitCtrl && webKitCtrl->GetEventHandler()) + webKitCtrl->GetEventHandler()->ProcessEvent(event); + + //We always want the user to handle this themselves + webkit_web_policy_decision_ignore(policy_decision); + return TRUE; +} + +static void +wxgtk_webview_webkit_title_changed(WebKitWebView*, + WebKitWebFrame*, + gchar *title, + wxWebViewWebKit *webKitCtrl) +{ + wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, + webKitCtrl->GetId(), + webKitCtrl->GetCurrentURL(), + ""); + event.SetString(wxString(title, wxConvUTF8)); + + if (webKitCtrl && webKitCtrl->GetEventHandler()) + webKitCtrl->GetEventHandler()->ProcessEvent(event); + +} + +static void +wxgtk_webview_webkit_resource_req(WebKitWebView *, + WebKitWebFrame *, + WebKitWebResource *, + WebKitNetworkRequest *request, + WebKitNetworkResponse *, + wxWebViewWebKit *webKitCtrl) +{ + wxString uri = webkit_network_request_get_uri(request); + + wxSharedPtr handler; + wxVector > hanlders = webKitCtrl->GetHandlers(); + + //We are not vetoed so see if we match one of the additional handlers + for(wxVector >::iterator it = hanlders.begin(); + it != hanlders.end(); ++it) + { + if(uri.substr(0, (*it)->GetName().length()) == (*it)->GetName()) + { + handler = (*it); + } + } + //If we found a handler we can then use it to load the file directly + //ourselves + if(handler) + { + //If it is requsting the page itself then return as we have already + //loaded it from the archive + if(webKitCtrl->m_vfsurl == uri) + return; + + wxFSFile* file = handler->GetFile(uri); + if(file) + { + //We load the data into a data url to save it being written out again + size_t size = file->GetStream()->GetLength(); + char *buffer = new char[size]; + file->GetStream()->Read(buffer, size); + wxString data = wxBase64Encode(buffer, size); + delete[] buffer; + wxString mime = file->GetMimeType(); + wxString path = "data:" + mime + ";base64," + data; + //Then we can redirect the call + webkit_network_request_set_uri(request, path.utf8_str()); + } + + } +} + +} // extern "C" + +//----------------------------------------------------------------------------- +// wxWebViewWebKit +//----------------------------------------------------------------------------- + +wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxWebView); + +bool wxWebViewWebKit::Create(wxWindow *parent, + wxWindowID id, + const wxString &url, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) +{ + m_busy = false; + m_guard = false; + + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) + { + wxFAIL_MSG( wxT("wxWebViewWebKit creation failed") ); + return false; + } + + m_widget = gtk_scrolled_window_new(NULL, NULL); + g_object_ref(m_widget); + m_web_view = WEBKIT_WEB_VIEW(webkit_web_view_new()); + + /* Place the WebKitWebView in the GtkScrolledWindow */ + gtk_container_add(GTK_CONTAINER(m_widget), GTK_WIDGET(m_web_view)); + gtk_widget_show(GTK_WIDGET(m_web_view)); + + g_signal_connect_after(m_web_view, "navigation-policy-decision-requested", + G_CALLBACK(wxgtk_webview_webkit_navigation), + this); + g_signal_connect_after(m_web_view, "load-error", + G_CALLBACK(wxgtk_webview_webkit_error), + this); + + g_signal_connect_after(m_web_view, "new-window-policy-decision-requested", + G_CALLBACK(wxgtk_webview_webkit_new_window), this); + + g_signal_connect_after(m_web_view, "title-changed", + G_CALLBACK(wxgtk_webview_webkit_title_changed), this); + + g_signal_connect_after(m_web_view, "resource-request-starting", + G_CALLBACK(wxgtk_webview_webkit_resource_req), this); + + m_parent->DoAddChild( this ); + + PostCreation(size); + + /* Open a webpage */ + webkit_web_view_load_uri(m_web_view, url.utf8_str()); + + //Get the initial history limit so we can enable and disable it later + WebKitWebBackForwardList* history; + history = webkit_web_view_get_back_forward_list(m_web_view); + m_historyLimit = webkit_web_back_forward_list_get_limit(history); + + // last to avoid getting signal too early + g_signal_connect_after(m_web_view, "notify::load-status", + G_CALLBACK(wxgtk_webview_webkit_load_status), + this); + + return true; +} + +bool wxWebViewWebKit::Enable( bool enable ) +{ + if (!wxControl::Enable(enable)) + return false; + + gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable); + + //if (enable) + // GTKFixSensitivity(); + + return true; +} + +GdkWindow* +wxWebViewWebKit::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const +{ + GdkWindow* window = gtk_widget_get_parent_window(m_widget); + return window; +} + +void wxWebViewWebKit::ZoomIn() +{ + webkit_web_view_zoom_in(m_web_view); +} + +void wxWebViewWebKit::ZoomOut() +{ + webkit_web_view_zoom_out(m_web_view); +} + +void wxWebViewWebKit::SetWebkitZoom(float level) +{ + webkit_web_view_set_zoom_level(m_web_view, level); +} + +float wxWebViewWebKit::GetWebkitZoom() const +{ + return webkit_web_view_get_zoom_level(m_web_view); +} + +void wxWebViewWebKit::Stop() +{ + webkit_web_view_stop_loading(m_web_view); +} + +void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags) +{ + if (flags & wxWEB_VIEW_RELOAD_NO_CACHE) + { + webkit_web_view_reload_bypass_cache(m_web_view); + } + else + { + webkit_web_view_reload(m_web_view); + } +} + +void wxWebViewWebKit::LoadURL(const wxString& url) +{ + webkit_web_view_load_uri(m_web_view, wxGTK_CONV(url)); +} + + +void wxWebViewWebKit::GoBack() +{ + webkit_web_view_go_back(m_web_view); +} + +void wxWebViewWebKit::GoForward() +{ + webkit_web_view_go_forward(m_web_view); +} + + +bool wxWebViewWebKit::CanGoBack() const +{ + return webkit_web_view_can_go_back(m_web_view); +} + + +bool wxWebViewWebKit::CanGoForward() const +{ + return webkit_web_view_can_go_forward(m_web_view); +} + +void wxWebViewWebKit::ClearHistory() +{ + WebKitWebBackForwardList* history; + history = webkit_web_view_get_back_forward_list(m_web_view); + webkit_web_back_forward_list_clear(history); +} + +void wxWebViewWebKit::EnableHistory(bool enable) +{ + WebKitWebBackForwardList* history; + history = webkit_web_view_get_back_forward_list(m_web_view); + if(enable) + { + webkit_web_back_forward_list_set_limit(history, m_historyLimit); + } + else + { + webkit_web_back_forward_list_set_limit(history, 0); + } +} + +wxVector > wxWebViewWebKit::GetBackwardHistory() +{ + wxVector > backhist; + WebKitWebBackForwardList* history; + history = webkit_web_view_get_back_forward_list(m_web_view); + GList* list = webkit_web_back_forward_list_get_back_list_with_limit(history, + m_historyLimit); + //We need to iterate in reverse to get the order we desire + for(int i = g_list_length(list) - 1; i >= 0 ; i--) + { + WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)g_list_nth_data(list, i); + wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem( + webkit_web_history_item_get_uri(gtkitem), + webkit_web_history_item_get_title(gtkitem)); + wxitem->m_histItem = gtkitem; + wxSharedPtr item(wxitem); + backhist.push_back(item); + } + return backhist; +} + +wxVector > wxWebViewWebKit::GetForwardHistory() +{ + wxVector > forwardhist; + WebKitWebBackForwardList* history; + history = webkit_web_view_get_back_forward_list(m_web_view); + GList* list = webkit_web_back_forward_list_get_forward_list_with_limit(history, + m_historyLimit); + for(guint i = 0; i < g_list_length(list); i++) + { + WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)g_list_nth_data(list, i); + wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem( + webkit_web_history_item_get_uri(gtkitem), + webkit_web_history_item_get_title(gtkitem)); + wxitem->m_histItem = gtkitem; + wxSharedPtr item(wxitem); + forwardhist.push_back(item); + } + return forwardhist; +} + +void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr item) +{ + WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)item->m_histItem; + if(gtkitem) + { + webkit_web_view_go_to_back_forward_item(m_web_view, + WEBKIT_WEB_HISTORY_ITEM(gtkitem)); + } +} + +bool wxWebViewWebKit::CanCut() const +{ + return webkit_web_view_can_cut_clipboard(m_web_view); +} + +bool wxWebViewWebKit::CanCopy() const +{ + return webkit_web_view_can_copy_clipboard(m_web_view); +} + +bool wxWebViewWebKit::CanPaste() const +{ + return webkit_web_view_can_paste_clipboard(m_web_view); +} + +void wxWebViewWebKit::Cut() +{ + webkit_web_view_cut_clipboard(m_web_view); +} + +void wxWebViewWebKit::Copy() +{ + webkit_web_view_copy_clipboard(m_web_view); +} + +void wxWebViewWebKit::Paste() +{ + webkit_web_view_paste_clipboard(m_web_view); +} + +bool wxWebViewWebKit::CanUndo() const +{ + return webkit_web_view_can_undo(m_web_view); +} + +bool wxWebViewWebKit::CanRedo() const +{ + return webkit_web_view_can_redo(m_web_view); +} + +void wxWebViewWebKit::Undo() +{ + webkit_web_view_undo(m_web_view); +} + +void wxWebViewWebKit::Redo() +{ + webkit_web_view_redo(m_web_view); +} + +wxString wxWebViewWebKit::GetCurrentURL() const +{ + // FIXME: check which encoding the web kit control uses instead of + // assuming UTF8 (here and elsewhere too) + return wxString::FromUTF8(webkit_web_view_get_uri(m_web_view)); +} + + +wxString wxWebViewWebKit::GetCurrentTitle() const +{ + return wxString::FromUTF8(webkit_web_view_get_title(m_web_view)); +} + + +wxString wxWebViewWebKit::GetPageSource() const +{ + WebKitWebFrame* frame = webkit_web_view_get_main_frame(m_web_view); + WebKitWebDataSource* src = webkit_web_frame_get_data_source (frame); + + // TODO: check encoding with + // const gchar* + // webkit_web_data_source_get_encoding(WebKitWebDataSource *data_source); + return wxString(webkit_web_data_source_get_data (src)->str, wxConvUTF8); +} + + +wxWebViewZoom wxWebViewWebKit::GetZoom() const +{ + float zoom = GetWebkitZoom(); + + // arbitrary way to map float zoom to our common zoom enum + if (zoom <= 0.65) + { + return wxWEB_VIEW_ZOOM_TINY; + } + else if (zoom > 0.65 && zoom <= 0.90) + { + return wxWEB_VIEW_ZOOM_SMALL; + } + else if (zoom > 0.90 && zoom <= 1.15) + { + return wxWEB_VIEW_ZOOM_MEDIUM; + } + else if (zoom > 1.15 && zoom <= 1.45) + { + return wxWEB_VIEW_ZOOM_LARGE; + } + else if (zoom > 1.45) + { + return wxWEB_VIEW_ZOOM_LARGEST; + } + + // to shut up compilers, this can never be reached logically + wxASSERT(false); + return wxWEB_VIEW_ZOOM_MEDIUM; +} + + +void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom) +{ + // arbitrary way to map our common zoom enum to float zoom + switch (zoom) + { + case wxWEB_VIEW_ZOOM_TINY: + SetWebkitZoom(0.6f); + break; + + case wxWEB_VIEW_ZOOM_SMALL: + SetWebkitZoom(0.8f); + break; + + case wxWEB_VIEW_ZOOM_MEDIUM: + SetWebkitZoom(1.0f); + break; + + case wxWEB_VIEW_ZOOM_LARGE: + SetWebkitZoom(1.3); + break; + + case wxWEB_VIEW_ZOOM_LARGEST: + SetWebkitZoom(1.6); + break; + + default: + wxASSERT(false); + } +} + +void wxWebViewWebKit::SetZoomType(wxWebViewZoomType type) +{ + webkit_web_view_set_full_content_zoom(m_web_view, + (type == wxWEB_VIEW_ZOOM_TYPE_LAYOUT ? + TRUE : FALSE)); +} + +wxWebViewZoomType wxWebViewWebKit::GetZoomType() const +{ + gboolean fczoom = webkit_web_view_get_full_content_zoom(m_web_view); + + if (fczoom) return wxWEB_VIEW_ZOOM_TYPE_LAYOUT; + else return wxWEB_VIEW_ZOOM_TYPE_TEXT; +} + +bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType) const +{ + // this port supports all zoom types + return true; +} + +void wxWebViewWebKit::SetPage(const wxString& html, const wxString& baseUri) +{ + webkit_web_view_load_string (m_web_view, + html.mb_str(wxConvUTF8), + "text/html", + "UTF-8", + baseUri.mb_str(wxConvUTF8)); +} + +void wxWebViewWebKit::Print() +{ + WebKitWebFrame* frame = webkit_web_view_get_main_frame(m_web_view); + webkit_web_frame_print (frame); + + // GtkPrintOperationResult webkit_web_frame_print_full + // (WebKitWebFrame *frame, + // GtkPrintOperation *operation, + // GtkPrintOperationAction action, + // GError **error); + +} + + +bool wxWebViewWebKit::IsBusy() const +{ + return m_busy; + + // This code looks nice but returns true after a page was cancelled + /* + WebKitLoadStatus status = webkit_web_view_get_load_status + (WEBKIT_WEB_VIEW(web_view)); + + +#if WEBKIT_CHECK_VERSION(1,1,16) + // WEBKIT_LOAD_FAILED is new in webkit 1.1.16 + if (status == WEBKIT_LOAD_FAILED) + { + return false; + } +#endif + if (status == WEBKIT_LOAD_FINISHED) + { + return false; + } + + return true; + */ +} + +void wxWebViewWebKit::SetEditable(bool enable) +{ + webkit_web_view_set_editable(m_web_view, enable); +} + +bool wxWebViewWebKit::IsEditable() const +{ + return webkit_web_view_get_editable(m_web_view); +} + +void wxWebViewWebKit::DeleteSelection() +{ + webkit_web_view_delete_selection(m_web_view); +} + +bool wxWebViewWebKit::HasSelection() const +{ + return webkit_web_view_has_selection(m_web_view); +} + +void wxWebViewWebKit::SelectAll() +{ + webkit_web_view_select_all(m_web_view); +} + +wxString wxWebViewWebKit::GetSelectedText() const +{ + WebKitDOMDocument* doc; + WebKitDOMDOMWindow* win; + WebKitDOMDOMSelection* sel; + WebKitDOMRange* range; + + doc = webkit_web_view_get_dom_document(m_web_view); + win = webkit_dom_document_get_default_view(WEBKIT_DOM_DOCUMENT(doc)); + sel = webkit_dom_dom_window_get_selection(WEBKIT_DOM_DOM_WINDOW(win)); + range = webkit_dom_dom_selection_get_range_at(WEBKIT_DOM_DOM_SELECTION(sel), + 0, NULL); + return wxString(webkit_dom_range_get_text(WEBKIT_DOM_RANGE(range)), + wxConvUTF8); +} + +wxString wxWebViewWebKit::GetSelectedSource() const +{ + WebKitDOMDocument* doc; + WebKitDOMDOMWindow* win; + WebKitDOMDOMSelection* sel; + WebKitDOMRange* range; + WebKitDOMElement* div; + WebKitDOMDocumentFragment* clone; + WebKitDOMHTMLElement* html; + + doc = webkit_web_view_get_dom_document(m_web_view); + win = webkit_dom_document_get_default_view(WEBKIT_DOM_DOCUMENT(doc)); + sel = webkit_dom_dom_window_get_selection(WEBKIT_DOM_DOM_WINDOW(win)); + range = webkit_dom_dom_selection_get_range_at(WEBKIT_DOM_DOM_SELECTION(sel), + 0, NULL); + div = webkit_dom_document_create_element(WEBKIT_DOM_DOCUMENT(doc), "div", NULL); + + clone = webkit_dom_range_clone_contents(WEBKIT_DOM_RANGE(range), NULL); + webkit_dom_node_append_child(&div->parent_instance, &clone->parent_instance, NULL); + html = (WebKitDOMHTMLElement*)div; + + return wxString(webkit_dom_html_element_get_inner_html(WEBKIT_DOM_HTML_ELEMENT(html)), + wxConvUTF8); +} + +void wxWebViewWebKit::ClearSelection() +{ + WebKitDOMDocument* doc; + WebKitDOMDOMWindow* win; + WebKitDOMDOMSelection* sel; + + doc = webkit_web_view_get_dom_document(m_web_view); + win = webkit_dom_document_get_default_view(WEBKIT_DOM_DOCUMENT(doc)); + sel = webkit_dom_dom_window_get_selection(WEBKIT_DOM_DOM_WINDOW(win)); + webkit_dom_dom_selection_remove_all_ranges(WEBKIT_DOM_DOM_SELECTION(sel)); + +} + +wxString wxWebViewWebKit::GetPageText() const +{ + WebKitDOMDocument* doc; + WebKitDOMHTMLElement* body; + + doc = webkit_web_view_get_dom_document(m_web_view); + body = webkit_dom_document_get_body(WEBKIT_DOM_DOCUMENT(doc)); + return wxString(webkit_dom_html_element_get_inner_text(WEBKIT_DOM_HTML_ELEMENT(body)), + wxConvUTF8); +} + +void wxWebViewWebKit::RunScript(const wxString& javascript) +{ + webkit_web_view_execute_script(m_web_view, + javascript.mb_str(wxConvUTF8)); +} + +void wxWebViewWebKit::RegisterHandler(wxSharedPtr handler) +{ + m_handlerList.push_back(handler); +} + +// static +wxVisualAttributes +wxWebViewWebKit::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(webkit_web_view_new); +} + + +#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT diff --git a/Externals/wxWidgets3/src/gtk/win_gtk.cpp b/Externals/wxWidgets3/src/gtk/win_gtk.cpp index 59d0dc8a02..84e6aaf41e 100644 --- a/Externals/wxWidgets3/src/gtk/win_gtk.cpp +++ b/Externals/wxWidgets3/src/gtk/win_gtk.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/win_gtk.cpp // Purpose: native GTK+ widget for wxWindow // Author: Paul Cornett -// Id: $Id: win_gtk.cpp 64725 2010-06-25 04:31:45Z PC $ +// Id: $Id: win_gtk.cpp 70482 2012-01-31 07:30:11Z PC $ // Copyright: (c) 2007 Paul Cornett // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -39,34 +39,36 @@ struct wxPizzaClass static void size_allocate(GtkWidget* widget, GtkAllocation* alloc) { - const bool is_resize = - widget->allocation.width != alloc->width || - widget->allocation.height != alloc->height; - const bool is_move = - widget->allocation.x != alloc->x || - widget->allocation.y != alloc->y; - wxPizza* pizza = WX_PIZZA(widget); int border_x, border_y; pizza->get_border_widths(border_x, border_y); int w = alloc->width - 2 * border_x; if (w < 0) w = 0; - if (GTK_WIDGET_REALIZED(widget) && (is_move || is_resize)) + if (gtk_widget_get_realized(widget)) { int h = alloc->height - 2 * border_y; if (h < 0) h = 0; + const int x = alloc->x + border_x; + const int y = alloc->y + border_y; - gdk_window_move_resize(widget->window, - alloc->x + border_x, alloc->y + border_y, w, h); + GdkWindow* window = gtk_widget_get_window(widget); + int old_x, old_y; + gdk_window_get_position(window, &old_x, &old_y); - if (is_resize && (border_x || border_y)) + if (x != old_x || y != old_y || + w != gdk_window_get_width(window) || h != gdk_window_get_height(window)) { - // old and new border areas need to be invalidated, - // otherwise they will not be erased/redrawn properly - GdkWindow* parent = gtk_widget_get_parent_window(widget); - gdk_window_invalidate_rect(parent, &widget->allocation, false); - gdk_window_invalidate_rect(parent, alloc, false); + gdk_window_move_resize(window, x, y, w, h); + + if (border_x + border_y) + { + // old and new border areas need to be invalidated, + // otherwise they will not be erased/redrawn properly + GdkWindow* parent = gtk_widget_get_parent_window(widget); + gdk_window_invalidate_rect(parent, &widget->allocation, false); + gdk_window_invalidate_rect(parent, alloc, false); + } } } @@ -76,7 +78,7 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc) for (const GList* list = pizza->m_fixed.children; list; list = list->next) { const GtkFixedChild* child = static_cast(list->data); - if (GTK_WIDGET_VISIBLE(child->widget)) + if (gtk_widget_get_visible(child->widget)) { GtkAllocation child_alloc; // note that child positions do not take border into @@ -236,7 +238,11 @@ GtkWidget* wxPizza::New(long windowStyle) pizza->m_is_scrollable = (windowStyle & (wxHSCROLL | wxVSCROLL)) != 0; // mask off border styles not useable with wxPizza pizza->m_border_style = int(windowStyle & BORDER_STYLES); +#if GTK_CHECK_VERSION(3,0,0) || defined(GTK_DISABLE_DEPRECATED) + gtk_widget_set_has_window(widget, true); +#else gtk_fixed_set_has_window(GTK_FIXED(widget), true); +#endif gtk_widget_add_events(widget, GDK_EXPOSURE_MASK | GDK_SCROLL_MASK | diff --git a/Externals/wxWidgets3/src/gtk/window.cpp b/Externals/wxWidgets3/src/gtk/window.cpp index cc7ce677b6..3ac730cad6 100644 --- a/Externals/wxWidgets3/src/gtk/window.cpp +++ b/Externals/wxWidgets3/src/gtk/window.cpp @@ -2,7 +2,7 @@ // Name: src/gtk/window.cpp // Purpose: wxWindowGTK implementation // Author: Robert Roebling -// Id: $Id: window.cpp 67280 2011-03-22 14:17:38Z DS $ +// Id: $Id: window.cpp 70734 2012-02-28 05:29:35Z PC $ // Copyright: (c) 1998 Robert Roebling, Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -31,42 +31,30 @@ #include "wx/tooltip.h" #include "wx/caret.h" #include "wx/fontutil.h" +#include "wx/scopeguard.h" #include "wx/sysopt.h" #include #include "wx/gtk/private.h" #include "wx/gtk/private/win_gtk.h" +#include "wx/gtk/private/event.h" +using namespace wxGTKImpl; +#ifdef GDK_WINDOWING_X11 #include +#else +typedef guint KeySym; +#endif #include #if GTK_CHECK_VERSION(3,0,0) #include #endif -#if !GTK_CHECK_VERSION(2,10,0) - // GTK+ can reliably detect Meta key state only since 2.10 when - // GDK_META_MASK was introduced -- there wasn't any way to detect it - // in older versions. wxGTK used GDK_MOD2_MASK for this purpose, but - // GDK_MOD2_MASK is documented as: - // - // the fifth modifier key (it depends on the modifier mapping of the X - // server which key is interpreted as this modifier) - // - // In other words, it isn't guaranteed to map to Meta. This is a real - // problem: it is common to map NumLock to it (in fact, it's an exception - // if the X server _doesn't_ use it for NumLock). So the old code caused - // wxKeyEvent::MetaDown() to always return true as long as NumLock was on - // on many systems, which broke all applications using - // wxKeyEvent::GetModifiers() to check modifiers state (see e.g. here: - // http://tinyurl.com/56lsk2). - // - // Because of this, it's better to not detect Meta key state at all than - // to detect it incorrectly. Hence the following #define, which causes - // m_metaDown to be always set to false. - #define GDK_META_MASK 0 -#endif +// gdk_window_set_composited() is only supported since 2.12 +#define wxGTK_VERSION_REQUIRED_FOR_COMPOSITING 2,12,0 +#define wxGTK_HAS_COMPOSITING_SUPPORT GTK_CHECK_VERSION(2,12,0) //----------------------------------------------------------------------------- // documentation on internals @@ -233,29 +221,6 @@ int g_lastButtonNumber = 0; // the trace mask used for the focus debugging messages #define TRACE_FOCUS wxT("focus") -//----------------------------------------------------------------------------- -// missing gdk functions -//----------------------------------------------------------------------------- - -void -gdk_window_warp_pointer (GdkWindow *window, - gint x, - gint y) -{ - if (!window) - window = gdk_get_default_root_window(); - - if (!GDK_WINDOW_DESTROYED(window)) - { - XWarpPointer (GDK_WINDOW_XDISPLAY(window), - None, /* not source window -> move from anywhere */ - GDK_WINDOW_XID(window), /* dest window */ - 0, 0, 0, 0, /* not source window -> move from anywhere */ - x, y ); - } -} - - //----------------------------------------------------------------------------- // "size_request" of m_widget //----------------------------------------------------------------------------- @@ -313,7 +278,8 @@ expose_event_border(GtkWidget* widget, GdkEventExpose* gdk_event, wxWindow* win) if (!win->IsShown()) return false; - const GtkAllocation& alloc = win->m_wxwindow->allocation; + GtkAllocation alloc; + gtk_widget_get_allocation(win->m_wxwindow, &alloc); const int x = alloc.x; const int y = alloc.y; const int w = alloc.width; @@ -325,7 +291,7 @@ expose_event_border(GtkWidget* widget, GdkEventExpose* gdk_event, wxWindow* win) if (win->HasFlag(wxBORDER_SIMPLE)) { gdk_draw_rectangle(gdk_event->window, - widget->style->black_gc, false, x, y, w - 1, h - 1); + gtk_widget_get_style(widget)->black_gc, false, x, y, w - 1, h - 1); } else { @@ -342,9 +308,12 @@ expose_event_border(GtkWidget* widget, GdkEventExpose* gdk_event, wxWindow* win) // for scrollable ones detail = "viewport"; + // clip rect is required to avoid painting background + // over upper left (w,h) of parent window + GdkRectangle clipRect = { x, y, w, h }; gtk_paint_shadow( - win->m_wxwindow->style, gdk_event->window, GTK_STATE_NORMAL, - shadow, NULL, wxGTKPrivate::GetEntryWidget(), detail, x, y, w, h); + gtk_widget_get_style(win->m_wxwindow), gdk_event->window, GTK_STATE_NORMAL, + shadow, &clipRect, wxGTKPrivate::GetEntryWidget(), detail, x, y, w, h); } return false; } @@ -356,16 +325,17 @@ expose_event_border(GtkWidget* widget, GdkEventExpose* gdk_event, wxWindow* win) extern "C" { static void -parent_set(GtkWidget* widget, GtkObject* old_parent, wxWindow* win) +parent_set(GtkWidget* widget, GtkWidget* old_parent, wxWindow* win) { if (old_parent) { g_signal_handlers_disconnect_by_func( old_parent, (void*)expose_event_border, win); } - if (widget->parent) + GtkWidget* parent = gtk_widget_get_parent(widget); + if (parent) { - g_signal_connect_after(widget->parent, "expose_event", + g_signal_connect_after(parent, "expose_event", G_CALLBACK(expose_event_border), win); } } @@ -376,18 +346,6 @@ parent_set(GtkWidget* widget, GtkObject* old_parent, wxWindow* win) // "key_press_event" from any window //----------------------------------------------------------------------------- -// These are used when transforming Ctrl-alpha to ascii values 1-26 -inline bool wxIsLowerChar(int code) -{ - return (code >= 'a' && code <= 'z' ); -} - -inline bool wxIsUpperChar(int code) -{ - return (code >= 'A' && code <= 'Z' ); -} - - // set WXTRACE to this to see the key event codes on the console #define TRACE_KEYS wxT("keyevent") @@ -677,12 +635,6 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event, wxWindowGTK *win, GdkEventKey *gdk_event) { - int x = 0; - int y = 0; - GdkModifierType state; - if (gdk_event->window) - gdk_window_get_pointer(gdk_event->window, &x, &y, &state); - event.SetTimestamp( gdk_event->time ); event.SetId(win->GetId()); @@ -736,10 +688,8 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event, event.m_rawCode = (wxUint32) gdk_event->keyval; event.m_rawFlags = gdk_event->hardware_keycode; - wxGetMousePosition( &x, &y ); - win->ScreenToClient( &x, &y ); - event.m_x = x; - event.m_y = y; + wxGetMousePosition(&event.m_x, &event.m_y); + win->ScreenToClient(&event.m_x, &event.m_y); event.SetEventObject( win ); } @@ -782,6 +732,7 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event, keysym = (KeySym)gdk_event->string[0]; } +#ifdef GDK_WINDOWING_X11 // we want to always get the same key code when the same key is // pressed regardless of the state of the modifiers, i.e. on a // standard US keyboard pressing '5' or '%' ('5' key with @@ -800,6 +751,9 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event, // use the normalized, i.e. lower register, keysym if we've // got one key_code = keysymNormalized ? keysymNormalized : keysym; +#else + key_code = keysym; +#endif // as explained above, we want to have lower register key codes // normally but for the letter keys we want to have the upper ones @@ -877,34 +831,58 @@ struct wxGtkIMData namespace { -// Send wxEVT_CHAR_HOOK event to the parent of the window and if it wasn't -// processed, send wxEVT_CHAR to the window itself. Return true if either of -// them was handled. -bool -SendCharHookAndCharEvents(const wxKeyEvent& event, wxWindow *win) +// Send wxEVT_CHAR_HOOK event to the parent of the window and return true only +// if it was processed (and not skipped). +bool SendCharHookEvent(const wxKeyEvent& event, wxWindow *win) { - // wxEVT_CHAR_HOOK must be sent to the top level parent window to allow it + // wxEVT_CHAR_HOOK must be sent to allow the parent windows (e.g. a dialog + // which typically closes when Esc key is pressed in any of its controls) // to handle key events in all of its children unless the mouse is captured // in which case we consider that the keyboard should be "captured" too. if ( !g_captureWindow ) { - wxWindow * const parent = wxGetTopLevelParent(win); - if ( parent ) - { - // We need to make a copy of the event object because it is - // modified while it's handled, notably its WasProcessed() flag - // is set after it had been processed once. - wxKeyEvent eventCharHook(event); - eventCharHook.SetEventType(wxEVT_CHAR_HOOK); - if ( parent->HandleWindowEvent(eventCharHook) ) - return true; - } + wxKeyEvent eventCharHook(wxEVT_CHAR_HOOK, event); + if ( win->HandleWindowEvent(eventCharHook) + && !event.IsNextEventAllowed() ) + return true; } - // As above, make a copy of the event first. - wxKeyEvent eventChar(event); - eventChar.SetEventType(wxEVT_CHAR); - return win->HandleWindowEvent(eventChar); + return false; +} + +// Adjust wxEVT_CHAR event key code fields. This function takes care of two +// conventions: +// (a) Ctrl-letter key presses generate key codes in range 1..26 +// (b) Unicode key codes are same as key codes for the codes in 1..255 range +void AdjustCharEventKeyCodes(wxKeyEvent& event) +{ + const int code = event.m_keyCode; + + // Check for (a) above. + if ( event.ControlDown() ) + { + // We intentionally don't use isupper/lower() here, we really need + // ASCII letters only as it doesn't make sense to translate any other + // ones into this range which has only 26 slots. + if ( code >= 'a' && code <= 'z' ) + event.m_keyCode = code - 'a' + 1; + else if ( code >= 'A' && code <= 'Z' ) + event.m_keyCode = code - 'A' + 1; + +#if wxUSE_UNICODE + // Adjust the Unicode equivalent in the same way too. + if ( event.m_keyCode != code ) + event.m_uniChar = event.m_keyCode; +#endif // wxUSE_UNICODE + } + +#if wxUSE_UNICODE + // Check for (b) from above. + // + // FIXME: Should we do it for key codes up to 255? + if ( !event.m_uniChar && code < WXK_DELETE ) + event.m_uniChar = code; +#endif // wxUSE_UNICODE } } // anonymous namespace @@ -926,6 +904,13 @@ gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget), if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) ) { + // Send the CHAR_HOOK event first + if ( SendCharHookEvent(event, win) ) + { + // Don't do anything at all with this event any more. + return TRUE; + } + // Emit KEY_DOWN event ret = win->HandleWindowEvent( event ); } @@ -1009,25 +994,15 @@ gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget), if ( key_code ) { + wxKeyEvent eventChar(wxEVT_CHAR, event); + wxLogTrace(TRACE_KEYS, wxT("Char event: %ld"), key_code); - event.m_keyCode = key_code; + eventChar.m_keyCode = key_code; - // To conform to the docs we need to translate Ctrl-alpha - // characters to values in the range 1-26. - if ( event.ControlDown() && - ( wxIsLowerChar(key_code) || wxIsUpperChar(key_code) )) - { - if ( wxIsLowerChar(key_code) ) - event.m_keyCode = key_code - 'a' + 1; - if ( wxIsUpperChar(key_code) ) - event.m_keyCode = key_code - 'A' + 1; -#if wxUSE_UNICODE - event.m_uniChar = event.m_keyCode; -#endif - } + AdjustCharEventKeyCodes(eventChar); - ret = SendCharHookAndCharEvents(event, win); + ret = win->HandleWindowEvent(eventChar); } } @@ -1041,7 +1016,7 @@ gtk_wxwindow_commit_cb (GtkIMContext * WXUNUSED(context), const gchar *str, wxWindow *window) { - wxKeyEvent event( wxEVT_KEY_DOWN ); + wxKeyEvent event( wxEVT_CHAR ); // take modifiers, cursor position, timestamp etc. from the last // key_press_event that was fed into Input Method: @@ -1070,23 +1045,9 @@ gtk_wxwindow_commit_cb (GtkIMContext * WXUNUSED(context), event.m_keyCode = (char)*pstr; #endif // wxUSE_UNICODE - // To conform to the docs we need to translate Ctrl-alpha - // characters to values in the range 1-26. - if ( event.ControlDown() && - ( wxIsLowerChar(*pstr) || wxIsUpperChar(*pstr) )) - { - if ( wxIsLowerChar(*pstr) ) - event.m_keyCode = *pstr - 'a' + 1; - if ( wxIsUpperChar(*pstr) ) - event.m_keyCode = *pstr - 'A' + 1; + AdjustCharEventKeyCodes(event); - event.m_keyCode = *pstr - 'a' + 1; -#if wxUSE_UNICODE - event.m_uniChar = event.m_keyCode; -#endif - } - - SendCharHookAndCharEvents(event, window); + window->HandleWindowEvent(event); } } } @@ -1119,6 +1080,21 @@ gtk_window_key_release_callback( GtkWidget * WXUNUSED(widget), } } +//----------------------------------------------------------------------------- +// key and mouse events, after, from m_widget +//----------------------------------------------------------------------------- + +extern "C" { +static gboolean key_and_mouse_event_after(GtkWidget* widget, GdkEventKey*, wxWindow*) +{ + // If a widget does not handle a key or mouse event, GTK+ sends it up the + // parent chain until it is handled. These events are not supposed to + // propagate in wxWidgets, so prevent it unless widget is in a native + // container. + return WX_IS_PIZZA(gtk_widget_get_parent(widget)); +} +} + // ============================================================================ // the mouse events // ============================================================================ @@ -1127,38 +1103,6 @@ gtk_window_key_release_callback( GtkWidget * WXUNUSED(widget), // mouse event processing helpers // ---------------------------------------------------------------------------- -// init wxMouseEvent with the info from GdkEventXXX struct -template void InitMouseEvent(wxWindowGTK *win, - wxMouseEvent& event, - T *gdk_event) -{ - event.SetTimestamp( gdk_event->time ); - event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK) != 0; - event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK) != 0; - event.m_altDown = (gdk_event->state & GDK_MOD1_MASK) != 0; - event.m_metaDown = (gdk_event->state & GDK_META_MASK) != 0; - event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK) != 0; - event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK) != 0; - event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK) != 0; - event.m_aux1Down = (gdk_event->state & GDK_BUTTON4_MASK) != 0; - event.m_aux2Down = (gdk_event->state & GDK_BUTTON5_MASK) != 0; - - wxPoint pt = win->GetClientAreaOrigin(); - event.m_x = (wxCoord)gdk_event->x - pt.x; - event.m_y = (wxCoord)gdk_event->y - pt.y; - - if ((win->m_wxwindow) && (win->GetLayoutDirection() == wxLayout_RightToLeft)) - { - // origin in the upper right corner - int window_width = win->m_wxwindow->allocation.width; - event.m_x = window_width - event.m_x; - } - - event.SetEventObject( win ); - event.SetId( win->GetId() ); - event.SetTimestamp( gdk_event->time ); -} - static void AdjustEventButtonState(wxMouseEvent& event) { // GDK reports the old state of the button for a button press event, but @@ -1189,9 +1133,23 @@ static void AdjustEventButtonState(wxMouseEvent& event) event.m_rightDown = !event.m_rightDown; return; } + + if ((event.GetEventType() == wxEVT_AUX1_DOWN) || + (event.GetEventType() == wxEVT_AUX1_DCLICK)) + { + event.m_aux1Down = true; + return; + } + + if ((event.GetEventType() == wxEVT_AUX2_DOWN) || + (event.GetEventType() == wxEVT_AUX2_DCLICK)) + { + event.m_aux2Down = true; + return; + } } -// find the window to send the mouse event too +// find the window to send the mouse event to static wxWindowGTK *FindWindowForMouseEvent(wxWindowGTK *win, wxCoord& x, wxCoord& y) { @@ -1241,6 +1199,7 @@ wxWindowGTK *FindWindowForMouseEvent(wxWindowGTK *win, wxCoord& x, wxCoord& y) else { if ((child->m_wxwindow == NULL) && + win->IsClientAreaChild(child) && (child->m_x <= xx) && (child->m_y <= yy) && (child->m_x+child->m_width >= xx) && @@ -1418,6 +1377,42 @@ gtk_window_button_press_callback( GtkWidget *widget, } } + else if (gdk_event->button == 8) + { + switch (gdk_event->type) + { + case GDK_3BUTTON_PRESS: + case GDK_BUTTON_PRESS: + event_type = wxEVT_AUX1_DOWN; + break; + + case GDK_2BUTTON_PRESS: + event_type = wxEVT_AUX1_DCLICK; + break; + + default: + ; + } + } + + else if (gdk_event->button == 9) + { + switch (gdk_event->type) + { + case GDK_3BUTTON_PRESS: + case GDK_BUTTON_PRESS: + event_type = wxEVT_AUX2_DOWN; + break; + + case GDK_2BUTTON_PRESS: + event_type = wxEVT_AUX2_DCLICK; + break; + + default: + ; + } + } + if ( event_type == wxEVT_NULL ) { // unknown mouse button or click type @@ -1501,6 +1496,14 @@ gtk_window_button_release_callback( GtkWidget *WXUNUSED(widget), event_type = wxEVT_RIGHT_UP; break; + case 8: + event_type = wxEVT_AUX1_UP; + break; + + case 9: + event_type = wxEVT_AUX2_UP; + break; + default: // unknown button, don't process return FALSE; @@ -1612,22 +1615,16 @@ window_scroll_event_hscrollbar(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* return false; } - wxMouseEvent event(wxEVT_MOUSEWHEEL); - InitMouseEvent(win, event, gdk_event); - GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Horz]; - if (!range) return FALSE; - if (range && GTK_WIDGET_VISIBLE (range)) + if (range && gtk_widget_get_visible(GTK_WIDGET(range))) { - GtkAdjustment *adj = range->adjustment; - gdouble delta = adj->step_increment * 3; + GtkAdjustment* adj = gtk_range_get_adjustment(range); + double delta = gtk_adjustment_get_step_increment(adj) * 3; if (gdk_event->direction == GDK_SCROLL_LEFT) delta = -delta; - gdouble new_value = CLAMP (adj->value + delta, adj->lower, adj->upper - adj->page_size); - - gtk_adjustment_set_value (adj, new_value); + gtk_range_set_value(range, gtk_adjustment_get_value(adj) + delta); return TRUE; } @@ -1659,18 +1656,15 @@ window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win) return TRUE; GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Vert]; - if (!range) return FALSE; - if (range && GTK_WIDGET_VISIBLE (range)) + if (range && gtk_widget_get_visible(GTK_WIDGET(range))) { - GtkAdjustment *adj = range->adjustment; - gdouble delta = adj->step_increment * 3; + GtkAdjustment* adj = gtk_range_get_adjustment(range); + double delta = gtk_adjustment_get_step_increment(adj) * 3; if (gdk_event->direction == GDK_SCROLL_UP) - delta = -delta; + delta = -delta; - gdouble new_value = CLAMP (adj->value + delta, adj->lower, adj->upper - adj->page_size); - - gtk_adjustment_set_value (adj, new_value); + gtk_range_set_value(range, gtk_adjustment_get_value(adj) + delta); return TRUE; } @@ -1753,7 +1747,7 @@ gtk_window_enter_callback( GtkWidget *widget, int y = 0; GdkModifierType state = (GdkModifierType)0; - gdk_window_get_pointer( widget->window, &x, &y, &state ); + gdk_window_get_pointer(gtk_widget_get_window(widget), &x, &y, &state); wxMouseEvent event( wxEVT_ENTER_WINDOW ); InitMouseEvent(win, event, gdk_event); @@ -1793,7 +1787,7 @@ gtk_window_leave_callback( GtkWidget *widget, int y = 0; GdkModifierType state = (GdkModifierType)0; - gdk_window_get_pointer( widget->window, &x, &y, &state ); + gdk_window_get_pointer(gtk_widget_get_window(widget), &x, &y, &state); InitMouseEvent(win, event, gdk_event); @@ -1885,29 +1879,19 @@ gtk_scrollbar_button_release_event(GtkRange* range, GdkEventButton*, wxWindow* w //----------------------------------------------------------------------------- static void -gtk_window_realized_callback(GtkWidget* widget, wxWindow* win) +gtk_window_realized_callback(GtkWidget* WXUNUSED(widget), wxWindowGTK* win) +{ + win->GTKHandleRealized(); +} + +//----------------------------------------------------------------------------- +// "unrealize" from m_wxwindow +//----------------------------------------------------------------------------- + +static void unrealize(GtkWidget*, wxWindowGTK* win) { if (win->m_imData) - { - gtk_im_context_set_client_window( win->m_imData->context, - win->m_wxwindow ? win->GTKGetDrawingWindow() : widget->window); - } - - // We cannot set colours and fonts before the widget - // been realized, so we do this directly after realization - // or otherwise in idle time - - if (win->m_needsStyleChange) - { - win->SetBackgroundStyle(win->GetBackgroundStyle()); - win->m_needsStyleChange = false; - } - - wxWindowCreateEvent event( win ); - event.SetEventObject( win ); - win->GTKProcessEvent( event ); - - win->GTKUpdateCursor(true, false); + gtk_im_context_set_client_window(win->m_imData->context, NULL); } //----------------------------------------------------------------------------- @@ -1934,8 +1918,10 @@ size_allocate(GtkWidget*, GtkAllocation* alloc, wxWindow* win) win->m_oldClientHeight = h; // this callback can be connected to m_wxwindow, // so always get size from m_widget->allocation - win->m_width = win->m_widget->allocation.width; - win->m_height = win->m_widget->allocation.height; + GtkAllocation a; + gtk_widget_get_allocation(win->m_widget, &a); + win->m_width = a.width; + win->m_height = a.height; if (!win->m_nativeSizeEvent) { wxSizeEvent event(win->GetSize(), win->GetId()); @@ -1977,15 +1963,71 @@ void gtk_window_style_set_callback( GtkWidget *WXUNUSED(widget), { if (win && previous_style) { - wxSysColourChangedEvent event; - event.SetEventObject(win); - - win->GTKProcessEvent( event ); + if (win->IsTopLevel()) + { + wxSysColourChangedEvent event; + event.SetEventObject(win); + win->GTKProcessEvent(event); + } + else + { + // Border width could change, which will change client size. + // Make sure size event occurs for this + win->m_oldClientWidth = 0; + } } } } // extern "C" +void wxWindowGTK::GTKHandleRealized() +{ + if (m_imData) + { + gtk_im_context_set_client_window + ( + m_imData->context, + m_wxwindow ? GTKGetDrawingWindow() + : gtk_widget_get_window(m_widget) + ); + } + + // Use composited window if background is transparent, if supported. + if (m_backgroundStyle == wxBG_STYLE_TRANSPARENT) + { +#if wxGTK_HAS_COMPOSITING_SUPPORT + if (IsTransparentBackgroundSupported()) + { + GdkWindow* const window = GTKGetDrawingWindow(); + if (window) + gdk_window_set_composited(window, true); + } + else +#endif // wxGTK_HAS_COMPOSITING_SUPPORT + { + // We revert to erase mode if transparency is not supported + m_backgroundStyle = wxBG_STYLE_ERASE; + } + } + + + // We cannot set colours and fonts before the widget + // been realized, so we do this directly after realization + // or otherwise in idle time + + if (m_needsStyleChange) + { + SetBackgroundStyle(GetBackgroundStyle()); + m_needsStyleChange = false; + } + + wxWindowCreateEvent event(static_cast(this)); + event.SetEventObject( this ); + GTKProcessEvent( event ); + + GTKUpdateCursor(true, false); +} + // ---------------------------------------------------------------------------- // this wxWindowBase function is implemented here (in platform-specific file) // because it is static and so couldn't be made virtual @@ -2038,6 +2080,7 @@ wxMouseState wxGetMouseState() ms.SetLeftDown((mask & GDK_BUTTON1_MASK) != 0); ms.SetMiddleDown((mask & GDK_BUTTON2_MASK) != 0); ms.SetRightDown((mask & GDK_BUTTON3_MASK) != 0); + // see the comment in InitMouseEvent() ms.SetAux1Down((mask & GDK_BUTTON4_MASK) != 0); ms.SetAux2Down((mask & GDK_BUTTON5_MASK) != 0); @@ -2182,17 +2225,14 @@ bool wxWindowGTK::Create( wxWindow *parent, if (HasFlag(wxALWAYS_SHOW_SB)) { gtk_scrolled_window_set_policy( scrolledWindow, GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS ); - - scrolledWindow->hscrollbar_visible = TRUE; - scrolledWindow->vscrollbar_visible = TRUE; } else { gtk_scrolled_window_set_policy( scrolledWindow, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); } - m_scrollBar[ScrollDir_Horz] = GTK_RANGE(scrolledWindow->hscrollbar); - m_scrollBar[ScrollDir_Vert] = GTK_RANGE(scrolledWindow->vscrollbar); + m_scrollBar[ScrollDir_Horz] = GTK_RANGE(gtk_scrolled_window_get_hscrollbar(scrolledWindow)); + m_scrollBar[ScrollDir_Vert] = GTK_RANGE(gtk_scrolled_window_get_vscrollbar(scrolledWindow)); if (GetLayoutDirection() == wxLayout_RightToLeft) gtk_range_set_inverted( m_scrollBar[ScrollDir_Horz], TRUE ); @@ -2268,6 +2308,7 @@ wxWindowGTK::~wxWindowGTK() // delete before the widgets to avoid a crash on solaris delete m_imData; + m_imData = NULL; // avoid problem with GTK+ 2.18 where a frozen window causes the whole // TLW to be frozen, and if the window is then destroyed, nothing ever @@ -2300,8 +2341,11 @@ bool wxWindowGTK::PreCreation( wxWindowGTK *parent, const wxPoint &pos, const w m_width = WidthDefault(size.x) ; m_height = HeightDefault(size.y); - m_x = (int)pos.x; - m_y = (int)pos.y; + if (pos != wxDefaultPosition) + { + m_x = pos.x; + m_y = pos.y; + } return true; } @@ -2310,6 +2354,21 @@ void wxWindowGTK::PostCreation() { wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") ); +#if wxGTK_HAS_COMPOSITING_SUPPORT + // Set RGBA visual as soon as possible to minimize the possibility that + // somebody uses the wrong one. + if ( m_backgroundStyle == wxBG_STYLE_TRANSPARENT && + IsTransparentBackgroundSupported() ) + { + GdkScreen *screen = gtk_widget_get_screen (m_widget); + + GdkColormap *rgba_colormap = gdk_screen_get_rgba_colormap (screen); + + if (rgba_colormap) + gtk_widget_set_colormap(m_widget, rgba_colormap); + } +#endif // wxGTK_HAS_COMPOSITING_SUPPORT + if (m_wxwindow) { if (!m_noExpose) @@ -2331,6 +2390,7 @@ void wxWindowGTK::PostCreation() g_signal_connect (m_imData->context, "commit", G_CALLBACK (gtk_wxwindow_commit_cb), this); + g_signal_connect(m_wxwindow, "unrealize", G_CALLBACK(unrealize), this); } // focus handling @@ -2370,10 +2430,30 @@ void wxWindowGTK::PostCreation() ConnectWidget( connect_widget ); - /* We cannot set colours, fonts and cursors before the widget has - been realized, so we do this directly after realization */ - g_signal_connect (connect_widget, "realize", - G_CALLBACK (gtk_window_realized_callback), this); + // connect handler to prevent events from propagating up parent chain + g_signal_connect_after(m_widget, + "key_press_event", G_CALLBACK(key_and_mouse_event_after), this); + g_signal_connect_after(m_widget, + "key_release_event", G_CALLBACK(key_and_mouse_event_after), this); + g_signal_connect_after(m_widget, + "button_press_event", G_CALLBACK(key_and_mouse_event_after), this); + g_signal_connect_after(m_widget, + "button_release_event", G_CALLBACK(key_and_mouse_event_after), this); + g_signal_connect_after(m_widget, + "motion_notify_event", G_CALLBACK(key_and_mouse_event_after), this); + + // We cannot set colours, fonts and cursors before the widget has been + // realized, so we do this directly after realization -- unless the widget + // was in fact realized already. + if ( gtk_widget_get_realized(connect_widget) ) + { + gtk_window_realized_callback(connect_widget, this); + } + else + { + g_signal_connect (connect_widget, "realize", + G_CALLBACK (gtk_window_realized_callback), this); + } if (!IsTopLevel()) { @@ -2422,7 +2502,8 @@ void wxWindowGTK::PostCreation() gtk_widget_show( m_widget ); } -gulong wxWindowGTK::GTKConnectWidget(const char *signal, void (*callback)()) +unsigned long +wxWindowGTK::GTKConnectWidget(const char *signal, wxGTKCallback callback) { return g_signal_connect(m_widget, signal, callback, this); } @@ -2456,15 +2537,13 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget ) g_signal_connect (widget, "leave_notify_event", G_CALLBACK (gtk_window_leave_callback), this); - if (IsTopLevel() && m_wxwindow) + if (m_wxwindow && (IsTopLevel() || HasFlag(wxBORDER_RAISED | wxBORDER_SUNKEN | wxBORDER_THEME))) g_signal_connect (m_wxwindow, "style_set", G_CALLBACK (gtk_window_style_set_callback), this); } bool wxWindowGTK::Destroy() { - wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") ); - m_hasVMT = false; return wxWindowBase::Destroy(); @@ -2502,12 +2581,15 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") ); wxASSERT_MSG( (m_parent != NULL), wxT("wxWindowGTK::SetSize requires parent.\n") ); - int currentX, currentY; - GetPosition(¤tX, ¤tY); - if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - x = currentX; - if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - y = currentY; + if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0 && (x == -1 || y == -1)) + { + int currentX, currentY; + GetPosition(¤tX, ¤tY); + if (x == -1) + x = currentX; + if (y == -1) + y = currentY; + } AdjustForParentClientOrigin(x, y, sizeFlags); // calculate the best size if we should auto size the window @@ -2539,7 +2621,7 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags int bottom_border = 0; /* the default button has a border around it */ - if (GTK_WIDGET_CAN_DEFAULT(m_widget)) + if (gtk_widget_get_can_default(m_widget)) { GtkBorder *default_border = NULL; gtk_widget_style_get( m_widget, "default_border", &default_border, NULL ); @@ -2583,7 +2665,7 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags bool wxWindowGTK::GTKShowFromOnIdle() { - if (IsShown() && m_showOnIdle && !GTK_WIDGET_VISIBLE (m_widget)) + if (IsShown() && m_showOnIdle && !gtk_widget_get_visible (m_widget)) { GtkAllocation alloc; alloc.x = m_x; @@ -2616,21 +2698,11 @@ void wxWindowGTK::OnInternalIdle() RealizeTabOrder(); } - // Update style if the window was not yet realized when - // SetBackgroundStyle() was called - if (m_needsStyleChange) - { - SetBackgroundStyle(GetBackgroundStyle()); - m_needsStyleChange = false; - } - wxWindowBase::OnInternalIdle(); } void wxWindowGTK::DoGetSize( int *width, int *height ) const { - wxCHECK_RET( (m_widget != NULL), wxT("invalid window") ); - if (width) (*width) = m_width; if (height) (*height) = m_height; } @@ -2682,7 +2754,7 @@ void wxWindowGTK::DoGetClientSize( int *width, int *height ) const case GTK_POLICY_AUTOMATIC: // may be shown or not, check GtkAdjustment *adj = gtk_range_get_adjustment(range); - if ( adj->upper <= adj->page_size ) + if (gtk_adjustment_get_upper(adj) <= gtk_adjustment_get_page_size(adj)) continue; } @@ -2725,39 +2797,17 @@ wxSize wxWindowGTK::DoGetBorderSize() const void wxWindowGTK::DoGetPosition( int *x, int *y ) const { - wxCHECK_RET( (m_widget != NULL), wxT("invalid window") ); - int dx = 0; int dy = 0; - if (!IsTopLevel() && m_parent && m_parent->m_wxwindow) + GtkWidget* parent = NULL; + if (m_widget) + parent = gtk_widget_get_parent(m_widget); + if (WX_IS_PIZZA(parent)) { - wxPizza* pizza = WX_PIZZA(m_parent->m_wxwindow); + wxPizza* pizza = WX_PIZZA(parent); dx = pizza->m_scroll_x; dy = pizza->m_scroll_y; } - - if (m_x == -1 && m_y == -1) - { - GdkWindow *source = NULL; - if (m_wxwindow) - source = m_wxwindow->window; - else - source = m_widget->window; - - if (source) - { - int org_x = 0; - int org_y = 0; - gdk_window_get_origin( source, &org_x, &org_y ); - - if (m_parent) - m_parent->ScreenToClient(&org_x, &org_y); - - const_cast(this)->m_x = org_x; - const_cast(this)->m_y = org_y; - } - } - if (x) (*x) = m_x - dx; if (y) (*y) = m_y - dy; } @@ -2766,13 +2816,13 @@ void wxWindowGTK::DoClientToScreen( int *x, int *y ) const { wxCHECK_RET( (m_widget != NULL), wxT("invalid window") ); - if (!m_widget->window) return; + if (gtk_widget_get_window(m_widget) == NULL) return; GdkWindow *source = NULL; if (m_wxwindow) - source = m_wxwindow->window; + source = gtk_widget_get_window(m_wxwindow); else - source = m_widget->window; + source = gtk_widget_get_window(m_widget); int org_x = 0; int org_y = 0; @@ -2780,10 +2830,12 @@ void wxWindowGTK::DoClientToScreen( int *x, int *y ) const if (!m_wxwindow) { - if (GTK_WIDGET_NO_WINDOW (m_widget)) + if (!gtk_widget_get_has_window(m_widget)) { - org_x += m_widget->allocation.x; - org_y += m_widget->allocation.y; + GtkAllocation a; + gtk_widget_get_allocation(m_widget, &a); + org_x += a.x; + org_y += a.y; } } @@ -2803,13 +2855,13 @@ void wxWindowGTK::DoScreenToClient( int *x, int *y ) const { wxCHECK_RET( (m_widget != NULL), wxT("invalid window") ); - if (!m_widget->window) return; + if (!gtk_widget_get_realized(m_widget)) return; GdkWindow *source = NULL; if (m_wxwindow) - source = m_wxwindow->window; + source = gtk_widget_get_window(m_wxwindow); else - source = m_widget->window; + source = gtk_widget_get_window(m_widget); int org_x = 0; int org_y = 0; @@ -2817,10 +2869,12 @@ void wxWindowGTK::DoScreenToClient( int *x, int *y ) const if (!m_wxwindow) { - if (GTK_WIDGET_NO_WINDOW (m_widget)) + if (!gtk_widget_get_has_window(m_widget)) { - org_x += m_widget->allocation.x; - org_y += m_widget->allocation.y; + GtkAllocation a; + gtk_widget_get_allocation(m_widget, &a); + org_x += a.x; + org_y += a.y; } } @@ -2887,7 +2941,7 @@ int wxWindowGTK::GetCharHeight() const wxCHECK_MSG( (m_widget != NULL), 12, wxT("invalid window") ); wxFont font = GetFont(); - wxCHECK_MSG( font.Ok(), 12, wxT("invalid font") ); + wxCHECK_MSG( font.IsOk(), 12, wxT("invalid font") ); PangoContext* context = gtk_widget_get_pango_context(m_widget); @@ -2913,7 +2967,7 @@ int wxWindowGTK::GetCharWidth() const wxCHECK_MSG( (m_widget != NULL), 8, wxT("invalid window") ); wxFont font = GetFont(); - wxCHECK_MSG( font.Ok(), 8, wxT("invalid font") ); + wxCHECK_MSG( font.IsOk(), 8, wxT("invalid font") ); PangoContext* context = gtk_widget_get_pango_context(m_widget); @@ -2943,7 +2997,7 @@ void wxWindowGTK::DoGetTextExtent( const wxString& string, { wxFont fontToUse = theFont ? *theFont : GetFont(); - wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") ); + wxCHECK_RET( fontToUse.IsOk(), wxT("invalid font") ); if (string.empty()) { @@ -3131,6 +3185,7 @@ void wxWindowGTK::GTKHandleFocusOutNoDeferring() wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() ); event.SetEventObject( this ); + event.SetWindow( FindFocus() ); GTKProcessEvent( event ); } @@ -3174,7 +3229,7 @@ void wxWindowGTK::SetFocus() GtkWidget *widget = m_wxwindow ? m_wxwindow : m_focusWidget; if ( GTK_IS_CONTAINER(widget) && - !GTK_WIDGET_CAN_FOCUS(widget) ) + !gtk_widget_get_can_focus(widget) ) { wxLogTrace(TRACE_FOCUS, wxT("Setting focus to a child of %s(%p, %s)"), @@ -3192,17 +3247,11 @@ void wxWindowGTK::SetFocus() void wxWindowGTK::SetCanFocus(bool canFocus) { - if ( canFocus ) - GTK_WIDGET_SET_FLAGS(m_widget, GTK_CAN_FOCUS); - else - GTK_WIDGET_UNSET_FLAGS(m_widget, GTK_CAN_FOCUS); + gtk_widget_set_can_focus(m_widget, canFocus); if ( m_wxwindow && (m_widget != m_wxwindow) ) { - if ( canFocus ) - GTK_WIDGET_SET_FLAGS(m_wxwindow, GTK_CAN_FOCUS); - else - GTK_WIDGET_UNSET_FLAGS(m_wxwindow, GTK_CAN_FOCUS); + gtk_widget_set_can_focus(m_wxwindow, canFocus); } } @@ -3210,8 +3259,7 @@ bool wxWindowGTK::Reparent( wxWindowBase *newParentBase ) { wxCHECK_MSG( (m_widget != NULL), false, wxT("invalid window") ); - wxWindowGTK *oldParent = m_parent, - *newParent = (wxWindowGTK *)newParentBase; + wxWindowGTK * const newParent = (wxWindowGTK *)newParentBase; wxASSERT( GTK_IS_WIDGET(m_widget) ); @@ -3220,14 +3268,17 @@ bool wxWindowGTK::Reparent( wxWindowBase *newParentBase ) wxASSERT( GTK_IS_WIDGET(m_widget) ); - if (oldParent) - gtk_container_remove( GTK_CONTAINER(m_widget->parent), m_widget ); + // Notice that old m_parent pointer might be non-NULL here but the widget + // still not have any parent at GTK level if it's a notebook page that had + // been removed from the notebook so test this at GTK level and not wx one. + if ( GtkWidget *parentGTK = gtk_widget_get_parent(m_widget) ) + gtk_container_remove(GTK_CONTAINER(parentGTK), m_widget); wxASSERT( GTK_IS_WIDGET(m_widget) ); if (newParent) { - if (GTK_WIDGET_VISIBLE (newParent->m_widget)) + if (gtk_widget_get_visible (newParent->m_widget)) { m_showOnIdle = true; gtk_widget_hide( m_widget ); @@ -3385,18 +3436,20 @@ void wxWindowGTK::RealizeTabOrder() { wxWindowGTK *win = *i; + bool focusableFromKeyboard = win->AcceptsFocusFromKeyboard(); + if ( mnemonicWindow ) { - if ( win->AcceptsFocusFromKeyboard() ) + if ( focusableFromKeyboard ) { // wxComboBox et al. needs to focus on on a different // widget than m_widget, so if the main widget isn't // focusable try the connect widget GtkWidget* w = win->m_widget; - if ( !GTK_WIDGET_CAN_FOCUS(w) ) + if ( !gtk_widget_get_can_focus(w) ) { w = win->GetConnectWidget(); - if ( !GTK_WIDGET_CAN_FOCUS(w) ) + if ( !gtk_widget_get_can_focus(w) ) w = NULL; } @@ -3412,7 +3465,8 @@ void wxWindowGTK::RealizeTabOrder() mnemonicWindow = win; } - chain = g_list_prepend(chain, win->m_widget); + if ( focusableFromKeyboard ) + chain = g_list_prepend(chain, win->m_widget); } chain = g_list_reverse(chain); @@ -3431,13 +3485,13 @@ void wxWindowGTK::Raise() { wxCHECK_RET( (m_widget != NULL), wxT("invalid window") ); - if (m_wxwindow && m_wxwindow->window) + if (m_wxwindow && gtk_widget_get_window(m_wxwindow)) { - gdk_window_raise( m_wxwindow->window ); + gdk_window_raise(gtk_widget_get_window(m_wxwindow)); } - else if (m_widget->window) + else if (gtk_widget_get_window(m_widget)) { - gdk_window_raise( m_widget->window ); + gdk_window_raise(gtk_widget_get_window(m_widget)); } } @@ -3445,19 +3499,19 @@ void wxWindowGTK::Lower() { wxCHECK_RET( (m_widget != NULL), wxT("invalid window") ); - if (m_wxwindow && m_wxwindow->window) + if (m_wxwindow && gtk_widget_get_window(m_wxwindow)) { - gdk_window_lower( m_wxwindow->window ); + gdk_window_lower(gtk_widget_get_window(m_wxwindow)); } - else if (m_widget->window) + else if (gtk_widget_get_window(m_widget)) { - gdk_window_lower( m_widget->window ); + gdk_window_lower(gtk_widget_get_window(m_widget)); } } bool wxWindowGTK::SetCursor( const wxCursor &cursor ) { - if ( !wxWindowBase::SetCursor(cursor.Ok() ? cursor : *wxSTANDARD_CURSOR) ) + if ( !wxWindowBase::SetCursor(cursor.IsOk() ? cursor : *wxSTANDARD_CURSOR) ) return false; GTKUpdateCursor(); @@ -3469,8 +3523,8 @@ void wxWindowGTK::GTKUpdateCursor(bool update_self /*=true*/, bool recurse /*=tr { if (update_self) { - wxCursor cursor(g_globalCursor.Ok() ? g_globalCursor : GetCursor()); - if ( cursor.Ok() ) + wxCursor cursor(g_globalCursor.IsOk() ? g_globalCursor : GetCursor()); + if ( cursor.IsOk() ) { wxArrayGdkWindows windowsThis; GdkWindow* window = GTKGetWindow(windowsThis); @@ -3505,17 +3559,20 @@ void wxWindowGTK::WarpPointer( int x, int y ) { wxCHECK_RET( (m_widget != NULL), wxT("invalid window") ); - // We provide this function ourselves as it is - // missing in GDK (top of this file). - - GdkWindow *window = NULL; - if (m_wxwindow) - window = m_wxwindow->window; - else - window = GetConnectWidget()->window; - - if (window) - gdk_window_warp_pointer( window, x, y ); + ClientToScreen(&x, &y); + GdkDisplay* display = gtk_widget_get_display(m_widget); + GdkScreen* screen = gtk_widget_get_screen(m_widget); +#ifdef __WXGTK30__ + GdkDeviceManager* manager = gdk_display_get_device_manager(display); + gdk_device_warp(gdk_device_manager_get_client_pointer(manager), screen, x, y); +#else +#ifdef GDK_WINDOWING_X11 + XWarpPointer(GDK_DISPLAY_XDISPLAY(display), + None, + GDK_WINDOW_XID(gdk_screen_get_root_window(screen)), + 0, 0, 0, 0, x, y); +#endif +#endif } wxWindowGTK::ScrollDir wxWindowGTK::ScrollDirFromRange(GtkRange *range) const @@ -3538,14 +3595,14 @@ bool wxWindowGTK::DoScrollByUnits(ScrollDir dir, ScrollUnit unit, int units) GtkRange* range = m_scrollBar[dir]; if ( range && units ) { - GtkAdjustment* adj = range->adjustment; - gdouble inc = unit == ScrollUnit_Line ? adj->step_increment - : adj->page_increment; + GtkAdjustment* adj = gtk_range_get_adjustment(range); + double inc = unit == ScrollUnit_Line ? gtk_adjustment_get_step_increment(adj) + : gtk_adjustment_get_page_increment(adj); - const int posOld = int(adj->value + 0.5); + const int posOld = wxRound(gtk_adjustment_get_value(adj)); gtk_range_set_value(range, posOld + units*inc); - changed = int(adj->value + 0.5) != posOld; + changed = wxRound(gtk_adjustment_get_value(adj)) != posOld; } return changed; @@ -3564,49 +3621,37 @@ bool wxWindowGTK::ScrollPages(int pages) void wxWindowGTK::Refresh(bool WXUNUSED(eraseBackground), const wxRect *rect) { - if ( !m_widget ) + if (m_wxwindow) { - // it is valid to call Refresh() for a window which hasn't been created - // yet, it simply doesn't do anything in this case - return; - } - - if (!m_wxwindow) - { - if (rect) - gtk_widget_queue_draw_area( m_widget, rect->x, rect->y, rect->width, rect->height ); - else - gtk_widget_queue_draw( m_widget ); - } - else - { - // Just return if the widget or one of its ancestors isn't mapped - GtkWidget *w; - for (w = m_wxwindow; w != NULL; w = w->parent) - if (!GTK_WIDGET_MAPPED (w)) - return; - - GdkWindow* window = GTKGetDrawingWindow(); - if (rect) + if (gtk_widget_get_mapped(m_wxwindow)) { - int x = rect->x; - if (GetLayoutDirection() == wxLayout_RightToLeft) - x = GetClientSize().x - x - rect->width; - GdkRectangle r; - r.x = rect->x; - r.y = rect->y; - r.width = rect->width; - r.height = rect->height; - gdk_window_invalidate_rect(window, &r, true); + GdkWindow* window = gtk_widget_get_window(m_wxwindow); + if (rect) + { + GdkRectangle r = { rect->x, rect->y, rect->width, rect->height }; + if (GetLayoutDirection() == wxLayout_RightToLeft) + r.x = gdk_window_get_width(window) - r.x - rect->width; + gdk_window_invalidate_rect(window, &r, true); + } + else + gdk_window_invalidate_rect(window, NULL, true); + } + } + else if (m_widget) + { + if (gtk_widget_get_mapped(m_widget)) + { + if (rect) + gtk_widget_queue_draw_area(m_widget, rect->x, rect->y, rect->width, rect->height); + else + gtk_widget_queue_draw(m_widget); } - else - gdk_window_invalidate_rect(window, NULL, true); } } void wxWindowGTK::Update() { - if (m_widget && GTK_WIDGET_MAPPED(m_widget)) + if (m_widget && gtk_widget_get_mapped(m_widget)) { GdkDisplay* display = gtk_widget_get_display(m_widget); // Flush everything out to the server, and wait for it to finish. @@ -3615,7 +3660,7 @@ void wxWindowGTK::Update() GdkWindow* window = GTKGetDrawingWindow(); if (window == NULL) - window = m_widget->window; + window = gtk_widget_get_window(m_widget); gdk_window_process_updates(window, true); // Flush again, but no need to wait for it to finish @@ -3643,7 +3688,9 @@ void wxWindowGTK::GtkSendPaintEvents() m_updateRegion.Clear(); return; } - +#if wxGTK_HAS_COMPOSITING_SUPPORT + cairo_t* cr = NULL; +#endif // Clip to paint region in wxClientDC m_clipPaintRegion = true; @@ -3655,7 +3702,7 @@ void wxWindowGTK::GtkSendPaintEvents() m_updateRegion.Clear(); gint width; - gdk_drawable_get_size(m_wxwindow->window, &width, NULL); + gdk_drawable_get_size(gtk_widget_get_window(m_wxwindow), &width, NULL); wxRegionIterator upd( m_nativeUpdateRegion ); while (upd) @@ -3675,6 +3722,27 @@ void wxWindowGTK::GtkSendPaintEvents() switch ( GetBackgroundStyle() ) { + case wxBG_STYLE_TRANSPARENT: +#if wxGTK_HAS_COMPOSITING_SUPPORT + if (IsTransparentBackgroundSupported()) + { + // Set a transparent background, so that overlaying in parent + // might indeed let see through where this child did not + // explicitly paint. + // NB: it works also for top level windows (but this is the + // windows manager which then does the compositing job) + cr = gdk_cairo_create(m_wxwindow->window); + gdk_cairo_region(cr, m_nativeUpdateRegion.GetRegion()); + cairo_clip(cr); + + cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR); + cairo_paint(cr); + cairo_set_operator(cr, CAIRO_OPERATOR_OVER); + cairo_surface_flush(cairo_get_target(cr)); + } +#endif // wxGTK_HAS_COMPOSITING_SUPPORT + break; + case wxBG_STYLE_ERASE: { wxWindowDC dc( (wxWindow*)this ); @@ -3709,7 +3777,7 @@ void wxWindowGTK::GtkSendPaintEvents() if (!parent) parent = (wxWindow*)this; - if (GTK_WIDGET_MAPPED(parent->m_widget)) + if (gtk_widget_get_mapped(parent->m_widget)) { wxRegionIterator upd( m_nativeUpdateRegion ); while (upd) @@ -3720,9 +3788,9 @@ void wxWindowGTK::GtkSendPaintEvents() rect.width = upd.GetWidth(); rect.height = upd.GetHeight(); - gtk_paint_flat_box( parent->m_widget->style, + gtk_paint_flat_box(gtk_widget_get_style(parent->m_widget), GTKGetDrawingWindow(), - (GtkStateType)GTK_WIDGET_STATE(m_wxwindow), + gtk_widget_get_state(m_wxwindow), GTK_SHADOW_NONE, &rect, parent->m_widget, @@ -3751,6 +3819,39 @@ void wxWindowGTK::GtkSendPaintEvents() paint_event.SetEventObject( this ); HandleWindowEvent( paint_event ); +#if wxGTK_HAS_COMPOSITING_SUPPORT + if (IsTransparentBackgroundSupported()) + { // now composite children which need it + // Overlay all our composite children on top of the painted area + wxWindowList::compatibility_iterator node; + for ( node = m_children.GetFirst(); node ; node = node->GetNext() ) + { + wxWindow *compositeChild = node->GetData(); + if (compositeChild->GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT) + { + if (cr == NULL) + { + cr = gdk_cairo_create(m_wxwindow->window); + gdk_cairo_region(cr, m_nativeUpdateRegion.GetRegion()); + cairo_clip(cr); + } + + GtkWidget *child = compositeChild->m_wxwindow; + GtkAllocation alloc; + gtk_widget_get_allocation(child, &alloc); + + // The source data is the (composited) child + gdk_cairo_set_source_window( + cr, gtk_widget_get_window(child), alloc.x, alloc.y); + + cairo_paint(cr); + } + } + if (cr) + cairo_destroy(cr); + } +#endif // wxGTK_HAS_COMPOSITING_SUPPORT + m_clipPaintRegion = false; m_updateRegion.Clear(); @@ -3767,7 +3868,7 @@ void wxWindowGTK::SetDoubleBuffered( bool on ) bool wxWindowGTK::IsDoubleBuffered() const { - return GTK_WIDGET_DOUBLE_BUFFERED( m_wxwindow ); + return gtk_widget_get_double_buffered( m_wxwindow ); } void wxWindowGTK::ClearBackground() @@ -3778,33 +3879,20 @@ void wxWindowGTK::ClearBackground() #if wxUSE_TOOLTIPS void wxWindowGTK::DoSetToolTip( wxToolTip *tip ) { - wxWindowBase::DoSetToolTip(tip); + if (m_tooltip != tip) + { + wxWindowBase::DoSetToolTip(tip); - if (m_tooltip) - { - m_tooltip->GTKApply( (wxWindow *)this ); - } - else - { - GtkWidget *w = GetConnectWidget(); - wxToolTip::GTKApply(w, NULL); + if (m_tooltip) + m_tooltip->GTKSetWindow(static_cast(this)); + else + GTKApplyToolTip(NULL); } } -void wxWindowGTK::GTKApplyToolTip( GtkTooltips *tips, const gchar *tip ) +void wxWindowGTK::GTKApplyToolTip(const char* tip) { - GtkWidget *w = GetConnectWidget(); - -#if GTK_CHECK_VERSION(2, 12, 0) - if (!gtk_check_version(2, 12, 0)) - { - gtk_widget_set_tooltip_text (w, tip); - } - else -#endif - { - gtk_tooltips_set_tip(tips, w, tip, NULL); - } + wxToolTip::GTKApply(GetConnectWidget(), tip); } #endif // wxUSE_TOOLTIPS @@ -3815,7 +3903,7 @@ bool wxWindowGTK::SetBackgroundColour( const wxColour &colour ) if (!wxWindowBase::SetBackgroundColour(colour)) return false; - if (colour.Ok()) + if (colour.IsOk()) { // We need the pixel value e.g. for background clearing. m_backgroundColour.CalcPixel(gtk_widget_get_colormap(m_widget)); @@ -3837,7 +3925,7 @@ bool wxWindowGTK::SetForegroundColour( const wxColour &colour ) return false; } - if (colour.Ok()) + if (colour.IsOk()) { // We need the pixel value e.g. for background clearing. m_foregroundColour.CalcPixel(gtk_widget_get_colormap(m_widget)); @@ -3859,15 +3947,15 @@ GtkRcStyle *wxWindowGTK::GTKCreateWidgetStyle(bool forceStyle) { // do we need to apply any changes at all? if ( !forceStyle && - !m_font.Ok() && - !m_foregroundColour.Ok() && !m_backgroundColour.Ok() ) + !m_font.IsOk() && + !m_foregroundColour.IsOk() && !m_backgroundColour.IsOk() ) { return NULL; } GtkRcStyle *style = gtk_rc_style_new(); - if ( m_font.Ok() ) + if ( m_font.IsOk() ) { style->font_desc = pango_font_description_copy( m_font.GetNativeFontInfo()->description ); @@ -3878,7 +3966,7 @@ GtkRcStyle *wxWindowGTK::GTKCreateWidgetStyle(bool forceStyle) flagsActive = 0, flagsInsensitive = 0; - if ( m_foregroundColour.Ok() ) + if ( m_foregroundColour.IsOk() ) { const GdkColor *fg = m_foregroundColour.GetColor(); @@ -3895,7 +3983,7 @@ GtkRcStyle *wxWindowGTK::GTKCreateWidgetStyle(bool forceStyle) flagsActive |= GTK_RC_FG | GTK_RC_TEXT; } - if ( m_backgroundColour.Ok() ) + if ( m_backgroundColour.IsOk() ) { const GdkColor *bg = m_backgroundColour.GetColor(); @@ -3930,7 +4018,7 @@ void wxWindowGTK::GTKApplyWidgetStyle(bool forceStyle) if ( style ) { DoApplyWidgetStyle(style); - gtk_rc_style_unref(style); + g_object_unref(style); } // Style change may affect GTK+'s size calculation: @@ -3967,35 +4055,34 @@ void wxWindowGTK::DoApplyWidgetStyle(GtkRcStyle *style) bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style) { - wxWindowBase::SetBackgroundStyle(style); + if (!wxWindowBase::SetBackgroundStyle(style)) + return false; - if ( style == wxBG_STYLE_PAINT ) + GdkWindow *window; + if ( m_wxwindow ) { - GdkWindow *window; - if ( m_wxwindow ) - { - window = GTKGetDrawingWindow(); - } - else - { - GtkWidget * const w = GetConnectWidget(); - window = w ? w->window : NULL; - } + window = GTKGetDrawingWindow(); + } + else + { + GtkWidget * const w = GetConnectWidget(); + window = w ? gtk_widget_get_window(w) : NULL; + } + bool wantNoBackPixmap = style == wxBG_STYLE_PAINT || style == wxBG_STYLE_TRANSPARENT; + + if ( wantNoBackPixmap ) + { if (window) { // Make sure GDK/X11 doesn't refresh the window // automatically. - gdk_window_set_back_pixmap( window, None, False ); -#ifdef __X__ - Display* display = GDK_WINDOW_DISPLAY(window); - XFlush(display); -#endif + gdk_window_set_back_pixmap( window, NULL, FALSE ); m_needsStyleChange = false; } else // window not realized yet { - // Do in OnIdle, because the window is not yet available + // Do when window is realized m_needsStyleChange = true; } @@ -4011,6 +4098,49 @@ bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style) return true; } +bool wxWindowGTK::IsTransparentBackgroundSupported(wxString* reason) const +{ +#if wxGTK_HAS_COMPOSITING_SUPPORT + if (gtk_check_version(wxGTK_VERSION_REQUIRED_FOR_COMPOSITING) != NULL) + { + if (reason) + { + *reason = _("GTK+ installed on this machine is too old to " + "support screen compositing, please install " + "GTK+ 2.12 or later."); + } + + return false; + } + + // NB: We don't check here if the particular kind of widget supports + // transparency, we check only if it would be possible for a generic window + + wxCHECK_MSG ( m_widget, false, "Window must be created first" ); + + if (!gdk_screen_is_composited(gtk_widget_get_screen(m_widget))) + { + if (reason) + { + *reason = _("Compositing not supported by this system, " + "please enable it in your Window Manager."); + } + + return false; + } + + return true; +#else + if (reason) + { + *reason = _("This program was compiled with a too old version of GTK+, " + "please rebuild with GTK+ 2.12 or newer."); + } +#endif // wxGTK_HAS_COMPOSITING_SUPPORT/!wxGTK_HAS_COMPOSITING_SUPPORT + + return false; +} + // ---------------------------------------------------------------------------- // Pop-up menu stuff // ---------------------------------------------------------------------------- @@ -4043,6 +4173,14 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y ) { wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") ); + // For compatibility with other ports, pretend that the window showing the + // menu has focus while the menu is shown. This is needed because the popup + // menu actually steals the focus from the window it's associated it in + // wxGTK unlike, say, wxMSW. + wxWindowGTK* const oldPendingFocus = gs_pendingFocus; + gs_pendingFocus = this; + wxON_BLOCK_EXIT_SET( gs_pendingFocus, oldPendingFocus ); + menu->UpdateUI(); wxPoint pos; @@ -4119,7 +4257,7 @@ bool wxWindowGTK::GTKIsOwnWindow(GdkWindow *window) const GdkWindow *wxWindowGTK::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - return m_wxwindow ? GTKGetDrawingWindow() : m_widget->window; + return m_wxwindow ? GTKGetDrawingWindow() : gtk_widget_get_window(m_widget); } bool wxWindowGTK::SetFont( const wxFont &font ) @@ -4144,12 +4282,12 @@ void wxWindowGTK::DoCaptureMouse() if (m_wxwindow) window = GTKGetDrawingWindow(); else - window = GetConnectWidget()->window; + window = gtk_widget_get_window(GetConnectWidget()); wxCHECK_RET( window, wxT("CaptureMouse() failed") ); const wxCursor* cursor = &m_cursor; - if (!cursor->Ok()) + if (!cursor->IsOk()) cursor = wxSTANDARD_CURSOR; gdk_pointer_grab( window, FALSE, @@ -4177,7 +4315,7 @@ void wxWindowGTK::DoReleaseMouse() if (m_wxwindow) window = GTKGetDrawingWindow(); else - window = GetConnectWidget()->window; + window = gtk_widget_get_window(GetConnectWidget()); if (!window) return; @@ -4221,17 +4359,14 @@ void wxWindowGTK::SetScrollbar(int orient, thumbVisible = 1; } - GtkAdjustment * const adj = sb->adjustment; - adj->step_increment = 1; - adj->page_increment = - adj->page_size = thumbVisible; - adj->value = pos; - g_signal_handlers_block_by_func( sb, (void*)gtk_scrollbar_value_changed, this); + gtk_range_set_increments(sb, 1, thumbVisible); + gtk_adjustment_set_page_size(gtk_range_get_adjustment(sb), thumbVisible); gtk_range_set_range(sb, 0, range); - m_scrollPos[dir] = sb->adjustment->value; + gtk_range_set_value(sb, pos); + m_scrollPos[dir] = gtk_range_get_value(sb); g_signal_handlers_unblock_by_func( sb, (void*)gtk_scrollbar_value_changed, this); @@ -4251,7 +4386,7 @@ void wxWindowGTK::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh)) sb, (void*)gtk_scrollbar_value_changed, this); gtk_range_set_value(sb, pos); - m_scrollPos[dir] = sb->adjustment->value; + m_scrollPos[dir] = gtk_range_get_value(sb); g_signal_handlers_unblock_by_func( sb, (void*)gtk_scrollbar_value_changed, this); @@ -4263,7 +4398,7 @@ int wxWindowGTK::GetScrollThumb(int orient) const GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)]; wxCHECK_MSG( sb, 0, wxT("this window is not scrollable") ); - return wxRound(sb->adjustment->page_size); + return wxRound(gtk_adjustment_get_page_size(gtk_range_get_adjustment(sb))); } int wxWindowGTK::GetScrollPos( int orient ) const @@ -4271,7 +4406,7 @@ int wxWindowGTK::GetScrollPos( int orient ) const GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)]; wxCHECK_MSG( sb, 0, wxT("this window is not scrollable") ); - return wxRound(sb->adjustment->value); + return wxRound(gtk_range_get_value(sb)); } int wxWindowGTK::GetScrollRange( int orient ) const @@ -4279,7 +4414,7 @@ int wxWindowGTK::GetScrollRange( int orient ) const GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)]; wxCHECK_MSG( sb, 0, wxT("this window is not scrollable") ); - return wxRound(sb->adjustment->upper); + return wxRound(gtk_adjustment_get_upper(gtk_range_get_adjustment(sb))); } // Determine if increment is the same as +/-x, allowing for some small @@ -4296,16 +4431,15 @@ wxEventType wxWindowGTK::GTKGetScrollEventType(GtkRange* range) wxASSERT(range == m_scrollBar[0] || range == m_scrollBar[1]); const int barIndex = range == m_scrollBar[1]; - GtkAdjustment* adj = range->adjustment; - const int value = wxRound(adj->value); + const double value = gtk_range_get_value(range); // save previous position const double oldPos = m_scrollPos[barIndex]; // update current position - m_scrollPos[barIndex] = adj->value; + m_scrollPos[barIndex] = value; // If event should be ignored, or integral position has not changed - if (!m_hasVMT || g_blockEventsOnDrag || value == wxRound(oldPos)) + if (!m_hasVMT || g_blockEventsOnDrag || wxRound(value) == wxRound(oldPos)) { return wxEVT_NULL; } @@ -4314,14 +4448,15 @@ wxEventType wxWindowGTK::GTKGetScrollEventType(GtkRange* range) if (!m_isScrolling) { // Difference from last change event - const double diff = adj->value - oldPos; + const double diff = value - oldPos; const bool isDown = diff > 0; - if (IsScrollIncrement(adj->step_increment, diff)) + GtkAdjustment* adj = gtk_range_get_adjustment(range); + if (IsScrollIncrement(gtk_adjustment_get_step_increment(adj), diff)) { eventType = isDown ? wxEVT_SCROLL_LINEDOWN : wxEVT_SCROLL_LINEUP; } - else if (IsScrollIncrement(adj->page_increment, diff)) + else if (IsScrollIncrement(gtk_adjustment_get_page_increment(adj), diff)) { eventType = isDown ? wxEVT_SCROLL_PAGEDOWN : wxEVT_SCROLL_PAGEUP; } @@ -4398,12 +4533,6 @@ void wxWindowGTK::GTKScrolledWindowSetBorder(GtkWidget* w, int wxstyle) } } -void wxWindowGTK::SetWindowStyleFlag( long style ) -{ - // Updates the internal variable. NB: Now m_windowStyle bits carry the _new_ style values already - wxWindowBase::SetWindowStyleFlag(style); -} - // Find the wxWindow at the current mouse position, also returning the mouse // position. wxWindow* wxFindWindowAtPointer(wxPoint& pt) @@ -4416,38 +4545,25 @@ wxWindow* wxFindWindowAtPointer(wxPoint& pt) // Get the current mouse position. wxPoint wxGetMousePosition() { - /* This crashes when used within wxHelpContext, - so we have to use the X-specific implementation below. - gint x, y; - GdkModifierType *mask; - (void) gdk_window_get_pointer(NULL, &x, &y, mask); - - return wxPoint(x, y); - */ + wxWindow* tlw = NULL; + if (!wxTopLevelWindows.empty()) + tlw = wxTopLevelWindows.front(); + GdkDisplay* display; + if (tlw && tlw->m_widget) + display = gtk_widget_get_display(tlw->m_widget); + else + display = gdk_display_get_default(); int x, y; - GdkWindow* windowAtPtr = gdk_window_at_pointer(& x, & y); - - Display *display = windowAtPtr ? GDK_WINDOW_XDISPLAY(windowAtPtr) : GDK_DISPLAY(); - Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display)); - Window rootReturn, childReturn; - int rootX, rootY, winX, winY; - unsigned int maskReturn; - - XQueryPointer (display, - rootWindow, - &rootReturn, - &childReturn, - &rootX, &rootY, &winX, &winY, &maskReturn); - return wxPoint(rootX, rootY); - + gdk_display_get_pointer(display, NULL, &x, &y, NULL); + return wxPoint(x, y); } GdkWindow* wxWindowGTK::GTKGetDrawingWindow() const { GdkWindow* window = NULL; if (m_wxwindow) - window = m_wxwindow->window; + window = gtk_widget_get_window(m_wxwindow); return window; } @@ -4462,8 +4578,8 @@ extern "C" // is realized (and so can be frozen): static void wx_frozen_widget_realize(GtkWidget* w, wxWindowGTK* win) { - wxASSERT( w && !GTK_WIDGET_NO_WINDOW(w) ); - wxASSERT( GTK_WIDGET_REALIZED(w) ); + wxASSERT( w && gtk_widget_get_has_window(w) ); + wxASSERT( gtk_widget_get_realized(w) ); g_signal_handlers_disconnect_by_func ( @@ -4472,9 +4588,11 @@ static void wx_frozen_widget_realize(GtkWidget* w, wxWindowGTK* win) win ); - GdkWindow* window = w->window; + GdkWindow* window; if (w == win->m_wxwindow) window = win->GTKGetDrawingWindow(); + else + window = gtk_widget_get_window(w); gdk_window_freeze_updates(window); } @@ -4482,10 +4600,11 @@ static void wx_frozen_widget_realize(GtkWidget* w, wxWindowGTK* win) void wxWindowGTK::GTKFreezeWidget(GtkWidget *w) { - if ( !w || GTK_WIDGET_NO_WINDOW(w) ) + if ( !w || !gtk_widget_get_has_window(w) ) return; // window-less widget, cannot be frozen - if ( !GTK_WIDGET_REALIZED(w) ) + GdkWindow* window = gtk_widget_get_window(w); + if (window == NULL) { // we can't thaw unrealized widgets because they don't have GdkWindow, // so set it up to be done immediately after realization: @@ -4499,7 +4618,6 @@ void wxWindowGTK::GTKFreezeWidget(GtkWidget *w) return; } - GdkWindow* window = w->window; if (w == m_wxwindow) window = GTKGetDrawingWindow(); gdk_window_freeze_updates(window); @@ -4507,10 +4625,11 @@ void wxWindowGTK::GTKFreezeWidget(GtkWidget *w) void wxWindowGTK::GTKThawWidget(GtkWidget *w) { - if ( !w || GTK_WIDGET_NO_WINDOW(w) ) + if ( !w || !gtk_widget_get_has_window(w) ) return; // window-less widget, cannot be frozen - if ( !GTK_WIDGET_REALIZED(w) ) + GdkWindow* window = gtk_widget_get_window(w); + if (window == NULL) { // the widget wasn't realized yet, no need to thaw g_signal_handlers_disconnect_by_func @@ -4522,7 +4641,6 @@ void wxWindowGTK::GTKThawWidget(GtkWidget *w) return; } - GdkWindow* window = w->window; if (w == m_wxwindow) window = GTKGetDrawingWindow(); gdk_window_thaw_updates(window); diff --git a/Externals/wxWidgets3/src/msw/accel.cpp b/Externals/wxWidgets3/src/msw/accel.cpp index b2bd12669f..53d542abf3 100644 --- a/Externals/wxWidgets3/src/msw/accel.cpp +++ b/Externals/wxWidgets3/src/msw/accel.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: accel.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: accel.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -148,7 +148,7 @@ WXHACCEL wxAcceleratorTable::GetHACCEL() const bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const { MSG *msg = (MSG *)wxmsg; - return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg); + return IsOk() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg); } #endif // wxUSE_ACCEL diff --git a/Externals/wxWidgets3/src/msw/anybutton.cpp b/Externals/wxWidgets3/src/msw/anybutton.cpp new file mode 100644 index 0000000000..b9206fdbbd --- /dev/null +++ b/Externals/wxWidgets3/src/msw/anybutton.cpp @@ -0,0 +1,1244 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: src/msw/anybutton.cpp +// Purpose: wxAnyButton +// Author: Julian Smart +// Created: 1998-01-04 (extracted from button.cpp) +// RCS-ID: $Id: anybutton.cpp 70815 2012-03-05 18:26:20Z JS $ +// Copyright: (c) Julian Smart +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#ifdef wxHAS_ANY_BUTTON + +#include "wx/anybutton.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/brush.h" + #include "wx/panel.h" + #include "wx/bmpbuttn.h" + #include "wx/settings.h" + #include "wx/dcscreen.h" + #include "wx/dcclient.h" + #include "wx/toplevel.h" + #include "wx/msw/wrapcctl.h" + #include "wx/msw/private.h" + #include "wx/msw/missing.h" +#endif + +#include "wx/imaglist.h" +#include "wx/stockitem.h" +#include "wx/msw/private/button.h" +#include "wx/msw/private/dc.h" +#include "wx/private/window.h" + +#if wxUSE_MARKUP + #include "wx/generic/private/markuptext.h" +#endif // wxUSE_MARKUP + +using namespace wxMSWImpl; + +#if wxUSE_UXTHEME + #include "wx/msw/uxtheme.h" + + // no need to include tmschema.h + #ifndef BP_PUSHBUTTON + #define BP_PUSHBUTTON 1 + + #define PBS_NORMAL 1 + #define PBS_HOT 2 + #define PBS_PRESSED 3 + #define PBS_DISABLED 4 + #define PBS_DEFAULTED 5 + + #define TMT_CONTENTMARGINS 3602 + #endif + + // provide the necessary declarations ourselves if they're missing from + // headers + #ifndef BCM_SETIMAGELIST + #define BCM_SETIMAGELIST 0x1602 + #define BCM_SETTEXTMARGIN 0x1604 + + enum + { + BUTTON_IMAGELIST_ALIGN_LEFT, + BUTTON_IMAGELIST_ALIGN_RIGHT, + BUTTON_IMAGELIST_ALIGN_TOP, + BUTTON_IMAGELIST_ALIGN_BOTTOM + }; + + struct BUTTON_IMAGELIST + { + HIMAGELIST himl; + RECT margin; + UINT uAlign; + }; + #endif +#endif // wxUSE_UXTHEME + +#ifndef WM_THEMECHANGED + #define WM_THEMECHANGED 0x031A +#endif + +#ifndef ODS_NOACCEL + #define ODS_NOACCEL 0x0100 +#endif + +#ifndef ODS_NOFOCUSRECT + #define ODS_NOFOCUSRECT 0x0200 +#endif + +#ifndef DT_HIDEPREFIX + #define DT_HIDEPREFIX 0x00100000 +#endif + +#if wxUSE_UXTHEME +extern wxWindowMSW *wxWindowBeingErased; // From src/msw/window.cpp +#endif // wxUSE_UXTHEME + +// ---------------------------------------------------------------------------- +// button image data +// ---------------------------------------------------------------------------- + +// we use different data classes for owner drawn buttons and for themed XP ones + +class wxButtonImageData +{ +public: + wxButtonImageData() { } + virtual ~wxButtonImageData() { } + + virtual wxBitmap GetBitmap(wxAnyButton::State which) const = 0; + virtual void SetBitmap(const wxBitmap& bitmap, wxAnyButton::State which) = 0; + + virtual wxSize GetBitmapMargins() const = 0; + virtual void SetBitmapMargins(wxCoord x, wxCoord y) = 0; + + virtual wxDirection GetBitmapPosition() const = 0; + virtual void SetBitmapPosition(wxDirection dir) = 0; + +private: + wxDECLARE_NO_COPY_CLASS(wxButtonImageData); +}; + +namespace +{ + +// the gap between button edge and the interior area used by Windows for the +// standard buttons +const int OD_BUTTON_MARGIN = 4; + +class wxODButtonImageData : public wxButtonImageData +{ +public: + wxODButtonImageData(wxAnyButton *btn, const wxBitmap& bitmap) + { + SetBitmap(bitmap, wxAnyButton::State_Normal); + SetBitmap(bitmap.ConvertToDisabled(), wxAnyButton::State_Disabled); + + m_dir = wxLEFT; + + // we use margins when we have both bitmap and text, but when we have + // only the bitmap it should take up the entire button area + if ( btn->ShowsLabel() ) + { + m_margin.x = btn->GetCharWidth(); + m_margin.y = btn->GetCharHeight() / 2; + } + } + + virtual wxBitmap GetBitmap(wxAnyButton::State which) const + { + return m_bitmaps[which]; + } + + virtual void SetBitmap(const wxBitmap& bitmap, wxAnyButton::State which) + { + m_bitmaps[which] = bitmap; + } + + virtual wxSize GetBitmapMargins() const + { + return m_margin; + } + + virtual void SetBitmapMargins(wxCoord x, wxCoord y) + { + m_margin = wxSize(x, y); + } + + virtual wxDirection GetBitmapPosition() const + { + return m_dir; + } + + virtual void SetBitmapPosition(wxDirection dir) + { + m_dir = dir; + } + +private: + // just store the values passed to us to be able to retrieve them later + // from the drawing code + wxBitmap m_bitmaps[wxAnyButton::State_Max]; + wxSize m_margin; + wxDirection m_dir; + + wxDECLARE_NO_COPY_CLASS(wxODButtonImageData); +}; + +#if wxUSE_UXTHEME + +// somehow the margin is one pixel greater than the value returned by +// GetThemeMargins() call +const int XP_BUTTON_EXTRA_MARGIN = 1; + +class wxXPButtonImageData : public wxButtonImageData +{ +public: + // we must be constructed with the size of our images as we need to create + // the image list + wxXPButtonImageData(wxAnyButton *btn, const wxBitmap& bitmap) + : m_iml(bitmap.GetWidth(), bitmap.GetHeight(), true /* use mask */, + wxAnyButton::State_Max), + m_hwndBtn(GetHwndOf(btn)) + { + // initialize all bitmaps except for the disabled one to normal state + for ( int n = 0; n < wxAnyButton::State_Max; n++ ) + { + m_iml.Add(n == wxAnyButton::State_Disabled ? bitmap.ConvertToDisabled() + : bitmap); + } + + m_data.himl = GetHimagelistOf(&m_iml); + + // no margins by default + m_data.margin.left = + m_data.margin.right = + m_data.margin.top = + m_data.margin.bottom = 0; + + // use default alignment + m_data.uAlign = BUTTON_IMAGELIST_ALIGN_LEFT; + + UpdateImageInfo(); + } + + virtual wxBitmap GetBitmap(wxAnyButton::State which) const + { + return m_iml.GetBitmap(which); + } + + virtual void SetBitmap(const wxBitmap& bitmap, wxAnyButton::State which) + { + m_iml.Replace(which, bitmap); + + UpdateImageInfo(); + } + + virtual wxSize GetBitmapMargins() const + { + return wxSize(m_data.margin.left, m_data.margin.top); + } + + virtual void SetBitmapMargins(wxCoord x, wxCoord y) + { + RECT& margin = m_data.margin; + margin.left = + margin.right = x; + margin.top = + margin.bottom = y; + + if ( !::SendMessage(m_hwndBtn, BCM_SETTEXTMARGIN, 0, (LPARAM)&margin) ) + { + wxLogDebug("SendMessage(BCM_SETTEXTMARGIN) failed"); + } + } + + virtual wxDirection GetBitmapPosition() const + { + switch ( m_data.uAlign ) + { + default: + wxFAIL_MSG( "invalid image alignment" ); + // fall through + + case BUTTON_IMAGELIST_ALIGN_LEFT: + return wxLEFT; + + case BUTTON_IMAGELIST_ALIGN_RIGHT: + return wxRIGHT; + + case BUTTON_IMAGELIST_ALIGN_TOP: + return wxTOP; + + case BUTTON_IMAGELIST_ALIGN_BOTTOM: + return wxBOTTOM; + } + } + + virtual void SetBitmapPosition(wxDirection dir) + { + UINT alignNew; + switch ( dir ) + { + default: + wxFAIL_MSG( "invalid direction" ); + // fall through + + case wxLEFT: + alignNew = BUTTON_IMAGELIST_ALIGN_LEFT; + break; + + case wxRIGHT: + alignNew = BUTTON_IMAGELIST_ALIGN_RIGHT; + break; + + case wxTOP: + alignNew = BUTTON_IMAGELIST_ALIGN_TOP; + break; + + case wxBOTTOM: + alignNew = BUTTON_IMAGELIST_ALIGN_BOTTOM; + break; + } + + if ( alignNew != m_data.uAlign ) + { + m_data.uAlign = alignNew; + UpdateImageInfo(); + } + } + +private: + void UpdateImageInfo() + { + if ( !::SendMessage(m_hwndBtn, BCM_SETIMAGELIST, 0, (LPARAM)&m_data) ) + { + wxLogDebug("SendMessage(BCM_SETIMAGELIST) failed"); + } + } + + // we store image list separately to be able to use convenient wxImageList + // methods instead of working with raw HIMAGELIST + wxImageList m_iml; + + // store the rest of the data in BCM_SETIMAGELIST-friendly form + BUTTON_IMAGELIST m_data; + + // the button we're associated with + const HWND m_hwndBtn; + + + wxDECLARE_NO_COPY_CLASS(wxXPButtonImageData); +}; + +#endif // wxUSE_UXTHEME + +} // anonymous namespace + +// ---------------------------------------------------------------------------- +// macros +// ---------------------------------------------------------------------------- + +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// helper functions from wx/msw/private/button.h +// ---------------------------------------------------------------------------- + +void wxMSWButton::UpdateMultilineStyle(HWND hwnd, const wxString& label) +{ + // update BS_MULTILINE style depending on the new label (resetting it + // doesn't seem to do anything very useful but it shouldn't hurt and we do + // have to set it whenever the label becomes multi line as otherwise it + // wouldn't be shown correctly as we don't use BS_MULTILINE when creating + // the control unless it already has new lines in its label) + long styleOld = ::GetWindowLong(hwnd, GWL_STYLE), + styleNew; + if ( label.find(wxT('\n')) != wxString::npos ) + styleNew = styleOld | BS_MULTILINE; + else + styleNew = styleOld & ~BS_MULTILINE; + + if ( styleNew != styleOld ) + ::SetWindowLong(hwnd, GWL_STYLE, styleNew); +} + +wxSize wxMSWButton::GetFittingSize(wxWindow *win, + const wxSize& sizeLabel, + int flags) +{ + wxSize sizeBtn = sizeLabel; + + // FIXME: The numbers here are pure guesswork, no idea how should the + // button margins be really calculated. + if ( flags & Size_ExactFit ) + { + // We still need some margin or the text would be overwritten, just + // make it as small as possible. + sizeBtn.x += (3*win->GetCharWidth())/2; + } + else + { + sizeBtn.x += 3*win->GetCharWidth(); + sizeBtn.y += win->GetCharHeight()/2; + } + + // account for the shield UAC icon if we have it + if ( flags & Size_AuthNeeded ) + sizeBtn.x += wxSystemSettings::GetMetric(wxSYS_SMALLICON_X); + + return sizeBtn; +} + +wxSize wxMSWButton::ComputeBestFittingSize(wxControl *btn, int flags) +{ + wxClientDC dc(btn); + + wxSize sizeBtn; + dc.GetMultiLineTextExtent(btn->GetLabelText(), &sizeBtn.x, &sizeBtn.y); + + return GetFittingSize(btn, sizeBtn, flags); +} + +wxSize wxMSWButton::IncreaseToStdSizeAndCache(wxControl *btn, const wxSize& size) +{ + wxSize sizeBtn(size); + + // All buttons have at least the standard height and, unless the user + // explicitly wants them to be as small as possible and used wxBU_EXACTFIT + // style to indicate this, of at least the standard width too. + // + // Notice that we really want to make all buttons equally high, otherwise + // they look ugly and the existing code using wxBU_EXACTFIT only uses it to + // control width and not height. + + // The 50x14 button size is documented in the "Recommended sizing and + // spacing" section of MSDN layout article. + // + // Note that we intentionally don't use GetDefaultSize() here, because + // it's inexact -- dialog units depend on this dialog's font. + const wxSize sizeDef = btn->ConvertDialogToPixels(wxSize(50, 14)); + if ( !btn->HasFlag(wxBU_EXACTFIT) ) + { + if ( sizeBtn.x < sizeDef.x ) + sizeBtn.x = sizeDef.x; + } + if ( sizeBtn.y < sizeDef.y ) + sizeBtn.y = sizeDef.y; + + btn->CacheBestSize(sizeBtn); + + return sizeBtn; +} + +// ---------------------------------------------------------------------------- +// creation/destruction +// ---------------------------------------------------------------------------- + +wxAnyButton::~wxAnyButton() +{ + delete m_imageData; +#if wxUSE_MARKUP + delete m_markupText; +#endif // wxUSE_MARKUP +} + +void wxAnyButton::SetLabel(const wxString& label) +{ + wxMSWButton::UpdateMultilineStyle(GetHwnd(), label); + + wxAnyButtonBase::SetLabel(label); + +#if wxUSE_MARKUP + // If we have a plain text label, we shouldn't be using markup any longer. + if ( m_markupText ) + { + delete m_markupText; + m_markupText = NULL; + + // Unfortunately we don't really know whether we can reset the button + // to be non-owner-drawn or not: if we had made it owner-drawn just + // because of a call to SetLabelMarkup(), we could, but not if there + // were [also] calls to Set{Fore,Back}groundColour(). If it's really a + // problem to have button remain owner-drawn forever just because it + // had markup label once, we should record the reason for our current + // owner-drawnness and check it here. + } +#endif // wxUSE_MARKUP +} + +// ---------------------------------------------------------------------------- +// size management including autosizing +// ---------------------------------------------------------------------------- + +void wxAnyButton::AdjustForBitmapSize(wxSize &size) const +{ + wxCHECK_RET( m_imageData, wxT("shouldn't be called if no image") ); + + // account for the bitmap size + const wxSize sizeBmp = m_imageData->GetBitmap(State_Normal).GetSize(); + const wxDirection dirBmp = m_imageData->GetBitmapPosition(); + if ( dirBmp == wxLEFT || dirBmp == wxRIGHT ) + { + size.x += sizeBmp.x; + if ( sizeBmp.y > size.y ) + size.y = sizeBmp.y; + } + else // bitmap on top/below the text + { + size.y += sizeBmp.y; + if ( sizeBmp.x > size.x ) + size.x = sizeBmp.x; + } + + // account for the user-specified margins + size += 2*m_imageData->GetBitmapMargins(); + + // and also for the margins we always add internally (unless we have no + // border at all in which case the button has exactly the same size as + // bitmap and so no margins should be used) + if ( !HasFlag(wxBORDER_NONE) ) + { + int marginH = 0, + marginV = 0; +#if wxUSE_UXTHEME + if ( wxUxThemeEngine::GetIfActive() ) + { + wxUxThemeHandle theme(const_cast(this), L"BUTTON"); + + MARGINS margins; + wxUxThemeEngine::Get()->GetThemeMargins(theme, NULL, + BP_PUSHBUTTON, + PBS_NORMAL, + TMT_CONTENTMARGINS, + NULL, + &margins); + + // XP doesn't draw themed buttons correctly when the client + // area is smaller than 8x8 - enforce this minimum size for + // small bitmaps + size.IncTo(wxSize(8, 8)); + + marginH = margins.cxLeftWidth + margins.cxRightWidth + + 2*XP_BUTTON_EXTRA_MARGIN; + marginV = margins.cyTopHeight + margins.cyBottomHeight + + 2*XP_BUTTON_EXTRA_MARGIN; + } + else +#endif // wxUSE_UXTHEME + { + marginH = + marginV = OD_BUTTON_MARGIN; + } + + size.IncBy(marginH, marginV); + } +} + +wxSize wxAnyButton::DoGetBestSize() const +{ + wxAnyButton * const self = const_cast(this); + + wxSize size; + + // Account for the text part if we have it. + if ( ShowsLabel() ) + { + int flags = 0; + if ( HasFlag(wxBU_EXACTFIT) ) + flags |= wxMSWButton::Size_ExactFit; + if ( DoGetAuthNeeded() ) + flags |= wxMSWButton::Size_AuthNeeded; + +#if wxUSE_MARKUP + if ( m_markupText ) + { + wxClientDC dc(self); + size = wxMSWButton::GetFittingSize(self, + m_markupText->Measure(dc), + flags); + } + else // Normal plain text (but possibly multiline) label. +#endif // wxUSE_MARKUP + { + size = wxMSWButton::ComputeBestFittingSize(self, flags); + } + } + + if ( m_imageData ) + AdjustForBitmapSize(size); + + return wxMSWButton::IncreaseToStdSizeAndCache(self, size); +} + +// ---------------------------------------------------------------------------- +// event/message handlers +// ---------------------------------------------------------------------------- + +WXLRESULT wxAnyButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +{ + if ( nMsg == WM_LBUTTONDBLCLK ) + { + // emulate a click event to force an owner-drawn button to change its + // appearance - without this, it won't do it + (void)wxControl::MSWWindowProc(WM_LBUTTONDOWN, wParam, lParam); + + // and continue with processing the message normally as well + } +#if wxUSE_UXTHEME + else if ( nMsg == WM_THEMECHANGED ) + { + // need to recalculate the best size here + // as the theme size might have changed + InvalidateBestSize(); + } +#endif // wxUSE_UXTHEME + // must use m_mouseInWindow here instead of IsMouseInWindow() + // since we need to know the first time the mouse enters the window + // and IsMouseInWindow() would return true in this case + else if ( (nMsg == WM_MOUSEMOVE && !m_mouseInWindow) || + nMsg == WM_MOUSELEAVE ) + { + if ( + IsEnabled() && + ( +#if wxUSE_UXTHEME + wxUxThemeEngine::GetIfActive() || +#endif // wxUSE_UXTHEME + (m_imageData && m_imageData->GetBitmap(State_Current).IsOk()) + ) + ) + { + Refresh(); + } + } + + // let the base class do all real processing + return wxControl::MSWWindowProc(nMsg, wParam, lParam); +} + +// ---------------------------------------------------------------------------- +// button images +// ---------------------------------------------------------------------------- + +wxBitmap wxAnyButton::DoGetBitmap(State which) const +{ + return m_imageData ? m_imageData->GetBitmap(which) : wxBitmap(); +} + +void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which) +{ +#if wxUSE_UXTHEME + wxXPButtonImageData *oldData = NULL; +#endif // wxUSE_UXTHEME + + // Check if we already had bitmaps of different size. + if ( m_imageData && + bitmap.GetSize() != m_imageData->GetBitmap(State_Normal).GetSize() ) + { + wxASSERT_MSG( (which == State_Normal) || bitmap.IsNull(), + "Must set normal bitmap with the new size first" ); + +#if wxUSE_UXTHEME + if ( ShowsLabel() && wxUxThemeEngine::GetIfActive() ) + { + // We can't change the size of the images stored in wxImageList + // in wxXPButtonImageData::m_iml so force recreating it below but + // keep the current data to copy its values into the new one. + oldData = static_cast(m_imageData); + m_imageData = NULL; + } +#endif // wxUSE_UXTHEME + //else: wxODButtonImageData doesn't require anything special + } + + // allocate the image data when the first bitmap is set + if ( !m_imageData ) + { +#if wxUSE_UXTHEME + // using image list doesn't work correctly if we don't have any label + // (even if we use BUTTON_IMAGELIST_ALIGN_CENTER alignment and + // BS_BITMAP style), at least under Windows 2003 so use owner drawn + // strategy for bitmap-only buttons + if ( ShowsLabel() && wxUxThemeEngine::GetIfActive() ) + { + m_imageData = new wxXPButtonImageData(this, bitmap); + + if ( oldData ) + { + // Preserve the old values in case the user changed them. + m_imageData->SetBitmapPosition(oldData->GetBitmapPosition()); + + const wxSize oldMargins = oldData->GetBitmapMargins(); + m_imageData->SetBitmapMargins(oldMargins.x, oldMargins.y); + + // No need to preserve the bitmaps though as they were of wrong + // size anyhow. + + delete oldData; + } + } + else +#endif // wxUSE_UXTHEME + { + m_imageData = new wxODButtonImageData(this, bitmap); + MakeOwnerDrawn(); + } + } + else + { + m_imageData->SetBitmap(bitmap, which); + } + + // it should be enough to only invalidate the best size when the normal + // bitmap changes as all bitmaps assigned to the button should be of the + // same size anyhow + if ( which == State_Normal ) + InvalidateBestSize(); + + Refresh(); +} + +wxSize wxAnyButton::DoGetBitmapMargins() const +{ + return m_imageData ? m_imageData->GetBitmapMargins() : wxSize(0, 0); +} + +void wxAnyButton::DoSetBitmapMargins(wxCoord x, wxCoord y) +{ + wxCHECK_RET( m_imageData, "SetBitmap() must be called first" ); + + m_imageData->SetBitmapMargins(x, y); + InvalidateBestSize(); +} + +void wxAnyButton::DoSetBitmapPosition(wxDirection dir) +{ + wxCHECK_RET( m_imageData, "SetBitmap() must be called first" ); + + m_imageData->SetBitmapPosition(dir); + InvalidateBestSize(); +} + +// ---------------------------------------------------------------------------- +// markup support +// ---------------------------------------------------------------------------- + +#if wxUSE_MARKUP + +bool wxAnyButton::DoSetLabelMarkup(const wxString& markup) +{ + if ( !wxAnyButtonBase::DoSetLabelMarkup(markup) ) + return false; + + if ( !m_markupText ) + { + m_markupText = new wxMarkupText(markup); + MakeOwnerDrawn(); + } + else + { + // We are already owner-drawn so just update the text. + m_markupText->SetMarkup(markup); + } + + Refresh(); + + return true; +} + +#endif // wxUSE_MARKUP + +// ---------------------------------------------------------------------------- +// owner-drawn buttons support +// ---------------------------------------------------------------------------- + +// drawing helpers +namespace +{ + +// return the button state using both the ODS_XXX flags specified in state +// parameter and the current button state +wxAnyButton::State GetButtonState(wxAnyButton *btn, UINT state) +{ + if ( state & ODS_DISABLED ) + return wxAnyButton::State_Disabled; + + if ( state & ODS_SELECTED ) + return wxAnyButton::State_Pressed; + + if ( btn->HasCapture() || btn->IsMouseInWindow() ) + return wxAnyButton::State_Current; + + if ( state & ODS_FOCUS ) + return wxAnyButton::State_Focused; + + return btn->GetNormalState(); +} + +void DrawButtonText(HDC hdc, + RECT *pRect, + wxAnyButton *btn, + int flags) +{ + const wxString text = btn->GetLabel(); + + if ( text.find(wxT('\n')) != wxString::npos ) + { + // draw multiline label + + // center text horizontally in any case + flags |= DT_CENTER; + + // first we need to compute its bounding rect + RECT rc; + ::CopyRect(&rc, pRect); + ::DrawText(hdc, text.wx_str(), text.length(), &rc, + DT_CENTER | DT_CALCRECT); + + // now center this rect inside the entire button area + const LONG w = rc.right - rc.left; + const LONG h = rc.bottom - rc.top; + rc.left = pRect->left + (pRect->right - pRect->left)/2 - w/2; + rc.right = rc.left+w; + rc.top = pRect->top + (pRect->bottom - pRect->top)/2 - h/2; + rc.bottom = rc.top+h; + + ::DrawText(hdc, text.wx_str(), text.length(), &rc, flags); + } + else // single line label + { + // translate wx button flags to alignment flags for DrawText() + if ( btn->HasFlag(wxBU_RIGHT) ) + { + flags |= DT_RIGHT; + } + else if ( !btn->HasFlag(wxBU_LEFT) ) + { + flags |= DT_CENTER; + } + //else: DT_LEFT is the default anyhow (and its value is 0 too) + + if ( btn->HasFlag(wxBU_BOTTOM) ) + { + flags |= DT_BOTTOM; + } + else if ( !btn->HasFlag(wxBU_TOP) ) + { + flags |= DT_VCENTER; + } + //else: as above, DT_TOP is the default + + // notice that we must have DT_SINGLELINE for vertical alignment flags + // to work + ::DrawText(hdc, text.wx_str(), text.length(), pRect, + flags | DT_SINGLELINE ); + } +} + +void DrawRect(HDC hdc, const RECT& r) +{ + wxDrawLine(hdc, r.left, r.top, r.right, r.top); + wxDrawLine(hdc, r.right, r.top, r.right, r.bottom); + wxDrawLine(hdc, r.right, r.bottom, r.left, r.bottom); + wxDrawLine(hdc, r.left, r.bottom, r.left, r.top); +} + +/* + The button frame looks like this normally: + + WWWWWWWWWWWWWWWWWWB + WHHHHHHHHHHHHHHHHGB W = white (HILIGHT) + WH GB H = light grey (LIGHT) + WH GB G = dark grey (SHADOW) + WH GB B = black (DKSHADOW) + WH GB + WGGGGGGGGGGGGGGGGGB + BBBBBBBBBBBBBBBBBBB + + When the button is selected, the button becomes like this (the total button + size doesn't change): + + BBBBBBBBBBBBBBBBBBB + BWWWWWWWWWWWWWWWWBB + BWHHHHHHHHHHHHHHGBB + BWH GBB + BWH GBB + BWGGGGGGGGGGGGGGGBB + BBBBBBBBBBBBBBBBBBB + BBBBBBBBBBBBBBBBBBB + + When the button is pushed (while selected) it is like: + + BBBBBBBBBBBBBBBBBBB + BGGGGGGGGGGGGGGGGGB + BG GB + BG GB + BG GB + BG GB + BGGGGGGGGGGGGGGGGGB + BBBBBBBBBBBBBBBBBBB +*/ +void DrawButtonFrame(HDC hdc, RECT& rectBtn, + bool selected, bool pushed) +{ + RECT r; + CopyRect(&r, &rectBtn); + + AutoHPEN hpenBlack(GetSysColor(COLOR_3DDKSHADOW)), + hpenGrey(GetSysColor(COLOR_3DSHADOW)), + hpenLightGr(GetSysColor(COLOR_3DLIGHT)), + hpenWhite(GetSysColor(COLOR_3DHILIGHT)); + + SelectInHDC selectPen(hdc, hpenBlack); + + r.right--; + r.bottom--; + + if ( pushed ) + { + DrawRect(hdc, r); + + (void)SelectObject(hdc, hpenGrey); + ::InflateRect(&r, -1, -1); + + DrawRect(hdc, r); + } + else // !pushed + { + if ( selected ) + { + DrawRect(hdc, r); + + ::InflateRect(&r, -1, -1); + } + + wxDrawLine(hdc, r.left, r.bottom, r.right, r.bottom); + wxDrawLine(hdc, r.right, r.bottom, r.right, r.top - 1); + + (void)SelectObject(hdc, hpenWhite); + wxDrawLine(hdc, r.left, r.bottom - 1, r.left, r.top); + wxDrawLine(hdc, r.left, r.top, r.right, r.top); + + (void)SelectObject(hdc, hpenLightGr); + wxDrawLine(hdc, r.left + 1, r.bottom - 2, r.left + 1, r.top + 1); + wxDrawLine(hdc, r.left + 1, r.top + 1, r.right - 1, r.top + 1); + + (void)SelectObject(hdc, hpenGrey); + wxDrawLine(hdc, r.left + 1, r.bottom - 1, r.right - 1, r.bottom - 1); + wxDrawLine(hdc, r.right - 1, r.bottom - 1, r.right - 1, r.top); + } + + InflateRect(&rectBtn, -OD_BUTTON_MARGIN, -OD_BUTTON_MARGIN); +} + +#if wxUSE_UXTHEME +void DrawXPBackground(wxAnyButton *button, HDC hdc, RECT& rectBtn, UINT state) +{ + wxUxThemeHandle theme(button, L"BUTTON"); + + // this array is indexed by wxAnyButton::State values and so must be kept in + // sync with it + static const int uxStates[] = + { + PBS_NORMAL, PBS_HOT, PBS_PRESSED, PBS_DISABLED, PBS_DEFAULTED + }; + + int iState = uxStates[GetButtonState(button, state)]; + + wxUxThemeEngine * const engine = wxUxThemeEngine::Get(); + + // draw parent background if needed + if ( engine->IsThemeBackgroundPartiallyTransparent + ( + theme, + BP_PUSHBUTTON, + iState + ) ) + { + // Set this button as the one whose background is being erased: this + // allows our WM_ERASEBKGND handler used by DrawThemeParentBackground() + // to correctly align the background brush with this window instead of + // the parent window to which WM_ERASEBKGND is sent. Notice that this + // doesn't work with custom user-defined EVT_ERASE_BACKGROUND handlers + // as they won't be aligned but unfortunately all the attempts to fix + // it by shifting DC origin before calling DrawThemeParentBackground() + // failed to work so we at least do this, even though this is far from + // being the perfect solution. + wxWindowBeingErased = button; + + engine->DrawThemeParentBackground(GetHwndOf(button), hdc, &rectBtn); + + wxWindowBeingErased = NULL; + } + + // draw background + engine->DrawThemeBackground(theme, hdc, BP_PUSHBUTTON, iState, + &rectBtn, NULL); + + // calculate content area margins + MARGINS margins; + engine->GetThemeMargins(theme, hdc, BP_PUSHBUTTON, iState, + TMT_CONTENTMARGINS, &rectBtn, &margins); + ::InflateRect(&rectBtn, -margins.cxLeftWidth, -margins.cyTopHeight); + ::InflateRect(&rectBtn, -XP_BUTTON_EXTRA_MARGIN, -XP_BUTTON_EXTRA_MARGIN); + + if ( button->UseBgCol() ) + { + COLORREF colBg = wxColourToRGB(button->GetBackgroundColour()); + AutoHBRUSH hbrushBackground(colBg); + + // don't overwrite the focus rect + RECT rectClient; + ::CopyRect(&rectClient, &rectBtn); + ::InflateRect(&rectClient, -1, -1); + FillRect(hdc, &rectClient, hbrushBackground); + } +} +#endif // wxUSE_UXTHEME + +} // anonymous namespace + +// ---------------------------------------------------------------------------- +// owner drawn buttons support +// ---------------------------------------------------------------------------- + +void wxAnyButton::MakeOwnerDrawn() +{ + if ( !IsOwnerDrawn() ) + { + // make it so + // note that BS_OWNERDRAW is not independent from other style bits + long style = GetWindowLong(GetHwnd(), GWL_STYLE); + style &= ~(BS_3STATE | BS_AUTO3STATE | BS_AUTOCHECKBOX | BS_AUTORADIOBUTTON | BS_CHECKBOX | BS_DEFPUSHBUTTON | BS_GROUPBOX | BS_PUSHBUTTON | BS_RADIOBUTTON | BS_PUSHLIKE); + style |= BS_OWNERDRAW; + SetWindowLong(GetHwnd(), GWL_STYLE, style); + } +} + +bool wxAnyButton::IsOwnerDrawn() const +{ + long style = GetWindowLong(GetHwnd(), GWL_STYLE); + return ( (style & BS_OWNERDRAW) == BS_OWNERDRAW ); +} + +bool wxAnyButton::SetBackgroundColour(const wxColour &colour) +{ + if ( !wxControl::SetBackgroundColour(colour) ) + { + // nothing to do + return false; + } + + MakeOwnerDrawn(); + + Refresh(); + + return true; +} + +bool wxAnyButton::SetForegroundColour(const wxColour &colour) +{ + if ( !wxControl::SetForegroundColour(colour) ) + { + // nothing to do + return false; + } + + MakeOwnerDrawn(); + + Refresh(); + + return true; +} + +bool wxAnyButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis) +{ + LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT)wxdis; + HDC hdc = lpDIS->hDC; + + UINT state = lpDIS->itemState; + switch ( GetButtonState(this, state) ) + { + case State_Disabled: + state |= ODS_DISABLED; + break; + case State_Pressed: + state |= ODS_SELECTED; + break; + case State_Focused: + state |= ODS_FOCUS; + break; + default: + break; + } + + bool pushed = (SendMessage(GetHwnd(), BM_GETSTATE, 0, 0) & BST_PUSHED) != 0; + + RECT rectBtn; + CopyRect(&rectBtn, &lpDIS->rcItem); + + // draw the button background + if ( !HasFlag(wxBORDER_NONE) ) + { +#if wxUSE_UXTHEME + if ( wxUxThemeEngine::GetIfActive() ) + { + DrawXPBackground(this, hdc, rectBtn, state); + } + else +#endif // wxUSE_UXTHEME + { + COLORREF colBg = wxColourToRGB(GetBackgroundColour()); + + // first, draw the background + AutoHBRUSH hbrushBackground(colBg); + FillRect(hdc, &rectBtn, hbrushBackground); + + // draw the border for the current state + bool selected = (state & ODS_SELECTED) != 0; + if ( !selected ) + { + wxTopLevelWindow * + tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); + if ( tlw ) + { + selected = tlw->GetDefaultItem() == this; + } + } + + DrawButtonFrame(hdc, rectBtn, selected, pushed); + } + + // draw the focus rectangle if we need it + if ( (state & ODS_FOCUS) && !(state & ODS_NOFOCUSRECT) ) + { + DrawFocusRect(hdc, &rectBtn); + +#if wxUSE_UXTHEME + if ( !wxUxThemeEngine::GetIfActive() ) +#endif // wxUSE_UXTHEME + { + if ( pushed ) + { + // the label is shifted by 1 pixel to create "pushed" effect + OffsetRect(&rectBtn, 1, 1); + } + } + } + } + + + // draw the image, if any + if ( m_imageData ) + { + wxBitmap bmp = m_imageData->GetBitmap(GetButtonState(this, state)); + if ( !bmp.IsOk() ) + bmp = m_imageData->GetBitmap(State_Normal); + + const wxSize sizeBmp = bmp.GetSize(); + const wxSize margin = m_imageData->GetBitmapMargins(); + const wxSize sizeBmpWithMargins(sizeBmp + 2*margin); + wxRect rectButton(wxRectFromRECT(rectBtn)); + + // for simplicity, we start with centred rectangle and then move it to + // the appropriate edge + wxRect rectBitmap = wxRect(sizeBmp).CentreIn(rectButton); + + // move bitmap only if we have a label, otherwise keep it centered + if ( ShowsLabel() ) + { + switch ( m_imageData->GetBitmapPosition() ) + { + default: + wxFAIL_MSG( "invalid direction" ); + // fall through + + case wxLEFT: + rectBitmap.x = rectButton.x + margin.x; + rectButton.x += sizeBmpWithMargins.x; + rectButton.width -= sizeBmpWithMargins.x; + break; + + case wxRIGHT: + rectBitmap.x = rectButton.GetRight() - sizeBmp.x - margin.x; + rectButton.width -= sizeBmpWithMargins.x; + break; + + case wxTOP: + rectBitmap.y = rectButton.y + margin.y; + rectButton.y += sizeBmpWithMargins.y; + rectButton.height -= sizeBmpWithMargins.y; + break; + + case wxBOTTOM: + rectBitmap.y = rectButton.GetBottom() - sizeBmp.y - margin.y; + rectButton.height -= sizeBmpWithMargins.y; + break; + } + } + + wxDCTemp dst((WXHDC)hdc); + dst.DrawBitmap(bmp, rectBitmap.GetPosition(), true); + + wxCopyRectToRECT(rectButton, rectBtn); + } + + + // finally draw the label + if ( ShowsLabel() ) + { + COLORREF colFg = state & ODS_DISABLED + ? ::GetSysColor(COLOR_GRAYTEXT) + : wxColourToRGB(GetForegroundColour()); + + wxTextColoursChanger changeFg(hdc, colFg, CLR_INVALID); + wxBkModeChanger changeBkMode(hdc, wxBRUSHSTYLE_TRANSPARENT); + +#if wxUSE_MARKUP + if ( m_markupText ) + { + wxDCTemp dc((WXHDC)hdc); + dc.SetTextForeground(wxColour(colFg)); + dc.SetFont(GetFont()); + + m_markupText->Render(dc, wxRectFromRECT(rectBtn), + state & ODS_NOACCEL + ? wxMarkupText::Render_Default + : wxMarkupText::Render_ShowAccels); + } + else // Plain text label +#endif // wxUSE_MARKUP + { + // notice that DT_HIDEPREFIX doesn't work on old (pre-Windows 2000) + // systems but by happy coincidence ODS_NOACCEL is not used under + // them neither so DT_HIDEPREFIX should never be used there + DrawButtonText(hdc, &rectBtn, this, + state & ODS_NOACCEL ? DT_HIDEPREFIX : 0); + } + } + + return true; +} + +#endif // wxHAS_ANY_BUTTON diff --git a/Externals/wxWidgets3/src/msw/artmsw.cpp b/Externals/wxWidgets3/src/msw/artmsw.cpp index 7f7ed5a855..b12355da80 100644 --- a/Externals/wxWidgets3/src/msw/artmsw.cpp +++ b/Externals/wxWidgets3/src/msw/artmsw.cpp @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // Modified by: // Created: 2008-10-15 -// RCS-ID: $Id: artmsw.cpp 62199 2009-09-29 17:04:08Z VS $ +// RCS-ID: $Id: artmsw.cpp 70154 2011-12-28 13:51:29Z VZ $ // Copyright: (c) Vaclav Slavik, 2008 // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -91,7 +91,7 @@ wxBitmap wxWindowsArtProvider::CreateBitmap(const wxArtID& id, /*static*/ void wxArtProvider::InitNativeProvider() { - Push(new wxWindowsArtProvider); + PushBack(new wxWindowsArtProvider); } // ---------------------------------------------------------------------------- @@ -124,6 +124,10 @@ wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& client) { return wxSize(16, 16); } + else if (client == wxART_LIST) + { + return wxSize(16, 16); + } return wxDefaultSize; } diff --git a/Externals/wxWidgets3/src/msw/bitmap.cpp b/Externals/wxWidgets3/src/msw/bitmap.cpp index be335ae726..624cabfff6 100644 --- a/Externals/wxWidgets3/src/msw/bitmap.cpp +++ b/Externals/wxWidgets3/src/msw/bitmap.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: bitmap.cpp 65962 2010-10-30 23:51:09Z VZ $ +// RCS-ID: $Id: bitmap.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -387,7 +387,7 @@ bool wxBitmap::CopyFromCursor(const wxCursor& cursor, wxBitmapTransparency trans { UnRef(); - if ( !cursor.Ok() ) + if ( !cursor.IsOk() ) return false; return CopyFromIconOrCursor(cursor, transp); @@ -397,7 +397,7 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon, wxBitmapTransparency transp) { UnRef(); - if ( !icon.Ok() ) + if ( !icon.IsOk() ) return false; return CopyFromIconOrCursor(icon, transp); @@ -605,7 +605,7 @@ bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc) SetHBITMAP((WXHBITMAP)hbmp); - return Ok(); + return IsOk(); } #if wxUSE_IMAGE @@ -739,7 +739,7 @@ wxImage wxBitmap::ConvertToImage() const // so the 'depth' argument is ignored. // TODO: transparency (create a mask image) - if (!Ok()) + if (!IsOk()) { wxFAIL_MSG( wxT("bitmap is invalid") ); return wxNullImage; @@ -747,7 +747,7 @@ wxImage wxBitmap::ConvertToImage() const wxImage image; - wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") ); // create an wxImage object int width = GetWidth(); @@ -823,7 +823,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, const wxDC& dc) bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc) { - wxCHECK_MSG( image.Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") ); UnRef(); @@ -929,7 +929,7 @@ wxImage wxBitmap::ConvertToImage() const // and then DIB to our wxImage wxImage image = dib.ConvertToImage(); - if ( !image.Ok() ) + if ( !image.IsOk() ) { return wxNullImage; } @@ -1039,7 +1039,7 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type) else // no bitmap handler found { wxImage image; - if ( image.LoadFile( filename, type ) && image.Ok() ) + if ( image.LoadFile( filename, type ) && image.IsOk() ) { *this = wxBitmap(image); @@ -1084,7 +1084,7 @@ bool wxBitmap::SaveFile(const wxString& filename, { // FIXME what about palette? shouldn't we use it? wxImage image = ConvertToImage(); - if ( image.Ok() ) + if ( image.IsOk() ) { return image.SaveFile(filename, type); } @@ -1106,14 +1106,14 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect ) const wxBitmap wxBitmap::GetSubBitmapOfHDC( const wxRect& rect, WXHDC hdc ) const { - wxCHECK_MSG( Ok() && + wxCHECK_MSG( IsOk() && (rect.x >= 0) && (rect.y >= 0) && (rect.x+rect.width <= GetWidth()) && (rect.y+rect.height <= GetHeight()), wxNullBitmap, wxT("Invalid bitmap or bitmap region") ); wxBitmap ret( rect.width, rect.height, GetDepth() ); - wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") ); + wxASSERT_MSG( ret.IsOk(), wxT("GetSubBitmap error") ); #ifndef __WXMICROWIN__ // handle alpha channel, if any @@ -1248,7 +1248,7 @@ void wxBitmap::SetMask(wxMask *mask) void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) { #if wxUSE_WXDIB - if ( !Ok() ) + if ( !IsOk() ) { // no bitmap, no data (raw or otherwise) return NULL; @@ -1326,7 +1326,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) void wxBitmap::UngetRawData(wxPixelDataBase& dataBase) { #if wxUSE_WXDIB - if ( !Ok() ) + if ( !IsOk() ) return; if ( !&dataBase ) @@ -1427,7 +1427,7 @@ wxMask::~wxMask() bool wxMask::Create(const wxBitmap& bitmap) { #ifndef __WXMICROWIN__ - wxCHECK_MSG( bitmap.Ok() && bitmap.GetDepth() == 1, false, + wxCHECK_MSG( bitmap.IsOk() && bitmap.GetDepth() == 1, false, wxT("can't create mask from invalid or not monochrome bitmap") ); if ( m_maskBitmap ) @@ -1468,7 +1468,7 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex) } #if wxUSE_PALETTE - if (bitmap.Ok() && bitmap.GetPalette()->Ok()) + if (bitmap.IsOk() && bitmap.GetPalette()->IsOk()) { unsigned char red, green, blue; if (bitmap.GetPalette()->GetRGB(paletteIndex, &red, &green, &blue)) @@ -1487,7 +1487,7 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex) bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour) { #ifndef __WXMICROWIN__ - wxCHECK_MSG( bitmap.Ok(), false, wxT("invalid bitmap in wxMask::Create") ); + wxCHECK_MSG( bitmap.IsOk(), false, wxT("invalid bitmap in wxMask::Create") ); if ( m_maskBitmap ) { @@ -1625,7 +1625,7 @@ HICON wxBitmapToIconOrCursor(const wxBitmap& bmp, int hotSpotX, int hotSpotY) { - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) { // we can't create an icon/cursor form nothing return 0; diff --git a/Externals/wxWidgets3/src/msw/bmpbuttn.cpp b/Externals/wxWidgets3/src/msw/bmpbuttn.cpp index ba28d5db69..76a63576c7 100644 --- a/Externals/wxWidgets3/src/msw/bmpbuttn.cpp +++ b/Externals/wxWidgets3/src/msw/bmpbuttn.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: bmpbuttn.cpp 66555 2011-01-04 08:31:53Z SC $ +// RCS-ID: $Id: bmpbuttn.cpp 67931 2011-06-14 13:00:42Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -80,7 +80,8 @@ bool wxBitmapButton::Create(wxWindow *parent, validator, name) ) return false; - SetBitmapLabel(bitmap); + if ( bitmap.IsOk() ) + SetBitmapLabel(bitmap); if ( !size.IsFullySpecified() ) { @@ -92,54 +93,4 @@ bool wxBitmapButton::Create(wxWindow *parent, return true; } -void wxBitmapButton::DoSetBitmap(const wxBitmap& bitmap, State which) -{ - if ( bitmap.IsOk() ) - { - switch ( which ) - { -#if wxUSE_IMAGE - case State_Normal: - if ( !HasFlag(wxBU_AUTODRAW) && !m_disabledSetByUser ) - { - wxImage img(bitmap.ConvertToImage().ConvertToGreyscale()); - wxBitmapButtonBase::DoSetBitmap(img, State_Disabled); - } - break; -#endif // wxUSE_IMAGE - - case State_Focused: - // if the focus bitmap is specified but current one isn't, use - // the focus bitmap for hovering as well if this is consistent - // with the current Windows version look and feel - // - // rationale: this is compatible with the old wxGTK behaviour - // and also makes it much easier to do "the right thing" for - // all platforms (some of them, such as Windows XP, have "hot" - // buttons while others don't) - if ( !m_hoverSetByUser ) - wxBitmapButtonBase::DoSetBitmap(bitmap, State_Current); - break; - - case State_Current: - // don't overwrite it with the focused bitmap - m_hoverSetByUser = true; - break; - - case State_Disabled: - // don't overwrite it with the version automatically created - // from the normal one - m_disabledSetByUser = true; - break; - - default: - // nothing special to do but include the default clause to - // suppress gcc warnings - ; - } - } - - wxBitmapButtonBase::DoSetBitmap(bitmap, which); -} - #endif // wxUSE_BMPBUTTON diff --git a/Externals/wxWidgets3/src/msw/bmpcbox.cpp b/Externals/wxWidgets3/src/msw/bmpcbox.cpp index 37fbfc70b8..ef7deffc98 100644 --- a/Externals/wxWidgets3/src/msw/bmpcbox.cpp +++ b/Externals/wxWidgets3/src/msw/bmpcbox.cpp @@ -3,7 +3,7 @@ // Purpose: wxBitmapComboBox // Author: Jaakko Salli // Created: 2008-04-06 -// RCS-ID: $Id: bmpcbox.cpp 67254 2011-03-20 00:14:35Z DS $ +// RCS-ID: $Id: bmpcbox.cpp 70039 2011-12-17 23:52:43Z VZ $ // Copyright: (c) 2008 Jaakko Salli // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -257,6 +257,16 @@ int wxBitmapComboBox::Insert(const wxString& item, return n; } +int wxBitmapComboBox::Insert(const wxString& item, const wxBitmap& bitmap, + unsigned int pos, void *clientData) +{ + OnAddBitmap(bitmap); + const int n = wxComboBox::Insert(item, pos, clientData); + if ( n != wxNOT_FOUND ) + DoSetItemBitmap(n, bitmap); + return n; +} + int wxBitmapComboBox::Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos, wxClientData *clientData) { diff --git a/Externals/wxWidgets3/src/msw/brush.cpp b/Externals/wxWidgets3/src/msw/brush.cpp index 795a7a773e..a4300be424 100644 --- a/Externals/wxWidgets3/src/msw/brush.cpp +++ b/Externals/wxWidgets3/src/msw/brush.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: brush.cpp 61508 2009-07-23 20:30:22Z VZ $ +// RCS-ID: $Id: brush.cpp 67681 2011-05-03 16:29:04Z DS $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -277,28 +277,28 @@ wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const wxColour wxBrush::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") ); return M_BRUSHDATA->GetColour(); } wxBrushStyle wxBrush::GetStyle() const { - wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); return M_BRUSHDATA->GetStyle(); } wxBitmap *wxBrush::GetStipple() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") ); return M_BRUSHDATA->GetStipple(); } WXHANDLE wxBrush::GetResourceHandle() const { - wxCHECK_MSG( Ok(), FALSE, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), FALSE, wxT("invalid brush") ); return (WXHANDLE)M_BRUSHDATA->GetHBRUSH(); } diff --git a/Externals/wxWidgets3/src/msw/button.cpp b/Externals/wxWidgets3/src/msw/button.cpp index fa3bc61418..cdf3a823d8 100644 --- a/Externals/wxWidgets3/src/msw/button.cpp +++ b/Externals/wxWidgets3/src/msw/button.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: button.cpp 67284 2011-03-22 17:15:34Z VZ $ +// RCS-ID: $Id: button.cpp 69984 2011-12-11 17:03:56Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -52,402 +52,24 @@ #include "wx/generic/private/markuptext.h" #endif // wxUSE_MARKUP -using namespace wxMSWImpl; - -#if wxUSE_UXTHEME - #include "wx/msw/uxtheme.h" - - // no need to include tmschema.h - #ifndef BP_PUSHBUTTON - #define BP_PUSHBUTTON 1 - - #define PBS_NORMAL 1 - #define PBS_HOT 2 - #define PBS_PRESSED 3 - #define PBS_DISABLED 4 - #define PBS_DEFAULTED 5 - - #define TMT_CONTENTMARGINS 3602 - #endif - - // provide the necessary declarations ourselves if they're missing from - // headers - #ifndef BCM_SETIMAGELIST - #define BCM_SETIMAGELIST 0x1602 - #define BCM_SETTEXTMARGIN 0x1604 - - enum - { - BUTTON_IMAGELIST_ALIGN_LEFT, - BUTTON_IMAGELIST_ALIGN_RIGHT, - BUTTON_IMAGELIST_ALIGN_TOP, - BUTTON_IMAGELIST_ALIGN_BOTTOM - }; - - struct BUTTON_IMAGELIST - { - HIMAGELIST himl; - RECT margin; - UINT uAlign; - }; - #endif -#endif // wxUSE_UXTHEME - -#ifndef WM_THEMECHANGED - #define WM_THEMECHANGED 0x031A -#endif - -#ifndef ODS_NOACCEL - #define ODS_NOACCEL 0x0100 -#endif - -#ifndef ODS_NOFOCUSRECT - #define ODS_NOFOCUSRECT 0x0200 -#endif - -#ifndef DT_HIDEPREFIX - #define DT_HIDEPREFIX 0x00100000 -#endif - // set the value for BCM_SETSHIELD (for the UAC shield) if it's not defined in // the header #ifndef BCM_SETSHIELD #define BCM_SETSHIELD 0x160c #endif -#if wxUSE_UXTHEME -extern wxWindowMSW *wxWindowBeingErased; // From src/msw/window.cpp -#endif // wxUSE_UXTHEME - -// ---------------------------------------------------------------------------- -// button image data -// ---------------------------------------------------------------------------- - -// we use different data classes for owner drawn buttons and for themed XP ones - -class wxButtonImageData -{ -public: - wxButtonImageData() { } - virtual ~wxButtonImageData() { } - - virtual wxBitmap GetBitmap(wxButton::State which) const = 0; - virtual void SetBitmap(const wxBitmap& bitmap, wxButton::State which) = 0; - - virtual wxSize GetBitmapMargins() const = 0; - virtual void SetBitmapMargins(wxCoord x, wxCoord y) = 0; - - virtual wxDirection GetBitmapPosition() const = 0; - virtual void SetBitmapPosition(wxDirection dir) = 0; - -private: - wxDECLARE_NO_COPY_CLASS(wxButtonImageData); -}; - -namespace -{ - -// the gap between button edge and the interior area used by Windows for the -// standard buttons -const int OD_BUTTON_MARGIN = 4; - -class wxODButtonImageData : public wxButtonImageData -{ -public: - wxODButtonImageData(wxButton *btn, const wxBitmap& bitmap) - { - SetBitmap(bitmap, wxButton::State_Normal); - SetBitmap(bitmap.ConvertToDisabled(), wxButton::State_Disabled); - - m_dir = wxLEFT; - - // we use margins when we have both bitmap and text, but when we have - // only the bitmap it should take up the entire button area - if ( btn->ShowsLabel() ) - { - m_margin.x = btn->GetCharWidth(); - m_margin.y = btn->GetCharHeight() / 2; - } - } - - virtual wxBitmap GetBitmap(wxButton::State which) const - { - return m_bitmaps[which]; - } - - virtual void SetBitmap(const wxBitmap& bitmap, wxButton::State which) - { - m_bitmaps[which] = bitmap; - } - - virtual wxSize GetBitmapMargins() const - { - return m_margin; - } - - virtual void SetBitmapMargins(wxCoord x, wxCoord y) - { - m_margin = wxSize(x, y); - } - - virtual wxDirection GetBitmapPosition() const - { - return m_dir; - } - - virtual void SetBitmapPosition(wxDirection dir) - { - m_dir = dir; - } - -private: - // just store the values passed to us to be able to retrieve them later - // from the drawing code - wxBitmap m_bitmaps[wxButton::State_Max]; - wxSize m_margin; - wxDirection m_dir; - - wxDECLARE_NO_COPY_CLASS(wxODButtonImageData); -}; - -#if wxUSE_UXTHEME - -// somehow the margin is one pixel greater than the value returned by -// GetThemeMargins() call -const int XP_BUTTON_EXTRA_MARGIN = 1; - -class wxXPButtonImageData : public wxButtonImageData -{ -public: - // we must be constructed with the size of our images as we need to create - // the image list - wxXPButtonImageData(wxButton *btn, const wxBitmap& bitmap) - : m_iml(bitmap.GetWidth(), bitmap.GetHeight(), true /* use mask */, - wxButton::State_Max), - m_hwndBtn(GetHwndOf(btn)) - { - // initialize all bitmaps except for the disabled one to normal state - for ( int n = 0; n < wxButton::State_Max; n++ ) - { - m_iml.Add(n == wxButton::State_Disabled ? bitmap.ConvertToDisabled() - : bitmap); - } - - m_data.himl = GetHimagelistOf(&m_iml); - - // no margins by default - m_data.margin.left = - m_data.margin.right = - m_data.margin.top = - m_data.margin.bottom = 0; - - // use default alignment - m_data.uAlign = BUTTON_IMAGELIST_ALIGN_LEFT; - - UpdateImageInfo(); - } - - virtual wxBitmap GetBitmap(wxButton::State which) const - { - return m_iml.GetBitmap(which); - } - - virtual void SetBitmap(const wxBitmap& bitmap, wxButton::State which) - { - m_iml.Replace(which, bitmap); - - UpdateImageInfo(); - } - - virtual wxSize GetBitmapMargins() const - { - return wxSize(m_data.margin.left, m_data.margin.top); - } - - virtual void SetBitmapMargins(wxCoord x, wxCoord y) - { - RECT& margin = m_data.margin; - margin.left = - margin.right = x; - margin.top = - margin.bottom = y; - - if ( !::SendMessage(m_hwndBtn, BCM_SETTEXTMARGIN, 0, (LPARAM)&margin) ) - { - wxLogDebug("SendMessage(BCM_SETTEXTMARGIN) failed"); - } - } - - virtual wxDirection GetBitmapPosition() const - { - switch ( m_data.uAlign ) - { - default: - wxFAIL_MSG( "invalid image alignment" ); - // fall through - - case BUTTON_IMAGELIST_ALIGN_LEFT: - return wxLEFT; - - case BUTTON_IMAGELIST_ALIGN_RIGHT: - return wxRIGHT; - - case BUTTON_IMAGELIST_ALIGN_TOP: - return wxTOP; - - case BUTTON_IMAGELIST_ALIGN_BOTTOM: - return wxBOTTOM; - } - } - - virtual void SetBitmapPosition(wxDirection dir) - { - UINT alignNew; - switch ( dir ) - { - default: - wxFAIL_MSG( "invalid direction" ); - // fall through - - case wxLEFT: - alignNew = BUTTON_IMAGELIST_ALIGN_LEFT; - break; - - case wxRIGHT: - alignNew = BUTTON_IMAGELIST_ALIGN_RIGHT; - break; - - case wxTOP: - alignNew = BUTTON_IMAGELIST_ALIGN_TOP; - break; - - case wxBOTTOM: - alignNew = BUTTON_IMAGELIST_ALIGN_BOTTOM; - break; - } - - if ( alignNew != m_data.uAlign ) - { - m_data.uAlign = alignNew; - UpdateImageInfo(); - } - } - -private: - void UpdateImageInfo() - { - if ( !::SendMessage(m_hwndBtn, BCM_SETIMAGELIST, 0, (LPARAM)&m_data) ) - { - wxLogDebug("SendMessage(BCM_SETIMAGELIST) failed"); - } - } - - // we store image list separately to be able to use convenient wxImageList - // methods instead of working with raw HIMAGELIST - wxImageList m_iml; - - // store the rest of the data in BCM_SETIMAGELIST-friendly form - BUTTON_IMAGELIST m_data; - - // the button we're associated with - const HWND m_hwndBtn; - - - wxDECLARE_NO_COPY_CLASS(wxXPButtonImageData); -}; - -#endif // wxUSE_UXTHEME - -} // anonymous namespace - // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- +BEGIN_EVENT_TABLE(wxButton, wxButtonBase) + EVT_CHAR_HOOK(wxButton::OnCharHook) +END_EVENT_TABLE() + // ============================================================================ // implementation // ============================================================================ -// ---------------------------------------------------------------------------- -// helper functions from wx/msw/private/button.h -// ---------------------------------------------------------------------------- - -void wxMSWButton::UpdateMultilineStyle(HWND hwnd, const wxString& label) -{ - // update BS_MULTILINE style depending on the new label (resetting it - // doesn't seem to do anything very useful but it shouldn't hurt and we do - // have to set it whenever the label becomes multi line as otherwise it - // wouldn't be shown correctly as we don't use BS_MULTILINE when creating - // the control unless it already has new lines in its label) - long styleOld = ::GetWindowLong(hwnd, GWL_STYLE), - styleNew; - if ( label.find(wxT('\n')) != wxString::npos ) - styleNew = styleOld | BS_MULTILINE; - else - styleNew = styleOld & ~BS_MULTILINE; - - if ( styleNew != styleOld ) - ::SetWindowLong(hwnd, GWL_STYLE, styleNew); -} - -wxSize wxMSWButton::GetFittingSize(wxWindow *win, - const wxSize& sizeLabel, - int flags) -{ - // FIXME: this is pure guesswork, need to retrieve the real button margins - wxSize sizeBtn = sizeLabel; - - sizeBtn.x += 3*win->GetCharWidth(); - sizeBtn.y += win->GetCharHeight()/2; - - // account for the shield UAC icon if we have it - if ( flags & Size_AuthNeeded ) - sizeBtn.x += wxSystemSettings::GetMetric(wxSYS_SMALLICON_X); - - return sizeBtn; -} - -wxSize wxMSWButton::ComputeBestFittingSize(wxControl *btn, int flags) -{ - wxClientDC dc(btn); - - wxSize sizeBtn; - dc.GetMultiLineTextExtent(btn->GetLabelText(), &sizeBtn.x, &sizeBtn.y); - - return GetFittingSize(btn, sizeBtn, flags); -} - -wxSize wxMSWButton::IncreaseToStdSizeAndCache(wxControl *btn, const wxSize& size) -{ - wxSize sizeBtn(size); - - // All buttons have at least the standard height and, unless the user - // explicitly wants them to be as small as possible and used wxBU_EXACTFIT - // style to indicate this, of at least the standard width too. - // - // Notice that we really want to make all buttons equally high, otherwise - // they look ugly and the existing code using wxBU_EXACTFIT only uses it to - // control width and not height. - - // The 50x14 button size is documented in the "Recommended sizing and - // spacing" section of MSDN layout article. - // - // Note that we intentionally don't use GetDefaultSize() here, because - // it's inexact -- dialog units depend on this dialog's font. - const wxSize sizeDef = btn->ConvertDialogToPixels(wxSize(50, 14)); - if ( !btn->HasFlag(wxBU_EXACTFIT) ) - { - if ( sizeBtn.x < sizeDef.x ) - sizeBtn.x = sizeDef.x; - } - if ( sizeBtn.y < sizeDef.y ) - sizeBtn.y = sizeDef.y; - - btn->CacheBestSize(sizeBtn); - - return sizeBtn; -} - // ---------------------------------------------------------------------------- // creation/destruction // ---------------------------------------------------------------------------- @@ -498,11 +120,6 @@ wxButton::~wxButton() { UnsetTmpDefault(); } - - delete m_imageData; -#if wxUSE_MARKUP - delete m_markupText; -#endif // wxUSE_MARKUP } // ---------------------------------------------------------------------------- @@ -518,7 +135,7 @@ WXDWORD wxButton::MSWGetStyle(long style, WXDWORD *exstyle) const ); // we must use WS_CLIPSIBLINGS with the buttons or they would draw over - // each other in any resizeable dialog which has more than one button in + // each other in any resizable dialog which has more than one button in // the bottom msStyle |= WS_CLIPSIBLINGS; @@ -541,132 +158,6 @@ WXDWORD wxButton::MSWGetStyle(long style, WXDWORD *exstyle) const return msStyle; } -void wxButton::SetLabel(const wxString& label) -{ - wxMSWButton::UpdateMultilineStyle(GetHwnd(), label); - - wxButtonBase::SetLabel(label); - -#if wxUSE_MARKUP - // If we have a plain text label, we shouldn't be using markup any longer. - if ( m_markupText ) - { - delete m_markupText; - m_markupText = NULL; - - // Unfortunately we don't really know whether we can reset the button - // to be non-owner-drawn or not: if we had made it owner-drawn just - // because of a call to SetLabelMarkup(), we could, but not if there - // were [also] calls to Set{Fore,Back}groundColour(). If it's really a - // problem to have button remain owner-drawn forever just because it - // had markup label once, we should record the reason for our current - // owner-drawnness and check it here. - } -#endif // wxUSE_MARKUP -} - -// ---------------------------------------------------------------------------- -// size management including autosizing -// ---------------------------------------------------------------------------- - -void wxButton::AdjustForBitmapSize(wxSize &size) const -{ - wxCHECK_RET( m_imageData, wxT("shouldn't be called if no image") ); - - // account for the bitmap size - const wxSize sizeBmp = m_imageData->GetBitmap(State_Normal).GetSize(); - const wxDirection dirBmp = m_imageData->GetBitmapPosition(); - if ( dirBmp == wxLEFT || dirBmp == wxRIGHT ) - { - size.x += sizeBmp.x; - if ( sizeBmp.y > size.y ) - size.y = sizeBmp.y; - } - else // bitmap on top/below the text - { - size.y += sizeBmp.y; - if ( sizeBmp.x > size.x ) - size.x = sizeBmp.x; - } - - // account for the user-specified margins - size += 2*m_imageData->GetBitmapMargins(); - - // and also for the margins we always add internally (unless we have no - // border at all in which case the button has exactly the same size as - // bitmap and so no margins should be used) - if ( !HasFlag(wxBORDER_NONE) ) - { - int marginH = 0, - marginV = 0; -#if wxUSE_UXTHEME - if ( wxUxThemeEngine::GetIfActive() ) - { - wxUxThemeHandle theme(const_cast(this), L"BUTTON"); - - MARGINS margins; - wxUxThemeEngine::Get()->GetThemeMargins(theme, NULL, - BP_PUSHBUTTON, - PBS_NORMAL, - TMT_CONTENTMARGINS, - NULL, - &margins); - - // XP doesn't draw themed buttons correctly when the client - // area is smaller than 8x8 - enforce this minimum size for - // small bitmaps - size.IncTo(wxSize(8, 8)); - - marginH = margins.cxLeftWidth + margins.cxRightWidth - + 2*XP_BUTTON_EXTRA_MARGIN; - marginV = margins.cyTopHeight + margins.cyBottomHeight - + 2*XP_BUTTON_EXTRA_MARGIN; - } - else -#endif // wxUSE_UXTHEME - { - marginH = - marginV = OD_BUTTON_MARGIN; - } - - size.IncBy(marginH, marginV); - } -} - -wxSize wxButton::DoGetBestSize() const -{ - wxButton * const self = const_cast(this); - - wxSize size; - - // Account for the text part if we have it. - if ( ShowsLabel() ) - { - int flags = 0; - if ( GetAuthNeeded() ) - flags |= wxMSWButton::Size_AuthNeeded; - -#if wxUSE_MARKUP - if ( m_markupText ) - { - wxClientDC dc(self); - size = wxMSWButton::GetFittingSize(self, - m_markupText->Measure(dc), - flags); - } - else // Normal plain text (but possibly multiline) label. -#endif // wxUSE_MARKUP - { - size = wxMSWButton::ComputeBestFittingSize(self, flags); - } - } - - if ( m_imageData ) - AdjustForBitmapSize(size); - - return wxMSWButton::IncreaseToStdSizeAndCache(self, size); -} - /* static */ wxSize wxButtonBase::GetDefaultSize() { @@ -883,6 +374,25 @@ void wxButton::Command(wxCommandEvent & event) // event/message handlers // ---------------------------------------------------------------------------- +void wxButton::OnCharHook(wxKeyEvent& event) +{ + // We want to ensure that the button always processes Enter key events + // itself, even if it's inside some control that normally takes over them + // (this happens when the button is part of an in-place editor control for + // example). + if ( event.GetKeyCode() == WXK_RETURN ) + { + // We should ensure that subsequent key events are still generated even + // if we did handle EVT_CHAR_HOOK (normally this would suppress their + // generation). + event.DoAllowNextEvent(); + } + else + { + event.Skip(); + } +} + bool wxButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { bool processed = false; @@ -922,44 +432,9 @@ WXLRESULT wxButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { UnsetTmpDefault(); } - else if ( nMsg == WM_LBUTTONDBLCLK ) - { - // emulate a click event to force an owner-drawn button to change its - // appearance - without this, it won't do it - (void)wxControl::MSWWindowProc(WM_LBUTTONDOWN, wParam, lParam); - - // and continue with processing the message normally as well - } -#if wxUSE_UXTHEME - else if ( nMsg == WM_THEMECHANGED ) - { - // need to recalculate the best size here - // as the theme size might have changed - InvalidateBestSize(); - } -#endif // wxUSE_UXTHEME - // must use m_mouseInWindow here instead of IsMouseInWindow() - // since we need to know the first time the mouse enters the window - // and IsMouseInWindow() would return true in this case - else if ( (nMsg == WM_MOUSEMOVE && !m_mouseInWindow) || - nMsg == WM_MOUSELEAVE ) - { - if ( - IsEnabled() && - ( -#if wxUSE_UXTHEME - wxUxThemeEngine::GetIfActive() || -#endif // wxUSE_UXTHEME - (m_imageData && m_imageData->GetBitmap(State_Current).IsOk()) - ) - ) - { - Refresh(); - } - } // let the base class do all real processing - return wxControl::MSWWindowProc(nMsg, wParam, lParam); + return wxAnyButton::MSWWindowProc(nMsg, wParam, lParam); } // ---------------------------------------------------------------------------- @@ -982,586 +457,5 @@ void wxButton::DoSetAuthNeeded(bool show) } } -// ---------------------------------------------------------------------------- -// button images -// ---------------------------------------------------------------------------- - -wxBitmap wxButton::DoGetBitmap(State which) const -{ - return m_imageData ? m_imageData->GetBitmap(which) : wxBitmap(); -} - -void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which) -{ -#if wxUSE_UXTHEME - wxXPButtonImageData *oldData = NULL; -#endif // wxUSE_UXTHEME - - // Check if we already had bitmaps of different size. - if ( m_imageData && - bitmap.GetSize() != m_imageData->GetBitmap(State_Normal).GetSize() ) - { - wxASSERT_MSG( which == State_Normal, - "Must set normal bitmap with the new size first" ); - -#if wxUSE_UXTHEME - if ( ShowsLabel() && wxUxThemeEngine::GetIfActive() ) - { - // We can't change the size of the images stored in wxImageList - // in wxXPButtonImageData::m_iml so force recreating it below but - // keep the current data to copy its values into the new one. - oldData = static_cast(m_imageData); - m_imageData = NULL; - } -#endif // wxUSE_UXTHEME - //else: wxODButtonImageData doesn't require anything special - } - - // allocate the image data when the first bitmap is set - if ( !m_imageData ) - { -#if wxUSE_UXTHEME - // using image list doesn't work correctly if we don't have any label - // (even if we use BUTTON_IMAGELIST_ALIGN_CENTER alignment and - // BS_BITMAP style), at least under Windows 2003 so use owner drawn - // strategy for bitmap-only buttons - if ( ShowsLabel() && wxUxThemeEngine::GetIfActive() ) - { - m_imageData = new wxXPButtonImageData(this, bitmap); - - if ( oldData ) - { - // Preserve the old values in case the user changed them. - m_imageData->SetBitmapPosition(oldData->GetBitmapPosition()); - - const wxSize oldMargins = oldData->GetBitmapMargins(); - m_imageData->SetBitmapMargins(oldMargins.x, oldMargins.y); - - // No need to preserve the bitmaps though as they were of wrong - // size anyhow. - - delete oldData; - } - } - else -#endif // wxUSE_UXTHEME - { - m_imageData = new wxODButtonImageData(this, bitmap); - MakeOwnerDrawn(); - } - } - else - { - m_imageData->SetBitmap(bitmap, which); - } - - // it should be enough to only invalidate the best size when the normal - // bitmap changes as all bitmaps assigned to the button should be of the - // same size anyhow - if ( which == State_Normal ) - InvalidateBestSize(); - - Refresh(); -} - -wxSize wxButton::DoGetBitmapMargins() const -{ - return m_imageData ? m_imageData->GetBitmapMargins() : wxSize(0, 0); -} - -void wxButton::DoSetBitmapMargins(wxCoord x, wxCoord y) -{ - wxCHECK_RET( m_imageData, "SetBitmap() must be called first" ); - - m_imageData->SetBitmapMargins(x, y); - InvalidateBestSize(); -} - -void wxButton::DoSetBitmapPosition(wxDirection dir) -{ - wxCHECK_RET( m_imageData, "SetBitmap() must be called first" ); - - m_imageData->SetBitmapPosition(dir); - InvalidateBestSize(); -} - -// ---------------------------------------------------------------------------- -// markup support -// ---------------------------------------------------------------------------- - -#if wxUSE_MARKUP - -bool wxButton::DoSetLabelMarkup(const wxString& markup) -{ - if ( !wxButtonBase::DoSetLabelMarkup(markup) ) - return false; - - if ( !m_markupText ) - { - m_markupText = new wxMarkupText(markup); - MakeOwnerDrawn(); - } - else - { - // We are already owner-drawn so just update the text. - m_markupText->SetMarkup(markup); - } - - Refresh(); - - return true; -} - -#endif // wxUSE_MARKUP - -// ---------------------------------------------------------------------------- -// owner-drawn buttons support -// ---------------------------------------------------------------------------- - -// drawing helpers -namespace -{ - -// return the button state using both the ODS_XXX flags specified in state -// parameter and the current button state -wxButton::State GetButtonState(wxButton *btn, UINT state) -{ - if ( state & ODS_DISABLED ) - return wxButton::State_Disabled; - - if ( state & ODS_SELECTED ) - return wxButton::State_Pressed; - - if ( btn->HasCapture() || btn->IsMouseInWindow() ) - return wxButton::State_Current; - - if ( state & ODS_FOCUS ) - return wxButton::State_Focused; - - return wxButton::State_Normal; -} - -void DrawButtonText(HDC hdc, - RECT *pRect, - wxButton *btn, - int flags) -{ - const wxString text = btn->GetLabel(); - - if ( text.find(wxT('\n')) != wxString::npos ) - { - // draw multiline label - - // center text horizontally in any case - flags |= DT_CENTER; - - // first we need to compute its bounding rect - RECT rc; - ::CopyRect(&rc, pRect); - ::DrawText(hdc, text.wx_str(), text.length(), &rc, - DT_CENTER | DT_CALCRECT); - - // now center this rect inside the entire button area - const LONG w = rc.right - rc.left; - const LONG h = rc.bottom - rc.top; - rc.left = (pRect->right - pRect->left)/2 - w/2; - rc.right = rc.left+w; - rc.top = (pRect->bottom - pRect->top)/2 - h/2; - rc.bottom = rc.top+h; - - ::DrawText(hdc, text.wx_str(), text.length(), &rc, flags); - } - else // single line label - { - // translate wx button flags to alignment flags for DrawText() - if ( btn->HasFlag(wxBU_RIGHT) ) - { - flags |= DT_RIGHT; - } - else if ( !btn->HasFlag(wxBU_LEFT) ) - { - flags |= DT_CENTER; - } - //else: DT_LEFT is the default anyhow (and its value is 0 too) - - if ( btn->HasFlag(wxBU_BOTTOM) ) - { - flags |= DT_BOTTOM; - } - else if ( !btn->HasFlag(wxBU_TOP) ) - { - flags |= DT_VCENTER; - } - //else: as above, DT_TOP is the default - - // notice that we must have DT_SINGLELINE for vertical alignment flags - // to work - ::DrawText(hdc, text.wx_str(), text.length(), pRect, - flags | DT_SINGLELINE ); - } -} - -void DrawRect(HDC hdc, const RECT& r) -{ - wxDrawLine(hdc, r.left, r.top, r.right, r.top); - wxDrawLine(hdc, r.right, r.top, r.right, r.bottom); - wxDrawLine(hdc, r.right, r.bottom, r.left, r.bottom); - wxDrawLine(hdc, r.left, r.bottom, r.left, r.top); -} - -/* - The button frame looks like this normally: - - WWWWWWWWWWWWWWWWWWB - WHHHHHHHHHHHHHHHHGB W = white (HILIGHT) - WH GB H = light grey (LIGHT) - WH GB G = dark grey (SHADOW) - WH GB B = black (DKSHADOW) - WH GB - WGGGGGGGGGGGGGGGGGB - BBBBBBBBBBBBBBBBBBB - - When the button is selected, the button becomes like this (the total button - size doesn't change): - - BBBBBBBBBBBBBBBBBBB - BWWWWWWWWWWWWWWWWBB - BWHHHHHHHHHHHHHHGBB - BWH GBB - BWH GBB - BWGGGGGGGGGGGGGGGBB - BBBBBBBBBBBBBBBBBBB - BBBBBBBBBBBBBBBBBBB - - When the button is pushed (while selected) it is like: - - BBBBBBBBBBBBBBBBBBB - BGGGGGGGGGGGGGGGGGB - BG GB - BG GB - BG GB - BG GB - BGGGGGGGGGGGGGGGGGB - BBBBBBBBBBBBBBBBBBB -*/ -void DrawButtonFrame(HDC hdc, RECT& rectBtn, - bool selected, bool pushed) -{ - RECT r; - CopyRect(&r, &rectBtn); - - AutoHPEN hpenBlack(GetSysColor(COLOR_3DDKSHADOW)), - hpenGrey(GetSysColor(COLOR_3DSHADOW)), - hpenLightGr(GetSysColor(COLOR_3DLIGHT)), - hpenWhite(GetSysColor(COLOR_3DHILIGHT)); - - SelectInHDC selectPen(hdc, hpenBlack); - - r.right--; - r.bottom--; - - if ( pushed ) - { - DrawRect(hdc, r); - - (void)SelectObject(hdc, hpenGrey); - ::InflateRect(&r, -1, -1); - - DrawRect(hdc, r); - } - else // !pushed - { - if ( selected ) - { - DrawRect(hdc, r); - - ::InflateRect(&r, -1, -1); - } - - wxDrawLine(hdc, r.left, r.bottom, r.right, r.bottom); - wxDrawLine(hdc, r.right, r.bottom, r.right, r.top - 1); - - (void)SelectObject(hdc, hpenWhite); - wxDrawLine(hdc, r.left, r.bottom - 1, r.left, r.top); - wxDrawLine(hdc, r.left, r.top, r.right, r.top); - - (void)SelectObject(hdc, hpenLightGr); - wxDrawLine(hdc, r.left + 1, r.bottom - 2, r.left + 1, r.top + 1); - wxDrawLine(hdc, r.left + 1, r.top + 1, r.right - 1, r.top + 1); - - (void)SelectObject(hdc, hpenGrey); - wxDrawLine(hdc, r.left + 1, r.bottom - 1, r.right - 1, r.bottom - 1); - wxDrawLine(hdc, r.right - 1, r.bottom - 1, r.right - 1, r.top); - } - - InflateRect(&rectBtn, -OD_BUTTON_MARGIN, -OD_BUTTON_MARGIN); -} - -#if wxUSE_UXTHEME -void DrawXPBackground(wxButton *button, HDC hdc, RECT& rectBtn, UINT state) -{ - wxUxThemeHandle theme(button, L"BUTTON"); - - // this array is indexed by wxButton::State values and so must be kept in - // sync with it - static const int uxStates[] = - { - PBS_NORMAL, PBS_HOT, PBS_PRESSED, PBS_DISABLED, PBS_DEFAULTED - }; - - int iState = uxStates[GetButtonState(button, state)]; - - wxUxThemeEngine * const engine = wxUxThemeEngine::Get(); - - // draw parent background if needed - if ( engine->IsThemeBackgroundPartiallyTransparent - ( - theme, - BP_PUSHBUTTON, - iState - ) ) - { - // Set this button as the one whose background is being erased: this - // allows our WM_ERASEBKGND handler used by DrawThemeParentBackground() - // to correctly align the background brush with this window instead of - // the parent window to which WM_ERASEBKGND is sent. Notice that this - // doesn't work with custom user-defined EVT_ERASE_BACKGROUND handlers - // as they won't be aligned but unfortunately all the attempts to fix - // it by shifting DC origin before calling DrawThemeParentBackground() - // failed to work so we at least do this, even though this is far from - // being the perfect solution. - wxWindowBeingErased = button; - - engine->DrawThemeParentBackground(GetHwndOf(button), hdc, &rectBtn); - - wxWindowBeingErased = NULL; - } - - // draw background - engine->DrawThemeBackground(theme, hdc, BP_PUSHBUTTON, iState, - &rectBtn, NULL); - - // calculate content area margins - MARGINS margins; - engine->GetThemeMargins(theme, hdc, BP_PUSHBUTTON, iState, - TMT_CONTENTMARGINS, &rectBtn, &margins); - ::InflateRect(&rectBtn, -margins.cxLeftWidth, -margins.cyTopHeight); - ::InflateRect(&rectBtn, -XP_BUTTON_EXTRA_MARGIN, -XP_BUTTON_EXTRA_MARGIN); - - if ( button->UseBgCol() ) - { - COLORREF colBg = wxColourToRGB(button->GetBackgroundColour()); - AutoHBRUSH hbrushBackground(colBg); - - // don't overwrite the focus rect - RECT rectClient; - ::CopyRect(&rectClient, &rectBtn); - ::InflateRect(&rectClient, -1, -1); - FillRect(hdc, &rectClient, hbrushBackground); - } -} -#endif // wxUSE_UXTHEME - -} // anonymous namespace - -// ---------------------------------------------------------------------------- -// owner drawn buttons support -// ---------------------------------------------------------------------------- - -void wxButton::MakeOwnerDrawn() -{ - long style = GetWindowLong(GetHwnd(), GWL_STYLE); - if ( (style & BS_OWNERDRAW) != BS_OWNERDRAW ) - { - // make it so - style |= BS_OWNERDRAW; - SetWindowLong(GetHwnd(), GWL_STYLE, style); - } -} - -bool wxButton::SetBackgroundColour(const wxColour &colour) -{ - if ( !wxControl::SetBackgroundColour(colour) ) - { - // nothing to do - return false; - } - - MakeOwnerDrawn(); - - Refresh(); - - return true; -} - -bool wxButton::SetForegroundColour(const wxColour &colour) -{ - if ( !wxControl::SetForegroundColour(colour) ) - { - // nothing to do - return false; - } - - MakeOwnerDrawn(); - - Refresh(); - - return true; -} - -bool wxButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis) -{ - LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT)wxdis; - HDC hdc = lpDIS->hDC; - - UINT state = lpDIS->itemState; - bool pushed = (SendMessage(GetHwnd(), BM_GETSTATE, 0, 0) & BST_PUSHED) != 0; - - RECT rectBtn; - CopyRect(&rectBtn, &lpDIS->rcItem); - - // draw the button background - if ( !HasFlag(wxBORDER_NONE) ) - { -#if wxUSE_UXTHEME - if ( wxUxThemeEngine::GetIfActive() ) - { - DrawXPBackground(this, hdc, rectBtn, state); - } - else -#endif // wxUSE_UXTHEME - { - COLORREF colBg = wxColourToRGB(GetBackgroundColour()); - - // first, draw the background - AutoHBRUSH hbrushBackground(colBg); - FillRect(hdc, &rectBtn, hbrushBackground); - - // draw the border for the current state - bool selected = (state & ODS_SELECTED) != 0; - if ( !selected ) - { - wxTopLevelWindow * - tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); - if ( tlw ) - { - selected = tlw->GetDefaultItem() == this; - } - } - - DrawButtonFrame(hdc, rectBtn, selected, pushed); - } - - // draw the focus rectangle if we need it - if ( (state & ODS_FOCUS) && !(state & ODS_NOFOCUSRECT) ) - { - DrawFocusRect(hdc, &rectBtn); - -#if wxUSE_UXTHEME - if ( !wxUxThemeEngine::GetIfActive() ) -#endif // wxUSE_UXTHEME - { - if ( pushed ) - { - // the label is shifted by 1 pixel to create "pushed" effect - OffsetRect(&rectBtn, 1, 1); - } - } - } - } - - - // draw the image, if any - if ( m_imageData ) - { - wxBitmap bmp = m_imageData->GetBitmap(GetButtonState(this, state)); - if ( !bmp.IsOk() ) - bmp = m_imageData->GetBitmap(State_Normal); - - const wxSize sizeBmp = bmp.GetSize(); - const wxSize margin = m_imageData->GetBitmapMargins(); - const wxSize sizeBmpWithMargins(sizeBmp + 2*margin); - wxRect rectButton(wxRectFromRECT(rectBtn)); - - // for simplicity, we start with centred rectangle and then move it to - // the appropriate edge - wxRect rectBitmap = wxRect(sizeBmp).CentreIn(rectButton); - - // move bitmap only if we have a label, otherwise keep it centered - if ( ShowsLabel() ) - { - switch ( m_imageData->GetBitmapPosition() ) - { - default: - wxFAIL_MSG( "invalid direction" ); - // fall through - - case wxLEFT: - rectBitmap.x = rectButton.x + margin.x; - rectButton.x += sizeBmpWithMargins.x; - rectButton.width -= sizeBmpWithMargins.x; - break; - - case wxRIGHT: - rectBitmap.x = rectButton.GetRight() - sizeBmp.x - margin.x; - rectButton.width -= sizeBmpWithMargins.x; - break; - - case wxTOP: - rectBitmap.y = rectButton.y + margin.y; - rectButton.y += sizeBmpWithMargins.y; - rectButton.height -= sizeBmpWithMargins.y; - break; - - case wxBOTTOM: - rectBitmap.y = rectButton.GetBottom() - sizeBmp.y - margin.y; - rectButton.height -= sizeBmpWithMargins.y; - break; - } - } - - wxDCTemp dst((WXHDC)hdc); - dst.DrawBitmap(bmp, rectBitmap.GetPosition(), true); - - wxCopyRectToRECT(rectButton, rectBtn); - } - - - // finally draw the label - if ( ShowsLabel() ) - { - COLORREF colFg = state & ODS_DISABLED - ? ::GetSysColor(COLOR_GRAYTEXT) - : wxColourToRGB(GetForegroundColour()); - - wxTextColoursChanger changeFg(hdc, colFg, CLR_INVALID); - wxBkModeChanger changeBkMode(hdc, wxBRUSHSTYLE_TRANSPARENT); - -#if wxUSE_MARKUP - if ( m_markupText ) - { - wxDCTemp dc((WXHDC)hdc); - dc.SetTextForeground(wxColour(colFg)); - dc.SetFont(GetFont()); - - m_markupText->Render(dc, wxRectFromRECT(rectBtn), - state & ODS_NOACCEL - ? wxMarkupText::Render_Default - : wxMarkupText::Render_ShowAccels); - } - else // Plain text label -#endif // wxUSE_MARKUP - { - // notice that DT_HIDEPREFIX doesn't work on old (pre-Windows 2000) - // systems but by happy coincidence ODS_NOACCEL is not used under - // them neither so DT_HIDEPREFIX should never be used there - DrawButtonText(hdc, &rectBtn, this, - state & ODS_NOACCEL ? DT_HIDEPREFIX : 0); - } - } - - return true; -} - #endif // wxUSE_BUTTON diff --git a/Externals/wxWidgets3/src/msw/calctrl.cpp b/Externals/wxWidgets3/src/msw/calctrl.cpp index ddbd321588..badc7e8821 100644 --- a/Externals/wxWidgets3/src/msw/calctrl.cpp +++ b/Externals/wxWidgets3/src/msw/calctrl.cpp @@ -3,7 +3,7 @@ // Purpose: wxCalendarCtrl implementation // Author: Vadim Zeitlin // Created: 2008-04-04 -// RCS-ID: $Id: calctrl.cpp 66558 2011-01-04 09:14:40Z SC $ +// RCS-ID: $Id: calctrl.cpp 70568 2012-02-11 16:26:47Z VZ $ // Copyright: (C) 2008 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -120,8 +120,8 @@ wxCalendarCtrl::Create(wxWindow *parent, SetDate(dt.IsValid() ? dt : wxDateTime::Today()); - if ( SetHolidayAttrs() ) - UpdateMarks(); + SetHolidayAttrs(); + UpdateMarks(); Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(wxCalendarCtrl::MSWOnClick)); @@ -396,10 +396,12 @@ void wxCalendarCtrl::SetHoliday(size_t day) void wxCalendarCtrl::UpdateMarks() { - // we show only one full month but there can be some days from the month - // before it and from the one after it so days from 3 different months can - // be partially shown - MONTHDAYSTATE states[3] = { 0 }; + // Currently the native control may show more than one month if its size is + // big enough. Ideal would be to prevent this from happening but there + // doesn't seem to be any obvious way to do it, so for now just handle the + // possibility that we can display several of them: one before the current + // one and up to 12 after it. + MONTHDAYSTATE states[14] = { 0 }; const DWORD nMonths = MonthCal_GetMonthRange(GetHwnd(), GMR_DAYSTATE, NULL); // although in principle the calendar might not show any days from the @@ -412,13 +414,9 @@ void wxCalendarCtrl::UpdateMarks() // in its window if you "zoom out" of it by double clicking on free areas // so the return value can be (much, in case of decades view) greater than // 3 but in this case marks are not visible anyhow so simply ignore it - if ( nMonths < WXSIZEOF(states) ) + if ( nMonths >= 2 && nMonths <= WXSIZEOF(states) ) { - wxFAIL_MSG("unexpectedly few months shown in the control"); - } - else if ( nMonths == WXSIZEOF(states) ) - { - // the fully visible month is the one in the middle + // The current, fully visible month is always the second one. states[1] = m_marks | m_holidays; if ( !MonthCal_SetDayState(GetHwnd(), nMonths, states) ) @@ -462,8 +460,8 @@ bool wxCalendarCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) { // month changed, need to update the holidays if we use // them - if ( SetHolidayAttrs() ) - UpdateMarks(); + SetHolidayAttrs(); + UpdateMarks(); } } } @@ -472,9 +470,24 @@ bool wxCalendarCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) case MCN_GETDAYSTATE: { const NMDAYSTATE * const ds = (NMDAYSTATE *)lParam; + + wxDateTime startDate; + startDate.SetFromMSWSysDate(ds->stStart); + + wxDateTime currentDate = m_date; + // Set to the start of month for comparison with startDate to + // work correctly. + currentDate.SetDay(1); + for ( int i = 0; i < ds->cDayState; i++ ) { - ds->prgDayState[i] = m_marks | m_holidays; + // set holiday/marks only for the "current" month + if ( startDate == currentDate ) + ds->prgDayState[i] = m_marks | m_holidays; + else + ds->prgDayState[i] = 0; + + startDate += wxDateSpan::Month(); } } break; diff --git a/Externals/wxWidgets3/src/msw/checkbox.cpp b/Externals/wxWidgets3/src/msw/checkbox.cpp index 064414e582..371dde59fa 100644 --- a/Externals/wxWidgets3/src/msw/checkbox.cpp +++ b/Externals/wxWidgets3/src/msw/checkbox.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: checkbox.cpp 66555 2011-01-04 08:31:53Z SC $ +// RCS-ID: $Id: checkbox.cpp 70015 2011-12-16 11:03:15Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -147,6 +147,19 @@ wxSize wxCheckBox::DoGetBestSize() const dc.GetMultiLineTextExtent(GetLabelText(str), &wCheckbox, &hCheckbox); wCheckbox += s_checkSize + GetCharWidth(); + if ( ::GetWindowLong(GetHwnd(), GWL_STYLE) & BS_MULTILINE ) + { + // We need to make the checkbox even wider in this case because + // otherwise it wraps lines automatically and not only on "\n"s as + // we need and this makes the size computed here wrong resulting in + // checkbox contents being truncated when it's actually displayed. + // Without this hack simple checkbox with "Some thing\n and more" + // label appears on 3 lines, not 2, under Windows 2003 using + // classic look and feel (although it works fine under Windows 7, + // with or without themes). + wCheckbox += s_checkSize; + } + if ( hCheckbox < s_checkSize ) hCheckbox = s_checkSize; } @@ -260,7 +273,7 @@ bool wxCheckBox::SetForegroundColour(const wxColour& colour) // the only way to change the checkbox foreground colour under Windows XP // is to owner draw it if ( wxUxThemeEngine::GetIfActive() ) - MakeOwnerDrawn(colour.Ok()); + MakeOwnerDrawn(colour.IsOk()); return true; } diff --git a/Externals/wxWidgets3/src/msw/choice.cpp b/Externals/wxWidgets3/src/msw/choice.cpp index eac398a30c..ce5c5510dc 100644 --- a/Externals/wxWidgets3/src/msw/choice.cpp +++ b/Externals/wxWidgets3/src/msw/choice.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: Vadim Zeitlin to derive from wxChoiceBase // Created: 04/01/98 -// RCS-ID: $Id: choice.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: choice.cpp 70870 2012-03-11 05:31:06Z JS $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -86,10 +86,7 @@ bool wxChoice::CreateAndInit(wxWindow *parent, // initialize the controls contents - for ( int i = 0; i < n; i++ ) - { - Append(choices[i]); - } + Append(n, choices); // and now we may finally size the control properly (if needed) SetInitialSize(size); @@ -358,6 +355,10 @@ void wxChoice::SetString(unsigned int n, const wxString& s) else if ( HasClientObjectData() ) oldObjData = GetClientObject(n); + // and also the selection if we're going to delete the item that was + // selected + const bool wasSelected = static_cast(n) == GetSelection(); + ::SendMessage(GetHwnd(), CB_DELETESTRING, n, 0); ::SendMessage(GetHwnd(), CB_INSERTSTRING, n, (LPARAM)s.wx_str() ); @@ -367,6 +368,11 @@ void wxChoice::SetString(unsigned int n, const wxString& s) else if ( oldObjData ) SetClientObject(n, oldObjData); + // and the selection + if ( wasSelected ) + SetSelection(n); + + // the width could have changed so the best size needs to be recomputed InvalidateBestSize(); } @@ -408,7 +414,7 @@ void wxChoice::DoSetItemClientData(unsigned int n, void* clientData) void* wxChoice::DoGetItemClientData(unsigned int n) const { LPARAM rc = SendMessage(GetHwnd(), CB_GETITEMDATA, n, 0); - if ( rc == CB_ERR ) + if ( rc == CB_ERR && GetLastError() != ERROR_SUCCESS ) { wxLogLastError(wxT("CB_GETITEMDATA")); @@ -544,7 +550,10 @@ void wxChoice::DoSetSize(int x, int y, const int hItem = SendMessage(GetHwnd(), CB_GETITEMHEIGHT, 0, 0); int heightWithItems = 0; if (!HasFlag(wxCB_SIMPLE)) - heightWithItems = height + hItem*nItems; + // The extra item (" + 1") is required to prevent a vertical + // scrollbar from appearing with comctl32.dll versions earlier + // than 6.0 (such as found in Win2k). + heightWithItems = height + hItem*(nItems + 1); else heightWithItems = SetHeightSimpleComboBox(nItems); @@ -749,7 +758,7 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) WXHBRUSH wxChoice::MSWControlColor(WXHDC hDC, WXHWND hWnd) { - if ( !IsEnabled() ) + if ( !IsThisEnabled() ) return MSWControlColorDisabled(hDC); return wxChoiceBase::MSWControlColor(hDC, hWnd); diff --git a/Externals/wxWidgets3/src/msw/clipbrd.cpp b/Externals/wxWidgets3/src/msw/clipbrd.cpp index e64b118fa3..d994fed669 100644 --- a/Externals/wxWidgets3/src/msw/clipbrd.cpp +++ b/Externals/wxWidgets3/src/msw/clipbrd.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: clipbrd.cpp 67280 2011-03-22 14:17:38Z DS $ +// RCS-ID: $Id: clipbrd.cpp 70440 2012-01-23 11:28:01Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -214,7 +214,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat, { wxBitmap *bitmap = (wxBitmap *)data; - if ( bitmap && bitmap->Ok() ) + if ( bitmap && bitmap->IsOk() ) { wxDIB dib(*bitmap); if ( dib.IsOk() ) @@ -332,19 +332,19 @@ bool wxSetClipboardData(wxDataFormat dataFormat, // string when you overwrite it so you follow up with code to replace // the 0 appended at the end with a '\r'... char *ptr = strstr(buf, "StartHTML"); - sprintf(ptr+10, "%08u", strstr(buf, "") - buf); + sprintf(ptr+10, "%08u", (unsigned)(strstr(buf, "") - buf)); *(ptr+10+8) = '\r'; ptr = strstr(buf, "EndHTML"); - sprintf(ptr+8, "%08u", strlen(buf)); + sprintf(ptr+8, "%08u", (unsigned)strlen(buf)); *(ptr+8+8) = '\r'; ptr = strstr(buf, "StartFragment"); - sprintf(ptr+14, "%08u", strstr(buf, "> Execute Command Address: 0x%08x (code: %x, device: %x) ", _Address, Command, DeviceID); + IWII_IPC_HLE_Device* pDevice = (DeviceID >= 0 && DeviceID < IPC_MAX_FDS) ? g_FdMap[DeviceID] : NULL; + + INFO_LOG(WII_IPC_HLE, "-->> Execute Command Address: 0x%08x (code: %x, device: %x) %p", _Address, Command, DeviceID, pDevice); switch (Command) { case COMMAND_OPEN_DEVICE: - { - // Create a new HLE device. The Mode and DeviceName is given to us but we - // generate a DeviceID to be used for access to this device until it is Closed. - std::string DeviceName; - Memory::GetString(DeviceName, Memory::Read_U32(_Address + 0xC)); + { + u32 Mode = Memory::Read_U32(_Address + 0x10); + DeviceID = getFreeDeviceId(); + + std::string DeviceName; + Memory::GetString(DeviceName, Memory::Read_U32(_Address + 0xC)); - u32 Mode = Memory::Read_U32(_Address + 0x10); - DeviceID = GetDeviceIDByName(DeviceName); - - // check if a device with this name has been created already - if (DeviceName.find("/dev/") == std::string::npos || DeviceID == -1) - { - if (DeviceName.find("/dev/") == 0) + + WARN_LOG(WII_IPC_HLE, "Tried to open %s as %d", DeviceName.c_str(), DeviceID); + if (DeviceID >= 0) + { + if (DeviceName.find("/dev/es") == 0) + { + u32 j; + for (j=0; jOpen(_Address, Mode); + Memory::Write_U32(DeviceID, _Address+4); + break; + } + } + if(j == ES_MAX_COUNT) + { + Memory::Write_U32(FS_EESEXHAUSTED, _Address + 4); + CmdSuccess = true; + } - pDevice = AccessDeviceByID(GetDeviceIDByName(std::string("_Unimplemented_Device_"))); + } + else if (DeviceName.find("/dev/") == 0) + { + pDevice = GetDeviceByName(DeviceName); + if (pDevice) + { + g_FdMap[DeviceID] = pDevice; CmdSuccess = pDevice->Open(_Address, Mode); + INFO_LOG(WII_IPC_FILEIO, "IOP: ReOpen (Device=%s, DeviceID=%08x, Mode=%i)", + pDevice->GetDeviceName().c_str(), DeviceID, Mode); + Memory::Write_U32(DeviceID, _Address+4); } else { - // create new file handle - u32 CurrentDeviceID = g_LastDeviceID; - pDevice = CreateFileIO(CurrentDeviceID, DeviceName); - g_DeviceMap[CurrentDeviceID] = pDevice; - g_FileNameMap[CurrentDeviceID] = DeviceName; - g_LastDeviceID++; - + WARN_LOG(WII_IPC_HLE, "Unimplemented device: %s", DeviceName.c_str()); + pDevice = GetDeviceByName(std::string("_Unimplemented_Device_")); CmdSuccess = pDevice->Open(_Address, Mode); - - INFO_LOG(WII_IPC_FILEIO, "IOP: Open File (Device=%s, ID=%08x, Mode=%i)", - pDevice->GetDeviceName().c_str(), CurrentDeviceID, Mode); + g_FdMap[DeviceID] = pDevice; + Memory::Write_U32(DeviceID, _Address+4); } - } - else - { - // F|RES: prolly the re-open is just a mode change - pDevice = AccessDeviceByID(DeviceID); + } + else + { + IWII_IPC_HLE_Device* pDevice = CreateFileIO(DeviceID, DeviceName); CmdSuccess = pDevice->Open(_Address, Mode); - INFO_LOG(WII_IPC_FILEIO, "IOP: ReOpen (Device=%s, DeviceID=%08x, Mode=%i)", - pDevice->GetDeviceName().c_str(), DeviceID, Mode); - } - } - break; + INFO_LOG(WII_IPC_FILEIO, "IOP: Open File (Device=%s, ID=%08x, Mode=%i)", + pDevice->GetDeviceName().c_str(), DeviceID, Mode); + if(Memory::Read_U32(_Address + 4) == DeviceID) + g_FdMap[DeviceID] = pDevice; + } + } + else + { + Memory::Write_U32(FS_EFDEXHAUSTED, _Address + 4); + CmdSuccess = true; + } + break; + } case COMMAND_CLOSE_DEVICE: - if (pDevice) + { + if (pDevice) { CmdSuccess = pDevice->Close(_Address); + + u32 j; + for (j=0; jIsHardware()) - DeleteDeviceByID(DeviceID); + delete pDevice; } else { @@ -335,50 +421,67 @@ void ExecuteCommand(u32 _Address) CmdSuccess = true; } break; - + } case COMMAND_READ: + { if (pDevice) + { CmdSuccess = pDevice->Read(_Address); + } else { Memory::Write_U32(FS_EINVAL, _Address + 4); CmdSuccess = true; } break; - + } case COMMAND_WRITE: + { if (pDevice) + { CmdSuccess = pDevice->Write(_Address); + } else { Memory::Write_U32(FS_EINVAL, _Address + 4); CmdSuccess = true; } break; - + } case COMMAND_SEEK: + { if (pDevice) + { CmdSuccess = pDevice->Seek(_Address); + } else { Memory::Write_U32(FS_EINVAL, _Address + 4); CmdSuccess = true; } break; - + } case COMMAND_IOCTL: + { if (pDevice) + { CmdSuccess = pDevice->IOCtl(_Address); + } break; - + } case COMMAND_IOCTLV: + { if (pDevice) + { CmdSuccess = pDevice->IOCtlV(_Address); + } break; - + } default: + { _dbg_assert_msg_(WII_IPC_HLE, 0, "Unknown IPC Command %i (0x%08x)", Command, _Address); break; + } } // It seems that the original hardware overwrites the command after it has been @@ -450,8 +553,7 @@ void Update() void UpdateDevices() { // Check if a hardware device must be updated - TDeviceMap::const_iterator itrEnd = g_DeviceMap.lower_bound(IPC_FIRST_FILEIO_ID); - for (TDeviceMap::const_iterator itr = g_DeviceMap.begin(); itr != itrEnd; ++itr) { + for (TDeviceMap::const_iterator itr = g_DeviceMap.begin(); itr != g_DeviceMap.end(); ++itr) { if (itr->second->IsOpened() && itr->second->Update()) { break; } diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h index 11420d1cdd..2e056b5bec 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h @@ -25,9 +25,9 @@ class IWII_IPC_HLE_Device; namespace WII_IPC_HLE_Interface { -#define IPC_FIRST_HARDWARE_ID 0 // first IPC device ID -#define IPC_FIRST_FILEIO_ID 33 // first IPC file ID - +#define IPC_FIRST_ID 0x00 // first IPC device ID +#define IPC_MAX_FILES 0x10 // first IPC file ID + // Init void Init(); @@ -46,14 +46,13 @@ void ES_DIVerify(u8 *_pTMD, u32 _sz); void SDIO_EventNotify(); -int GetDeviceIDByName(const std::string& _rDeviceName); - -IWII_IPC_HLE_Device* AccessDeviceByID(u32 _ID); - -void DeleteDeviceByID(u32 _ID); IWII_IPC_HLE_Device* CreateFileIO(u32 _DeviceID, const std::string& _rDeviceName); +IWII_IPC_HLE_Device* GetDeviceByName(const std::string& _rDeviceName); +IWII_IPC_HLE_Device* AccessDeviceByID(u32 _ID); +int getFreeDeviceId(); + // Update void Update(); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h index 36709a084f..113b14cffb 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h @@ -39,7 +39,7 @@ class PointerWrap; #define FS_ENOENT2 (u32)-106 // File not found #define FS_ENFILE (u32)-107 // Too many fds open #define FS_EFBIG (u32)-108 // max block count reached? -#define FS_ENFILE2 (u32)-109 // Too many fds open +#define FS_EFDEXHAUSTED (u32)-109 // Too many fds open #define FS_ENAMELEN (u32)-110 // pathname is too long #define FS_EFDOPEN (u32)-111 // FD is already open #define FS_EIO2 (u32)-114 // returned on ECC error @@ -47,6 +47,7 @@ class PointerWrap; #define FS_EDIRDEPTH (u32)-116 // max directory depth exceeded #define FS_EBUSY2 (u32)-118 // Resource busy //#define FS_EFATAL (u32)-119 // fatal error not used by IOS as fatal ERROR +#define FS_EESEXHAUSTED (u32)-1016 // Max of 2 ES handles at a time class IWII_IPC_HLE_Device { 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 98a85d25ca..f5a893012a 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 @@ -28,7 +28,7 @@ static Common::replace_v replacements; -// This is used by several of the FileIO and /dev/fs/ functions +// This is used by several of the FileIO and /dev/fs functions std::string HLE_IPC_BuildFilename(const char* _pFilename, int _size) { std::string path_full = File::GetUserPath(D_WIIROOT_IDX); @@ -128,7 +128,7 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) // The file must exist before we can open it // It should be created by ISFS_CreateFile, not here - if(File::Exists(m_Filename)) + if (File::Exists(m_Filename)) { INFO_LOG(WII_IPC_FILEIO, "FileIO: Open %s (%s == %08X)", m_Name.c_str(), Modes[_Mode], _Mode); ReturnValue = m_DeviceID; @@ -149,21 +149,22 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) bool CWII_IPC_HLE_Device_FileIO::OpenFile() { - switch(m_Mode) + switch (m_Mode) { case ISFS_OPEN_READ: + { m_pFileHandle.Open(m_Filename, "rb"); break; - - // "r+b" is technically wrong, but OPEN_WRITE should not truncate the file as "wb" does. + } case ISFS_OPEN_WRITE: m_pFileHandle.Open(m_Filename, "r+b"); break; case ISFS_OPEN_RW: + { m_pFileHandle.Open(m_Filename, "r+b"); break; - + } default: PanicAlertT("FileIO: Unknown open mode : 0x%02x", m_Mode); break; @@ -178,21 +179,21 @@ void CWII_IPC_HLE_Device_FileIO::CloseFile() bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) { - u32 ReturnValue = FS_RESULT_FATAL; - const s32 SeekPosition = Memory::Read_U32(_CommandAddress + 0xC); - const s32 Mode = Memory::Read_U32(_CommandAddress + 0x10); + u32 ReturnValue = FS_RESULT_FATAL; + const s32 SeekPosition = Memory::Read_U32(_CommandAddress + 0xC); + const s32 Mode = Memory::Read_U32(_CommandAddress + 0x10); - if(OpenFile()) + if (OpenFile()) { ReturnValue = FS_RESULT_FATAL; - const u64 fileSize = m_pFileHandle.GetSize(); + const u64 fileSize = m_pFileHandle.GetSize(); INFO_LOG(WII_IPC_FILEIO, "FileIO: Seek Pos: 0x%08x, Mode: %i (%s, Length=0x%08llx)", SeekPosition, Mode, m_Name.c_str(), fileSize); - switch(Mode){ + switch (Mode){ case 0: { - if(SeekPosition >=0 && SeekPosition <= fileSize) + if (SeekPosition >=0 && SeekPosition <= fileSize) { m_SeekPos = SeekPosition; ReturnValue = m_SeekPos; @@ -202,7 +203,7 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) case 1: { s32 wantedPos = SeekPosition+m_SeekPos; - if(wantedPos >=0 && wantedPos <= fileSize) + if (wantedPos >=0 && wantedPos <= fileSize) { m_SeekPos = wantedPos; ReturnValue = m_SeekPos; @@ -212,7 +213,7 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) case 2: { s32 wantedPos = fileSize+m_SeekPos; - if(wantedPos >=0 && wantedPos <= fileSize) + if (wantedPos >=0 && wantedPos <= fileSize) { m_SeekPos = wantedPos; ReturnValue = m_SeekPos; @@ -244,7 +245,7 @@ bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress) const u32 Size = Memory::Read_U32(_CommandAddress + 0x10); - if(OpenFile()) + if (OpenFile()) { if (m_Mode == ISFS_OPEN_WRITE) { @@ -284,7 +285,7 @@ bool CWII_IPC_HLE_Device_FileIO::Write(u32 _CommandAddress) const u32 Size = Memory::Read_U32(_CommandAddress + 0x10); - if(OpenFile()) + if (OpenFile()) { if (m_Mode == ISFS_OPEN_READ) { @@ -318,21 +319,14 @@ bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress) #if defined(_DEBUG) || defined(DEBUGFAST) DumpCommands(_CommandAddress); #endif - const u32 Parameter = Memory::Read_U32(_CommandAddress + 0xC); + const u32 Parameter = Memory::Read_U32(_CommandAddress + 0xC); + u32 ReturnValue = 0; - //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); - - // Return Value - u32 ReturnValue = 0; // no error - - switch(Parameter) + switch (Parameter) { case ISFS_IOCTL_GETFILESTATS: { - if(OpenFile()) + if (OpenFile()) { u32 m_FileLength = (u32)m_pFileHandle.GetSize(); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h index 6c31e7be31..681baeebe6 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h @@ -37,7 +37,7 @@ public: virtual bool Close(u32 _CommandAddress, bool _bForce); virtual bool IOCtlV(u32 _CommandAddress); - u32 ES_DIVerify(u8 *_pTMD, u32 _sz); + static u32 ES_DIVerify(u8 *_pTMD, u32 _sz); private: enum From 8479d5bdf7eac446271288611f749776a1510e84 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Sun, 18 Mar 2012 21:50:07 +1300 Subject: [PATCH 062/185] Some code clean up. I am terrible at coding styles... --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 33 +++++++++++++------- 1 file changed, 21 insertions(+), 12 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 756e59305d..6c1ab5baef 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -85,7 +85,8 @@ void Init() _dbg_assert_msg_(WII_IPC_HLE, g_DeviceMap.empty(), "DeviceMap isnt empty on init"); u32 i; - for(i=0; iIsHardware()) { // close all files and delete their resources @@ -160,7 +162,7 @@ void Shutdown() void SetDefaultContentFile(const std::string& _rFilename) { TDeviceMap::const_iterator itr = g_DeviceMap.begin(); - while(itr != g_DeviceMap.end()) + while (itr != g_DeviceMap.end()) { if (itr->second && itr->second->GetDeviceName().find(std::string("/dev/es")) == 0) { @@ -185,7 +187,8 @@ void SDIO_EventNotify() int getFreeDeviceId() { u32 i; - for(i=0; iIsHardware() ? 1 : 0; p.Do(isHw); if (isHw) @@ -348,7 +355,7 @@ void ExecuteCommand(u32 _Address) break; } } - if(j == ES_MAX_COUNT) + if (j == ES_MAX_COUNT) { Memory::Write_U32(FS_EESEXHAUSTED, _Address + 4); CmdSuccess = true; @@ -382,7 +389,7 @@ void ExecuteCommand(u32 _Address) INFO_LOG(WII_IPC_FILEIO, "IOP: Open File (Device=%s, ID=%08x, Mode=%i)", pDevice->GetDeviceName().c_str(), DeviceID, Mode); - if(Memory::Read_U32(_Address + 4) == DeviceID) + if (Memory::Read_U32(_Address + 4) == DeviceID) g_FdMap[DeviceID] = pDevice; } @@ -553,8 +560,10 @@ void Update() void UpdateDevices() { // Check if a hardware device must be updated - for (TDeviceMap::const_iterator itr = g_DeviceMap.begin(); itr != g_DeviceMap.end(); ++itr) { - if (itr->second->IsOpened() && itr->second->Update()) { + for (TDeviceMap::const_iterator itr = g_DeviceMap.begin(); itr != g_DeviceMap.end(); ++itr) + { + if (itr->second->IsOpened() && itr->second->Update()) + { break; } } From c3d13b048c40b9df99d401939bd747e1de5c878e Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 18 Mar 2012 02:31:19 -0700 Subject: [PATCH 063/185] build against wxWidgets3 from Externals on Windows. use Externals version of libpng on Windows. --- Externals/libpng/png/png.vcxproj | 209 +++++++++++++++ Externals/libpng/png/png.vcxproj.filters | 33 +++ .../wxWidgets3/wx/{wxmsw_old.h => wxmsw.h} | 243 ++++++++++++------ Source/Core/DolphinWX/Dolphin.vcxproj | 26 +- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 4 +- Source/Core/DolphinWX/Src/Main.cpp | 14 +- Source/Core/DolphinWX/Src/NetWindow.h | 1 + Source/Core/DolphinWX/Src/WXInputBase.cpp | 4 +- Source/Dolphin_2010.sln | 122 +++------ .../Plugin_VideoDX11/Plugin_VideoDX11.vcxproj | 12 +- .../Plugin_VideoDX9/Plugin_VideoDX9.vcxproj | 12 +- .../Plugin_VideoOGL/Plugin_VideoOGL.vcxproj | 12 +- .../Plugin_VideoSoftware.vcxproj | 21 +- Source/VSProps/WXWOverrides.props | 2 +- 14 files changed, 502 insertions(+), 213 deletions(-) create mode 100644 Externals/libpng/png/png.vcxproj create mode 100644 Externals/libpng/png/png.vcxproj.filters rename Externals/wxWidgets3/wx/{wxmsw_old.h => wxmsw.h} (91%) diff --git a/Externals/libpng/png/png.vcxproj b/Externals/libpng/png/png.vcxproj new file mode 100644 index 0000000000..886af15d1b --- /dev/null +++ b/Externals/libpng/png/png.vcxproj @@ -0,0 +1,209 @@ + + + + + DebugFast + Win32 + + + DebugFast + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {01573C36-AC6E-49F6-94BA-572517EB9740} + Win32Proj + png + + + + StaticLibrary + true + Unicode + + + StaticLibrary + true + Unicode + + + StaticLibrary + false + Unicode + + + StaticLibrary + false + Unicode + + + StaticLibrary + false + Unicode + + + StaticLibrary + false + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Disabled + ..\..\zlib;%(AdditionalIncludeDirectories) + + + Windows + true + + + + + Disabled + ..\..\zlib;%(AdditionalIncludeDirectories) + + + Windows + true + + + + + MaxSpeed + true + true + ..\..\zlib;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + + + + + MaxSpeed + true + true + ..\..\zlib;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + + + + + MaxSpeed + true + true + ..\..\zlib;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + + + + + MaxSpeed + true + true + ..\..\zlib;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + + + + + + \ No newline at end of file diff --git a/Externals/libpng/png/png.vcxproj.filters b/Externals/libpng/png/png.vcxproj.filters new file mode 100644 index 0000000000..779fdfc4ff --- /dev/null +++ b/Externals/libpng/png/png.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Externals/wxWidgets3/wx/wxmsw_old.h b/Externals/wxWidgets3/wx/wxmsw.h similarity index 91% rename from Externals/wxWidgets3/wx/wxmsw_old.h rename to Externals/wxWidgets3/wx/wxmsw.h index aa7a997702..0205c8c66e 100644 --- a/Externals/wxWidgets3/wx/wxmsw_old.h +++ b/Externals/wxWidgets3/wx/wxmsw.h @@ -4,7 +4,7 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id: setup0.h 66506 2010-12-31 17:39:37Z VZ $ +// RCS-ID: $Id: setup0.h 69463 2011-10-18 21:57:02Z VZ $ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -192,7 +192,7 @@ // // Recommended setting: depends on whether you intend to use C++ exceptions // in your own code (1 if you do, 0 if you don't) -#define wxUSE_EXCEPTIONS 0 +#define wxUSE_EXCEPTIONS 1 // Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI // @@ -201,15 +201,6 @@ // Recommended setting: 0 (this is still work in progress...) #define wxUSE_EXTENDED_RTTI 0 -// Set wxUSE_STL to 1 to derive wxList(Foo) and wxArray(Foo) from -// std::list and std::vector, with a compatibility interface, -// and for wxHashMap to be implemented with templates. -// -// Default is 0 -// -// Recommended setting: YMMV -#define wxUSE_STL 0 - // Support for message/error logging. This includes wxLogXXX() functions and // wxLog and derived classes. Don't set this to 0 unless you really know what // you are doing. @@ -261,44 +252,6 @@ // Recommended setting: 1 as setting it to 0 disables many other things #define wxUSE_STREAMS 1 -// This is not a real option but is used as the default value for -// wxUSE_STD_IOSTREAM and wxUSE_STD_STRING. -// -// Currently the Digital Mars and Watcom compilers come without standard C++ -// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have -// them (e.g. from STLPort). -// -// VC++ 5.0 does include standard C++ library headers, however they produce -// many warnings that can't be turned off when compiled at warning level 4. -#if defined(__DMC__) || defined(__WATCOMC__) \ - || (defined(_MSC_VER) && _MSC_VER < 1200) - #define wxUSE_STD_DEFAULT 0 -#else - #define wxUSE_STD_DEFAULT 1 -#endif - -// Use standard C++ streams if 1 instead of wx streams in some places. If -// disabled (default), wx streams are used everywhere and wxWidgets doesn't -// depend on the standard streams library. -// -// Notice that enabling this does not replace wx streams with std streams -// everywhere, in a lot of places wx streams are used no matter what. -// -// Default is 0 -// -// Recommended setting: 1 if you use the standard streams anyhow and so -// dependency on the standard streams library is not a -// problem -#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT - -// Enable conversion to standard C++ string if 1. -// -// Default is 1 for most compilers. -// -// Recommended setting: 1 unless you want to ensure your program doesn't use -// the standard C++ library at all. -#define wxUSE_STD_STRING wxUSE_STD_DEFAULT - // Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf. // Note that if the system's implementation does not support positional // parameters, setting this to 1 forces the use of the wxWidgets implementation @@ -314,6 +267,107 @@ // Recommended setting: 1 if you want to support multiple languages #define wxUSE_PRINTF_POS_PARAMS 1 + +// ---------------------------------------------------------------------------- +// Interoperability with the standard library. +// ---------------------------------------------------------------------------- + +// Set wxUSE_STL to 1 to enable maximal interoperability with the standard +// library, even at the cost of backwards compatibility. +// +// Default is 0 +// +// Recommended setting: 0 as the options below already provide a relatively +// good level of interoperability and changing this option arguably isn't worth +// diverging from the official builds of the library. +#define wxUSE_STL 0 + +// This is not a real option but is used as the default value for +// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS. +// +// Currently the Digital Mars and Watcom compilers come without standard C++ +// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have +// them (e.g. from STLPort). +// +// VC++ 5.0 does include standard C++ library headers, however they produce +// many warnings that can't be turned off when compiled at warning level 4. +#if defined(__DMC__) || defined(__WATCOMC__) \ + || (defined(_MSC_VER) && _MSC_VER < 1200) + #define wxUSE_STD_DEFAULT 0 +#else + #define wxUSE_STD_DEFAULT 1 +#endif + +// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<> +// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but +// usually more limited) implementations are used which allows to avoid the +// dependency on the C++ run-time library. +// +// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't +// support using standard containers and that VC6 needs non-default options for +// such build to avoid getting "fatal error C1076: compiler limit : internal +// heap limit reached; use /Zm to specify a higher limit" in its own standard +// headers, so you need to ensure you do increase the heap size before enabling +// this option for this compiler. +// +// Default is 0 for compatibility reasons. +// +// Recommended setting: 1 unless compatibility with the official wxWidgets +// build and/or the existing code is a concern. +#define wxUSE_STD_CONTAINERS 0 + +// Use standard C++ streams if 1 instead of wx streams in some places. If +// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the +// standard streams library. +// +// Notice that enabling this does not replace wx streams with std streams +// everywhere, in a lot of places wx streams are used no matter what. +// +// Default is 1 if compiler supports it. +// +// Recommended setting: 1 if you use the standard streams anyhow and so +// dependency on the standard streams library is not a +// problem +#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT + +// Enable minimal interoperability with the standard C++ string class if 1. +// "Minimal" means that wxString can be constructed from std::string or +// std::wstring but can't be implicitly converted to them. You need to enable +// the option below for the latter. +// +// Default is 1 for most compilers. +// +// Recommended setting: 1 unless you want to ensure your program doesn't use +// the standard C++ library at all. +#define wxUSE_STD_STRING wxUSE_STD_DEFAULT + +// Make wxString as much interchangeable with std::[w]string as possible, in +// particular allow implicit conversion of wxString to either of these classes. +// This comes at a price (or a benefit, depending on your point of view) of not +// allowing implicit conversion to "const char *" and "const wchar_t *". +// +// Because a lot of existing code relies on these conversions, this option is +// disabled by default but can be enabled for your build if you don't care +// about compatibility. +// +// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled. +// +// Recommended setting: 0 to remain compatible with the official builds of +// wxWidgets. +#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL + +// VC++ 4.2 and above allows and but you can't mix +// them. Set this option to 1 to use , 0 to use . +// +// Note that newer compilers (including VC++ 7.1 and later) don't support +// wxUSE_IOSTREAMH == 1 and so will be used anyhow. +// +// Default is 0. +// +// Recommended setting: 0, only set to 1 if you use a really old compiler +#define wxUSE_IOSTREAMH 0 + + // ---------------------------------------------------------------------------- // non GUI features selection // ---------------------------------------------------------------------------- @@ -467,7 +521,7 @@ // Default is 1. // // Recommended setting: 1 -#define wxUSE_DIALUP_MANAGER 1 +#define wxUSE_DIALUP_MANAGER 0 // Compile in classes for run-time DLL loading and function calling. // Required by wxUSE_DIALUP_MANAGER. @@ -651,6 +705,34 @@ // Recommended setting: 1 #define wxUSE_STC 0 +// Use wxWidget's web viewing classes +// +// Default is 1 +// +// Recommended setting: 1 +#define wxUSE_WEBVIEW 0 + +// Use the IE wxWebView backend +// +// Default is 1 on MSW +// +// Recommended setting: 1 +#ifdef __WXMSW__ +#define wxUSE_WEBVIEW_IE 0 +#else +#define wxUSE_WEBVIEW_IE 0 +#endif + +// Use the WebKit wxWebView backend +// +// Default is 1 on GTK and OSX +// +// Recommended setting: 1 +#if defined(__WXGTK__) || defined(__WXOSX__) +#define wxUSE_WEBVIEW_WEBKIT 0 +#else +#define wxUSE_WEBVIEW_WEBKIT 0 +#endif // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced // 2D drawing API. (Still somewhat experimental) @@ -714,6 +796,15 @@ // Recommended setting: 1 (don't change except for very special programs) #define wxUSE_CONTROLS 1 +// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup(). +// Currently markup is supported only by a few controls and only some ports but +// their number will increase with time. +// +// Default is 1 +// +// Recommended setting: 1 (may be set to 0 if you want to save on code size) +#define wxUSE_MARKUP 0 + // wxPopupWindow class is a top level transient window. It is currently used // to implement wxTipWindow // @@ -740,6 +831,7 @@ // // Recommended setting: 1 #define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl +#define wxUSE_BANNERWINDOW 1 // wxBannerWindow #define wxUSE_BUTTON 1 // wxButton #define wxUSE_BMPBUTTON 1 // wxBitmapButton #define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl @@ -775,8 +867,10 @@ #define wxUSE_STATTEXT 1 // wxStaticText #define wxUSE_STATBMP 1 // wxStaticBitmap #define wxUSE_TEXTCTRL 1 // wxTextCtrl +#define wxUSE_TIMEPICKCTRL 1 // wxTimePickerCtrl #define wxUSE_TOGGLEBTN 1 // requires wxButton #define wxUSE_TREECTRL 1 // wxTreeCtrl +#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR // below either wxStatusBar95 or a generic wxStatusBar will be used. @@ -993,6 +1087,14 @@ // Recommended setting: 1 #define wxUSE_NOTIFICATION_MESSAGE 1 +// wxRichToolTip is a customizable tooltip class which has more functionality +// than the stock (but native, unlike this class) wxToolTip. +// +// Default is 1. +// +// Recommended setting: 1 (but can be safely set to 0 if you don't need it) +#define wxUSE_RICHTOOLTIP 1 + // Use wxSashWindow class. // // Default is 1. @@ -1266,11 +1368,11 @@ // // Recommended setting: 1, only set to 0 if you have trouble compiling // wxCHMHelpController (could be a problem with really ancient compilers) -#define wxUSE_MS_HTML_HELP 0 +#define wxUSE_MS_HTML_HELP 1 // Use wxHTML-based help controller? -#define wxUSE_WXHTML_HELP 1 +#define wxUSE_WXHTML_HELP 0 #define wxUSE_CONSTRAINTS 1 // 0 for no window layout constraint system @@ -1298,28 +1400,15 @@ // to create files in SVG (Scalable Vector Graphics) format. #define wxUSE_SVG 1 -// ---------------------------------------------------------------------------- -// other compiler (mis)features -// ---------------------------------------------------------------------------- - -// Set this to 0 if your compiler can't cope with omission of prototype -// parameters. +// Should wxDC provide SetTransformMatrix() and related methods? // -// Default is 1. +// Default is 1 but can be set to 0 if this functionality is not used. Notice +// that currently only wxMSW supports this so setting this to 0 doesn't change +// much for non-MSW platforms (although it will still save a few bytes +// probably). // -// Recommended setting: 1 (should never need to set this to 0) -#define REMOVE_UNUSED_ARG 1 - -// VC++ 4.2 and above allows and but you can't mix -// them. Set this option to 1 to use , 0 to use . -// -// Note that newer compilers (including VC++ 7.1 and later) don't support -// wxUSE_IOSTREAMH == 1 and so will be used anyhow. -// -// Default is 0. -// -// Recommended setting: 0, only set to 1 if you use a really old compiler -#define wxUSE_IOSTREAMH 0 +// Recommended setting: 1. +#define wxUSE_DC_TRANSFORM_MATRIX 1 // ---------------------------------------------------------------------------- // image format support @@ -1443,7 +1532,7 @@ // Recommended setting: 1, required by wxMediaCtrl #define wxUSE_ACTIVEX 1 -// wxDC cacheing implementation +// wxDC caching implementation #define wxUSE_DC_CACHEING 1 // Set this to 1 to enable wxDIB class used internally for manipulating @@ -1524,6 +1613,14 @@ // Recommended setting: 0, this is mainly used for testing #define wxUSE_DATEPICKCTRL_GENERIC 0 +// Set this to 1 to be able to use wxTimePickerCtrlGeneric in addition to the +// native wxTimePickerCtrl for the platforms that have the latter (MSW). +// +// Default is 0. +// +// Recommended setting: 0, this is mainly used for testing +#define wxUSE_TIMEPICKCTRL_GENERIC 0 + // ---------------------------------------------------------------------------- // Crash debugging helpers // ---------------------------------------------------------------------------- diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index 942bd41f4e..e5c9c7a91d 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -130,7 +130,7 @@ - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -144,7 +144,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -158,7 +158,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -174,7 +174,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -188,7 +188,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -204,7 +204,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -336,24 +336,18 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / {cd3d4c3c-1027-4d33-b047-aec7b56d0bf6} + + {01573c36-ac6e-49f6-94ba-572517eb9740} + {d8890b98-26f7-4cff-bbfb-b95f371b5f20} {93d73454-2512-424e-9cda-4bb357fe13dd} - - {0e231fb1-f3c9-4724-accb-de8bcb3c089e} - - - {05c75041-d67d-4903-a362-8395a7b35c75} - - + {1c8436c9-dbaf-42be-83bc-cf3ec9175abe} - - {11f55366-12ec-4c44-a8cb-1d4e315d61ed} - {3e1339f5-9311-4122-9442-369702e8fcad} diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 8e0a498915..3717ed4367 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -723,8 +723,8 @@ const GameListItem *CGameListCtrl::GetISO(size_t index) const CGameListCtrl *caller; #if wxCHECK_VERSION(2, 9, 0) -int wxCALLBACK wxListCompare(long item1, long item2, wxIntPtr sortData) -#else +int wxCALLBACK wxListCompare(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData) +#else // 2.8.x int wxCALLBACK wxListCompare(long item1, long item2, long sortData) #endif { diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 709c2b4b53..d38c90e07f 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -115,37 +115,37 @@ bool DolphinApp::OnInit() wxCmdLineEntryDesc cmdLineDesc[] = { { - wxCMD_LINE_SWITCH, wxS("h"), wxS("help"), + wxCMD_LINE_SWITCH, "h", "help", _("Show this help message"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, { - wxCMD_LINE_SWITCH, wxS("d"), wxS("debugger"), + wxCMD_LINE_SWITCH, "d", "debugger", _("Opens the debugger"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { - wxCMD_LINE_SWITCH, wxS("l"), wxS("logger"), + wxCMD_LINE_SWITCH, "l", "logger", _("Opens the logger"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { - wxCMD_LINE_OPTION, wxS("e"), wxS("exec"), + wxCMD_LINE_OPTION, "e", "exec", _("Loads the specified file (DOL,ELF,GCM,ISO,WAD)"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { - wxCMD_LINE_SWITCH, wxS("b"), wxS("batch"), + wxCMD_LINE_SWITCH, "b", "batch", _("Exit Dolphin with emulator"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { - wxCMD_LINE_OPTION, wxS("V"), wxS("video_backend"), + wxCMD_LINE_OPTION, "V", "video_backend", _("Specify a video backend"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { - wxCMD_LINE_OPTION, wxS("A"), wxS("audio_emulation"), + wxCMD_LINE_OPTION, "A", "audio_emulation", _("Low level (LLE) or high level (HLE) audio"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, diff --git a/Source/Core/DolphinWX/Src/NetWindow.h b/Source/Core/DolphinWX/Src/NetWindow.h index 974a52e79d..ae27a75921 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.h +++ b/Source/Core/DolphinWX/Src/NetWindow.h @@ -24,6 +24,7 @@ #include #include +#include #include #include #include diff --git a/Source/Core/DolphinWX/Src/WXInputBase.cpp b/Source/Core/DolphinWX/Src/WXInputBase.cpp index fdc738d8e0..467371ae9c 100644 --- a/Source/Core/DolphinWX/Src/WXInputBase.cpp +++ b/Source/Core/DolphinWX/Src/WXInputBase.cpp @@ -44,6 +44,9 @@ const wxString WXKeyToString(int keycode) case WXK_SHIFT: return wxT("Shift"); case WXK_ALT: return wxT("Alt"); case WXK_RAW_CONTROL: return _("Control"); +#ifdef __WXOSX__ + case WXK_COMMAND: return _("Command"); +#endif case WXK_MENU: return _("Menu"); case WXK_PAUSE: return _("Pause"); case WXK_CAPITAL: return _("Caps Lock"); @@ -131,7 +134,6 @@ const wxString WXKeyToString(int keycode) case WXK_WINDOWS_LEFT: return _("Windows Left"); case WXK_WINDOWS_RIGHT: return _("Windows Right"); case WXK_WINDOWS_MENU: return _("Windows Menu"); - case WXK_COMMAND: return _("Command"); } if (keycode > WXK_SPACE && keycode < WXK_DELETE) { diff --git a/Source/Dolphin_2010.sln b/Source/Dolphin_2010.sln index 0e9032470d..b003809427 100644 --- a/Source/Dolphin_2010.sln +++ b/Source/Dolphin_2010.sln @@ -10,6 +10,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\D {AA862E5E-A993-497A-B6A0-0E8E94B10050} = {AA862E5E-A993-497A-B6A0-0E8E94B10050} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} {B39AC394-5DB5-4DA9-9D98-09D46CA3701F} = {B39AC394-5DB5-4DA9-9D98-09D46CA3701F} + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Core\Common\Common.vcxproj", "{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}" @@ -17,7 +18,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Core\Common\Commo {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SVNRevGen", "Core\Common\SVNRevGen.vcxproj", "{69F00340-5C3D-449F-9A80-958435C6CF06}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SCMRevGen", "Core\Common\SVNRevGen.vcxproj", "{69F00340-5C3D-449F-9A80-958435C6CF06}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AudioCommon", "Core\AudioCommon\AudioCommon.vcxproj", "{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}" ProjectSection(ProjectDependencies) = postProject @@ -45,31 +46,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\Externals\zlib\z {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxAdv28", "..\Externals\wxWidgets\build\msw\wx_adv.vcxproj", "{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxAui", "..\Externals\wxWidgets\build\msw\wx_aui.vcxproj", "{05C75041-D67D-4903-A362-8395A7B35C75}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} - {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxBase28", "..\Externals\wxWidgets\build\msw\wx_base.vcxproj", "{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - {3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxCore28", "..\Externals\wxWidgets\build\msw\wx_core.vcxproj", "{11F55366-12EC-4C44-A8CB-1D4E315D61ED}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoCommon", "Core\VideoCommon\VideoCommon.vcxproj", "{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}" ProjectSection(ProjectDependencies) = postProject {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} @@ -110,29 +86,27 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX9", "Plugins\Plugin_ ProjectSection(ProjectDependencies) = postProject {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - {05C75041-D67D-4903-A362-8395A7B35C75} = {05C75041-D67D-4903-A362-8395A7B35C75} - {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX11", "Plugins\Plugin_VideoDX11\Plugin_VideoDX11.vcxproj", "{9A4C733C-BADE-4AC6-B58A-6E274395E90E}" ProjectSection(ProjectDependencies) = postProject {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - {05C75041-D67D-4903-A362-8395A7B35C75} = {05C75041-D67D-4903-A362-8395A7B35C75} - {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoOGL", "Plugins\Plugin_VideoOGL\Plugin_VideoOGL.vcxproj", "{1909CD2D-1707-456F-86CA-0DF42A727C99}" ProjectSection(ProjectDependencies) = postProject {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - {05C75041-D67D-4903-A362-8395A7B35C75} = {05C75041-D67D-4903-A362-8395A7B35C75} - {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoSoftware", "Plugins\Plugin_VideoSoftware\Plugin_VideoSoftware.vcxproj", "{9E9DA440-E9AD-413C-B648-91030E792211}" ProjectSection(ProjectDependencies) = postProject {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputCommon", "Core\InputCommon\InputCommon.vcxproj", "{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}" @@ -150,6 +124,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSPTool", "DSPTool\DSPTool. {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxBase28", "..\Externals\wxWidgets3\build\msw\wx_base.vcxproj", "{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}" + ProjectSection(ProjectDependencies) = postProject + {01573C36-AC6E-49F6-94BA-572517EB9740} = {01573C36-AC6E-49F6-94BA-572517EB9740} + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} + {3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "..\Externals\libpng\png\png.vcxproj", "{01573C36-AC6E-49F6-94BA-572517EB9740}" + ProjectSection(ProjectDependencies) = postProject + {3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -256,54 +242,6 @@ Global {3E1339F5-9311-4122-9442-369702E8FCAD}.Release|Win32.Build.0 = Release|Win32 {3E1339F5-9311-4122-9442-369702E8FCAD}.Release|x64.ActiveCfg = Release|x64 {3E1339F5-9311-4122-9442-369702E8FCAD}.Release|x64.Build.0 = Release|x64 - {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Debug|Win32.ActiveCfg = Debug|Win32 - {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Debug|Win32.Build.0 = Debug|Win32 - {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Debug|x64.ActiveCfg = Debug|x64 - {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Debug|x64.Build.0 = Debug|x64 - {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 - {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.DebugFast|Win32.Build.0 = DebugFast|Win32 - {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.DebugFast|x64.ActiveCfg = DebugFast|x64 - {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.DebugFast|x64.Build.0 = DebugFast|x64 - {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Release|Win32.ActiveCfg = Release|Win32 - {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Release|Win32.Build.0 = Release|Win32 - {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Release|x64.ActiveCfg = Release|x64 - {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Release|x64.Build.0 = Release|x64 - {05C75041-D67D-4903-A362-8395A7B35C75}.Debug|Win32.ActiveCfg = Debug|Win32 - {05C75041-D67D-4903-A362-8395A7B35C75}.Debug|Win32.Build.0 = Debug|Win32 - {05C75041-D67D-4903-A362-8395A7B35C75}.Debug|x64.ActiveCfg = Debug|x64 - {05C75041-D67D-4903-A362-8395A7B35C75}.Debug|x64.Build.0 = Debug|x64 - {05C75041-D67D-4903-A362-8395A7B35C75}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 - {05C75041-D67D-4903-A362-8395A7B35C75}.DebugFast|Win32.Build.0 = DebugFast|Win32 - {05C75041-D67D-4903-A362-8395A7B35C75}.DebugFast|x64.ActiveCfg = DebugFast|x64 - {05C75041-D67D-4903-A362-8395A7B35C75}.DebugFast|x64.Build.0 = DebugFast|x64 - {05C75041-D67D-4903-A362-8395A7B35C75}.Release|Win32.ActiveCfg = Release|Win32 - {05C75041-D67D-4903-A362-8395A7B35C75}.Release|Win32.Build.0 = Release|Win32 - {05C75041-D67D-4903-A362-8395A7B35C75}.Release|x64.ActiveCfg = Release|x64 - {05C75041-D67D-4903-A362-8395A7B35C75}.Release|x64.Build.0 = Release|x64 - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|Win32.ActiveCfg = Debug|Win32 - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|Win32.Build.0 = Debug|Win32 - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|x64.ActiveCfg = Debug|x64 - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|x64.Build.0 = Debug|x64 - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|Win32.Build.0 = DebugFast|Win32 - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|x64.ActiveCfg = DebugFast|x64 - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|x64.Build.0 = DebugFast|x64 - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|Win32.ActiveCfg = Release|Win32 - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|Win32.Build.0 = Release|Win32 - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|x64.ActiveCfg = Release|x64 - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|x64.Build.0 = Release|x64 - {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Debug|Win32.ActiveCfg = Debug|Win32 - {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Debug|Win32.Build.0 = Debug|Win32 - {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Debug|x64.ActiveCfg = Debug|x64 - {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Debug|x64.Build.0 = Debug|x64 - {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 - {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.DebugFast|Win32.Build.0 = DebugFast|Win32 - {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.DebugFast|x64.ActiveCfg = DebugFast|x64 - {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.DebugFast|x64.Build.0 = DebugFast|x64 - {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Release|Win32.ActiveCfg = Release|Win32 - {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Release|Win32.Build.0 = Release|Win32 - {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Release|x64.ActiveCfg = Release|x64 - {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Release|x64.Build.0 = Release|x64 {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Debug|Win32.ActiveCfg = Debug|Win32 {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Debug|Win32.Build.0 = Debug|Win32 {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Debug|x64.ActiveCfg = Debug|x64 @@ -448,6 +386,30 @@ Global {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|Win32.Build.0 = Release|Win32 {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.ActiveCfg = Release|x64 {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.Build.0 = Release|x64 + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|Win32.ActiveCfg = Debug|Win32 + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|Win32.Build.0 = Debug|Win32 + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|x64.ActiveCfg = Debug|x64 + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|x64.Build.0 = Debug|x64 + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|Win32.Build.0 = DebugFast|Win32 + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|x64.ActiveCfg = DebugFast|x64 + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|x64.Build.0 = DebugFast|x64 + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|Win32.ActiveCfg = Release|Win32 + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|Win32.Build.0 = Release|Win32 + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|x64.ActiveCfg = Release|x64 + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|x64.Build.0 = Release|x64 + {01573C36-AC6E-49F6-94BA-572517EB9740}.Debug|Win32.ActiveCfg = Debug|Win32 + {01573C36-AC6E-49F6-94BA-572517EB9740}.Debug|Win32.Build.0 = Debug|Win32 + {01573C36-AC6E-49F6-94BA-572517EB9740}.Debug|x64.ActiveCfg = Debug|x64 + {01573C36-AC6E-49F6-94BA-572517EB9740}.Debug|x64.Build.0 = Debug|x64 + {01573C36-AC6E-49F6-94BA-572517EB9740}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 + {01573C36-AC6E-49F6-94BA-572517EB9740}.DebugFast|Win32.Build.0 = DebugFast|Win32 + {01573C36-AC6E-49F6-94BA-572517EB9740}.DebugFast|x64.ActiveCfg = DebugFast|x64 + {01573C36-AC6E-49F6-94BA-572517EB9740}.DebugFast|x64.Build.0 = DebugFast|x64 + {01573C36-AC6E-49F6-94BA-572517EB9740}.Release|Win32.ActiveCfg = Release|Win32 + {01573C36-AC6E-49F6-94BA-572517EB9740}.Release|Win32.Build.0 = Release|Win32 + {01573C36-AC6E-49F6-94BA-572517EB9740}.Release|x64.ActiveCfg = Release|x64 + {01573C36-AC6E-49F6-94BA-572517EB9740}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj b/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj index 2903bd0550..52d1c37aed 100644 --- a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj +++ b/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj @@ -117,7 +117,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) true @@ -127,7 +127,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) true @@ -137,7 +137,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) true @@ -149,7 +149,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) true @@ -161,7 +161,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) true @@ -173,7 +173,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) true diff --git a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj index 604fea8a2b..c152fcb630 100644 --- a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj +++ b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj @@ -122,7 +122,7 @@ Disabled - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug stdafx.h @@ -135,7 +135,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) true @@ -144,7 +144,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) true @@ -155,7 +155,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) true @@ -166,7 +166,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) true @@ -177,7 +177,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) true diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj index f782fd2c93..d72f0fa9a9 100644 --- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj +++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj @@ -117,7 +117,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\GLew\include;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -129,7 +129,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\GLew\include;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -141,7 +141,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\GLew\include;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -155,7 +155,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\GLew\include;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -169,7 +169,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\GLew\include;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -183,7 +183,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\GLew\include;..\..\..\Externals;%(AdditionalIncludeDirectories) true diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj index db6f072f20..7235327fb9 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj +++ b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj @@ -115,7 +115,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -126,7 +126,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -137,7 +137,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -150,7 +150,7 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -163,12 +163,12 @@ - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) @@ -233,15 +233,6 @@ - - {0e231fb1-f3c9-4724-accb-de8bcb3c089e} - - - {1c8436c9-dbaf-42be-83bc-cf3ec9175abe} - - - {11f55366-12ec-4c44-a8cb-1d4e315d61ed} - {3e5c4e02-1ba9-4776-bdbe-e3f91ffa34cf} diff --git a/Source/VSProps/WXWOverrides.props b/Source/VSProps/WXWOverrides.props index 512c9a83e3..cf6d5d6065 100644 --- a/Source/VSProps/WXWOverrides.props +++ b/Source/VSProps/WXWOverrides.props @@ -13,7 +13,7 @@ Async 4267 _LIB;__WXMSW__;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msvc;..\..\..\zlib;..\..\src\png; + ..\..\;..\..\include;..\..\..\zlib;..\..\..\libpng From ff63c689d6f3ea0a896d1905e5b2d13877a601e1 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 18 Mar 2012 02:33:03 -0700 Subject: [PATCH 064/185] wxMSW no longer allows overriding OnPaintDrawImages, so remove the msw-specific drawing code from the GameListCtrl (it's rendered correctly by default) --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 51 ---------------------- Source/Core/DolphinWX/Src/GameListCtrl.h | 1 - 2 files changed, 52 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 3717ed4367..20322673a1 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -149,9 +149,6 @@ BEGIN_EVENT_TABLE(wxEmuStateTip, wxTipWindow) END_EVENT_TABLE() BEGIN_EVENT_TABLE(CGameListCtrl, wxListCtrl) -#ifdef _WIN32 - EVT_PAINT(CGameListCtrl::OnPaintDrawImages) -#endif EVT_SIZE(CGameListCtrl::OnSize) EVT_RIGHT_DOWN(CGameListCtrl::OnRightClick) EVT_LEFT_DOWN(CGameListCtrl::OnLeftClick) @@ -384,48 +381,6 @@ std::string CGameListCtrl::GetGameNames() const return m_gameList; } -#ifdef _WIN32 -// This draws our icons on top of the gamelist, it's only used on Windows -void CGameListCtrl::OnPaintDrawImages(wxPaintEvent& event) -{ - wxPaintDC dc(this); - - // Calls the default drawing code - wxControl::OnPaint(event); - - // Draw the flags, platform icons and emustate icons on top if there's games to show - if (m_ISOFiles.empty()) - return; - - // Retrieve the topmost shown item and get drawing offsets - const long - top_item = GetTopItem(), - bottom_item = std::min(top_item + GetCountPerPage() + 2, (long)GetItemCount()); - - int flagOffset = GetColumnWidth(0) + GetColumnWidth(1) + - GetColumnWidth(2) + GetColumnWidth(3); - int stateOffset = flagOffset + GetColumnWidth(4) + GetColumnWidth(5); - - // Only redraw shown lines - for (long i = top_item; i != bottom_item; ++i) - { - wxRect itemRect; - if (GetItemRect(i, itemRect)) - { - const int itemY = itemRect.GetTop(); - const GameListItem& rISOFile = *m_ISOFiles[GetItemData(i)]; - - m_imageListSmall->Draw(m_PlatformImageIndex[rISOFile.GetPlatform()], - dc, itemRect.GetX()+3, itemY); - m_imageListSmall->Draw(m_FlagImageIndex[rISOFile.GetCountry()], - dc, flagOffset, itemY); - m_imageListSmall->Draw(m_EmuStateImageIndex[rISOFile.GetEmuState()], - dc, stateOffset, itemY); - } - } -} -#endif - void CGameListCtrl::InsertItemInReportView(long _Index) { // When using wxListCtrl, there is no hope of per-column text colors. @@ -455,12 +410,8 @@ void CGameListCtrl::InsertItemInReportView(long _Index) m_gamePath.append(rISOFile.GetFileName() + '\n'); // Insert a first row with the platform image, that will be used as the Index -#ifndef _WIN32 long ItemIndex = InsertItem(_Index, wxEmptyString, m_PlatformImageIndex[rISOFile.GetPlatform()]); -#else - long ItemIndex = InsertItem(_Index, wxEmptyString, -1); -#endif if (rISOFile.GetImage().IsOk()) ImageIndex = m_imageListSmall->Add(rISOFile.GetImage()); @@ -516,13 +467,11 @@ void CGameListCtrl::InsertItemInReportView(long _Index) SetItem(_Index, COLUMN_TITLE, name, -1); SetItem(_Index, COLUMN_NOTES, description, -1); -#ifndef _WIN32 // Emulation state SetItemColumnImage(_Index, COLUMN_EMULATION_STATE, m_EmuStateImageIndex[rISOFile.GetEmuState()]); // Country SetItemColumnImage(_Index, COLUMN_COUNTRY, m_FlagImageIndex[rISOFile.GetCountry()]); -#endif // File size SetItem(_Index, COLUMN_SIZE, NiceSizeFormat(rISOFile.GetFileSize()), -1); diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.h b/Source/Core/DolphinWX/Src/GameListCtrl.h index 8fca14f632..274cfdb7ee 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.h +++ b/Source/Core/DolphinWX/Src/GameListCtrl.h @@ -99,7 +99,6 @@ private: DECLARE_EVENT_TABLE() // events - void OnPaintDrawImages(wxPaintEvent& event); void OnLeftClick(wxMouseEvent& event); void OnRightClick(wxMouseEvent& event); void OnMouseMotion(wxMouseEvent& event); From d9a7510937cf4bc6020656ddd38880d436a65549 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 18 Mar 2012 03:30:03 -0700 Subject: [PATCH 065/185] forgot to add wxwidgets3 vcxproj to git, since it was masked by gitignore... fix up misc warnings and build errors --- .../wxWidgets3/build/msw/wx_base.vcxproj | 1687 ++++++++ .../build/msw/wx_base.vcxproj.filters | 3426 +++++++++++++++++ Languages/Languages.vcxproj | 5 - Source/Core/DolphinWX/Dolphin.vcxproj | 6 +- Source/DSPTool/DSPTool.vcxproj | 10 - Source/VSProps/WXWOverrides.props | 2 +- 6 files changed, 5117 insertions(+), 19 deletions(-) create mode 100644 Externals/wxWidgets3/build/msw/wx_base.vcxproj create mode 100644 Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters diff --git a/Externals/wxWidgets3/build/msw/wx_base.vcxproj b/Externals/wxWidgets3/build/msw/wx_base.vcxproj new file mode 100644 index 0000000000..ed41c88d76 --- /dev/null +++ b/Externals/wxWidgets3/build/msw/wx_base.vcxproj @@ -0,0 +1,1687 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + DebugFast + Win32 + + + DebugFast + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + + + + + + true + true + true + true + true + true + + + + + + true + true + true + true + true + true + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + true + true + true + true + true + true + + + + + + + + + true + true + true + true + true + true + + + + + + + true + true + true + true + true + true + + + + + + + + true + true + true + true + true + true + + + + + + + + true + true + true + true + true + true + + + + + + + + true + true + true + true + true + true + + + + + + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + + + + true + true + true + true + true + true + + + + + + + true + true + true + true + true + true + + + + + + + + + + + + + + true + true + true + true + true + true + + + + + + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + + + + + + + + true + true + true + true + true + true + + + + + {01573c36-ac6e-49f6-94ba-572517eb9740} + + + {3e1339f5-9311-4122-9442-369702e8fcad} + + + + wxWidgets + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} + wxBase28 + + + + StaticLibrary + Unicode + + + StaticLibrary + Unicode + + + StaticLibrary + Unicode + + + StaticLibrary + Unicode + + + StaticLibrary + Unicode + + + StaticLibrary + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + __WXDEBUG__;%(PreprocessorDefinitions) + + + + + + + + + + __WXDEBUG__;%(PreprocessorDefinitions) + + + + + + + + + \ No newline at end of file diff --git a/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters b/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters new file mode 100644 index 0000000000..7c02f384fa --- /dev/null +++ b/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters @@ -0,0 +1,3426 @@ + + + + + {ea19c29f-6825-47dc-b54d-ee464810b353} + + + {e1077817-0cf8-4a28-b86f-34e85984db45} + + + {887bf107-6891-4a1f-a32f-5be1aafc0535} + + + {303d663d-e46a-4394-9423-5d6bd35169f9} + + + {dab87ac5-435c-4c4c-a685-966df965635c} + + + {dd338b6e-5f9c-42f6-b1c3-e4db2c484490} + + + {7a3796f6-d621-4a89-a785-d0ec354b9652} + + + {3112ece1-9900-49c2-b90d-7e9c956d3cfb} + + + {6f4ef8f1-41e1-4bd6-8940-ac03c6b9218c} + + + {c4049f2a-35bb-494f-a789-c83ed28f18f1} + + + {302035ca-b308-4626-83f9-60c08f3015c9} + + + + + Setup Headers + + + Setup Headers + + + Setup Headers + + + Setup Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW\private + + + Headers\MSW\private + + + Headers\MSW\private + + + Headers\MSW\private + + + Headers\MSW\private + + + Headers\MSW\private + + + Headers\MSW\private + + + Headers\MSW\private + + + Headers\MSW\private + + + Headers\MSW\private + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\MSW\ole + + + Headers\MSW\ole + + + Headers\MSW\ole + + + Headers\MSW\ole + + + Headers\MSW\ole + + + Headers\MSW\ole + + + Headers\MSW\ole + + + Headers\MSW\ole + + + Headers\MSW\ole + + + Headers\MSW\ole + + + + + AUI + + + AUI + + + AUI + + + AUI + + + AUI + + + AUI + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW\ole + + + MSW\ole + + + MSW\ole + + + MSW\ole + + + MSW\ole + + + MSW\ole + + + MSW\ole + + + MSW\ole + + + + + Common + + + + + + + MSW + + + \ No newline at end of file diff --git a/Languages/Languages.vcxproj b/Languages/Languages.vcxproj index 279bed1a3f..b10b94bfcd 100644 --- a/Languages/Languages.vcxproj +++ b/Languages/Languages.vcxproj @@ -45,19 +45,14 @@ - <_ProjectFileVersion>10.0.30319.1 ..\Binary\$(Platform)\ ..\Binary\$(Platform)\ ..\Binary\$(Platform)\ ..\Binary\$(Platform)\ - - X64 - - diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index e5c9c7a91d..27edc2e619 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -130,7 +130,7 @@ - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -158,7 +158,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -174,7 +174,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) diff --git a/Source/DSPTool/DSPTool.vcxproj b/Source/DSPTool/DSPTool.vcxproj index af68266d2f..0cd03302aa 100644 --- a/Source/DSPTool/DSPTool.vcxproj +++ b/Source/DSPTool/DSPTool.vcxproj @@ -95,7 +95,6 @@ - <_ProjectFileVersion>10.0.30319.1 AllRules.ruleset @@ -137,9 +136,6 @@ - - X64 - ../Core/Core/Src;../Core/Common/Src;%(AdditionalIncludeDirectories) @@ -162,9 +158,6 @@ - - X64 - /MP %(AdditionalOptions) ../Core/Core/Src;../Core/Common/Src;%(AdditionalIncludeDirectories) @@ -188,9 +181,6 @@ - - X64 - ../Core/Core/Src;../Core/Common/Src;%(AdditionalIncludeDirectories) diff --git a/Source/VSProps/WXWOverrides.props b/Source/VSProps/WXWOverrides.props index cf6d5d6065..d979a83c43 100644 --- a/Source/VSProps/WXWOverrides.props +++ b/Source/VSProps/WXWOverrides.props @@ -12,7 +12,7 @@ wx/wxprec.h Async 4267 - _LIB;__WXMSW__;%(PreprocessorDefinitions) + _LIB;__WXMSW__;WXBUILDING;%(PreprocessorDefinitions) ..\..\;..\..\include;..\..\..\zlib;..\..\..\libpng From cfbcaa2cc6d2c990b907747298ad012aa1c6c2fd Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 18 Mar 2012 23:37:38 +1100 Subject: [PATCH 066/185] Linux build fix --- Source/Core/Common/Src/BreakPoints.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/BreakPoints.cpp b/Source/Core/Common/Src/BreakPoints.cpp index 9164312f82..1700276d85 100644 --- a/Source/Core/Common/Src/BreakPoints.cpp +++ b/Source/Core/Common/Src/BreakPoints.cpp @@ -18,8 +18,8 @@ #include "Common.h" #include "DebugInterface.h" #include "BreakPoints.h" +#include "../../Core/Src/PowerPC/JitCommon/JitBase.h" #include -#include "..\..\Core\Src\PowerPC\JitCommon\JitBase.h" bool BreakPoints::IsAddressBreakPoint(u32 _iAddress) { From 483d15a9c3fcc6615ecd0d8e50c6fde759a4abfe Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 18 Mar 2012 05:47:55 -0700 Subject: [PATCH 067/185] fix Common lib re-linking all the time rename wxBase28 project to wxWidgets --- Source/Core/Common/Common.vcxproj | 25 +- Source/Core/Common/Common.vcxproj.filters | 1 - Source/Core/Common/SVNRevGen.vcxproj | 26 +- Source/Core/Common/Src/MemoryUtil.cpp | 410 +++++++++++----------- Source/Dolphin_2010.sln | 60 +--- 5 files changed, 227 insertions(+), 295 deletions(-) diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index 732fc7258c..0128a75a09 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -108,27 +108,21 @@ - - .\Src;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) - + true - - .\Src;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) - + true - - .\Src;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) - + true true @@ -137,9 +131,7 @@ - - .\Src;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) - + true true @@ -148,9 +140,7 @@ - - .\Src;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) - + true true @@ -159,9 +149,7 @@ - - .\Src;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) - + true true @@ -268,7 +256,6 @@ - diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters index 0922d00196..8b05ecbba4 100644 --- a/Source/Core/Common/Common.vcxproj.filters +++ b/Source/Core/Common/Common.vcxproj.filters @@ -124,7 +124,6 @@ - diff --git a/Source/Core/Common/SVNRevGen.vcxproj b/Source/Core/Common/SVNRevGen.vcxproj index 61e3aedb7b..803e059d19 100644 --- a/Source/Core/Common/SVNRevGen.vcxproj +++ b/Source/Core/Common/SVNRevGen.vcxproj @@ -7,13 +7,11 @@ - - cscript /nologo /E:JScript "make_scmrev.h.js" - Updating scmrev.h - dummy - + + + @@ -37,25 +35,9 @@ - - Level3 - MaxSpeed - true - true - - - true - true - true - - - + cscript /nologo /E:JScript "make_scmrev.h.js" - - - - diff --git a/Source/Core/Common/Src/MemoryUtil.cpp b/Source/Core/Common/Src/MemoryUtil.cpp index 3e3cafa335..ebfa380be4 100644 --- a/Source/Core/Common/Src/MemoryUtil.cpp +++ b/Source/Core/Common/Src/MemoryUtil.cpp @@ -1,207 +1,207 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "Common.h" -#include "MemoryUtil.h" -#include "StringUtil.h" - -#ifdef _WIN32 -#include -#include -#else -#include -#include -#endif - -#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) -#include -#define PAGE_MASK (getpagesize() - 1) -#define round_page(x) ((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK)) -#endif - -// This is purposely not a full wrapper for virtualalloc/mmap, but it -// provides exactly the primitive operations that Dolphin needs. - -void* AllocateExecutableMemory(size_t size, bool low) -{ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Common.h" +#include "MemoryUtil.h" +#include "StringUtil.h" + +#ifdef _WIN32 +#include +#include +#else +#include +#include +#endif + +#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) +#include +#define PAGE_MASK (getpagesize() - 1) +#define round_page(x) ((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK)) +#endif + +// This is purposely not a full wrapper for virtualalloc/mmap, but it +// provides exactly the primitive operations that Dolphin needs. + +void* AllocateExecutableMemory(size_t size, bool low) +{ #if defined(_WIN32) void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); -#else - static char *map_hint = 0; -#if defined(__x86_64__) && !defined(MAP_32BIT) - // This OS has no flag to enforce allocation below the 4 GB boundary, - // but if we hint that we want a low address it is very likely we will - // get one. - // An older version of this code used MAP_FIXED, but that has the side - // effect of discarding already mapped pages that happen to be in the - // requested virtual memory range (such as the emulated RAM, sometimes). - if (low && (!map_hint)) - map_hint = (char*)round_page(512*1024*1024); /* 0.5 GB rounded up to the next page */ -#endif - void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC, - MAP_ANON | MAP_PRIVATE -#if defined(__x86_64__) && defined(MAP_32BIT) - | (low ? MAP_32BIT : 0) -#endif - , -1, 0); -#endif /* defined(_WIN32) */ - - // printf("Mapped executable memory at %p (size %ld)\n", ptr, - // (unsigned long)size); - -#if defined(__FreeBSD__) - if (ptr == MAP_FAILED) - { - ptr = NULL; -#else - if (ptr == NULL) - { -#endif - PanicAlert("Failed to allocate executable memory"); - } -#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) - else - { - if (low) - { - map_hint += size; - map_hint = (char*)round_page(map_hint); /* round up to the next page */ - // printf("Next map will (hopefully) be at %p\n", map_hint); - } - } -#endif - -#if defined(_M_X64) - if ((u64)ptr >= 0x80000000 && low == true) - PanicAlert("Executable memory ended up above 2GB!"); -#endif - - return ptr; -} - -void* AllocateMemoryPages(size_t size) -{ -#ifdef _WIN32 - void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_READWRITE); -#else - void* ptr = mmap(0, size, PROT_READ | PROT_WRITE, - MAP_ANON | MAP_PRIVATE, -1, 0); -#endif - - // printf("Mapped memory at %p (size %ld)\n", ptr, - // (unsigned long)size); - - if (ptr == NULL) - PanicAlert("Failed to allocate raw memory"); - - return ptr; -} - -void* AllocateAlignedMemory(size_t size,size_t alignment) -{ -#ifdef _WIN32 - void* ptr = _aligned_malloc(size,alignment); -#else - void* ptr = NULL; - posix_memalign(&ptr, alignment, size); -; -#endif - - // printf("Mapped memory at %p (size %ld)\n", ptr, - // (unsigned long)size); - - if (ptr == NULL) - PanicAlert("Failed to allocate aligned memory"); - - return ptr; -} - -void FreeMemoryPages(void* ptr, size_t size) -{ - if (ptr) - { -#ifdef _WIN32 - - if (!VirtualFree(ptr, 0, MEM_RELEASE)) - PanicAlert("FreeMemoryPages failed!\n%s", GetLastErrorMsg()); - ptr = NULL; // Is this our responsibility? - -#else - munmap(ptr, size); -#endif - } -} - -void FreeAlignedMemory(void* ptr) -{ - if (ptr) - { -#ifdef _WIN32 - - _aligned_free(ptr); - -#else - free(ptr); -#endif - } -} - -void WriteProtectMemory(void* ptr, size_t size, bool allowExecute) -{ -#ifdef _WIN32 - DWORD oldValue; - if (!VirtualProtect(ptr, size, allowExecute ? PAGE_EXECUTE_READ : PAGE_READONLY, &oldValue)) - PanicAlert("WriteProtectMemory failed!\n%s", GetLastErrorMsg()); -#else - mprotect(ptr, size, allowExecute ? (PROT_READ | PROT_EXEC) : PROT_READ); -#endif -} - -void UnWriteProtectMemory(void* ptr, size_t size, bool allowExecute) -{ -#ifdef _WIN32 - DWORD oldValue; - if (!VirtualProtect(ptr, size, allowExecute ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE, &oldValue)) - PanicAlert("UnWriteProtectMemory failed!\n%s", GetLastErrorMsg()); -#else - mprotect(ptr, size, allowExecute ? (PROT_READ | PROT_WRITE | PROT_EXEC) : PROT_WRITE | PROT_READ); -#endif -} - -std::string MemUsage() -{ -#ifdef _WIN32 -#pragma comment(lib, "psapi") - DWORD processID = GetCurrentProcessId(); - HANDLE hProcess; - PROCESS_MEMORY_COUNTERS pmc; - std::string Ret; - - // Print information about the memory usage of the process. - - hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, processID); - if (NULL == hProcess) return "MemUsage Error"; - - if (GetProcessMemoryInfo(hProcess, &pmc, sizeof(pmc))) - Ret = StringFromFormat("%s K", ThousandSeparate(pmc.WorkingSetSize / 1024, 7).c_str()); - - CloseHandle(hProcess); - return Ret; -#else - return ""; -#endif -} +#else + static char *map_hint = 0; +#if defined(__x86_64__) && !defined(MAP_32BIT) + // This OS has no flag to enforce allocation below the 4 GB boundary, + // but if we hint that we want a low address it is very likely we will + // get one. + // An older version of this code used MAP_FIXED, but that has the side + // effect of discarding already mapped pages that happen to be in the + // requested virtual memory range (such as the emulated RAM, sometimes). + if (low && (!map_hint)) + map_hint = (char*)round_page(512*1024*1024); /* 0.5 GB rounded up to the next page */ +#endif + void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC, + MAP_ANON | MAP_PRIVATE +#if defined(__x86_64__) && defined(MAP_32BIT) + | (low ? MAP_32BIT : 0) +#endif + , -1, 0); +#endif /* defined(_WIN32) */ + + // printf("Mapped executable memory at %p (size %ld)\n", ptr, + // (unsigned long)size); + +#if defined(__FreeBSD__) + if (ptr == MAP_FAILED) + { + ptr = NULL; +#else + if (ptr == NULL) + { +#endif + PanicAlert("Failed to allocate executable memory"); + } +#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) + else + { + if (low) + { + map_hint += size; + map_hint = (char*)round_page(map_hint); /* round up to the next page */ + // printf("Next map will (hopefully) be at %p\n", map_hint); + } + } +#endif + +#if defined(_M_X64) + if ((u64)ptr >= 0x80000000 && low == true) + PanicAlert("Executable memory ended up above 2GB!"); +#endif + + return ptr; +} + +void* AllocateMemoryPages(size_t size) +{ +#ifdef _WIN32 + void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_READWRITE); +#else + void* ptr = mmap(0, size, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE, -1, 0); +#endif + + // printf("Mapped memory at %p (size %ld)\n", ptr, + // (unsigned long)size); + + if (ptr == NULL) + PanicAlert("Failed to allocate raw memory"); + + return ptr; +} + +void* AllocateAlignedMemory(size_t size,size_t alignment) +{ +#ifdef _WIN32 + void* ptr = _aligned_malloc(size,alignment); +#else + void* ptr = NULL; + posix_memalign(&ptr, alignment, size); +; +#endif + + // printf("Mapped memory at %p (size %ld)\n", ptr, + // (unsigned long)size); + + if (ptr == NULL) + PanicAlert("Failed to allocate aligned memory"); + + return ptr; +} + +void FreeMemoryPages(void* ptr, size_t size) +{ + if (ptr) + { +#ifdef _WIN32 + + if (!VirtualFree(ptr, 0, MEM_RELEASE)) + PanicAlert("FreeMemoryPages failed!\n%s", GetLastErrorMsg()); + ptr = NULL; // Is this our responsibility? + +#else + munmap(ptr, size); +#endif + } +} + +void FreeAlignedMemory(void* ptr) +{ + if (ptr) + { +#ifdef _WIN32 + + _aligned_free(ptr); + +#else + free(ptr); +#endif + } +} + +void WriteProtectMemory(void* ptr, size_t size, bool allowExecute) +{ +#ifdef _WIN32 + DWORD oldValue; + if (!VirtualProtect(ptr, size, allowExecute ? PAGE_EXECUTE_READ : PAGE_READONLY, &oldValue)) + PanicAlert("WriteProtectMemory failed!\n%s", GetLastErrorMsg()); +#else + mprotect(ptr, size, allowExecute ? (PROT_READ | PROT_EXEC) : PROT_READ); +#endif +} + +void UnWriteProtectMemory(void* ptr, size_t size, bool allowExecute) +{ +#ifdef _WIN32 + DWORD oldValue; + if (!VirtualProtect(ptr, size, allowExecute ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE, &oldValue)) + PanicAlert("UnWriteProtectMemory failed!\n%s", GetLastErrorMsg()); +#else + mprotect(ptr, size, allowExecute ? (PROT_READ | PROT_WRITE | PROT_EXEC) : PROT_WRITE | PROT_READ); +#endif +} + +std::string MemUsage() +{ +#ifdef _WIN32 +#pragma comment(lib, "psapi") + DWORD processID = GetCurrentProcessId(); + HANDLE hProcess; + PROCESS_MEMORY_COUNTERS pmc; + std::string Ret; + + // Print information about the memory usage of the process. + + hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, processID); + if (NULL == hProcess) return "MemUsage Error"; + + if (GetProcessMemoryInfo(hProcess, &pmc, sizeof(pmc))) + Ret = StringFromFormat("%s K", ThousandSeparate(pmc.WorkingSetSize / 1024, 7).c_str()); + + CloseHandle(hProcess); + return Ret; +#else + return ""; +#endif +} diff --git a/Source/Dolphin_2010.sln b/Source/Dolphin_2010.sln index b003809427..20869448e3 100644 --- a/Source/Dolphin_2010.sln +++ b/Source/Dolphin_2010.sln @@ -3,7 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\Dolphin.vcxproj", "{1B099EF8-6F87-47A2-A3E7-898A24584F49}" ProjectSection(ProjectDependencies) = postProject {8C60E805-0DA5-4E25-8F84-038DB504BB0D} = {8C60E805-0DA5-4E25-8F84-038DB504BB0D} - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {9E9DA440-E9AD-413C-B648-91030E792211} = {9E9DA440-E9AD-413C-B648-91030E792211} {93D73454-2512-424E-9CDA-4BB357FE13DD} = {93D73454-2512-424E-9CDA-4BB357FE13DD} {B6398059-EBB6-4C34-B547-95F365B71FF4} = {B6398059-EBB6-4C34-B547-95F365B71FF4} @@ -14,55 +13,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\D EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Core\Common\Common.vcxproj", "{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SCMRevGen", "Core\Common\SVNRevGen.vcxproj", "{69F00340-5C3D-449F-9A80-958435C6CF06}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AudioCommon", "Core\AudioCommon\AudioCommon.vcxproj", "{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}" ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SOIL", "..\Externals\SOIL\SOIL.vcxproj", "{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SFML_Network", "..\Externals\SFML\build\vc2010\SFML_Network.vcxproj", "{93D73454-2512-424E-9CDA-4BB357FE13DD}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LZO", "..\Externals\LZO\LZO.vcxproj", "{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\Externals\zlib\zlib.vcxproj", "{3E1339F5-9311-4122-9442-369702E8FCAD}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoCommon", "Core\VideoCommon\VideoCommon.vcxproj", "{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}" ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {AA862E5E-A993-497A-B6A0-0E8E94B10050} = {AA862E5E-A993-497A-B6A0-0E8E94B10050} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} {8544F1FF-F2A5-42D8-A568-C56B5D3B4181} = {8544F1FF-F2A5-42D8-A568-C56B5D3B4181} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CLRun", "..\Externals\CLRun\clrun\CLRun.vcxproj", "{AA862E5E-A993-497A-B6A0-0E8E94B10050}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcxproj", "{8C60E805-0DA5-4E25-8F84-038DB504BB0D}" ProjectSection(ProjectDependencies) = postProject {CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6} = {CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6} - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {93D73454-2512-424E-9CDA-4BB357FE13DD} = {93D73454-2512-424E-9CDA-4BB357FE13DD} {B6398059-EBB6-4C34-B547-95F365B71FF4} = {B6398059-EBB6-4C34-B547-95F365B71FF4} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} @@ -71,13 +47,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcxp EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bochs_disasm", "..\Externals\Bochs_disasm\Bochs_disasm.vcxproj", "{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiscIO", "Core\DiscIO\DiscIO.vcxproj", "{B6398059-EBB6-4C34-B547-95F365B71FF4}" ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} {3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD} EndProjectSection @@ -85,33 +57,28 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX9", "Plugins\Plugin_VideoDX9\Plugin_VideoDX9.vcxproj", "{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}" ProjectSection(ProjectDependencies) = postProject {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX11", "Plugins\Plugin_VideoDX11\Plugin_VideoDX11.vcxproj", "{9A4C733C-BADE-4AC6-B58A-6E274395E90E}" ProjectSection(ProjectDependencies) = postProject {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoOGL", "Plugins\Plugin_VideoOGL\Plugin_VideoOGL.vcxproj", "{1909CD2D-1707-456F-86CA-0DF42A727C99}" ProjectSection(ProjectDependencies) = postProject {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoSoftware", "Plugins\Plugin_VideoSoftware\Plugin_VideoSoftware.vcxproj", "{9E9DA440-E9AD-413C-B648-91030E792211}" ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputCommon", "Core\InputCommon\InputCommon.vcxproj", "{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}" ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} EndProjectSection EndProject @@ -120,14 +87,12 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSPTool", "DSPTool\DSPTool.vcxproj", "{1970D175-3DE8-4738-942A-4D98D1CDBF64}" ProjectSection(ProjectDependencies) = postProject {8C60E805-0DA5-4E25-8F84-038DB504BB0D} = {8C60E805-0DA5-4E25-8F84-038DB504BB0D} - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxBase28", "..\Externals\wxWidgets3\build\msw\wx_base.vcxproj", "{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxWidgets", "..\Externals\wxWidgets3\build\msw\wx_base.vcxproj", "{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}" ProjectSection(ProjectDependencies) = postProject {01573C36-AC6E-49F6-94BA-572517EB9740} = {01573C36-AC6E-49F6-94BA-572517EB9740} - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD} EndProjectSection EndProject @@ -136,6 +101,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "..\Externals\libpng\ {3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SCMRevGen", "Core\Common\SVNRevGen.vcxproj", "{69F00340-5C3D-449F-9A80-958435C6CF06}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -170,18 +137,6 @@ Global {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|Win32.Build.0 = Release|Win32 {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|x64.ActiveCfg = Release|x64 {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|x64.Build.0 = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.ActiveCfg = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.Build.0 = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.ActiveCfg = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.Build.0 = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|Win32.ActiveCfg = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|Win32.Build.0 = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|x64.ActiveCfg = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|x64.Build.0 = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.ActiveCfg = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.Build.0 = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.ActiveCfg = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.Build.0 = Release|x64 {37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|Win32.ActiveCfg = Debug|Win32 {37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|Win32.Build.0 = Debug|Win32 {37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|x64.ActiveCfg = Debug|x64 @@ -410,6 +365,15 @@ Global {01573C36-AC6E-49F6-94BA-572517EB9740}.Release|Win32.Build.0 = Release|Win32 {01573C36-AC6E-49F6-94BA-572517EB9740}.Release|x64.ActiveCfg = Release|x64 {01573C36-AC6E-49F6-94BA-572517EB9740}.Release|x64.Build.0 = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.Build.0 = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|Win32.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|x64.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|x64.Build.0 = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From c5d746f3d87f70beb803218fc42f0c4859544b64 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 18 Mar 2012 06:41:12 -0700 Subject: [PATCH 068/185] remove scons files from VS projects --- Externals/Bochs_disasm/Bochs_disasm.vcxproj | 1 - Externals/CLRun/clrun/CLRun.vcxproj | 2 -- Externals/CLRun/clrun/CLRun.vcxproj.filters | 2 -- Externals/LZO/LZO.vcxproj | 1 - Externals/LZO/LZO.vcxproj.filters | 1 - Externals/SOIL/SOIL.vcxproj | 1 - Externals/libpng/png/png.vcxproj | 1 - Externals/libpng/png/png.vcxproj.filters | 1 - Externals/wxWidgets3/build/msw/wx_base.vcxproj | 1 - Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters | 1 - Externals/zlib/zlib.vcxproj | 1 - Externals/zlib/zlib.vcxproj.filters | 1 - Source/Core/AudioCommon/AudioCommon.vcxproj | 1 - Source/Core/AudioCommon/AudioCommon.vcxproj.filters | 1 - Source/Core/Core/Core.vcxproj | 1 - Source/Core/Core/Core.vcxproj.filters | 1 - Source/Core/DiscIO/DiscIO.vcxproj | 1 - Source/Core/DiscIO/DiscIO.vcxproj.filters | 1 - Source/Core/DolphinWX/Dolphin.vcxproj | 1 - Source/Core/DolphinWX/Dolphin.vcxproj.filters | 1 - Source/Core/InputCommon/InputCommon.vcxproj | 1 - Source/Core/InputCommon/InputCommon.vcxproj.filters | 1 - Source/Core/VideoCommon/VideoCommon.vcxproj | 1 - Source/Core/VideoCommon/VideoCommon.vcxproj.filters | 1 - Source/DSPTool/DSPTool.vcxproj | 1 - Source/DSPTool/DSPTool.vcxproj.filters | 1 - Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj | 1 - Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters | 1 - .../Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj | 1 - .../Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj.filters | 1 - 30 files changed, 32 deletions(-) diff --git a/Externals/Bochs_disasm/Bochs_disasm.vcxproj b/Externals/Bochs_disasm/Bochs_disasm.vcxproj index f7110f2e9a..50f62f70f6 100644 --- a/Externals/Bochs_disasm/Bochs_disasm.vcxproj +++ b/Externals/Bochs_disasm/Bochs_disasm.vcxproj @@ -152,7 +152,6 @@ - diff --git a/Externals/CLRun/clrun/CLRun.vcxproj b/Externals/CLRun/clrun/CLRun.vcxproj index 0b168991d0..c6a4cb2e6d 100644 --- a/Externals/CLRun/clrun/CLRun.vcxproj +++ b/Externals/CLRun/clrun/CLRun.vcxproj @@ -166,9 +166,7 @@ - - diff --git a/Externals/CLRun/clrun/CLRun.vcxproj.filters b/Externals/CLRun/clrun/CLRun.vcxproj.filters index 795200b898..3f252a668b 100644 --- a/Externals/CLRun/clrun/CLRun.vcxproj.filters +++ b/Externals/CLRun/clrun/CLRun.vcxproj.filters @@ -46,9 +46,7 @@ - - Resource Files diff --git a/Externals/LZO/LZO.vcxproj b/Externals/LZO/LZO.vcxproj index b29b9b2c84..76b75cdc4c 100644 --- a/Externals/LZO/LZO.vcxproj +++ b/Externals/LZO/LZO.vcxproj @@ -143,7 +143,6 @@ - diff --git a/Externals/LZO/LZO.vcxproj.filters b/Externals/LZO/LZO.vcxproj.filters index 50cd659802..889fdb14a0 100644 --- a/Externals/LZO/LZO.vcxproj.filters +++ b/Externals/LZO/LZO.vcxproj.filters @@ -26,6 +26,5 @@ - \ No newline at end of file diff --git a/Externals/SOIL/SOIL.vcxproj b/Externals/SOIL/SOIL.vcxproj index eba92bad49..33f75bbaf9 100644 --- a/Externals/SOIL/SOIL.vcxproj +++ b/Externals/SOIL/SOIL.vcxproj @@ -150,7 +150,6 @@ - diff --git a/Externals/libpng/png/png.vcxproj b/Externals/libpng/png/png.vcxproj index 886af15d1b..e272b07452 100644 --- a/Externals/libpng/png/png.vcxproj +++ b/Externals/libpng/png/png.vcxproj @@ -28,7 +28,6 @@ - diff --git a/Externals/libpng/png/png.vcxproj.filters b/Externals/libpng/png/png.vcxproj.filters index 779fdfc4ff..5bccb29842 100644 --- a/Externals/libpng/png/png.vcxproj.filters +++ b/Externals/libpng/png/png.vcxproj.filters @@ -2,7 +2,6 @@ - diff --git a/Externals/wxWidgets3/build/msw/wx_base.vcxproj b/Externals/wxWidgets3/build/msw/wx_base.vcxproj index ed41c88d76..d99f6f8b94 100644 --- a/Externals/wxWidgets3/build/msw/wx_base.vcxproj +++ b/Externals/wxWidgets3/build/msw/wx_base.vcxproj @@ -1534,7 +1534,6 @@ - diff --git a/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters b/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters index 7c02f384fa..e11b02d82e 100644 --- a/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters +++ b/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters @@ -3416,7 +3416,6 @@ Common - diff --git a/Externals/zlib/zlib.vcxproj b/Externals/zlib/zlib.vcxproj index 9fdde8c277..e4432e2612 100644 --- a/Externals/zlib/zlib.vcxproj +++ b/Externals/zlib/zlib.vcxproj @@ -166,7 +166,6 @@ - diff --git a/Externals/zlib/zlib.vcxproj.filters b/Externals/zlib/zlib.vcxproj.filters index eed3c06cf2..5e4b0a7921 100644 --- a/Externals/zlib/zlib.vcxproj.filters +++ b/Externals/zlib/zlib.vcxproj.filters @@ -83,7 +83,6 @@ - diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj index a82ab9aecc..0c5f256c19 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj @@ -210,7 +210,6 @@ - diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters index f3fd6b4aaa..7e098ecb85 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters @@ -46,7 +46,6 @@ - diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index 1e0561bc23..e03d40e43a 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -571,7 +571,6 @@ - diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index 66b25af176..020cf76ad0 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -1036,7 +1036,6 @@ - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes diff --git a/Source/Core/DiscIO/DiscIO.vcxproj b/Source/Core/DiscIO/DiscIO.vcxproj index d94ac13212..417b28fa0a 100644 --- a/Source/Core/DiscIO/DiscIO.vcxproj +++ b/Source/Core/DiscIO/DiscIO.vcxproj @@ -226,7 +226,6 @@ - diff --git a/Source/Core/DiscIO/DiscIO.vcxproj.filters b/Source/Core/DiscIO/DiscIO.vcxproj.filters index 80ddbe57c6..a16eb0625d 100644 --- a/Source/Core/DiscIO/DiscIO.vcxproj.filters +++ b/Source/Core/DiscIO/DiscIO.vcxproj.filters @@ -133,7 +133,6 @@ - diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index 27edc2e619..72c40a3db4 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -330,7 +330,6 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj.filters b/Source/Core/DolphinWX/Dolphin.vcxproj.filters index ec7d68798b..61ae0826fc 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj.filters +++ b/Source/Core/DolphinWX/Dolphin.vcxproj.filters @@ -266,7 +266,6 @@ - Resources diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj index 8eed835b2d..dc987d83a2 100644 --- a/Source/Core/InputCommon/InputCommon.vcxproj +++ b/Source/Core/InputCommon/InputCommon.vcxproj @@ -191,7 +191,6 @@ - diff --git a/Source/Core/InputCommon/InputCommon.vcxproj.filters b/Source/Core/InputCommon/InputCommon.vcxproj.filters index c6acfdd6b3..311476bc72 100644 --- a/Source/Core/InputCommon/InputCommon.vcxproj.filters +++ b/Source/Core/InputCommon/InputCommon.vcxproj.filters @@ -54,7 +54,6 @@ - diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj index dd29d29ccb..f53c18cb37 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj @@ -266,7 +266,6 @@ - diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters index 5ce157a78e..c933fbc939 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters @@ -248,7 +248,6 @@ - Decoding\OpenCL diff --git a/Source/DSPTool/DSPTool.vcxproj b/Source/DSPTool/DSPTool.vcxproj index 0cd03302aa..e72c055233 100644 --- a/Source/DSPTool/DSPTool.vcxproj +++ b/Source/DSPTool/DSPTool.vcxproj @@ -192,7 +192,6 @@ - diff --git a/Source/DSPTool/DSPTool.vcxproj.filters b/Source/DSPTool/DSPTool.vcxproj.filters index 8ab6b219a0..c5b78da492 100644 --- a/Source/DSPTool/DSPTool.vcxproj.filters +++ b/Source/DSPTool/DSPTool.vcxproj.filters @@ -18,7 +18,6 @@ TestData - diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj index d72f0fa9a9..18b8ac4d84 100644 --- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj +++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj @@ -235,7 +235,6 @@ - diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters index ed581ff963..cd170691da 100644 --- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters +++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters @@ -74,7 +74,6 @@ - diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj index 7235327fb9..66cfab9b01 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj +++ b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj @@ -239,7 +239,6 @@ - diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj.filters b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj.filters index 57784e2717..4bc1901325 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj.filters +++ b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj.filters @@ -56,7 +56,6 @@ - From 2ab2afaa1f77d03c5396338127d7e2463dafc680 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 18 Mar 2012 07:50:37 -0700 Subject: [PATCH 069/185] update portaudio to stable_v19_20111121 and fix linker warnings --- Externals/portaudio/Win32/Debug/portaudio.lib | Bin 0 -> 1367996 bytes Externals/portaudio/Win32/Debug/portaudio.pdb | Bin 0 -> 192512 bytes .../portaudio/Win32/DebugFast/portaudio.lib | Bin 0 -> 1318338 bytes .../portaudio/Win32/DebugFast/portaudio.pdb | Bin 0 -> 192512 bytes .../portaudio/Win32/Release/portaudio.lib | Bin 0 -> 1318338 bytes .../portaudio/Win32/Release/portaudio.pdb | Bin 0 -> 192512 bytes Externals/portaudio/Win32/portaudio.lib | Bin 1100706 -> 0 bytes Externals/portaudio/x64/Debug/portaudio.lib | Bin 0 -> 1240980 bytes Externals/portaudio/x64/Debug/portaudio.pdb | Bin 0 -> 184320 bytes .../portaudio/x64/DebugFast/portaudio.lib | Bin 0 -> 1161496 bytes .../portaudio/x64/DebugFast/portaudio.pdb | Bin 0 -> 184320 bytes Externals/portaudio/x64/Release/portaudio.lib | Bin 0 -> 1161496 bytes Externals/portaudio/x64/Release/portaudio.pdb | Bin 0 -> 184320 bytes Externals/portaudio/x64/portaudio.lib | Bin 1062780 -> 0 bytes Source/VSProps/Dolphin.Win32.props | 2 +- Source/VSProps/Dolphin.x64.props | 2 +- 16 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 Externals/portaudio/Win32/Debug/portaudio.lib create mode 100644 Externals/portaudio/Win32/Debug/portaudio.pdb create mode 100644 Externals/portaudio/Win32/DebugFast/portaudio.lib create mode 100644 Externals/portaudio/Win32/DebugFast/portaudio.pdb create mode 100644 Externals/portaudio/Win32/Release/portaudio.lib create mode 100644 Externals/portaudio/Win32/Release/portaudio.pdb delete mode 100644 Externals/portaudio/Win32/portaudio.lib create mode 100644 Externals/portaudio/x64/Debug/portaudio.lib create mode 100644 Externals/portaudio/x64/Debug/portaudio.pdb create mode 100644 Externals/portaudio/x64/DebugFast/portaudio.lib create mode 100644 Externals/portaudio/x64/DebugFast/portaudio.pdb create mode 100644 Externals/portaudio/x64/Release/portaudio.lib create mode 100644 Externals/portaudio/x64/Release/portaudio.pdb delete mode 100644 Externals/portaudio/x64/portaudio.lib diff --git a/Externals/portaudio/Win32/Debug/portaudio.lib b/Externals/portaudio/Win32/Debug/portaudio.lib new file mode 100644 index 0000000000000000000000000000000000000000..e05680c0247fb24fc5b2d013094e23a91b80448e GIT binary patch literal 1367996 zcmeFaU5sQ|avqku%jJ^8HTRd4Y!g&#LBJ%fneDFXndx4T;$~&utjg{Do4lD--K()K zZ)M)9PEJ%Se&a7SKKGCQ8vlO&SI!!r|C@i#`~AX~{$k_c z@1Ok}jV~;JL;e1(Uu=Bg;rF2p9>&1K714`bk8;TZVhKUp>&ejnQ4VGKNsfrl~h zFa{pRz{41L7y}Pu;9(3rjDd$S@Gu4*#=yUvG4SPo{+-7Eo8O=O$A6_^e!uc(-fKMk zKD5EZ82D^s;A_A84;lx5fB&fQwR`-2{Tq|UANlX^{e0u=|C;`O<1ddJ_V=&9)A$Dc z{`Mc#|Nh>eZ+zo3{(kd!{-6>3W}|$%TP(BgYO!17%f+u3FQ0udTIP#Yt6aS)HoIc8 zZGh-vv0}Pb=_q~pbhWTNG$y-f_g|#hNBd%P+gU8ZtDk?mxY^&dUgxV-v22z5)y~ki zi>rLU+-X!l-+p2+F2{@fP0=YgH~B94^e}c;thS5GWnrk&{ARt>X(wfGu`2S7<2K2! ziI8j9TrSI5zAO60O}V+XU@mKGzu6S4-SXBD%}+r53AYd@?re%M;c2m(EN-|UOyX+O zqO_DjmM)88-N>>{kuSe{eD(h0500MB=SNph^5<7G2funOe;V03KP$Jp=6d0Hs@_UJ zDVD{qT#0TqTqFnjyOFheX}6ud*mh6y?PAv4&ll)p^wm{9E6(!Od|7NjG;AlW=BS%B zd%ZN7OuB>9R6?ii?l4ORL^c-i)>(6Kn)JHqL{hh=<8d;WIHX7c=E$O*behwimnfZ% zM#J$WP0o>2ay##~6Ong&xqPvmZmG~H4~jf$j+_1Lq&pcmCrK2T^-*jeGfJ8-L>kUB znV_9o<6)YfG*L-a5C%@B1FE)waG}s-sy#aU)oiyYS1-0Lbn&hjEmn=}bP9HZX|LDF zUZl<5>2Tbgob|hdbkZEOk}Q3dPLh7sYz?RBq}$4p*4Z#?5$cWvr>%nw`(0FFbT%9$ zS#vyYzRE`9VJk_~Au4d79D`vuMWN6MV-PdxwA~pr`$=|;RzaUo3xI)uwv*B1ECixf z<7DVTn?1k==$*_J&L^0@48LdnDfOnvusMC1oez7{z7IZW2E}c)GZeDx7XiTTAeJ16 zN=|@9GU|2Fq}_p6CJn14udwC>5$63SwOh3)8XimG`uSuyOebEs(9SjWB}}DM1dL|U z?gnhz-CDjtMHmAb=R79K;d37jh8Q9KQ0Qx5gtx)O_!Dk84H`uQYgmCiR@6}|OG#P; z!{33c>;x`SHe%LK!s#@IEE%^Ub|H!flkrdq0W;YgHXTmKEx+B=jH|Sq16NBZaFG&D z#>q*~&x7Ti*IP;~S9)B5BTN-2TDyzpInAtC>ocm72}7yB!qLJAmw5{^2XgmSt(0{H zMq*gV$++8A1Jr`B+DxWnZWssa4O=g$VH{-G?@tF^eD4k+>@m*M&T!oKY3wQ^61JNY ztOk7+z)D(Mo`j;+rWP5`#xB?*mjos4H6hNkQLj0nl4b32_goEcn_;KhOVkSGmAgyJ zK&RPC;`#NHc6ZvZ!8v&qS(j|a=+U4keJBduQ7;MMgJg0s9Q$pLweICBuf!iso4xMD zhm8}gNL{s#*o>jEux=xoDjgxIo~V{?lDuTG;sC?Zus1yQvzVOQHOLX3Ydu0_aemTe z)ypfhooqJgd3QWPMSQAJUoD%K3hFp=&8Aq$N0?5ucykI28>j;VQg5cvZOl-oK}G%F zoREZTbvs?GK+V>%TR!6ygC?qL%NV6;cbmPWHMs{jL)jlCr%&$4*{8i<35f5}XW)C3 z-N6?Ec+jS1jaHoI4RqqR5}&msrfZ@Ey-^E#;lW-~t#!Dh_o=y}Im~B(u~S=LjNf`3 zbddU%;!L}P4(n;rcCZvjwONq7S3@{qwL$Wko=jeipaj$j})e@)`1u%P2+v8i_!)@+D`^QIh?+mv_5$9{P@GH*{my^BY_0Jlc+uHoxIB0 z-P0~MbT#c@IeNrcc&5C=h%`fxqTd_c$y%wt2YJzc(x0%p)m(OHzO%|;4XJqA-NlOM z)P0DK?;@f-9QL&b$AzuIMZZZ~y;`10l688+Ca+zQ#;O-Ox)I2xa`YrSxyAN2UuMR|arWZifO%I88lC7hb!Za^WHEX>G+(r%8i(Z55uTSA_>2PaZMdPvrKq=&~sKzfkt^kmd+nGHsylO{YL7=VVKCFcMfGw&4ar<_a-z;Xz zM-XL)`O!|!vsQU?gYpE)du6#U=IIVb+MC4+J^?RRSZ!PRdK+b{(rC9p$*Z5J1I9kt z24IC_ZMcHT#CA|3M}u;=xVjC>!4uhG?4Db-GaM~Nmlvl1(J$r;o<;#&c8uDfD@Ogr zd~vehQsxp|M}9uC#Cdqa`qsh{+$U-@5WX{@+z~o{U|o+U=ik7 z7D+0sE*`d>1f~oRdk8n2oau_og0jS|EvUlQ6jURPKPRZ8!g_v#KFPXl0w=|QjU8F1 zpS~I>>wg7j1ZD-1epH_*y{O000ySxBnYyP{{+u5OVgqz%h>4TR3C@Mk_wGb z4J-#e8;+Io?Lg9?DUIQlqOG=z;`=0{Iixm+D(|dPg?0-D0!KyG%_eL{EjV=Gf%L1} zPPFps^1y83J->jYFDAoL;AEaEei@Wb*=uEM$zO{O&r4v*1UyH8H3 zSi6(X#5MFMB!Mej0E3@+3O;QNT<+0GGj|6gxEU537FEhrtQawUFeRRa@W($bNnJbg5?=z zcobD=Dw2sp3SGn^p|eBmqNx(&_6bnD>*-t9hr?p@j!(QwjEBR1bdaS`r+RRoBsQbS zY)VJ%Zl`AM#>BJ~T9`R1W@4PQr@Rh&1xv@iAlDwx3+!Edx+!n}Y#kx_lCgFxIv}Y! zN!tB>Fk)#(UX`E*`l?1wOteAWvY(vSF4EIco7Rr7K<6!ZYRtac@=%89WbDRqj*uBb<U#88aiWRtJ9>v9vcTYp_#AHgi&$O%hL3wKxot~>m`sZ9gvOM`7bePvyUJHgll#Oyk(SHJtUVy zu)gU*%rfR^6vQJ^lB&sjJ^q_Q$xLPnY2!-*Fjle<0v%GvqWGAk4OQ0%X=`KzSjPkr zDCgY-o=-mwtXmY!=mVWmI)I~zDY7A?XPcr=%9U3(gBnDpQaLH!L)1+ZTV)qc zddikhvv!MI1!ZlB6%03^+4f;m5#g&zbYxkagH72a4!LcW?|?zu&^nIfnuH4GVGgeO?GizS+LcmrBaQRy-;f6cUYvrLQsj%LsDx zBEkM{_JjRmi*WjKMd1w!wq8?6av#ESnI)gjmiu|p*_1cw>+)@PH7M}kc9$=)GFHjs zOuE~4vE9+ioEGaGS_m1PtBFUO;te9!u{0q(AA-0_F)o%l!joTHi+DXrd$C<(?HlAb z#kkm(`^~I4#IZXoS5-RbBCIkI7n7QFtYkG`Q!8i9?Y5jPv|6PKHhyn*w|R^KB=k;#agrMKJ8r_t=lSI|MvyY}-KboR^TnA{TSy2w9Kry;nPJt~Uj zj&dih1)31)CsF+9^(}(#G13lkPxot5PqtY?ec9eD@R8A2@>yQP1D~~vH;b7*=nz2< zlfH6}NL)s$f;f+1>ql;q^`_WvS;cjIktHiAw-`_-iyelZSB@;gzq>upHw)?rBp}_y z%YB4~J{G(0mCs6?qm#b3Ui0C2iHuGbE&1Rf#s& z`3kMD(QGPA3|_Q}Ey}ondka%WA55YC7C4BnO)w})-yVUBpb=Y z!}VNrcg0Qe=^Bk!MkWoFR$oaylz=v^epK7GzXHFy5+zNT$#( zaY};?73?hY>v$nj>_->zoF_O-(`~5f|~8gVzYZa&s`B! zIyfOQUANm{T9`yWwk5_)4F!#kO2LCnMmU8vMDx#zlhSoTv^+$b-L#rfD+Mg6 zzru#Bkf6ccsP@@(@=raf7iM!--XKhiob9@U{p59x4k@v`#FAEz-_)XBFP0E^FqL>Y z(h7rt*2js%x|D5FaCY7lR;5jD^2IXV(GmrX&&yKcjt}6(bQk$~b3nn#<=)&z5u2?q zTXX^_6%lgmXq_HodQ1W3`e-m`<>lp~Qb_9Ac$)}JWZ+9|bkGZeLjyh_iw<@{6C3Cr zIx@%!UpK%BS2vKl{dmLZ$)Fusw7kItqRvA1ay>~eSL2|L zqP(0ecFS-!_VUZZYza)K8%{wnFn^$?T*vE&NDiFhj10Jbd5NK0*Ia|e?2||$CFw#f zM~kuH?sY{aiJ&6mPp0IDGrUmkS;m|B~fe)`uNBoB_%AcNY{(?>S(jL z!CI)hD$)`GL3A?uG>2NFN*QerpDflQAw{fBRMn(_4aTWvQa9wVm%H+|8)n$2>vF%1 z4dFoVQ8RZkc{ORb>oOsDe097iF2h9;%EX+MHYpsSOi}|mwG|^AFtN#NmFwHh;`+5+ zp0N$t6`9bt5$T_ia*4C{x4v>IF~|n{KHY|lD7LfBf_D-E+TD`b9~S)rCKDD zR@EUf($*2Pi);n6TZ!atP-#1jVX+#mcD^l4GM=v2@dnW~&iwUHCAGNa+x&J*J4*#` zVi2((O^i+Ia7*v(P|eN8ZZv$RxHF+3`v9gehHSB#60r)7577^#C2vg_}`(p@xoUbhy`Oj;YzkK)GupYI zpZaF*O@IXrHaNKdlx*`F7K~>l_LsN)0*0M<O))5TZ_CXm2djbbW_E7E#*JYK zlcH|Pno5BD0xUsF;t3vFV-^UDN=K7w+dswHQ_K&ROBw8W%xT#nRV6<+Qq{48I3#13 z1g>d+VKAen$A)>u6xm#}%K&3}S#GR3Gt81q`69(|rM~E5M4PXlulBg?h5WAZ$#43% zm0w~I7@fw?+0wi&a3Rj#7`fs^mG#clm>ndQb7}H5<8;8lKt2MY<;%NToP*}q3tQ%h`IC`2}sK>`bGbTRWQ-FdHiw>`< zQfX>OkgUieUzfaABsvCYZ}N(zy*D&REbFpc$4M(aH0&<B-*ssTo#$U&tpmDgntzFl9l)2R>Y z=#ECZO+DrnWlN`tPL1T(R5fbGda~NzAm|H{p*mUP+oh~l^mrHm+cU384WKpq!p*3wb?Z%dU1En>=i-pkrTx-PGLd!sGz~;8MxbpkXVz8N~^QRkx zdYE7y#WhMH{JDn8=*Bgc2H4-Uoubxw5RydA2Fi{{rL2ld;A&KWEi&aD?xZZ2y9I8< z6tk3&W;xduP~XB3A@FSrAUI$v*m{dgkhL*HRHf|JN%$zTW>b%32e$Kst=)GMvVIHA z*u%SFB8lvS30%7aW~5fA^&(gug7@FAZoP#jXzc!iEY##`_T>l?LHm=AQ!}a+yt*;m zX1bv&%Y(&Kv_^|5=J8>OXg!ES+AW90!x{lw3oJb01`j+1Dupf-&Tom&uyAWh5VVX( z<(lab6-wKORm!>gO`CbVKy_ZiZbT0CL)@t7WQTzN`krLH#R|~^feyRP4sF%9*|^l_ z@4fjSStWu(sNoy$wsdg~ha3fjt*!%W`<5;zz?LGECkh%05#0u~51YC85!0-uh2R~N z!7z1bI0|Q>nzGHP!E~>MW319m)5H(1^*OYsQl)LmxL%BMc1}C$yG}bu=@~qc}@)l0;KLGtK$@PaF%mf*xTZ;;Rp) zP-Cov)L_2yVX&c!WZ|{VH7VfQ6B}ETVp77vmXJARbuB%Y1|RGO4H$;lxmUBzo6#rN z*$GbBP{^pXq$^At=3_X1V0f+gHZ_4}&22&g#dMQGS2=on5Jhwj`+m8BgEw8cE&RTq zv8=fztGWF4>AIvqQkRIMlZ2kn2ysS=Ll6{(0J_xNP85Q5#uUs?&RzN@Ryq1Qe9LFHEZXm{4kAFsR){P$E!=xxrhxq} zgg3#IOf;EVfTRjUA1xLVt?$BSEdm>6&FXZ7E1fXec8H9RfZD~XM9iuPbC(G)6O@S| zl5$*JNhn;_w27uW2i+E-lwNyEaD9d*VO@>}U(K?IHVpcUvNYiOEDc3nmIfcmvRqw9^EB`SnHrMX zTn#~x?Sf8vLL}pT1TjLoH`mJK?GGafj+aGJ#EK&Eeo0KTh*B6(JS&5ZWn*wb7N!kk z9tKvEi9ttmF-Sj~e!j+xv0fsY9Q`8SLZ>FtE%JsXlLA&Sk39D-B}gH#(Km-ngBI1xCz|4o6$Okh56W zEFo+=n2=~!ceKOdUSnj~Mls8`LrYtaa*@+1T^9c4t7(}`@D_SuN@#D5W&ZLU4uyJBYuw8z$~g z7;vB{$nA{*tJ6Zo9I3Y0+Kd*T+Ri*gQk^)5sKdGB(>ifnfeS4};o8vcS*0>VM1jxB z&EnU|Mzti%=5jAIg^)m~cM8S-yC$cmWh<)Uf*vt*Sdn9jQA|i(Mh5L=Lxx(h(yN#| z0?7J7$C)hF9z^K}h$LUkNsnqRx7K&eUJ7iFW%q9}fe`i~;_j`u*H(nv?C(L8c`7xSU`@#~;a@L)GJ9JAsaB z(~WU5$9_>UEI9OaD~{^GFox~Jq@2L=YU3Y_wag?%kf_>p+Q9?}JL!duiI@s;OkZ() z2vPr3G%X_pLxm&5;yrMKe6uOviqx_MC3 z<`IKv6wuz$1tutPWfRO`PXS?w8jInkP@uF#r{0m}Q|Z#qX>&+(%`0YzgS8B6LWIP1 zS|7*bMW^sx8=0C1f`}|AS@R7xY1f7HS}Ss%BzmQ@qEnz?(kSVa=52_?!8_%9W_Ly{ zwu0brZQ9rP7A~D7BtJ$(n22JX%T05=HV2q>qv}Kzw68oVDqL6_u%%JJhiR>}(v*P1 z>ja%RMA#c=SY1)nn!|}vVgwZZmliuR;h1hz$PO;s@C*+M+;7pv+k&-?>r$;^lnsvt z!1;b=t!Ii8fHyFDm#c6X070SZz*NSK;f_tXJF~AW-ZGG`NEl@Bph4sC_!Oeil zE0_jsY1ueWm)GdURu{~5S4cn-JH(#MW`69mHXmm|h-JV)TQ$_JC^5eTxMhQh7{01l zC@rS7MvB9)CMO!;I4WI;;{+0gb=4?D1}vqLg<&wo>qoaJL@Ice3-u*zENB&P=R z*EUYnWTZb?A_YB!!C78af?G{OQV_zEPd+YEO6dtQ#FH{!(Mj1ZV@*SFf26C9QQD5F z0|qoiZ`JbE$AQ=x3~!hFnUj`l6#A!)vWJzfPFnnuzXPYoI3gcD4% z%fR%kb_RCTj0U5Z_D&DGm<3Q{47SqP!(*wSjLi^YoFAuv4T*QoL6J~&B5pY&$Dg`X ziq|!V{<>8o7>H@)m97ZiQLe!i{u6O1c`(fK+rpB3dpGkwLq8HLC+OU7tkzT0f*t9}UPH)+&uP z>4oJpOe};j771uOu=Pmo)(65Afpfz)7fHVzsvBM80;RWjC)n?@)@Z{lG(rvvW#1FK zK@L42wM?ktIvhd7ci_bOuFRTi*r{NhHzo6cRqLIfD74op>tTrVd=k)=|V6 zx1b(xaw(y_3^ZDpnN@idJT_IivedpCNJXEQ2FgxmYSMZqxGu_erGjF;ME`%kEY0y4 zm37;}>nbfs;sQ7i9=34wfb)zANWfcjhc8?#@{d$8$b~3eN(nw0Z{*3IVUn zMUdRdyVA?ubjZ$9Prjhnx3z*JB?L*lC147JA_q^jQ1ZE%C8E+s*d@`bFMLRqOOZ2O}vj`A*AC>WE&PPHeCxJSDT4X7S9KVB*^8^yvCXF zYq7QE@dPWt3WwU~xKj;oR#*(YHokZbd*X>YCRdA)?FJ(R-5qCW^;eIgq)J7IbW?)*pwXk%&7!q03j; zAzY&hGZ&Go9g3|OJ7p`>Y~GDSYnw=$^Qx)H)K!5hQ%VKQ!l-UII2VrWK>F&X5Cv<%8_c*Gei|$7nzp1L?Q!}kl388NUXFAo zd_}D*2m3E*yJ<~1-cC?`5!2H3ueqQVvczeZ5{+vM5OJZi5(wId@Xm0xgXSx4uoN`O zda;G95qm{}#Kjepw53^8`NL|u=KPvN94^zE4!cFCF1&6E2K!mhlD4eE^ENm-x_RM~7 z!6)vl;1*1$xUAtvuGxHKg>^wU5TQ-aaj-4V2?hjzb3GY?qh|1cI=~Lo*2i;Eea!L9so@#bBoQ9XwYk4D?bMd6&=y z{4hq;nHD6Fc8<$z2uvbN#(Q#d$b&c7I@mTOLggzHl7lJP{Ux&r`A@}}(~A^OQYvTL zbZp{_7`R@i#Sg6a*SL%vN^hgQQR}d&n!i?t5(d4^myxv)@n94z3HOcUgz-Fi4A9;; zw`(CNRnQJ1eD^$P9OPr}_sple#S-_B?C|&(E=l)7t@4X}o39r*Y+e+7cp+KeGC(9z zBThS{u>Hq5CA4ydU|h0>E#RCB3Gy>sF>appk_qW43ZqPkbOiPnL4(wh5=xR9AUss+ zY+JSTlh=^SQ1O(x;iN=4MA3aL&M-oJ0Ikkn-HMr=rE_4~u5`Dv^RP8LbIR+~_dn?g8KN^mEY*_W16gYl|pf&q- zhzN(0uxP^NcaMt?^ZAEYN6+)iS$_5OnT1~!kL8bnKYje{>Zw3D`0V)EGly{St7jkN z5%`l2j-MROEuxXFn{QNC^>0)M+S9}kX&e?q6gzbsSWygNlOPq7ZAgj(Mm5EK*W)kp z#csH&!y~TdQ1$|C1|N^R#j1~I!O(B22e|i?%5(?X&60qH>f(AH67Mm=YA9zD3N&f0 zZzm_D8f*?7zwMSfU`q-uV#Sb=C#Z1|XGjApH9 zBB>E@K+ioPI-zxz;Nh%Hy~o3GQds{s(4IKUMpgk~ZdG9R5xP1|ED;;4_E2~60z@Sp z#-(~{sy*yCyMyd|L;R--sUf`tZ+Si>iHmR5FmgPTo7on+06=BqxxE2pR_6ve*R zOwS*qI8ZYLay)5e7tI%m2TUh;N&4g!9(2b$wW*JKg|}k+cn;3zHNqR;(?RPjJDE=K zf~!eF8*6qcV32dBCwL3_bc~0jp;0u`7kH+2((T}tMSAVolHhssF)r-JJFI8T@o9p_ z;K!gbi#3lL0^DG6nBeFxg5z3(POo{IX7xo-`1%qke0>2FzCM5THg?L;4@ene&ad(2g*3wEnI0%UC zdG#(~)@>vGXxQtvUg?Ay!9q@BFzMULFgqEOG*HidbFu14+ueSg+&qq+Vb0+R^;3Gr z*zyucyrCCG;6?f27!s+PMm_Rfg?D;*=TKJ8=5p4>oAKE7=*M}hN$H8sY5zbu@l5w5 zY*foWO~%P!iguW$8U2B$knv7rtmrA===QprO_~&KRxMtA!7tGH$#Bp@`RV0zl@xzw zh`Ad%p+*lnOYF&XoK7-4Yd9Py*@WIRJR8z$rY=2?3VsKg9;@V6MIAC2o$a*Mc?mJx z#0!Yc1p0@f6wpEH0sB=tfC8da$;6PM1`A^3&7!qAZfC8t;dtsY^H3O3sA%eXCY5M3 zAUa3R8xNg;v#oRtGcWZDa?<|!nG zNR!~9RZQ#jqC3GVf!As=5VG`aIuRXy);&qa11vdNraik3fz&}Cj$K&wfpi57;Dp_YmQ}g$HJ#8+FiAcG%xHbto3@N_UaaqH$*_ZK3?ewsrQZWQp%t7)KAGW%?q{x;xN~ zbDwfp;(M0E(cf7P8p>2>GlXlJnMU?K$c7LO*%Xf^YqkA{8w<5u?pggx`X4r3{g@*8 zq+~`-|FHn$sPQa?b`%?zOwvyJL&(PZ5-O^0N|LrRq!@`VyAKb3`5TkIWfp4J)n*Fw z;HTCbLl3KDW~d-CI%*eDB?0PSvvAsz;SkGzO~WyTok;g0s&71>8MQ#P$Yz+vk#;s6 zDvTw%qcD!HwlD`es&*x?LI&BBv`#Wi>~4Q*lv~%=jsVj7Ac0ri6iWh>`sfxQ?Ip=5 zwhmPh-a5o+wKE7?O`(GIj@2yeV0~4=C~E#LSwnTHLPkorYYnmBV&(EGiX#_dJL9kK zQ|K|11lwFyJii=M=;2+Xl*d{_ZEmb)42=)_>sQt7OF)M)Oxv~0j2t~kLn^Wr3AIb3 z2ZQ0OCiL^5%@npZ9b@M($@*G7sqDKH8SSzBswz0E5fL3-VO^8sayfLeG+Bj^Jh zS1}X>MWJntEX2WN6@u#6D0n1+H3)^AG@_27hpy+_dD$!w8dt--^Kwuw@Ln+9!X~$E zm9F!$g&QBq$sBS3Mmu}SJ6Oe1v?uOVftxypO=hp*cCDsDJUpHSk1{;PJt5?usU}ie z337hmhM+1M=XUa&pp~9iR$S|c z<7_dE-o6AV>rDB`*&kRaq%7S~VdP_*1RsJ}zDkN~NgPHcDjWP}($Hp_rT{ z<9@S8+pWnMCMna>R2+@dVmhd$HnKZQd?O=4Y>54SGya9k;_})1Pt1SD{(pQmvoK&W zZw>uC3V-_eiFGSUf5g+rN78cz^Pb}K^f4S?B87t&AAT5z$6Z>FuLAm!a?iFA`*jQF zP;0&KA*hgC5bU-!a5y^W!i^VT+231(rj$NArnVs0{KhebfOh>vgepTwf#65TJPOcJ zLP{6LI!hFv8Y&$>Jf`p!JQ7YX9prNpji&OekZ^&0nhvg>f9;sq+Mo#?G~Q?x5{igW zkK(BOJ%XC1tCT&uYP*`wF`%KK+Q$!cE9 z0G07@<%ZeePDaS#TjgT5jH<*cr#Q81g&+sZue%K}id}-Ba4ZvgY~ch`rHmGdwc}`o zF$AYQ{K2?ei;f+st`sOg?tv$l!D7I}AC9x9k_T4qfQcnjCDeI^bO`$9(=b(z0YjhA z;~7xijf+=KR!6dAcwG`(OPSiMq^O=(GLML!^+borYzL(x_hI*Gt$Q|=R~ng%LPTn8 zWmYf-ZQ}12o3PZ%mB`{~Qc`$JbG;BSn-mj8V{1eqh98BU5)p@r>CkC4a`nY{cwTCQ z;6ipxb08EhuDXPFsKAsLp2$MXyZDZLwWC#M&r}Y|{bKx~NbfMJnL-pD{kP!*ikfc& zQ1M8do{O)ee;J^2_L6CssU>lWR-a=eathVd_Y5*eRY9>lG8s3H+b#Yyvt-p%A&P50U_Ym#@;s7goVIYXM zs!C1VQN<7WIuOO^AaIcr)bzKk}PjYy5-X{aWMb_rKPdeBK*6{!NSoN(+@nas3Seie2*uUyBg)Mu(7Vz8l;oCzC{C}kdz6@ET z{>7w7yp|@#!{F?* zj=rSmo(p(U|IInYqRzLx*mh5H+-B3H+kn_aO-?L*C>@7ja0;W<9CfK)CKN|Pr|s?# zA=pGV7I5Y5>>(^Nl~5IZ;gA9c=Ey?dCMpx9(-B2)r-;HGc-&Obh0Xi_e}{6~%jJtL zT^7-x9zZ8?2y=GQg+G}Bej`8xzEGH(#Eg>W3z3FfIhi1Ur8OR==}8mas+yjGlj(pu zT0poPFi6x0@Q(xC>!6S^8NS#m0}|eO(E&dXr-vR+4|yl39!?MGGjk@`L&?BO6x+k; zp@-8$9E?Qr}}F2}<`B6k$7asa7* zOxd{Jy8h!MJ`V?p)B^72E`=0l4+n{Gx-vR7xp@eKaOv2IFJrw3wISEQkPr_CiLkal z93-ME8Jhn(93-NP0;au5*1>_t?4mn3KB}H7sX`tO7d;#<;$uGI2%5avD8&5{94>m1 z;x42i?#?*FxoVu5p#ys67$Xkrq_|KeqZ=Qx7NKxg(xC*WxbfluzTbuEa&$JtStguH z!g)h0;twVp47*rc$lOc^nwWIj?$FbH*)go4us+ka5%~&eI~h&RLLhDy8Yj5BLXb9l zfbo?Ou5doV^kw)x>rcswE4fTx+ACEA_ypI0cyujXyhMii5Qr1)=3*0(9MqMZ0E59hc zciY`szCcA70~+T%R#$IG?n7Jy*6;d50q4>f7~yR&G5&<(TVz810M@V~OoY{_m8Ik* z2!_7{SJ??%j3JoemAZi67(Rq?n-1;aOx$EVR6@W^Hiu1zQydTWdPU8+O3OKLwS)o} zDdA+C@Z|%d?by`n<*JOYl^$2%2vY@$){btPsTo#`s${}Y?#W=ZFv4YyE6Ebb-B&mh z8JDt-z(@=Wfmyjtcf-8Ebq<;fyiAknIDqwVZH!Mf?DwYweH|K|ZXBezDF+AhB`51$ z5yphF^FJs`A1YvX)JsCRK9uW~4{O~^+-oDM`w`tKNO#=`7;dQn zOER>0zyW)41qkQ$yL3yPM>m1D+XoDBpTO|c&th_J*C1Q9$+`9)iY(4gy6j~3INHf( zlj_S6eX3DkEt{6=qTNTXbRISvLHetAcaa(0Z8pFPj@``^K20;!X}nSYHzy?FTDZaw zD^Rm_?3T|s1#S--p4u`-Y1-XpFKJEg!Oc+iN6G1vJ974E?^goid-NIj9;rL&sHNjI zg8&}1Ytb}saH$jyZyzKvT@%fsH){3oD6wj-!!2;1nk$;addCAS3@{qwL$Wkp3rNm^+V9$+i31E1B2@|FX~V{3u=&bm%d+O z&9JT3fk-jibc;Z2W}1}1NBha(Cx_E_lhy}Mo*#dhHJf#Xb0m=9cM`RSJzUMw?w)oL zx>8eJ%h4mo!b5lFMH?tc(eL3($~y>C7RQk$b-XBY<_<1szO%|;)op7T@wB^(70;>r z5FOt|M0+^Ivm6{3wrm&uCT;aTiz;!p#+{WEb=K$(JA5%&a z-8HGxcKfg}BNIxS?%%A{R&=c`Af}5z!1|uTRCP@$5 zMx}j5(C4GbVyxQ%IQ5)fv?C9!qG}1{wJx?g33RM#3LRP1G~%Ta7kCE=m%e*NV}ka1 zn}YSmuSOHxGdjYp(=n>ZIOEi68jk3u!zycy91l;&&2aS>sd+1-uFs9|n5NxuCUV-? z6lR1S4d}@}6!Ipvrr04S@gi7is(E&nH1+;O^u5m&b>&t{LLslo>N1K9Do#-yPYO(z zHglsUXuUQrN}`Edw!MS6;&B{Zx zZ&&%vVx|rtN7-S1ApVOVk>NLJyyU$S7f0#S?0gxDhehZmuKC(V*{Wme`WP-$obL zV@NkWDcIy}*f!&i?z-@L2G+Fztr|?i=`ONeeo0rHq0k*%>u;<)Ea&JlTNTqA#U>pr z!aU0&NrlzL!{X{s-<08D58;M%C03=NEOBcKs<1T$)kqV$9@J4`J-4)CClglgNiOr7KOr%bFjAHodvq8UBFMELBlFc7l`BDITREQ%b;7KS{|k|e!#<&{gVU_9l)p<9esFQ1g2N@oD0?fxEH;8YjiOD zuzZuNux>Doy@zkGQ zQ3y=ij}g1j9XEBgGtE3#he(fLdB(zkq6$q#GEqpOi&!Ldb_`H7Rbt#e0g87$ee3#g zSm>_f6R#5EAwqLv5;cW7)r0$l-kebxMTAy5YIi#|b2rLVIbv0V!o$n53XdU8c^&i$ zmX3Wvu05U?e9^fWlqp@A?R`ggYA3XK5tgh}Vv=K<6!ZYRtac7E|eMEyQe$o6yxz4MENH#ZITysO4hkJvE$1g`=wx@J)cfRy1c(&PH9kW@$)ug+d zhah^y(@#h?nx}XSb-u{yI=rm8+iez?`yD-DDhtCDX;FNlxAZO>^*SlP0ldcjhe5J+ zaeV}{m=7J|iZ47VH(k&9jboXQ-b6U|AMNoLAYC{rsm8HRjpl%&;Y{)`3)fTCS7GK^U)aOGqszlH1GKcBNcBJ`?;|lGK#>( z;P(D?*<`dAH#}%3rlzVGOdQy(UDYSA)Yd@4;JK#fq+Y=Of_ODe*nvjPa#jM#(gE41 zo&OS(Hv0%NxZ@)5e!m5sJf~|Fd3dPr^Flz>+penrycb&g8WVk=^^f|7@$P`P$y(9n ztqa66uI|$aR;oRSS*sn5f_Owq9IHJm|4s37hNnW>AesP-ouKr?_)kLv*gp+az8IRoAM@oUB2zE1_l1x?(!vsZG?!481}_)q`_=31&oJ|=1vcc}S-GmxVY%Z~Sv=^?D-~|jT$i|yb|e?6aLof4eKWHv{5qepGN;+>ifi?+I#*{hH*RxeMCl>vB57Rm{bPcts0>C*Bvc+evPR zlb1zGgAEnLn=jY#LZoksJ^n;x%kkgQ>SrbbS^zv=KaqKi^yT$sI2hAVgCb-3T{kn8hP_sQ*Y<92b zdB_ufE=sj8MRVC zNBtExWQ7C`?nbrGrjvi_Nxd+ev+@R!K;+NW9qcEsYjjAECEXWZkKfdyUN4q&Jo6Le zNGl8mT0dW`>Qc5z!P$9JSd})p$rsCbM@!UEkfp>OAHa#}F7or{fP#}(x4DfXaQ}G> z4y7Uj#-<4(A}Emp%JtFoCaQaKhCMq;5anF#2A0Cs;4@M{T)re%!j*KSWi~&)HZn-~9LeCx?q9`vX ziygVMJ>I?il3zAai-{_f;S`W!{ywVlH$+^4C$gnP!h$)ppTCXLXw`f!fu51j&!|Pui^=U8?1%8 zks>V-5JcO;r#aLbRmy04_++sb2`OT2qN*kZY%oqWle!^?z1$TRZ@1krvMybh`)zCp z2YQd1B$LUjNxNN_3Blv5<3({9E{ael=A^Vq;Q(cl8px@w82o^VO&&eav{_ugw#zfZ zTy{k!^lb!_XQW(?V6XI*ONl`?o1Mv;5yf`4S@2Fmw=6-s^s3$tR%d=2gv13wiM8C) zQFhRG(Y}t1K}z8_{0Ov}y@t*P>nh75N=WPUvJe>%jB6#Sx;JF1^%7#Ay0}_6kgI?- zY^Y~cTFZR9rLE`&`cScfX1JKys`EoDnu6$BxbSgH78AE4_qY&^r7+b9nF!$~6Ps66 ziVeMb6G;qW(bqC5n|8M9*%s~wktJ;pBFqRp%6G3Ls9yQD*eLUDtRZTOKPa`GhMOzG zmL6*2wyP(Av8oP;dWFNp3#*n2)EW36-aNiql zEzB3OC-u1)BtI8|9o5!o8HdO!<0;IF89@rb4Q33Baej(0h5mr2HjVySLt2}wrgzgD z4|Xc);k84B%xLF+e(IaKUlSHI*x=w{iZNVlXC?NRxBUW!op|Hl**hKTyZMq8y=X4A z)z*WxyTZJ{J}y~_7Xy!BO)OD-RUoURr>*cZ#& z?ws=xYbs_qsopU)8no)$S4jys!TQ0(58n@`@p?p&lO# z#Vdf&aZdN-0~cb^;Z;>CP3;Jh6 zZK~=7CRZ4ZE`L=}7^Nxe0T(X$L_#`drGMdPSYsL@bitW^bbg0aXXw?Q`OPGuG31S( znqkFfGO(5ev}C;7A!Y_zPsoOY3#7f;WLejW?XyufE-rJt`#mc%We@kW0|$!xCW&kJ zUYaXDDk?eD8rJ73ZL0=sze_8ZrU!W_>kYgn4?I*^nSeS8P*8>|qNjpQJ`EaO zm84f*mp%A)ea%j%KB%KR8tFDQ?a0kgQMPoN=+sDlO;w|2tS77e4ZZbPO7DTrExujK zYDJHSkr72g0OBc6Owq+mHIr7)!pVPzvrZ%%D#P}$I)?{5dE-=F^A)D5{sRsPsUO#N zJHo72T<0@iNzpJp@%_S!8h8ork99Z{sn1m3FH^SGWNBu|pVsBo$74&e*mT&T9Oz?Rq ztseN9c@z`|x51IoC`nB{@nW%Ox#5aJ9;+}91Pdbe0n@c$(^D|ed@A@b1ALlaVHM`u z8K<#dvCB-h^2G%zY;X~cw+r4-}2s+2LZsMy%Unl_tuW6QpQ(l*|Uh0xt! zYsA<>%Rp?v=C-%E^83zWu$iYLjvK^s7)P<<8l@2aTtj7a;~Gl?>~GpmQENO1Nup*0 zWyhmZRz)RnH7dXsneq;IQkKizV(s-ZA;oR!$cC<2NSq<2h2#VQ0qmoIs_}bPYQ91?pL?o zLK8H0e?b;%ay9#M1c{*iNyn)f)e2tS7;ZD&P?hDuVk%mr#T0nKJ2ngvtp{;PyXCNW zSR-I-frTgB;DM(=;a%-bIKL%6!@{j4LC`WDm20L$R48p9Rw?J|H*Mze0@Zm5+b22H z4{@WSlN|#7>wA**7Ar&x1Ul@N7EN-38EF$R8<#jJUXgH-RU$~IhHt#v(#16#aug@F zx(=-ETRQ)aEk!6#6f_hfx(#R_HgoYKrddr3!8;~{Vd~Iu6wX35Wt&lh>0S%RSf!iF z8T4y}P14;ip0~#!?6xqDUBdFYbFLVh3No4l_HC?O+o0GT}5oV)Eyj@np)-hq)DDXgI{s zS}xYn%rKAQEXhd{O##g`=OZR@EaVD$goTK&KA1v{u?|v$`O1gEhANVU*EZLrfNM`| zY)y(u2?tw3=9Ja7^jsQzup2aB7-HvM%{FgFpIm1r8$=g_leDBOOdIB7IDTMwt@t)I zfo9EZLITBflR{THdV3H>bPoG|xq*W>T{v^?zM!$Jxh1Q){PyX(q*bVwcH3qSVksjS z?jSah4lbKTU$8yK?B+Nc$i5^mB2^h7j=}I|fq=5L=zFyx2ns_$u@V!7V4X3A=+h>G zzKKasNWNS5X5I+~|}AIQ{@)aGgkf@~L8R|VM;7S@eQo!Py)Rwi$^ zbcNt}S!BXkQ6%0kiD?!wP7NrYmBGfcF}NTL(*`mR1FOlzprg4Mq@PVcUt`8tFA+6d zzsR@HsY!H;ykSJ4fECOm&%H|tQi$#)?BG@nXW+W98ixHIFE@@{6!Tb_8R3`LlX}D# zrU5$fXypZekLSavSU!yK^U)&OsyxO{$$MYe9(9fmyx3ytzO|OR3ZBimLO8jUj6w5C zBXEHA7YvIuo8d4su?}0>?v2}dSYX8b=y0^f3ptC0%@V@4g9(Xtb>2XSdySD{8^tWv z4lQjx%0*5GLAf){SJN_?$h(5m`@kS+cCsulLl~qe^;Co#w%vUgqDjD1N@4a%k%&5z z0wk&r?Vzz36$KE1<0zUe2=x(^QkrEUIKzP*#9!MD6ZapJ}Ma8h-(ATXvssqCq zwhxnX0?Vt7e=ycElN3RsYSU>46CmuQ7d9qhD#S5;#ql9T{ZrAjj1UYJjtq%icsr@hk`mCx<&cL}h|Bz_484WQL7CRp3}bMDZ#`2&ztB<(NcP(~S}L-@}Pg zj6r1{p4p5IIH7|$g5Qhc7GXrz@B9M$8C`e!Q{>Xa@y)$khI;vJx!=(vkm4Hum+ZB4W0=9&#MW)v_G!&l5B2GJ;>y`u|EP~gfYn8BU` z!VonU!%d+;X^Bp~Bg?1KrJd8}Ps%n*+?cQFWpU+E<;U2v0uwxJW6bC&&;_%6LU5WxI?u4Z;19t~y3(JEjg8&=9><%U2%BG(3}sGr410mRPDzq0HFd6oWl;g zr=0eTpDu2&-^|)2e10bU7)Se-@Q^g$z#gxH3{4|xjHiYSal#2E*=1mQRyzYbYDR<6 zOM9n>UCaWgF$P;{?BTIgP{w8mG0u1nRh$AgB;Gj(MMBYuvmHDB$X%-&$l*A0krp8% zAQ+`wb%wu8?u12QRt%4ces(olR(+ z->Q)qHD;~h>e^&pwiI~n%Nqug2TeMNh5Lu`(t_jGJB8AR0V0)Sw@g5;9rQL#P6WI% zyAa=V0ndy#7pO!kp+m@cMhCf4G!l-vsT(+CE2}Ui#BF)NlH$?IPt9cDjMEto8h8VT zJ#T!o7w%G#>C>vIO0iJkNs(e81;x7f(?J6(1D3ts;TWq>P1oj75$FAqa<#>uo}}k3 z*kEx{GhI+`3Lk(o+#s3a-qQeWuD`<7WBl@1#t&fAb;fFxX)YBq+B-+>dA$9s_K<2PkX{<>vET3UwA%w9= zK-+<>M{2h|5T*#68@9Pf`mMh4MJ`Z!i+6(kE^Cc8%t9mNpiuTbu^Z&j15(R`8m_|; zM0^L1z3FO?7Lz!psH!oGUl!fnCNg05XlIm z@SD=)p>dUtF?hM4sdm!ECd6H3Bbs>8IsiM}O;uaN>X>SD4L_XEFxDH*jUWje``30g z;__o_VBobmIg$gp)lMAFK}J@H0#(|%L#GCNGSo^_J9up|9Z7cu-O}%1!MLUplpIIj zSH;VU^ImsM6{kJSYUbE*C*^C+|uxchey| zOFj95Ufich0!RX?}zx|R?m z@s@xo42m2)(L%}RW|oLb8)273tG@6dsgeqKCC#WPaoGaz_q>{O%9{da%NZ-o>kX9c z3g=p?YCcMWRw|^WC&4ReI2InqUg^{Z?fkp~!YA+BCskb?xWbN<*L6h;u+Rwoo(%WZ zVVAykh`KJ8H1R%$g^-Rjk!@JG*mNy?Tx}*kSv(&ck|38u^BQNyuf^7u#}ljoD;zMM z<4!fWSz$5o+W6u%?1?Apm|QJFwi}EPba$Mg)n7e|k}7Qp%C$Nk(44=aMlcpqj0%IG z%P%YBh}eb^%vv@bxl*mF^w6HLKaawlSY z{M(}9TsX1=>8qDQ6s!SnFym_YX{@ws+LC^>$LXg?W_2}tIntT%6}7G$?7yJxrZwew zJ3;kDOiS0l=7Ltp5~p2CG_EZ`#D&gEAZQ=LJHyouny=gwP7gtQu zmS$1q53A{t!(?+l7ly@A+Yarz;PGlt&JVCUYac+uSPyeDe6#s{=C)xT_q1suI0abS zkD9oiap_$uENIm1%a@irHCwf^7!b7IsEQ%MO8tp;5E~4ECNn0inUIuAGD}wT&;+70 zoHtfer)hgcp|U32K};@2!O}qo$V34c92(LLH@>rjJho-J#|_Z-u1html{20Wy~Cqo zb|L}=iD8DFh9=~uwaSYA+avwUeRPG4?rv5UZUVt582QsW50#bWomqp!a7+fAI5*8HVUM}uH|oWNb^ zoMRO@WdLow=g_uoY^z0%hd|tuWMaAvFsE%c~+8=dCjq5;A6y1``|>O*)3;f@C-awX5w; zDu>t5bgeML0}+CYLmgO-{g8Ubl1mK%U)q0T#~b71>4eE^ENm-x_RM~7!6)vl;1*1$ zxUAtvuGxHKg>^wU5TQ-aajD`&5CCVq#}10^IW7h>z3<>5Tkwz}DMYBe1|wXOLZN2X9YZL6 zZ&px_@cI~{92eJ6zc=|Npw$=CgwU%K_Y4CiS0|UkKre-ncL`mnoO$0ojrf$Mcz{J?sD zjmyZP^ft;uAb^ViBy!l1YLGO`vT9*lw|;l7caFrFum0owcKb}a;@3fe)0@16&Z zgM7^Wo+I4I+3qEH0(yc+oynn==?5YtCTrnAL_GQEqwp$viykthC*+cs2aqlqUjOOz z@fsn0a-JfUg;mO7G1YQ7RD0NOb}_rclG2m5{bmm@9OCsZP)tOY8kdcRy)GUz^wYYx zyn4MMUhN%@>9NHLp2NdfvPe86iI?%tyYv#L59QbG^h+$3oL&N=mt62#oqA^5rQxU9 zBojR4LXRe?ch(|V8~k{frYFsDBxxJ@j*>RNP?SdS?x{0Z49(TPBwfMq3p3{NPvv5@ z)zgVJNu{wQ+CC>3&%iz?7)Jw&cA-sFo_>Ph!(F+;?FLXj5i-ttT|V6{mYB(G78=uf zh*t;b>XdwL)Y}>oo*w~?IwM)AcfKf7=6(Wcxl()~jr8FkAKO~*d)No+6GJ+%R;8wk zce^XROkh(G1n<20AYAI-!s{JSd6u_LU5+`9ZQ$xUmykj_3yp;e!!|LCZ5Nk&TsFAi z@HLe;R7pHcWB5f*&e7PNLitVT>Nb=WsxpnDW{3TTz2 zOKZElDfCXU^x|$U&NW@UcfsE$A)P{9D;MEWGX^{+OcUXvcb=N-rrfX1{0KXXaFI@Q z0wZWrJ1885em+spd;#|+IB6rQJdVP(Mg*z02R5XrmZGMwTrS}lG#X=AnwQT$fQyiQ zaBrX$t2?PR(KcuXH4GA1V96q{h^W&eHG&thGB8CNApI%n8Y+eKp6%E+2RWm{`EXjC z_h^=bCgK2I6``z3qu}2!Hl>(#h;2MtLCQmp;z9`=ry)so77~n0 zwv6Wv&b1~340V;NCY8Vu&=YdT2pWKW{z6zytcImW6ocj>(A(5|Hx zE00F?WIYdw_n5$vQK=aXREiQ|N_eXr^iNICT>JU>oC<_oZRRWA^{t!hPv&-F1Gb7AsfUtDa zcJQ14I%hALhRJkM>Bu9FA0E^vZkeO1pwRi`z~n=Wj8sVIY zg8AyNwvM_oV()-6AbdBT-AH7bhHMsH99*^aS3Zbb3?MEdPQ0FtEED`8_{_Z)a(w1B zeC9QLiW)w}O#F!UysDwUdL|L3JWn4#kzm_CPahvWl?X@wzQ;(yXCi@vKf98Q92}z~ zN}UgpS)0Td-zI}$QIEgK7rWuA4v+QVQ1$|C^i&i)hsVb5x7WE{ zw8~X-oM?K7y$$KB%N=w z`7ON>{mH!(+=CGA!r6UFu;n%U9t>%^Ub40R9>i;~8f>`tAtbx{ z8l}At*V%dxBk=qlY(LZN(>rAtSef&;&9v8ZzD_z|iT&V%4<0>w^5L@&m3;WscY2@u zQsWQ*X)*kdf2q;<<%arsZ@z(X4hpsYd5q6L^*QrRf4=k8#(Q&Wi=Rsk=8wPIXnYL1 z-FphM!pC6w5Qls(DK==4N3P$C4 z)ENEhdz;B|F!y)_P2cKu-B$D(doAyQMvvP{QiX>Z8Y9CKKC`^)%woI z6a%&W7=cf3SCGToPoU0{B!(=));N3f8@O@=@A;@#yEjw_g>H z&<~G);bYw7w8W*K-}=n?FI2+MoQ}#pLr7Rj<^F6{76azdyWd|tdUu7J(5}lz?_M0^ z_vO2f-W|^Id-)ju-QrvOqB}S~!e@p*+QW;K{%j{F(^LF0Y63_b#Z1{>l*c>k4mv{* z+wP8&)+9w#K)W;T_1e=>FL~L5uX~aZyViJ;rAcc#PO`x;yJ(IFh#jDe$W7jyw!6cu z)o;FlH7yw=VS~uxNe(f15Sy27h-OU*$E+kWw0=`48~>TeO<+&*v(> z&xp72XBuC(2~0x$`5%71@%aW;$VTJ;#P3=|>BE%qC-C=N!~c^XY5WB$!{5f|zlG2L z6rX<#pMM9Re-fX+iO+u@pZ_^N-^b_Q#pkc!^Y7!ci_iZ8pQNz-7CxyS|0O=dwz&qJ z+ToAmmwx^!+U6%4U$$-YA-;dm_=?vyl;$V#dye0qwN?Eb#{e83Ws?#X&E4@)gBpT( zo1ZV6KN>%VhWHbWFB-04%4}J}?DaE^pZMC3A;}lOV~%hRx^Wt6pf(i}mKc%(Be1Ze zA!e@e$AG1hQCjtCj!s61Z|YB@E0%hbpJH-60zwHy5q)Bm0SYBc^Ms7%zBe;c2~ z?C;?7r}6op;q%|d=WpVZ=>IN0{{%k&9zMT?&%ck)pTp;G;q%|a=WpZl7xDRD;S;K9 z<9F~$s_B1?Pf|aB7oX4Y`QPC4Pvi5y!{>ML`QPL71fTx{KHK>GAMx42=l_JyGkpHf z`1~F|e-EEMeEu)^9N_bR#pej0zmLz4@cF;}KkR)8U=&66eocTROgIwc7A0JY${B9) z$TftKOfqCL0bF1VNq|5ub8smd#VbZuymdWR*BiwHQSn@GQE-tJT~|@@Mnypd#T69g z|9!8I>6uPKAn0%PpN7fz`qiuI>Z(^qS69CWq^^Ae%mIE14A-?9@KGQ2>e@2s+So8% zV;q*x0{j}#HN5=52S^PoT;B#1j?p!(>vu4zydu1lP{$oitOB-^uqOX|S7Pe$c+`t= zus(PkhunO&d>2O;hb+{dnI@}&e9gYK1hdThN!$$$B!<~TC;VwYxa91F8 zxI2(Kd^C_c+yh7*J{CwF?hQ-?_61UB`vIw=#{;ROCjzOXCjqm71A*DVK|t#0VBln6 z0+0__!+`83hXVt^kw88eq7STQ+r|A>&jFqWECQYmECD6~%Yezia$qX30_Xy=I~fP0 z{-PXhZ320h_RtmKJZ41jxi8rNj=*_RSesy+c*vss8f+8VUM;g_7?+VGDY?21op zK$(MyXzk;q#>r}}WI*GDe+O-agTZ!m_|#i%Fu>PF`S2E;pK#E@fN^)$8F#2U8ew}8 z)&c420~LJ7=wnhh1nvrnD4#}_;^Pg*+oQ*ujc*&uuq__D__f`6mN~{~=#OzwZ+Nhu zAE5KS(8+k5&jt1e76FF>i-BB}A>hrxhk>^N9|7JDTnW4f_!#hh;40vQ zz{i0P1D^n{1g-`?4txr@8u&EuX&~m7)z1N+1+D=;2gF#co(H}J{5$Yv;2I#tT=fs& zYru8De*<3x{s*`L_!jVG;5)#70x<@wSAZV_HvzW+Uk82;d;|Ce@ISzBfNueJ1GfOb z1HJ>?1AG_wU*J~YKHvvH2lV1YpcD8Jkp0TX!0_>#jspdi3z-(RDQ8kM7#DjCisXG4*=m6`k z49GT64rCjs0QLq}0@()U0oexT1K9=^0NDl>0oex51+on+2C@yD2V@(l2C@xY089j8 z)+BABe?5>oe-n^8 z{}&*2{bu0Vz*~Xyfp-8G0{;d)7kD?Y8h9U&eZ+F$#lQ!EmjYJ+Id^{u$Z_!z;1$3} zfqw?B1XAx;0mIu8=D$#`V85T(0&U;Y@1yK(b5zFZgE+?l8){3z>7@(-yo_-|JE08~{@-t7zpE)K8~iqX{u(~$eT#~p44pC#>JpFf_@(Ro zXQ8LmulIp$#~%QP13v_EzPb~b2>cr80)7Kz{9V8az;A(UuipVD0`~wpU;QtT^VPk; zKLPgv*=~OX<^uNvX8?Z&a;*9V$aadwLK%x%0xNME30wq>0#*ZC11|)&0bT@b3%mr_ z9(Wn>7$Do_vA|`(oF{1Zfz=^;J z=z$N|5||B)1m*yvfRli&fs=u4fPVsVel!($3~(BdebIDac>l)wYl)vRuiXQ=gROxw zPCNXlBlY%gLq|%d#8}L#f2ZkCT$MnmAy@9pBzQCnGt{+_q8~|Jf91Oe)m;k&6I1G3#a1`)5 zAp3|LfGNORfb1h~1*QT23UmW+2ePmD8_)y18<+{a2gp9-J|O#y`+m24+1&g zT>+$iJPZuixuxJYq;qwxg)$Dy>0JC8(7E9Jw0^~_cYX@RYsCE2kkUrbde=e?vERY^ zPGc7IsmoX|F%Q-U59(g3&VLeh%{qDmNL_vtNL_vlNL}6nq%OY$q%OY;q%Lm-QkUNc zGQAIh)a8$W)a8$X)a7kJ>hh;R>hfnm>hg9Vb$KU{y8Jbey88`~y1E-kUEKquu6_@k z1pEOw1-KU|;~j7s&i4ZYz@LFLfWH9qfl%7&LVyFvw%iI>0*nTh0b2vhfiXaigKdEG zfbD?uf$f0{fp{?_^VSZ)@V3zxWy!wS=#OVaU>vl}HxGMF6#5vPDoWRETmn~X?3!pu zA_tjohRPmfO*B;achF{jR})UldJ5JJ%!9hdgKcKG&hHMLjK}#%V1M8!;85Ub;K{&b zAlqCjFd66qGX6N=c;I*-+nyVk0Xzff1*QYp1~Y&hA2NY#b6z0lm{~x!IUg_&mX*iYRAl=(cCHxEV;OqLv%4u`b zWw<`7R>eB{ygzU6#Hc>)s)ldsd1l2oXuR3N@A&lbGj3bCujG+wHE%qB(f459B>ZPa zyzu0#*j?8@HRg`TTV4^nOR4vSf6lY5uijjg_F?sxT^>ry&%}ga2rdxo`0uF?#$R%8 z%*qX4cl*bsUtIl@yk`ObUmN#z`fkMR89#I{{%+SbpI?RNRHTD>BpUb0Q>$cCB|eYB zrb=vmXlPSqqc-CldXn0XJ?`((s(jGw!^l@KkxE+gIjl6aEsynXG-_J5Ec=uXH6eWq zS8(GT?yhh4kodj@Gs@ym1r(OW^L%*xN%7N#0X`YpNriSY8lk7gA9lp}z6rP@5*-~s zP!a}Xm@tN78>GP*u5m`{oTgtb!FD%HiAXC#jM)$R`Epk<)xcW1p9 z?Q-V5n3o%FUQS&biTw^}wo&Rsor+Q0bjqnlM`@uk>J*)Fsz*R^)QD31bt*<)Wsv7o zBcruv=NNUePB~SN)>@1h6|Ym^IkAQ$sm#`?7*(WGPIWJ+-Uy9R59pLrZ35Lxc(3V{ zQ|$p2FTA}vPLDOF2f}u2W96HBNixic6BAF4{DI`UeGD0 z%I~N#!)1a;o@a4Y|HLN}Y;P z3v|k<9s@N}Qh8FRoa${*BZT*!PHAd0TzDmh(5S#WRi{wmppXK1lXc3e=7U0W!0#NLa;mFAwGrO+I^|T4gMz|C z?kSyes?DIF@Zi0nQ%?0AC@4I5Kj@T`YpMFN1}ot)B8RW6P73NWLtZxO~(kXU2Jl4007bL~T#bbRdHV_`u{_zUZ zpXke(wBEJ<6&$ryvDl1?8NI7x`-fks^>l6j@P-!us$CpiJFQLohu^vR=C>E`f18a! zy(gJ^JF>;DEib>@v&BzicUOJ;-kP_6xcS|W-!9%CnEt0F>spT8xt*f5pW-^k(X{K; zcD~?a6y5n3{D=}d{d}i!{T=OVJFoq+XNz4Iyujd^E=y18i5zV{c#e>tB|E#K1XeSL zHLmS7uAMcmT{W&fHLkriuKl&H9<|Xmo?W&69<|9W5m@W#Q9CiZ#=reg%PK7If70@f zt2{m8qQ_!tT|0mHcxm7JS$Hx*^};GZ@3cM$w$qvDwa%Ye(?xpG*TPgOtQY+i`m2V@DlG56 zR;N{8VN?eT;}H5Q4o#dRM9K_+Lt&(h$r_J;G06e18~$oMOs8bmL!|uGco@EAjv6Vm zK8?q@8E1%*GB441V{y(QF%o+zjPzWfC>yCJn7m9-!-VHIc~d}fh7+l-#a|BYk?Jq_ z%b820`aAw&Ql~nqmJTD7>seapL{M7j8Z-1IP@LgJs*}(FI1h>B&KOq=BtH+ zUrjT{t1r7R0_evrI<~|WdH?cNjLuWwSih-;`XC*q#?sUdEslH>BMgxd>N8z}_oAnx ze{)U!sV|-H^;jY!G9)n149;eeF=Ca1!~HV6 zBTc8T###Rm&MKU>3*lhbusTaPMmpc(EENS2Ob5F|72muCIVm{%XGl78z`;&8%U!V7 z*eV<&KR4nm9=900(}%&qyLd~=uYrTN{1y)O>8PR*PDh+=7LJi;>|NovZkAY6z7TZbgA<5FwPU0^uJUs=nbId8ylX=ednmM5 zxJYQ&s5&kpBJxU@5+m!A;HQujfH^MP#Vs$h?O6y0!rTJCMMEkhhtzQyi=dI65n~#b z(=#;!1r(Yo?Boy233gHH(xd8-*7mB{qXf$jxgImRjzmL>Z;Y*gaaobjuRUg@J*U>a z0QMYMN=1sV@6Ztm33cSdBBz($h=idH%V~KUkpK%&p{0lYVqqDoF^t1i4q^)q<#NDA3~bZr#>ayX zIkMf9t0cz3l=b7n2&{0mk#SJxG<@0_AI~tOS0g=IYlQO}@%Ysn{5Ie_kQuBcnHLwk zDR5v>RaA)!X_iYEe|EX*q*|EQ%>YZEG8_ddeqPSU)1op@1)U3F#Um1{X=CF0L5|03 zSQ6#Av9dG@OG7-rP778i;Qc$#pVQBCI&$?TQf%KW(|H7z-+0UgxITB0&QDgVnq}(( z_5xznQ@+dd0#k90e9E4DKahFO1)c+(0lX5J2mBjwCh&e>A#f!SYfRP80Ly`!fmOiQ zftcyp_91hHinV0u#B0zAT4o@RI`KVzr-kVRno`l$ zn&sLsS2=NT(=IL7^ah=$xn0uiz`~)PQNdi$=D`YM1#$_FM(*>n_^ zo}QePG68?ts^M%QQ90D+OBdy`u&5TQOr@K<|tPmBq1DSBBoTRJ(eapF1(0rrfUXmNnpwBfu zLA;lUiu(fWHYyn<0k?4UVCT*B!6#v6<^;FPjOS1i4@JTIKxIe8eSmloDknSOPJqs6 z$wz2nN!ds#*^lgY&;wd%0oia8C-=|1wA6Sh;%g7a@T72f{|s!UUl309P<>ghajq;l zLUZ8_iI(G7YmUdIC#3~=2Z8L&KxXn8NDD79w1gt937Pj3tzSD6?j~?Qu@L6{MDu=< zQ4SKFoYv%|x_#cH?3D3nXIi4Iwdh8@nz!T(q znyJ9rC!GY2gFC@&yqeOk4y8s|c9tIshAX(ox#3Nam!T8A%nX{__qcsNC?WPwX;Gl( zh~k>;g1N->ak$YmWQZ0K8I3*!GyT~ZGBx2S5%y>JlE%5H3Q5VZrih_e3ys!t=5nPX zndHn&E#y;_R)or);`6#vaCMJM>Wpz1(!vNChqlF=k`iV}OCtmh_|n{|q5|Z%GWqC$ zlF+Ofi8cI@TnM#i7Op4h44x%O?F>cd)j|2o3&nY&D+^kGCW=HfcCd783>(k3nVR8~ zY>*uxQH1UG<_yOhzo@u@!l%-vCrx1`xYGi@l%$MwcZMqf?Lo<-nZu5xD=R%I1sc!? zkv1TE4!uz&W&3@BacEDFgKA~^v(WO`GAR^c6+-G6Y`Lg0_9YB&VGYl6X@)Q<&`%d= zX%$FDh0@4oMtUatVR+p%GZSeQb7iE42vI$Fu_&uhNLr>!`SA8g6OOhDyWs^B!vr#B zkvu_{Y;BdaT-zdQl$p~i>Zk6eB&CdZrKV(hr(o}-cI6nW5Zp>=1v}9XccXYK92NJ8 z6uv(zomI}7$x4D3SF^<0TB92}nv{e7J}Eifg?)wERoYp_Bo~I(24#=aW!qb2rQm#1 zGLUDzX~|H=0yg?tQ3+%`RLUrXI9qD4cWP89`xhp4lvM~xSwxI}Cz+ts{_E#WVw6WwWFiuR|*M+6NBCjaL-dI;th!-5MQ@DjR(v8*rx2&7KYe zDwIkFKW3#zh;%v%2d!Ha8p9=L2}V;p#wzIcXH3XIOA9K4(WH;HifIj&qp8`Xds@S@ zk|r6&Y3g^pRRHxic}gngOj^IdNfk5Q%PPYW$V)9xbNS56^tMW96A<+J7@m#R-X~PR z<4sD*HvF|)wvMYyj81@Ml=Nnsg2&e@nB|fg zhmm6cdIeE39;7%(zw{uhAX=V}LmS3G{npJpGD>iWRbJXRHHB_?jTDE5NZ8cK=nk-_ zM7#L}tGv`ICTJKn+!+{$Ju>An6nvOf)ay@9cl+Q^IH*fTgBos?)5jo=fk8=5)mic* ztdc%ox_>gJ4LQkZcoR@RM#~r(BE?xwmN`rZ(=?<dK+HaKQj2Swfi3mGEKEzxi63XxOtO_8Xa=xHWk8f3pt%SRxP34L?ZQZ} zPdX_QZN$}_Eki^XV7Eqr*17;DxZ?xkprDd3Bh;yfBClE?#pDr#abxsQYL4`9WVX?n zG9%SGKC;^yYz&T`Br}P22HTBpi%%((ZLc#mPu6D9#_DXdYi9pN`8XpHTGVFI>Jg3f zI_Tm0t@F{~RYY?rug`DRJ6qZ3;5rq?<*X?zO?{5w!bCYcYl`$!Ct+@dFF0Yxo3^{P zXALMq%6JY2oB~n6VG782jwyYP_UOk9Qy{_=V9^C+kYEBvc#F_*9~GJ5Y&wkJ(hS#3 zl=A@qk6iKy<&!aqQmukgnD3^br}X;0o}>)SO69qOQ+CQlnsUh)uX6Cn>@%+vWrm?G zbG8xi@UdDOnawLjn^LTsbdQvWE5N4AX`9S{d8O8-oY4xBF+R!!jloVc*tj2b!rAE6 zC+jsK&yyo!Sp{Xe8KvSz&dfv`du(=i#=KD;VtAFdrW|IRc#5!;2oJKJQ_U1>>lH;-YF!!oB^9B(Mx#S|WwiN_DF(qsjoEV82E_sLTo<+_@3 zcz9+_nA+6M3^B5n?MlbAI;g(J-FG)7$KmNPsQgEpd>NI{A9(!|9izBUbTJEMl&E}3 z0Z&2Y?9zPc!N^n5;CbPasTls1%2BORajT`rNx?1=Odiukk}N!R~taR-oCW$vt`va+JW zJXuYa_2%vf`WZo9cdEzd)@v|;H7&nO(!u(#q!YlD5c93*xG1D-E{~_wvqIfyK_lns z-keN4NAQ%Znm!EMfozm`blgu`zWM0SB|+is(|D;EG=vuixoDQIGGDKxMi-~ zV2w~)@u4V};K0WkoQTGP)dv^#o8{FJ9Im}VD7g3rwU3VDQa}KcoYeGyn-BePS}+t9 z8!f|A0P-?GWqM`7j0tny0c>p%1D#iNTrXTockh6wh3L4iv3T#bu8e9=3n?xsjb5nM zbf`2+pIPVAD3a6XMtC5Pmc6z?9w=JVpb;kVPzrj`kE9b z7@8t#wRsHAB2i%0n{#F4xUV$Fa?$#V1w5m1J)Dtb$4mdC_sNX$64xk(`u{`U<$lYg+G< zNSuSPIx!33Fo({MC2~KKO82ISsb+G~vsWv6wgIiyr6#Ccd`aXr{IO|1NTqwO^U$Hg)}4m z<}nJPb=H*(7ErX_MjF0!a6Q4{8m*y7ynT$YmGEGtHFatMt93laL_U$QU9g+R-Ll)p zLtlM>2gEA0}$&Nxa_Ruj+I%7$4?p^ zwX1#ny_newKW^;j2a2Zs<;)2OO4r_f(STFs-3#PruCSprG>W@Z@)r45wrcXvvX!BHAVQo!p~OC zJ3X+mXF|6#2NhOd4qF?-A9=~<$Et2#cDwKA&RaHp@E^QD{8IQ+QmV7YTsx!tr9Z}8 zb=}HKPQ%v@5lp}3GdmZ4+*&POw|cm9-l((RRJ6Yd{yQg}F|E(_8#`Wg!SPr9>$9X^ z@D5V=al39<_xXXnE2rJ?W97WawNSxM*qe1`#Z`HCNH~a}UQG}m) z_S6e^t;sri*v7PH^Y^#Kc6HeBg8Z@Em@;H*d9TN|@J z?!4GD4xBb{>_R-`qRquRUOMOX>Q|jx?z#Bh*GHW^dfybh;}ZVLXX4&}W7ocWFaPuI zA*XM=8T?JcAM@RdpWV5k&)BMGV}^V+_PmuS&sI!lT-@EQ+8p=djuTG5tL*AeKJNuv zFT%g(s|~4T|124O)$zv;TDan+y|7^-{NaDSd2@8{tS=vR<#%jdbmF_P|0Mj67GLyA z$JRODfAL)VxaC)7;RV}3ypxM{%wFC7?d-qxNqnNWH!FR|ZMo1n;jb(#ag09s><4%mc6kCH(W--gvTm`L#Dq`K0aj>*8Ks zgT2()f*k93xBo3qT=MXxS+||_w`Y%@F`^oJCH$3lb^6C{SNrPk7wt{x@ZI|5s4wB$ z?OPm$7l*NqjL(n0_^uXn-O1fI`R}Y5G#vK)gunQfq_K~e-5T}eiecN+KiU30cE$^T zp}YTImfk+}oNFeWTh{-X`>J3UOZaCF==pHVAEOUc1b~R}yqx@5_;Vk;d(l%Dj=H|vhyQwR_rG6#80CP^WnvvS|M!(khTJyuy_aI&{OE&>TXIK1P3s4i6=pr^j%qhRsg1(F`pUvJz0*!8et6#}S4{i%iBF*qF-&Jc z@$j_bzYLkZ?XSN~p7rnN*P$GQzjN-|=~Hw2t+=swmt%{6dhk`)t`q(#t!_PM@BEVT zN5AiR%$;R#BR?MrUu|9g!(*=$o_Nl}*Eig|b7g0IiG&xjv5uQMw0QISr7x}6zq81( z^tunx!4(Prh0=c49lJEM%g3{BUVdExzg~Y__&aWY=*P7WKH}?f>#nxX9`iys>{%Cn z-&P-eaQsmTeV)p0`+lD(V^Q{F@u^O%Bl%zbT)qx3-E(Ea)}O9?>M0lA0So`($=BTa z$uEocr#^J;7gN6c^GQm*B>dcGKAv#t$4SE;S^n99)O8<1PujF&I&)`__p0nx%dZ&L z>4(Q2+xr8i1H!*$$(d($|9a$~#@7^AKiU5_-0z*jUofm^{F1%r&K&#iy;a|DIv1a` zY!`mtg^%wZ-1CKTU1u)Z{{9sw7D6A|GyU#wWyGA=_sw6rXRiOW^7MBu#fT{U)n|0v zdwF#BZ0SmOGf)zE&QK9e`C%Qkvrd*cf+)4?T`Hk^>sk_-*GH{%-jS>Hkaa^a`XJnx#D&RZ9E)3eWge)H9z zoq=yng#Sv!@E9eaA~5Oxia$H{#0^V8>GU z&-9tp`t$4&13c|+ye@U#rq5ubQ21x(biaG`$?;uFK2<{>dgfZZoZl||Mc?|aJ^h{N zYtMahc1RSS~wwUF?myQLL(f9>T<*PL_O z^2Zad{~7k|g`fI*{1x+$`P+ytFMhvo?8vGM@eG5ReXQfOE2iI(H2w0Q;woBt2HaZp zJnVT2zj&TAV$0>Lt{T|l{bxH&*#2+4;}?EJ`(^L6eYJ1mdxJ;yIenuKpS!#z{BDn& zfARBwPw{wCC-2N(`Xu_#V=(5$I?nsgiT7Rb-ik?`cBr5F6+VJ`DG>gyirr7IE&J~; zYi|DLzdesR0sYeb!e7{}Y~n**rr+QGnoAbk_SW$}*uxXP|LZT#erZJ2MXPpw^+dOf z6HxCXG3LfPrl0g_^uIpa`1j4z@BjBH|Gf+2#W}*?`P#>ea%aUHn0)d#Pd_tb!B%`{ zBK(;@s;IrE|NFrE+do)-*PN>{7PUZ|iFLfT>%7|MW}Z0s%?F-3X3SkVU*PS4@Hf0u z_Vst`KA%4RRqwaCP?q29w z20PHgf4bkQuDLh9e9G~yirU`w(~tjz9bDmG_{N60@7>e6L)L4oTd}YtuZcGW*Y8bl7buyE;=J;v7I5Xf(yFF5 zb7ZBwU{(_grMw`w0=~Az;N4+&&xOSWfxKd@e>An9XX%#a&DFAV2zC$avcK1q838_Z zIwGpVTWDh0>SNaECMLs@Eh{b6Tl66mZO~&g%`R3|7B;n0C@Zg+-6+-1FQl*b1@V}< z#rK~RbXsjxHo67O3z}FiGxEw8mNhCn4NM@5iz^mZz^z3S^HNycs1)XDKE*36KE>ym zUWBJsROVylx`{b~wj6;We-=M4Y+BD!RbB*N;Z010`Dps>z#nbCF~L9V_9Gu^mSIZV zWR0fl~t z+O%eX62enm6H5qrYO>ntqtWmtW~HiRZV4bRsGP6Q=?;5}IlrXo^Z%lPrru1+ zjA28x@;GumLtc~CuJBO9N4~~XQo}lfc>^o~G$x&fD;rPfO-y8NW$}?%ki#54x2m$V zF_~$&WQq!l3oD!2nlJ%r@_3D+Eyr}cF?ZB(9U-04rq&WilcFYP)S29b{=(ASlg zabd8DC0n$pU_lw&L^m-R+|iMEC^;gDVEHz;sBl)J#-s*xu3~mUQBiK$5f~pE+u1dc z8I&(y0yMprD&{q{En<0K9)`quP0R~!Ha~xEBYWP4JG+7fd5wDqJ$xQ*rIoU^@kl5_UaqVN9kBQC(R80v}sfS4FMfyXC-v9p^F19JSQ5XX0#Z{8hF7 z{aJI=Y;2PZO{mtj$6M>!Ke5&yoh2zRS=Xj^54j=NTfLi!o?u+<*ji7U^^PkaW6nb4 zYW;0sv3uB>tlCZ9rIKMubn=`~krk`$;^T2??3KXB4TJC(yAiMf zund3kt{A-eChsy(*!zLd8}JvqOc09w1$qpc#KjI4@Ln=`TR>5vBgJVCN*-~)G(-1- zViSlIgJ94FP-9UlS}Mt)w7i@N3U)CNnrrf^ObP*V;LSNCj05konJ)hRK1|NeGcsN0$K>#gwO}0BnSn!ube6`Mpr0|X8fUi2;U0b-7uYz|DD5y}J!CK>9n(T3xV)SC z48uOB#}XN#-_SW)eoPyd;I_iAzH~m(V~LE=KkA&|ebG5?JbqfKGPn=Uj047OEhgir znRS^JrM~0qhe>srw+RFai^~Fmw1Uc%P^%(|FmtGdrI+UA7L6+}C`cU6WW+>{ub?tL zx1w@9tk}5t5aKSGS!&3SD=jb1#fK>s6}httCM71&9H(3)rPMTS!?Y5EMml|!n6>BR zmRBU&ZFh!P3pK0g@QjFB3n9dwivslxgB#d9mj!$gm{k*R;y3Gta_l~|Nm zgf+)_d{$G24Nv82U9+XaW=n<5mI|9K750X4RjyTFsHH+{H~lLcD%8x(_2oFIA9r9{IvjMgetr|4ZSfJC%rx=5r2Gi?hMA>f zoGu6>zQzX?IW$v+fk~;J3BJI@s)F)`P!H_S^5iZkEUqd}nTWel9p{H?zK|y97@eQ!$;XVT1@j8?3cR_Mv+)q6nK0x$ps>PSQdU)oAulFw7oI!G zD=RF4p}IJ5cIupR&90$gu}~M%GTjAoGz~{0H49f#BE2wS17ykg0riz zvm`$?w=#ETQR)0t*=AB$T7qZ0n7F-=>dnmHo3)^+M7mJ89$Xx}@P~R*`FaxgZY(Bl z8<<}peZGjUD$&224M~L`Q_)!ij`oOvXZ8bI5up$}M?&PjhQL%!t|R0&Lv9D;c(ttD zl34{I!pA{48r6)W8-!nha2q@dnZij``Guv5X8f!_n)yqYNSJRyoaa;|9_1bRD8z>X zG2O@~VdJ1a-G>l9Yhf3+9Pca5+~3E*W5L1GN%cS=zJ9142K)?oGH^R^D)0;74B(f* zLLkzqUI6?G$TI#0ct3C#@LAwKAWQ8h;Az19K$gxgzyg+%Lsee_j0CbE@Z?zC4hR<; z)%}1yfP;WNfn$L2z|(-efoA~w0W*Qe17`r?Jfpe*cmnWyByVkt*Wfyd;Bj`w*6^t8yjS7q`4lySim3N+^K&aC+hs)sZfY@`Gu8EN3G(vR zuoM?;RmHqVUD$_@QKjLmLj+!6#=^>iimZalD(r>L7mYk0TppW{95wW6?bI|>$%ev% z;i9qM;^aPIX@6Me)K_+ax9I#T=nd-ws~V!Oi-25ZIv02ba52yeJP*jnAY`H%U(~2- z{Lcq20p0_=7`Os>8Sr^v4e%vkEpQX?N?;VOe--d3ATnRw9e5oOI?4XTreEhE9%}&o zmmEIm3+_$M+1EdT-1%$@E>hPJN|+);l11n909xy$iCyRK+4<>JPr6aV0hc4G7QI$ zs>vgKoIDj}erj0RF%ETsxDI8l9rm{A!#V^S$PpYA!y4z|w?;Nv-ZIC$dAUVZ`~*8D zt}8ffQ^Jv!R#(&Huw~Shz4euAr4ejh+IUc=vk5FW)*;tX**19m33bCVoemrW#HvE| z>A7dh4%T&OJ25(AJXKo;an}2<-ENG|w-VV4&U#oooK#p^Qe)cDJt#BYE5_04QNZOu zwx0)pY(EbI6M+u_54CLnjd-aIlf`oW5>bzrzp#Mqv3tO)B)|=%qbRw(fbBFt6&J` z{G1_E`^_0LyGYLA*+BH>&z<&bI24bwQ#`vUO1)|;2L0k2Gz}JCjcj^rw z$L%+PPXXTo^7@O9r6ZcCxCZSr^;K=-jz^(s#{?futHO{HZ2F0bnn032)t!kcYO~es zW~GGu$-7%k&(o&h*kV zVO`sr?EfcbyZeOIrUxeB{hqL@G>mN5ZQHv?SQ0SG>D3az3dR4G2)&pcz4*ir2#Fbt?S z+cN({+cKvSXRb(a)M4*q^e&jGVAVPn$&IKo| zMMyqES||K3!Ig<2Vq`T`1Y__7Q$%_x_NCS~9!SoF@p0yxmJMOOyV(jm3!>QyyLf#1 zy;@=K7t)|YR%(3yWN`)MP4S42AR7EUd}Hkc4t^oG%jF7;gZmOXsi=1W$;j3um?ziP zlw6ZdyWPK;DR{$Bc(d8}BWL!#*{VC<_(q8}=fwXbtM0shxQ7G7c>8Z;>77QV`3_J_ z7UN@vXjw^i!*u$uX7oMGL_5tXPs1zeBJKn)D8ydx06r+J%A;G-5aaDM%Iw7$2tPr( z>krfSAPw~Y7M9&d#fbdjT8*b^`U$AMbUe=6 z>yJfYwJA@%ybL9lo)UmAvUYzZ3-h$yehDt5)l5(cbsgm0{#z?V{kdP%vKO0-Z@lJm zFgmUso>{fgT%NA=H!erccs=jm8F~$=$82Ogpye4R+gXOapgvwbXGYsTA~x=gR;#;& zI4qO*znY1Amd~rGr9dVe2c#!?vG|5b6nrk2>L2oO5pL_A`J%GHzPhGwM}hHA#7*~F z5q8Mb4;hN;(?9fcd+egl~5{&<|}R)?s%$P$Yc2+X2muK+#_>8UAeA%@3{K zzvt*5Z`$|{+L_4P-42X)GJU(-feVFicRR3Nlh1j}wW|Bb+oxBy&wJ{Vomfq18^d($ z?g+AlZ+AyD%2DTr7OMJA#*mf7ZbFR!%Eixcl8Um;Cbft2O_G8xU;hiFMfB z6igDn-A%!*!neCA_*nRMHwFFi*?C=V3d)3UcSrEJ@a^sh_6gtajvx`ecdWzij^JY9 z+uaeoB7D0$f(~&^$L@|`lJM>B2yPL+-5tR;;oIF2Xl?|~%PG6&)4j94iI{NlO)LK9 zi@?4tjIyx~yPJZigl~6KuwVFgHwCBTGx56I6kI6$8wMO-{KcsKFI*IO?UjEOyt5s9 zu7q!QQ_vX?C3U$em@a&~n}R!qZ+BDhrSR=;3WlKV)#avOf$;5a3Z50d-AzG6XQpF! zQ=qvKu)8Vvv&h@s6uc&UyPJZ}U6{VzO~F**+uao0DSW$|f-i+{cT+GJ`wZ)HQ!r2X zb~gpj3E%FfpoN(Kx4S8D3*YXh;LpOhyD9jO@a=92j_J;P+T9f73*YXhV1@AQZVJ8? zzTHhh7N+_2xhc2;v-u{OdTVx5P%(Ahs6j)5jvF+?p-uG)U@>*yR69(~ZVLJ@7(McY zsf}{G(d?$6qI6~@&0E*!n55ZFLBr((OKui71&3gg(=Z`kR$5+}%MT=**zjqe_lP?> zIE4E-;zrt=eI?Z4C+L6JS3=q0`aUWyZn_VNKf1Ss!!F#pO|>of2lSONx1zWpzc9Cn z9qu36_?lb#7N z@n~X8LQ(voT{s+eRX6)wu$Tw3IGAbnxxfboSneA%WU8fDesiA-2kBudoBmXT$E#-7 z4O8nMUYk8PgssOldv2Jj8@ZIn@l4H`C-@Zu0(Y@}4w#&zQWgOx|vj_p`}!Ae%Tr&bsPUjOr2O zA;a9!8>RAfDn`xLDW|#*6m7l4s0Ve*sh$MYM|jWZlvBL~id*Sp)IW8~ss011pYYz+ zDW}>7>Nw$T*D0sE62-$D#Hed@%BlWp^6oTw51YKlOx^~Q_ln6|fIT!PA-yQIPN!nj z2Ay)MR@fOcK(5wWr<|%IsDZ-ks#8wY2hMdtyk% zsFphAR4!0Mh3D2Or^*I3M0k^R%Bk`|B?xbpPB~RMsA0mJr&CVV7W-nfYsBf4Q*qCY z#v5SrZU;3Sap3?&r{DlYr=03k?1~v7DJSWaQ>B9%DLk)EITg3S zJ)%=iwI9@I@S@as?1v#0qtbQCsjdYzMtC>slvCXa>SW>Ft5Z(364Y4XJ)u)h)e`$( zwDh8N3grjt6v#!X+jS~N-KA4b^&O~FC6ym^%Bdo-`-Rr0VpOC~IaM4eT3w4#opj2n zJ_N;-W7IaCa;lrKvjqhQ-mN<2RDSGYz(y7Drsx#(1*VZ80N(LB>BIY(|+kwBD^cB z*0tZOM~JR*Z9_2Jw3umt^pZ29arnw zT;qAA*8j={ixLkUP^zM1t?QNA@rh$SJI_P5U#U$_ta0sx6f)W(uExLliy<%!hTAam z)bfjjU%=QycRC@8Q0v-h^M@0F7ngz6RPh~#9AdcF;s}SN=xZYNbas%7*LGrRHU2m5h$f=g+oCT=$ktkaY>ofJ^{#EGPF3q_1O3*uo|?VX zvv;CscKlNR=B(K*&_&j|qC?#Rp+t`fbF*{mmq@HKN^=-giYhiLre&?aV@(9|w`4S$ zkmjW*Q@hYQ==ENxd&k=7iE|pfTxE2vXWdxO-pZqpno+SWwTng6;dY3{oMh@Gs>A3W#e@|jl~-LP?ME&D>QqvHXE}cH6-=ZX1!|LoF#37kAcs_Q^uZUosoL2=>{sU9|Y&w*mc9I0M5 zd2fN@Bq&mSV)Ax_;zTA={cQ45&7cZ`oC^xGbnwbRVW%wQ&ND-= z0EK4)gx&}W&nKYX2E_?fr25#TzBH-tOll~4#S=tsG$`$Asi67`Z-U920qS`0I;z`2 zX)*3KL!Sku<^FY0m|@|%Z-LTs`l%_m2NWM{BE>doU!mHdTk0cJS5Uo$S_En^sE+Dd zP=kbb6DTdcyFqC=T?J~OgsuTKK&b7Yv^(EzQa_qh1U^gALQ_F$_b~yKmR=F4VUo(( zptP%rKQpZly;52p!m2DsfK_WAyg44 zE$$_tIF*l7wV<@PH-OUO-UW)2|48)+C_WlQs{NpPf$FG|@g${bXDKMHKF$Zl$$F%^ z2$YuIGEiE2^s>n5eWbb%)Tu(@j~qSl7fI_!Jg|Ppa!_NwYd(bC1v9D&i}D9zy=+** z)ER{(T$KYQE}W(Yx6YO2&rpf*dQdi~F#qUVmn%-sTByXC1-X@jh793VHICJX6}c@O z^YJ(IusfEc2dhvyyJI#;;eu5gw;9k=I92BERln@*`7 zOJpP+I&shrBZutCA3^q6gHm6tF4Y55fyG#ya ztgu~uoyjq3@EsdxkB!p``Sr@x^*polQ0uJuVaK9YTRD>FM@$aGyCa>=)^tSXJ`|UE z7n05+R*sa$GAl<)>@t(Xl!qbZHNvsxa5%b=(3JaIIdb)Qlf!f-Bb`LySkqZ$${4O3 zX=vF@S<<=P3mn6@Ur}jA zf#ydhG3dyUehobZ#iiv7wJ)PJ>sf&iyFX&|N3+lz8emx7vDoRUTYwgW>JAAp+5?d~ z%`t)>wB#3Rbkn#w>}jnmpqD6dxcGnITCpBKD2Btxq$1its5HykbUR5mlHx)#(R4Ve z`4w`Prj(XcmX{VK4ohI+g<6@U$4ZO&bj>eDz?KQ!;X|0TS9gID>K&jSA=At~@?iSm zFjA<)T)T7dP`pI290&CoIdlwO4Dg`O$S6ghk>^g-W=?EZ*726-)A1W%>95FB&RD}0 zs87!EXO~;4%OSUDg2v&DEs;JW=~KuM0>FX3`^_?C=Dc~}qL2MVkSz9k#$Lb4J)+S$K_3(4Gh1vABS zYLh)k{-fE0WU~j!W)G6h9wZOf{iFU_RkH`l^1SeEgTY?on4xaOhTWTzZs4FNdH{^5EUO7Rb%> zI&~bld3vmgM$k!Es+?~Y8Wv20ZZJzsPn;D}R=hD=Ss4y>DiIh=CmV&&EASqZ@Y9Mn z3)5$D+Q+qfMvygnZ$Y_MlPHmxxIGBsMU0?v<+;TLa(VjG92SyW+@w}jit7#w@G}mU z7wd{EqeVIs`KXQuoeVqzDJk8t8Z+^2RlSjUwGB^8A;bboN8 zjVM4~M?Wr&z-sTw;*GR3iYv_BTf?XSXG%gfjK>X76Y}5`65e1vxfOFod8i@vC=XpQ z)vY|#IGgg&v(r`t&?FZ>G19b&x^z2!#=-iaF0uQ$R%iN9=kcJSC!$M!AayARNL`u& zguW;&K2;-3T+uBAPQ`f*a2k+l;Yq0a4qyPd0yqQs3@{(K4mcC|IdB&6Yv62P4DwS5 z{2u3h@iUH#K(y3<-osA^ATa^!^6&pg`Fpaoe!11i(OhJe%8Lr(npk8 zGR}Kuz4HF^b$&6+7c|}zRdd}R^3_9uale4|)N$!k4wAZG?biUN=`^XdUCS{MuhCR&* zRI~4+-?i@}IxlOQQzOF*P_x@1w@;=Ooba(oW7Rkp`~YUbqiNDOSAauIc4nq%3pQkG zGI6GiKO+TlIj+=k?sQkmcvs2<>{!%PyII9G_* zBOGN$$WBU5hRf6BtjtN6)TGHH1M}9=l<@h|{gbg}Q@d0rlMgq%yqiEqQjR-K96Sbm znSM;2@tv6_+u0_Y?n+BanL?Lw-YgepQJEPsH{u1mn8I*r04J|Wsi|23_<5zbSNKZA zO1740S5t1XCw+W&wpV6pOre_@Vq`7bm7akD!7h>P%oMm*;qwqByPJ~ZTrOmo>qz7u zZSs>bvzq|_d|tmq_jvJy@PF-g=r?vT^s71&;*zq@eWojrjbi;RTmac!{?MZWv*FFP zzV(8RM8^%qy8>_Sq{5Qm+aELt_$9%5E}V^MbHOY&mqT{-Lthgkk$lJ=FJ|ul!naSj z_nu$TUl0Az^g?M{eB89avbQ%U6P`!tl_nDHFWUATs~UedT2m@-Q93$n3#B~5Le#`evws)QMl65-PY z&~Civ@S;R~ZV#R67-}K4uttlM0-r`{t_c`5F$6@%eW}MtNp~e>_`QL&tW5k(Ny+5gTvL83#B~pR# zGtZuS;jT4VM-SVW_H6$CwqvjdK={M9mh@l#?8ZyyoKe*B)`+;Zc;6@dfwLZYZ*9!_ zxbtGqIB?p)u?z9d2pVLp>L_H-o=P_+!3%@v}QO^ch?AY|N0a#-6tl-!x(4L#$(5+}*9(9QWdm6HdRY?CMWG zM~8E!@a-;L?hwA+rOS5V+g-N|#Jjjyhuw7x_bxbL{O8$Z}s zH0#!(k+&?ZP->p=?XFv%7QWqeOG_uyvAb?@3*YXdWts5pE?Qm}zTHJjcf2T#b=Y0B z1cYyQ#X#)04(OkXQU90>>8?kMCN9Z+ETo zv+(V%RZ=nYiFMdrt6VPp^Zs+Zg8%kG!kY>%zCYR?%F&*j=kk#YCVk z*D9K;7rSef?ILe?t-@!&Scl!UN}2HOu2r58zTLIT&%(F6R!Qy5^zE)yYJ`8^eK-BZ zac=unuhxtlJi0pVMtmD2e7kFvE?t<8-L=Xz;oDuSXs%xDu2r^+yxp~m=IX`nT4jD$ zUf1qg<$2-TU8_WOqrBax zBs03ru2q^{tHd9I>k^C0m_S8U*%9>M8`7LZ<9rjR$Cx{u?Oy8K^rD2V!sLU@aoY9zc8m?-1mS|!k%}zV&@ix%x zw4;uvMf5JsPCJ^Nb{xW5DKv(9)Wlv2sWdz7Xm;9Bz`nX7FSk4&`gFK{H4ZzX>3$>V z+e2N3eGhn*4s-o)=v0i_qEk*a9=jPB3WotY(Ww}y%S10(HFb&eJKUx){`P!mH6Kr@9VQKjGb^ zQ%-d^sJ_CxU#FbvaZr7P_moaK)r+9Gr7T9htW$8e0gC(VV$|C@n z*e{^vxra_U)!BIWjKW0RDxGr5J}A6_RMko?SEFw}n})#`M>}Bq92LSSiJ4+;%{p`+aOqTMoUDjg&F>bJ$vLl zT1#lp%$o6SV90yz$1TXH@wOZGG83*jBX-HU9u_;zq4^&TyYw5L!cGXoF8v+M>#!G@ zbLJmbq^TUNFUTDJ$1L!kikr`gAc49k(bda<7n(-ZL@$MYO zxJuww!QcwZgWtN6?E?5KXg-=p!1RJ35Bh28^-1sACvGN~s`YK=+l z2E`sDQvDYce0(6i77>~qosOz4DD4_OK(V)hWo}UHiz3xbQ0yln)m@<2JHUQ1DE0}F z>OoNK31A}`6x)BKS_P`NP^&@p66#q{J%w5WDqbl3kpmlU5X(5QEd*yQ+7i{N)59D8 zK7Z5pVTljiH$P=q+F3Lh{y%2>c)F2s6YaK-X^C-w8BW4#gOUAI3x}bT>sQ@o?@Ll1$#l-Pa@fPDIabb4UW~0&D-EkH-6({# za8xo%$Z;0#DR6L`1G>3g>&Fvyn+yvCva<2%lD@;+)VxqOcI;D%hPP$9sXACLs|%eHo| zsi}I^)?o|w3iLqVLhd{cEjUibFOjxjD+?A_wc>loyx>vl$xIQGK097{&oXOLV~d7; zg$`r4-f1uk_1Sp+2{H%5ug#Z=$y-1#L_Qwu8QR+g4cEz8C3&|Dav49puk zCa5=v5%#)E`sd%+&MYUIoImo%<1;)Ew!sreq+PzATkc0+xgsKKFBE8LG)vQ z351#c4>y8nTnKSt1d&E1ImlyuM?QRn-N+cRzR530bq8$i)R?%A2Y91LH89 zPuOwhl*T9ri>nEi0c6a>xCj_1gIK)`c*`^3HeoJoHI6aUJHfbP%;+F*y=PuO{GKtH zt7h^UKr9z3OvI|0zZ~HAz`pnyN0dS6xCr;mCr`%bJ(u7YZg-V&D8na9@stRJ7U*>^ zei>4#%F7E%DvK5xnvkE&yQ(;df#IMX;USWy_J`NwJ@T4H-p|Cn@Ep(L)y&6Pb=+Go z@OkiFc!bv{r=x?y>XUIO&nN5`3}dvsw}7vxprFi_eys`^(4uFzo^$^D+|{UUxTuZ`G;CPe3wlARgQ zt=e={QDO)nQf0s%4QxDQ(}V-9SJFH{w8n*X7!N|wb4A5{Ancs%K(a483oFzbr?mnH zMqXguCS^RwdkptDSnAhOI%DAj_i3cgCC%cKP+NsfiYo$S2xf%5h-y_WT%Rio_IiZhY@hXyWS{jA?XC8K zIoC?`iQ0kf`54+{n|(=Mfy{;q$^#e<+QcOpG7578jC>pevoRJ1noYK*W=_gT&rC|C z?WksxtuXDCk>s(MDm6@uwzpcUOm?NgQ0WvH|MI%B#6*`2$u!UsYn5}sYFCI9t&dSE z&MGCT`Ms=!)THbr)k_yT$|{7UEFwlaaE%%?s%x0z(hRAlLh-eWb+QVH#WGr0YBt$Q zQ?nQ-ld@fS!KxKiv&mM?DjY1yWlnIzexBbe2IVl=8s=}CO|}|Fti`Tzv&mK(5PTPX z8f>IzrJso*B+Hc+7(XH1gDn)ArBa9TCT00(Y$_u&!wr*DFi?l*d@V3S4;+`}Mjw|x z#f;TL5AeBC{Ip0$`-^5^OFb|vGc((qI~qy0(gV!^_NY%Fi&1)jX0|cl_R)l+FC|Hz zw^Ah9h)WyOE{f;^>`f`qS{D!tkmIso50d#ZLY;ajZAD68v&mLYy$pMt+T#ioA!R(r zAU-V6Mu@`{p#B8#RFI>MsN&J%#?sP)9d$ok}{IgT=MABY_gSg(atO-W5N-jQBTez zO~a|}O&MAe4d9Jc7N=D(VC?hJ=pP?4n@zShn`})<33z-d&&DU(D*q?St4pT*?NR* zu+j!(C3^ehOxOhe6>P84+$C4B1L;XwX&9R`vR!GeEbN4gj{6Agtb($l+`NK{l+yC? z`Q;f^#RaemgMC8y`lbTCRem=`ZaqT@b~(*vzGS4D@VE;XCF(!{8Be%iYYc(IV%6LGmB zYMALwfk{|*30{B~713PpP)VW#qKwA`$e*5#-Tj)~TR$3;vO^uZaej_!nfN_{Y?0F z+pPUtGkv>F)l%WxZKpmae7o(`pM`I?otlid-?0w6?bI6K+ijQVTzsV>{8 zlZ9`$oqCJ#?Y2`t629Gb>hahlQkU)2BH`O@r#>QlyY19(g>Sc=I=U^>x7$u#EPT7| z)PD%yZaXywUjWr*JJlSc=`mXTpwo~KVGkv@5)LFu}+fH2}e7o(`Z-sBS zojMAAP+hiD&lkSkcIr#Qx7$u_i=nA5+o@jR+ij;_BYeB<)Hj9ycv|WgH~v5N-UL3X z>hAx)VT}nYQCx8eh&w3z;>skMKqMQP35(kpk^v&wOeP>!+fm#wZnbW$*1EMWwQ8+f zt!>fLLMwG?ZL2;mRPCb{R8*{Jss7%dbCr2+!x_}=G=47J?r=E-@AEq z{4Xb*GGoTAE7!B1hvum}-Kq7)K2vw<4~>1M?$iy&K2vw zOx>wF&`=J}$<&=%W$bI;d*_VbOz1rS!42;|yjSI+7jbID*k|faRR?o$PNweE{pcTb zr#rRY*k|faz025V>Q3EY>@#(zPGVC`ce+#0HujmiQ-5XbGj*rt?IC|Mb*EMv`%K-b z*Bbjw-Kqa$>@#(z4rjl^;G9g|sizzJOx>wJHujmiQ$I8InYvStXV2Z>oJ`%R-!t~z z>rO4x;jnE{iLqUGYEZWm%7Yr}<6ogt&}}?B-%;1}RcI+~>sZ)USHEb?wuYuHUT^DY z>i8-`m8ObyyYAG6MIBkxnKZOFqS3@8*EZ&0L&H`n!0AD8O-IAx*jE>xMe%mNRR2}P zOuBs%9nvkZO%idt?$j)0P|6#c>y7e;ZAsw7;?~Y>Rgp|k+T+`-CN5sr(b}?&#f5#I zvHE6aH@*rTDeRB7gVPHIpE^KL-`d>V+M*){=J3F_Re=9m<*B_$l&@N$tcreHYirXs z7MATwQ?s>ijU1iaiekG(wQPL#Yis=Jp>-px8{+e~(Ua{;Q@1NkZQYU3>A)D(u6Rlg5(>>RsrpD&R z#I}wc7|}OxYtMAMy43CJQqP>6rZl@J8CBoDv~63*@Ju7tH8n2Ss^cnf2`n254I)G<)`lne}a#;Pp)X)V0(# zE$wLRIJu*>v%Q|5Ev<>VL}P2qRt2)>;)v+Dc^eDG38nN;z)P%tznKS&zkJn9pl-ZiHRjsd|Bz3@~zd5DbL!6 z-4?o=ZxuSGJS&Qc#ZjKP*)io?w>zdh>kZHDEzfSVXGgHjvw7BdOe|62i&RI*ly9By znDVTZm{^d+Zna~|v;K&QL-W}E#WCesuVd2UWWM#kjw#Q|W#@(M-yp}7XBB#OBRsn^ zF&)IS#N09QHphf#?5{Z3_}tGigxR>X^{1i|J5fH{3DhSw~@#&-vDIjw#PN z!LzIM>>50~g`V9S_6cZ{TfX(IW6HDi5p$iL&$m8yOnH`ciOzDBiK03-xBB#{Unr}r zqc^@S7=5jqPhGaMpHEq7N+BuF&qA54mDsh*Je~IJsm>$mx^2g;NdG-+>z?#&yx`vof!d#&oPIOOp6TJy#i-+uLjSEN|PT9;?vkU2v| zD{&p{i)+^xdR&)O8c?Lo6;KJ`C5UwUuHVxQUr=-JvSaOs3%dy}0eqQFGz4zMy5U_L z)1rb7;8o%Ey7^l3+qSFjg1x6N*gk!->ET8lgQ^{M3AGhU4GJmybC2*$HRiYO&h_l- zJkzC^*mJ<$Z+Uh%c&2AD9boSM#k2b>CKW|nNrnpG0P8c)E|=6*)f-^#i0ME~L#(|q z*`bm)RaMpj)_6>+$^)!6OtydDz@%^wur9=8KXC;n`yDr68fEU@>fL<^(@10YOH8V8 z1FV&p?DszBxm$}#Rdj&09+N6Ca@D!miRAmmei`rAhT}Ki^}!!1=2agrt3;%)RmcGaUCL|svTa7YKaCr| z8b>{yO@-_6&Qr#XG0)2M$590jd4OOj?>$mBQAEvKi^OnIxMLp3M5>~e%wruJ+aKLK!LgCqcGH|; zv&6G0blhByO*Mb%ao=EUWb4NLO}~wa`^%n%TRntmVcBh(FvH>Np-Kh|Z#TuL2VzFsWt@G-dj8dtolQY!6ezlrtO)z{K zywZXod$hy4q3v1el@!<7>Z2S#%n#q=LA^^-P@AS7A{OIYpG{N8&7aTy`P5~_vS^!d z-ZQf^-oDhQje=00(HU>4U#fS<<~JpHyrBmbwv_*!g4Xrp&L$ zBa<}=7Q-EbC_LSse*pi;yaTCT&wB1WjZa%bUQavsCJxS~kEu(AcdGQ{rmLZ)8MUk{adW%lPJ(i(HF|}=U}Gh% zQ`Q>CjehHre}w%@X@+e>F0}p!G{Y`z<$y+8W5+gYhkatZcG&IOVYh3CO=uiZb3{X9J6b~LbuKu$a8zkSaj(>e`aPc4*mCl0^9tKH z??p$nHOwm&vjykb<42?_SsIo09 zb}eaakJl&W6h=yB6drOyXG^?r?C3G+<$lYa%xdiDtZOQa_@)eJ6`!2ask#;6=-!LE zL{szp`ri3OOgfZ=-daHDD}4T|(GKg$=zp_@SaqY%ry(3}?O5=Hrv6A{}JJE%JP7&bvo_gX3;jb~eQprf)O6kQ8)cs{oim9h;50v%42EGG~4;t|PU;6IPXu_L*WlrsAG=bm@ zTuK4^Ds=8@>Mh+y6L0A@MXrUVr~Km)dx~fX_ftN*jw$-)k{dmxzQu^BtmL-4VRsAm z3{h$NW;ZmOZ?rVBHmlF8U|H9}pde`3*izDwX;;B+=u`#QM`pZ=-I%bwL~0#5c1o|l zk1}S`q;ccTz)$18Tr=)#J_hv;iV|0MM zcLNTmMPPu?yXR8J6ng!ruTf-t(pWgErM0PbL2Kct+2i<|!$78rp-t61MlDrK`Bj2y zt#M;v%+|3Lk+CFPR67krbqGu8fr`y8shAPLepXqrRJfE@rQIzlL+5WaQdL`7Qd(PH zE}fU*ImI<$lr+k_;+km8=z|N#Dyw3%Lp7CX`O=H3t7@X5+LE%WSaC&YMmRPtj2=23 zD&d}OgYpVIKlbF|_9$(*ysJeU9a`QndZua3M1?PAjVT;e5hZ@|eSRC`w0M1EN1TMH zKWa(+!n*dD25t36p=~x&-`d8F($?PPj4ye&k4@PDl@cM{4=lHjO~;HGGj`0$s?m;g zKG~JdI)aoTvH#5@Rm=LAMqmVg?zN$hz0W}Htgb6)NVP1h_Eh8AsWha)ubJo>xp^IG z%wk_?^p7|VkH23NRP66MhvpLy{Tcq5%gnH#&c^<{$+z)Wsl)i01>gJv^`X@!J9hRs z*!}d0ZaAMl8HC$Stdz^Dk&)P1HbEV%3Oj=FS@~p4!;fWhd02-;dkM$;P>F~;jQpJcpLl_ejjRZ`2*M={tym>_rQbUz3>Ql9~=i+ zm`u)u55iO6LvTKP7`DPk;8OS`Tn2e}@-p~qcn$mwq|ailg5QU$;g8_&pqA6uz~4Z^ zntTyH4PS-N!N0>lKz-BokFXEv{vxb^ufpr$TKHY~2D}aa4c-Uef=|G=;UD2T_!@i{ zs@#(%8DGaZiS+5``~g#!w6q~R)um$& zb6q0R*`_I2mf?aQThTMl)kC@r!pR+Y%OR7_gl}?aC~2m*=^jUJ({HMJD-I$4I_jF+ zn&LHf&e-Xkz}om%ypZjT@g`fu?88Ia`ZCMevFLxzmbk}}g#%))M*|*dDHo0hj zu|(&N z$;FVmoVpYIo%822l2b#dB+|VOGskI9!0J0gN~Zf1 zqV(C_UAZ-qTT))9$+VKXM4k7sF_n3z#Vy30z8NmBC4$OSwbDwns)AbE>=otBtQBQH zo^>mV7b!KzPQ+A^*7jVH)H3VU-BcuXAXG^oS6gpS{SL$G1;;~0r^-l!wD>5YRXe-u zA#~T?t8A?x0F(GzNtxBfH))e9Z|6YO%df)&Ae+jPhruKq4KIWf;l)s!j+VpeknJnU zYRHDOq$WYGf^G0y@GN*ORC{wBybQ7(&D2NQ(&Wwj{vK4lycs?SZ-b9P+E~;6{{XJx z_YdLo@E)l8c^}*e?}w^~KY;^@(}S=8J_?Zy)?*OaU_B0z1=i1@HWsmYCRqeuf#q;5 zJQ@BK&Vz5jM))Rdfp5VCq%BVpS8a$(eiObA36s9rn^c;90rj1BI$X(JVGi64?f{R1 z`7j0t!G&-LOu*gY*^uvFC(ngL;YE-yy(hl~_k)rN`@>-SHka4s^5;qdwQob5-)isa zt65_Laz@X{%?$olQ|at0hYyH##C?KB-ga{#Xe2{)SJkqkyZWdyt8T-@Qp6J)`%J znh@@@KH8Q`tU7tlRlIYlRh^?h5Z&7Opimb z?#O2qqXhdnjGpQPUX+N6pj`A_2+Lqf4Y!sCM|vdRaWkRDl7Lw zg_nMGuhXErI+G<0Li6Ye{#z4)IBZQi{DgQaj~;|dhlilj;c=*R_&E%g1@*~PFZ8EN zvP1oC{g&*I44)8?9ePG?cID4k7Roy8M2PU|)HbJQ?0Sn!|CLpKWC#nz+uz&KyI1fh zkJT&C^#t)!c%FnBBm5RBY`^;w@m=^y(Ouo%KvI{h;0^ z$Xz5suM=cz(qjkWt@4ov72I8&^cd1ZdboiPmXC9J{+K|0@TW&%Dm}cquYwXh{qr4 z6b`or7F3$NYBRg=OB>IOH>Ad<5p4?C1ve8+KfkT6ven+BQ|Q>`BtLwit*)$PG5ZG^ z(k6KHc_uxTll(a4LL+wb(KGwbKe*!`mR7d7g{|6yHn2c;RxWnli+Z)>w>^Ixe{b4*Wt<-in z?4~ZTJ#H(UXiMX8&zER>V_nOF&ZfHdlE%csc>Am9!rc}~UBGDd2k6S!p z3ZdG5uO^wjpo&1Pmwon}S#^6WA6)4mxpcSGi=NZvszB9aXFKJ5i+eA(=s@y8k|Vg; zHJiOQbE;-_AUR_R6TIxHufQMRMa@p&vKGY8e7+~M6;bQ4cJ!QXDrQ?#eDp0EN#W`` zBlz`U4->HL!T$exJF8hYVD8c4ANxl$_k&I|_D7y{%-qk5&Wqi0=Fm|m4|?{yW<3)3 znO|gh#<;)pcWY}0J-+Y0@BE_XUw1tCqxmeE@`AxRnfpp-8~Y)T9X#)*2R?1N|CHs= z|Kj|Qqn34}vH#hGCm&fbc*C_nopQ@V{VpB6!OS1x&ze4SKHslzd$e_J&KGxoBk^12 z{`<)Pe~f$MvYk)LKmW5&azA_E+WBa()<0j+rE`GwE;<+6gterc(3=vrhC%K?&xjwqQ0%O zi6LRHed%sv?zW_AgK2bn9gOt!kfyw?QhCy|UKYPLWx88P4dDa1JW7wIy`PRXXDbIQplb*=8UUy7+)}UP1Zm?s@v)3HxjWFB$_r%5w@MsSo+aHVww-jN$dqR_?P#w|540Y2O!?O1 zjw#PtkLgh3%Ld1kXKf}rnghpMIukPGS4FcZ%uVfTZ8Es^TeKe+opVL zAIHQyJiD7cyO%K?YrkWtZQ>n{DbKpcv%BB3TaW2D^TcEZ7c%8r$2g`u>vqrXPS5U5 zOjYW zYmvIEcH#{TV@dfO9Jy)^uiN6k*Nw~Yt({t7C zbIZf)mz}fT=lXP9uL^I{YuD}2Rk3N=6FJK(Hg(l*I=Xh_&X-+=bys-P6Ke{lo{3l2^uYwj7?)2U{LZPVlq)0%Zt9LOW;=Bck$K@Z{6}^! zdt#)U%;UGoD+?!4cQf9%*)1OZx=~+c>eJv1MN-So8Du3E zQ3krE_gjviwS&5fc>6|5-noC(s4S89=s#4O9w%8F6 zrmpbduIahUNyOR>=e};y;I1M>&3Y5^+~u`zI>B?&=bChUd3pHFW#8L+uO8Yu9##M;yrRmoF$6 zA1jxo3}@kB{&PZ4;%t=QOUYq&{2>Ytu@d`sRg6TI9fBO(v~0!5YRZ^fLkE+0wIjK4 z2(}2XlX17vtt^9=tM2*k&3s|nj@@;&6 z8S|T%*JH+)YS))zsB6p4*=!~HtZO1f%buuq14UGxT@`+ww>> z@=Lf+mzRMmj(@$o|KfZ8;7C5CKQDRw#AL5*1VwCy`)v)+);)h11&>}Dv$50opB^5j ztNC9Qc7XL7|I<&zZV!r|ZTeqK8eX8E4$~pV^f@LC76w>-kw)~DG38>SpN&b|+~}iY z+65E6dQ5v@I?9+N(xw>GFiew;=^#v#jOlPp6OCy!rU}M00n<2R(ndKADh61km>6O3 z#!5`;I1aEPnAGVUV9mjFtTCN}=@?_0he@520oDRcb_kj<*&#RslO2M^nCuXI4U-)L zHk~;kxB!zKf^TB7L+}_TwFyJ4HJBI`VR`}6AY)?T-fVatVzE@|xH}A!?QS9_+g&jx zdbvEik$%;Y#&jkVY_{nEOm@D#jY%5>hFJX>Qrf0{F^w{I^_WH)(>a(9H>O)LDc^@! z>oM7H`xhqrZBqtX)>v~ljA@K9&BSE8tHWfw`!=TW=I&i7JBrQG#_k80Yrj4C4MJ0`G66VjZ zHBc$kH%Et%kHz%-)32(6I+yP0>Swvf&s8$)%e7ItNVlnQExe}|Vxyxa^3TqpM24G7 zGi>h7uvw8|^T!OE57KP>dg&<6KD~6dGXiBU^%Hc-jcq55m-gkxv?Rku+jP_2=m3v< z+5YG#kA2A>zg9)1L^f@RY+^Q-abrw(W%}c2Riu(+^+#PUUB-OC*c4JvQg6Qlo2h9wk6?3J zn$2&pNv7GnfQ@~*VP1#L{b_DK!A2jVPra)jNxmV?W*=+@Q-f_ce$@>)qim#VoBO^A zJi*3>?v5#9ouR?dv0}A5(cZc=xccjVf_tgk9o7hQmT?5~C#CbSq_eqsDcgD6jcxAZ zDHRaGB}~_ac~bj-JpGBr#_Wtqx5E4MeL`toa5u1<#?euj(vWDIJWtIsw-d3rvvI`r zvba6YA*fWW?Im&dZtx*bdt%IJoh)7$uU{1IXmfN@MizD^&?D92$qCz)YwfsFN)_?l zO5;jWz;@+YTd~xkxmf0Tv6$~DkCQ*+#*Chjifi0CQsOO-+b2KDi6tr^OU;3r9$cGa zFWoy%WpQu;-c7EQi{K)BrVG261U4$T&LU`js85*F1ng&U_lwzQ=d76jl!5z%muNlu z>$%E^fq!Sd>nEFPGE&ouX@9c)5-aB4yG>@<*6s#o&%)W^8>8gfF3b+t)X!jD@>efa z1ov(JU4^Nq169R)NuZJ(Id1&KLf^F|&6{J!PntAlk{*x-mK}`-mgyW#eZUdtK@BWR zkxuHgr(NA>U|ByX$GQf0=k83a#1*I2o+{0o?dcj*o@HFo5w_j9eonPUPxUM6mA!;y z@Jd?J(5Zu7sq5rCPTg_b&VNm{rmpaJr*!YF2&alTx^p2%eRQ!4-YU$Z(dGIV0{$6| zF6l2;_-^jjU8d%jJ8^f9<5oUr)BN%m6ue8D#DTBh3dPgzjy}y zm?kSngDmUcq6UM#1E_I~Eoo?8wC#FQf4yB7&30WhwcB;kpf}XkDY9J`O><$XZ|BB# zT{I_07S=6kK|gNCBDz}k)-4?uh%Fv7C8b|i`;gqdKSngmVMA;l#b!z^cixWgUT7&!^ z2YzNf)&FJH(@0;3&ZEDg0r+!RtS3X+N{mEs8-3dlGJSI`%p8RAHXR55S{`*g7e@%;JNS=MatRy>&w-=ht?&qVC*)&V$-Cibs2QU%@Nqa6{u+*h ze}og@>u@6ED4TUO{0BT1<}kMsg4)_z1UcGcO@kv~89Wk3;nA=bPJ^?c=8DRwh0IGOm%t8~gq`pjxEOv9E`^W7 zufe~EWcnMCva>4jW5s%C}|bjGcCmJ@s*r&wYbKsa&Tp`PT63J=qmgd9V$N?AmZbeQ$~UlSA7VeR zjrO|S=bvzXyU*`TZPVrcUgG>-;P`)^^Sjv%kMq0D`MsM{-8!7#H#)!d{#3gpndx4t z!)ljmu(;8&Kb&?$^?M}Ln$9RV0ZxEg^_&D}z++)8JPyX-@vsq=z)m;~UJa+i@4yq_ z?XU{|5LUyV!y32}M&MI03jY9W;frt<>`Thdfz0<NmB(J0W9z(_WnkSMYl&{4M+%d>WnuQORPVrq;A$%U}*^bOBU5b|Ksw zUIa(LE~vF+)LSQyg_pw;cmy1z(0ggs;G0do_dbP`J%XF|a-@MEw@670%84%}L}}P@SBf8OD9FQxBUf z$Cj{_@g=6E^6a@O&zx(Ez2QJ(mC-qNTajUSI^Xndjf`{EHyUfdL>i1lLV#OJFkAbh zY+OxIZH+B_7onThLylaTX^zesN78tw_QZZMUFVdh#(WY=y5_j#orK_D?UtvyvBd}r z3B12ktaNz-fb&J)xTW{AArAsk3v+J8M(0r{)ykehp)nC;NRf0@bB<>_zC_^!C z3?(;SfP2Chp_1SgSPfr=bKz_7RJax{gs;OT@C_&l|2F(K{5!lGu7f{?>)~_o1GpZ3 z1pfuuTVeXUA4AEBO;GzwK7*1E|AJ-k3s?vH^taV9^@lC|&V`+D2dIAVPH-6<3@?QR zP-~}q!0X^%5Vb4T-tZ|n6l&dcAE^HCzVH*cA4GM5RS5IpFt{Te4ukdXe$sIyf9{@w zl40rUSZfIs%fl|hzQX6NZmqyICYEujK3isNETBs7O zuA8rqrV26$tKt0FwMZJvRMRSVv8)BmGkd||;HWxBw3)VRCz$Nyp>u?#e5Hbx+0 zD94$xvDF;v^{RRaZaKX>bye7k_{EE)!=jFAy~|WG)u+?=b1$Wt>Jv-2R@AYah`I@- z<56%lWXzP*9*$$6c52YpnEG@aJb~ZSU<;&7CC`8-z+ir&%FOJnamC&h_8Clv=U)EZmXfl~N9yjjg>-6_llx|6~c9Y5Kh`X8GsPI&F zHqWE?YC6CKNjcZpVlUU(y>l#8B3w&5|J2)bGa3bXj(hbL-OToE?FZD+FO*mKKW}Lw z-ciF!M0-nI>H}=q`V8sS%84z$G%s~T-INe1?R%aQqTn=WUA!p6BWV;=nVQ$y+T@(k zSD9SnJY_c*65Ay>(p5Rc?stCE{%QT5Q0V?$&hJ^y{ogsif8zXBZPw+9eWMD(x~r4MXgb*c`uA&e;+&%{utK52jG18Ak+*C za|y{?;G^&k_!#^t{26=_vZj`N3H}1Eg)87&@Cm5-j+Jm7Tm^R^y!7po+THUM+y(v~ z?ggKP`$J@RQhR-9$Beq(Kf@5eS*J>tz!zb#9??g%3VDZ0ov!u6?62)o5KMpMD4rV` zs7HF{0Pc%NyA{yNK_a@HkwWfvbM>|cWpqZ=>rjm}Gi`MY?Gnx~GgCUsM$$3W57Ed< z{g9U_L@14hHD@)-;zqMnebUS3(^NjYJcg=@Lb3kB6%VF8zipQTadU}Z$rXv(fLdA zZtGq61bh#^3O|7AFMI@dfg2$ze=O$GlDorAa3AG=ID|u;ZUe~s{PID&$C*52dzdFgz0O57`}-JP3}1I(kkRlT+XXSPUn^3OEU#0gr=!g;ODYL5p3q z$$!8wr0-^x!F)*HI7uJOs)PqX_R%HB!df^B&W5K!(jYkxo(!*or@|Xy9lQzF!@J>p z_z+wGAA^l>1w0)-2|M6huoJ!u7sL1AQn(3HUy}cV=fNGQN6X;O@B+9WybvbSL@Lmfq>615{c{F4C8^ZglLKYcT!BC{#N=8)_Uj2ddx597M7No(R=%JPFQ( z4X^{o;ZnE&ejT0;B?lM5>tHjy2`+&v;Zmrc1TrT1XZUrf`I~RRV7sYyUzeMkYB#B> z=C}Hvb^MJAw3~WHZWP8Lsd7WRsZS}Jg2J8dE((fTCN+I-%j8SP(|nKU9l`$hRg`fereFSD80Po)pu&19490%}_PX5ow^462i=p3&e>;Ci z1mdq}bpI6o(&KOTuw^8G>o?B3NdWZ&-FlVY&s)d??xlAsJ@Vkmj^&-iM}FT8Wq&VJ z|L1-vIq(1^Iu>giX1wwsRC+uFE8)XXaX_YLq>IvDek-eVsa)hk*(qHv;V-B*PtV9r zIe&Ylm5Ye>$k}S?d-`BNuxz+eU=KV)9|Rv9=%&A(>YvQvz3%0fABA7x(e+E>sqp;@ z7C_ppq$I?zVIlktJQ&h;nf}RhP|yAW2Fs1=lhWFarqTyNVa&dX!Rjg7~1@!XqA$_WNB&?t@MyH-zeHF zP&f`7TgZo&`nVai6*_KR%dCTL4a;0X>b~E0tYMkDuIh6#9CyQ(%F`=(hkGggR0np3 z=R1}=BGZ(ngQ3E`3p^a|3Xg(A;8eIfJOS#Gje}6f5TE`!5#+Gc4SIX*K^$a3V?4?(Ldgt zijS!@JdJ1EOYaTJ)uWkblK00zim`P(JQS9}S#SnC6;{AFtcGX78mRC`V6c8%gS{>{ z*ugZ>^FbA}dPeTM_}eF#CN*pxW`Fe-gsWRI0_oC;kGj(3>uJW${!i}?rpsL7rSO~x zl`bd25_l?{3u92}Q3so0JvXO`0E!1zx)l2ycmK8lC zH#%99^)oE4pvH~=qO54jOLzSrdr-Yo4=Avvn!b5MB}nsP7yCR^Sd>mXLFK)!<*a8b ze3!tz;pOlkcqJ@_S3$||w1}=lw!3!X#%S=D!JMcDs-v}Rq--WB-_n_i_3k;^` zW!Nk2-1K}5AuxzvZh9`~UQpewo{^|jUn--Vd0iOSM;v*+W9+{2sikszl=iHqs-p^r zu2iuz>3N#5wEt6Bg5~ZI%8kNzI8;A!6g(0h0hOLd!df^Qs{I}V)lXqeWBP{^U@)B+ zdz#PcD4%roJ3#X#sdQq_hBJ`q?UkM>#I3l+&)rnZSLgC2-9_85!=Sr@>o#*=)pv3v zFx+*0XYNE_1aYTRy8m>J`^^t?*RST3X*hdshEmwwr*jk|t?-z6A7{!(RZ%NOfvPB< z)Mh3;pVE}Ds;l%Mw+opFUNZkoZw`Ac`RHECHOO4(X4|}xE`tv_yEp_A41jTkKu*zA5d-er|{eGGpM@!FZc`i1^fd<_?fk# z9Jr33{oqE}AASZ0K#Q;rgactNJPhstkA-W;BK_$K_V1s@?)X5O>KXM#f5~5QFilY&+%T(AJ6_Wh)qMfa_^fcrzu zAr-=4nr=yUKErcUzntt0BU@Z1{N`2n&_vU4LG4nKy6!%v`O=ciCZhJV5Y+zcf< z8HO3z*#}B?_Jxw2=m0UYlQje*JM*Dr=O8HAxg!kbjp~Q4AvR3A))%v6ocap)@fRF_ z>KVCFT{|}=JL$hR%`OekiDrz+aqC{bc5EnhrcJGTg4&bXAJAbwTIrkuR%ck%F~pyJ z!+g!sY=^~4sZ#I%kfrGaDDAag>|P45%CXXTAIJW7`k#u!-Eb%PL%0{b2ObQ61V_Pp z;Ust;RKNLtSPXv*)gS%|)SSqJa2|XJw!nv>^6C+&Jo+hA9{mjd3_cE5!Jk8oWq$!* zgTI8@0`>$ffWLzK!Ie<`-e1Fs@Hemsu7Zo;Z=u#GpMvMWHE=onJ-h}!4R3+Zz~8~= zpz`l|7%USdG#MKSi`(XX=YaIR=W{3=!7;R+QM!pg_Bw_+zH{tqMdhn|<+_Idnr-J9 z%kn;p5#^QR`Q(%3eK=DVOjxB`urnvkVr+^TV>_%uZokZJRa2e$>i*lD8ZOI4_hW7KcyyP2K*0}tszam|J;@C1H#h0N z8jIlITYD)2gKtd%JnuZKkei@+0awROBle4sg&kY{VNP}bZse&##Gpp({!O6o62^Tc zmNekVFSr_Km*Kg+HO=pE3RQTB`s234E7Kfm%E_pf;;y^nX!wrCv6+I>{VC3G_x?$N z`|W}IR|oF@FmV6(f%|U;?hmkI<-LEsBP-k~G0ASu>v)&siDdWN*pxf=jf{DZ*-d z!*4;!>}%l5@LKpccmsSF-UvT|--A1nK{vxa;BBxF-VPuWU2q({8_tIJ!a8^# zlx+Vo)H$yQ;JNTYsDAT9@G|%q)VZ&pL-uf4zl8V0C*f1@*HHc8)$m>TJGc=(1+`yg z4P;%!dKw-ApM_)Lb5L^-Bo{{q=#W4#F36Jxy$--oZj%@93R=DgNx z@bJDY@j~`!Sg%9&PFQb3_BL2=!7Jf<_#^l}WGzw}bdrz558#vVL-L+XsR2vSF^CP*2zn&Eq}9exHA zkTPH`fn#<+9zf!3odt=5bv8U1egpDnod?f_=flh41@H#g1-}omOTG!OfWui>|0X;Q zehV&v*T75Rci^?~yYN+b6Wk}C`VUWpx56{v?eIeQ0Gv!K{}Xr|d=M7HN8lp(Q}`|T z7`zd#fWL)L!dKx+_;A(SCJGm!34DJml!l7_F z+y_SCzHmO=A2z{4cqTjmehrR*!M^@qXs38(+Po$m5^wzX56njg#^!oPZp4gv&41%W zv9E7!Z>d(ti+XOh&Ca*ar*FlKsGf4yb9{5jTExkm|GXaW-AnORUqtD3sbks3m|SU* zfaBp}I0G($GvQJgfnS63;n}bWejTTFD1Hj zZOejQU|pcQ3DH1CY2fe8a~h>?HTF00l<%4;9ZwtUk4F~+fA5kdW3_5O7o zh_$<({itna{#QCEkB9K<9>@Mq?DtU`y#hzUSK%c18k`E(!V}=@a4viYo)77xn0eCo zpw__NhquBF@Gkfnd`!>u8*A3Sc7)2qU7+^K?+Sxu;B}s( z31AAwzSa-3*C13TKH%>-o(s-}>lw{MJIQS0KJkmN?4Bvy25AVZPxB;FCKY-`K zkKo1dWB5Jz1^hM4Vc(I;OdqIx>kETrp@h6vUb(e3SQc*KUhpiDo>5uQ98>zb2z%0; zNjc5rWG@5V)nd8UTAs74p~|Y=5yP=ILveT8m&y%i?D;rn3z`8<1;vTRg#J3JFb3=B z5!3~RdpsNlC&0tuL^uXcf=5I4k0-0((NOEx$HHdFc){$gJswIPPlflx5Y*gh5nK(6 zq0+qsz5>H=9h?q#B3xx~JY-+GnWw9S!F)k1n~TVrOZn0llYXm?s+|b#rPMQWqqt3U zE4QW3ZO>)~)$Bl4ws5z*i>j$KS3&TWR8#Av(|wQVJxW`K2i7r;{Uww+y}Jw2Ewe6z zyFu1$OxyQOsBkd`&4{bo%%1uepKw384_(jf!Jn9=e-W7X&k}E<9cW^D{`nv7V5nSg zsekbl?Yz?B88{w32i3p$1Dpw;hms$EfhspIz$W+-RR7`?sPgR&L< zH2n+CCz$@l+fet7rDaeg<6aWmAq{xu?pl zcgN>FMlw+IUn;i}4IQRcclT8}eK!?sccRe<6Ssfon~qb<|0JI1a%Y-sxuQDlUJ9$q z{_a>j?pPj9pIPA_3HOJi;DK-~RJ|Do7r_Zo^ZgUyg>VwQ3{Hl(!lU2=@EG_EJQl8n z$HUj*RQMhYL5pw{!$GhFYW_bAHD^=`r3+{}oDOF|rENJ3=9lLG3-QyE$(Uhc8&up?_D(^+45d) z+zna{OUg=2H}E1S@G1-{9CtXs$B_5>{fP5>0eP?AN01!4?#I2i#^f(MO0Qtqc_ZI$ z``?6Wi~a`3!1eGr_%2jkeh+G%@_o1fegK!ikKontV|Xq61b!cW3V#ntFLTZ^2Y$}a zJ}{4P^n;pj>6wrX8z(){B$$-Jqm?i{}5;4tcihf zp`JOIXTuyfPB$dc*c@lkzzCSfu}csjN5E*4-t~@ETYFX&axM?L5mMS$?=Fwj&vV8#+A9B`^CCWG-jawkE@-K1!dIPV zy2tS~-rSa0S`)8tZEu*@Ip5Tyo1I&YW^29{8Wg35R%g|sxV3F5gB*KpVK{d>rA|mE zp%L-<1zH!8`^Faer{mlAJ2s57o2r}Ymdaj{Sn1f4c(U?WCbx1ui$}WL--oC(!Sybk z2)XCnUE1$IJHOpi&m~SFbbtTK`R)4m1Lo#*srw`Um^U()TbY^fF_%6%=Z*OsKXgOo zRdrW&?H zz(2t=;h*98@C8W!&0>BssXF``{supTZ$r*?TJOQh@O>D9AHq2N z2rhyj!)Evi);XabT}He!7-41N!ECngcIO$I0<&aqu{;p82A%-9DEi|g)hTm_y(K?{|=|a zjqn86w?FMRWM8*c0gGTIz6PGIr0Q#y~lbI9tl@M)>*9Iz#6y;vR+~R z4lagkpw<+gh1bF7AoKp#AK@?I^KcFP3uIp1dJ*Q1d^je)*H!51v`nGa5#UH^^Wv&HLG(Y6y<;DYEX>+fJUp2fxs?O$w~N zp6w3&hhw8Q&(Y2yDL&14pLAoS#;TLuP(X!Ua$8{=>DWh+FN#hrJOIvyQ8)+oHr<}! zx!_sX?CB;A{ibW9*tyq#L$aCqlP#qi>scn<>YQ||chaq)n{+#u*bU*&ji}}?_U5-D z`vHHi@;5cmH`Ft7qp|4Csq$9R+1Aup&lGcMV|z!!>6@S+am+-MlzK}y7bVc&yQAMR z-%%!`ASL*#w>O1#n7)?=m$I}skad{On+B1?2(Y%$8b|I#v-2bq5caT=xLF;oo$d8; z`(TH!EH31hdntY@i&RnXJnreFo#MO*7Qz-d0k*;E@C-N;w!`@_0hhu~_%*l~D!rD# zVA*{UdnKbk4+{D1=7IVI!9372awBd<9*iAt^1#b1p7LG2l>%Qyh81op!!*wOHUZAe zu;5&a(m?s8vT>;st#e4{Ld;)>2f=fp`g+S?F+3lZ!wX<7yb!97cM)6wFNSBsOW^si z3u+GFQmFCUWl(dtm&04&74SBAB@E`T^1ZipOwXviE#+@3@^{==lfVDoIyQVuS>~?h zWM-L>TmCwx_yz0OwWOWmd>t%=-+`)QH^Nf*U8woqn_vUH8Fs>3pvKs@LZ#PjFqj9& z=h*d&D46Sd+SPrTP1kS9xp(*r?t|1b`(l42Oq)OPJ|`1wS?OH37j??tSZ;B;i_zS? z?naVoKI>dhof!=kKwTOH>HbUhPs<%7z3u#V?`y(9mj+dK^K0^BwQXzuS6r1Jyuq6< z8^T56^(Xa-lXrwbU&a z>hDNu>h}lyNyZ0taqAhmnZ%#3Tm-)!rLrNfyScg*25v9KnVM3gs-BE*s@qprt9`yI zJjyHnSxR?Zoy1jPTnr^cmq4OseGO{P<7_w{egi5VN!Z)8QQI2abFhW9aXzH=?@1b! z;Vq@h`NUJ{asgDjTnLpemq4XU7gV}j4wWufz+k!*V6V$xX8Jn6Rc7M+1@#^18M#q` z(0(8L(i)%dgJMb+_f~)zCB|14M*G~#Yn27PYlLIZJ~Ok%cOBIGukR*KDmQ-lsCqCI zJH=6P(t1*GPFT;#%|!mXi%6Z-c@7-2;2YTj`-oX^{`zw73Ctuy3GepPzLuWrjqccs8y1Km4Rh zs9EcU8?s=$&m){ceZ*Ueci0gwtDg$a4LT%PI+Cc{u^|xjfWyxr5)O@7+G9 zZZPxwPHQ9bFH}4|TvA+BJs0s~zd7IUD1wJLs|nAn4M(EZVb+cX2k+t*+UlCB>PR?R zRuY?4R#F_Q7Q$7pgH$lOZe7p@6K%c?4AIc+}& z``r=AbXRVI75H5l-)gJ9%pc}>wX5F|UiqB3{tWRuA=#p&Qh9NCC=w|vK_u8g+Rg7M zOrVwWfh3<1@g;gunG#(V;hJb!IKs52?bGglpJs(?%1X<^C7J2#mbE?n&h1dy1+KiR z*iJP!hv9sZI8>@@jce>-V_(kVpo@k$|@_$B9tC)1bf)o5MBa!mjIh5yFMb!Hl3CvHTvc&-A}t-PE7MMT!Z+DxwRk_RM+*SG}o17rKRDLm?Icdu7~3H{}{pHG$l3R zX|a-UX{fe5%0>zMrq|Bs=JXlm70ht?tM0T~8mh|L@^UJM-`-zPrne{Nk87}oWpyyC znq98*8y94V1z+k^&q6TUu12SMR4geKo6%9mC&nA=L!Awct=?CqrkihHwWHA^TiD7H z4Fv6=zQHogtQ1LN!lkB4`bycV7g6^Ri5ab`Hcho2%5xqf3idO4n(}5p)W>_MI>hH>89Cao z%6Fbpbuf*gyc*xcTEe==!&dbKgln1@svn%dx5>wO(bEoO}!0Jc|xv&0J-P z(|HY-kfk+qO$V%!VN#COR#%&7Y$`(UO+&n4I!DKg%!;7d6@6f!n5T+lw6(3Zsdd59 zN(4HMV7A&)lQ8wG+j^>&)b6)Vi?_tv>za(Dc%ER}S4mUTj1IJSwj2L-=ES~AJ6q}# zjjb&+I_%?8QVKIX5Q6Y5qUm&st1Da4zQ2^FGd+}kH%633t0K{|fLGOJm6F+ZpPH&x z9j&cVr^fG9z)i8|?2sOunGTERGTp-&5r5bu$ebvoM>GAsH2t&6!m}B=WDi@YGE`nQ z&5REyi|Ilx-8bGD$h5$HjWMdLYNE6_{`Y0}%tEzu${SnaW5<}U+oczkbU*Dr+?eeC zxuVtfFQ#vaRM$1Oa}FbG5CV@(qphr~U&QX$o+2MEi7=-0`*aZkzxb}HnMj~Scupb=LMV=o1Y_9X zf4k?3zDErbI+cKd`sfd)-GYot^C(S1mMm?lYi_K!4_Gdg7`(pP!iW-(o+`W%qgB~sRT4GFk4 zZ*s+OdV!>HX9g|eFE9yg{Y#I_NB)FrAzBznfE-JRaMUTiLpw0{(JYM%*AGu#k7oYUSwxPdK2W! zf98bE(61&iQ4q)uyQoQaY@v#TrWI$1mb741MVao%sES^^DyzyEl&Tp}Wkmm7di=ez zPd%%s)wor&ijh=pN*95?>dCxyxTZ8z98S6Ipx znC=`INxG%VZ&n{`tF@BD{MDT7K9@ehd{-~2#USWz;I3@w3+LVzfo=?@EyvPXyyx&+j9}%iQ;ADpcigNAGzp&tTE-VnsPY1s-`67l%DKSEM~#j?xO@{y%#i`qy=oS_tHqH zG|V`=vLsq%%PTU^4t#;mnBJ!O zBcWbVC?=Z>3GKa#r8o)~F^NU0YHNyv{o7RY6eZzm%-#V-Wj8M>u25rvt8AKSnB)^H z|8!sNXz!lkwmdv7#3HEMuxkTBu!rsiu$nR_v7Qo7t}NKY^Opig(@zbpi6NkncG`H7 z(Oc}!OOwj!Ei&!9+Xk4LTvqAkW6+(~fpupQSZu0mZ!k+|N~Ar#0M4l>SFH}rvH0FZ z#Z0}&6|j4G&%24tL?s(NQmscYL|({EwMhBsmcYF|A4|iU6xFiwoz8lU7aOHtWl0E; zLz5d0(YMmZo%CYny-3A8^&Yp)8|uBsEPCRiy4D1n1?5Pf2joiyBcxNlWsRLJ=DbOk zU?;|liJdPjPsf?t$=cE@movJ@UId+#%w9lKHOQUx3D#QAFLD`kSygta!Q{GI+Jfz( zJ;n(XwP2)D^;N4VSp%Zin4%vXetSX11)&^RaJN%B#cp>yl07D=dTY9m z@+XJIw{(BZl2P_rVah`lB}XF#$zu7UWxzCF%o=QY)$Huit*EN3is4W8&^iM#y~mBU zmI^c8;lRSuUizd*FGm=c4lhCpcEPqe5X@%sKvH}fk6jp zWB2SuJ(Wss$kL~SeO1}#)D*O=4&4-Uee5}|B&{9S;E=;BxW2(oQ56e-86!;3WvHA! zFZ-Y9kb489>}7~vbP1b)re|~;JpXV}%p5qaWKbY^PV7k=r@#%aiPs)c`9_mg!b z%CMQ0H#Kpx>@UmG>QY8D#@=;2z&M_(ca@v%0CGIgcw9X@J!H9#trH531>W(cOeGKG;r-%#eWe&xOT`m|-Io2Nta0m1sdQt4uTKYpcsr5w0kr$Vj^Bc8>pciCLF) zTxe&7T#!I156B0N60~|_-zBNi?z)>h>?s4~mHZ&(Qm&?j>DiG38k_4TDVVxhRym8= zNQ#3!pzTMuCdXoYqGT*$y^+2MqhakksnqVhaxWsJcgh#rSjrAmvzINsFX3Aor_o~R zvBO#OQP!<9X)-HRV|sPWMeH5uiI_o>y#tNS80kLS11K88y}G-B+AUU&f;G%M6KdjK zU82?As&KHkHJ1qzZ60vfW6WlWpujR!$G4Nw?nGtCgbFqa7suG6IK5I6jx?-Vd=GYc ze4e>0-)s&FX9zXFJA2lK{<6kA3U5Y3lkx7zOg8FLNP|*3!(nNK?eK^|f@Xa`Wq?hp z8BI!t$7<>sTj4Y)*}L`HBtm-D`HGP}R@q`?BD3wt1Y7fzfScJ_*VLF;nlXq?xp1^I zYPn5S@WEhri9TT^^LY$$OaabZbn|(&w4UStOt9PDr1d|1-gt|Q8egk#F3CB;9D{1B zt85Low^M9`6Scm?F)M`xJJH_S%3Am)a$|%1 zYl%16pD&g?v0Z$Wa$)NYFyE~SW^^hgD&ozp?MtKWbuArjt?h}7(&LLwd24H1+&M9% zrCDuTv|svh>ZPSkbqh@A$G-Cq?%3h5mzdd%6X|Tzo6sbsPL%CzlkuQ~-BXSAjVPP4 zLuHyu+rj6?K_cFc4k|m@Q&IkcdnNJ3jrH-`mb%4tjZLPR4Hijn;?nLIq{dsp{0lg= z$5V7QC;-UZ;97dXH4U+bU!L=zkO?^VW}t%^6mUm=X%<;Ua0>xod7Bm{6@V=ygB`ny zXf#6>1VZ3MOfJ<`_zi6Zhi94Gq1$4bEt8w?U_Hp$5L=^}4z|9#Tamrza_r}5aLu%E z`l3~;WIB`dCcE4@ZSAMjtNYkqu%W)DtVpYls+hXb*S=wP7^wx8T|e8dSkjF-ej|TWXVj6N_ z!E4y|v1UbMWn;a#=Q?4b(?b8%^rZCg4z{)1gD@RE+2^I(oBjGGp>;Dqa1$Xl&G